Skip to content

Commit 6955576

Browse files
committed
open-api: fix minor upgrade/breaking changes
1 parent 5c51e50 commit 6955576

File tree

4 files changed

+14
-4
lines changed

4 files changed

+14
-4
lines changed

modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/ParameterExt.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ public class ParameterExt extends Parameter {
2525
@JsonIgnore private boolean single = true;
2626

2727
@JsonIgnore private List<AnnotationNode> annotations = List.of();
28+
@JsonIgnore private boolean defaultValueSet;
2829

2930
public void setJavaType(String javaType) {
3031
this.javaType = javaType;
@@ -34,6 +35,10 @@ public String getJavaType() {
3435
return javaType;
3536
}
3637

38+
public boolean isDefaultValueSet() {
39+
return defaultValueSet;
40+
}
41+
3742
public Object getDefaultValue() {
3843
if (defaultValue != null) {
3944
if (javaType.equals(boolean.class.getName())) {
@@ -58,6 +63,7 @@ public void setSingle(boolean single) {
5863

5964
public void setDefaultValue(Object defaultValue) {
6065
this.defaultValue = defaultValue;
66+
this.defaultValueSet = true;
6167
}
6268

6369
@Override

modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/RouteParser.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,9 @@ private List<Parameter> checkParameters(ParserContext ctx, List<Parameter> param
195195
Optional.ofNullable(ctx.schema(javaType))
196196
.ifPresent(
197197
schema -> {
198-
schema.setDefault(paramExt.getDefaultValue());
198+
if (paramExt.isDefaultValueSet()) {
199+
schema.setDefault(paramExt.getDefaultValue());
200+
}
199201
parameter.setSchema(schema);
200202
});
201203
}

modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/projection/SchemaPruner.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,9 @@ private static void copyMetadata(Schema<?> source, Schema<?> target) {
120120
target.setTitle(source.getTitle());
121121
target.setDescription(source.getDescription());
122122
target.setFormat(source.getFormat());
123-
target.setDefault(source.getDefault());
123+
if (source.getDefaultSetFlag()) {
124+
target.setDefault(source.getDefault());
125+
}
124126
if (source.getExample() != null) {
125127
target.setExample(source.getExample());
126128
}

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@
112112
<vertx.version>5.0.8</vertx.version>
113113

114114
<!--OpenAPI-->
115-
<swagger.version>2.2.44</swagger.version>
116-
<swagger-parser.version>2.1.38</swagger-parser.version>
115+
<swagger.version>2.2.45</swagger.version>
116+
<swagger-parser.version>2.1.39</swagger-parser.version>
117117
<redoc.version>2.0.0-rc.20</redoc.version>
118118

119119
<!-- SSL -->

0 commit comments

Comments
 (0)