Skip to content

Commit 832669b

Browse files
committed
Upgrage swagger-core to 2.2.25
1 parent 2a0e353 commit 832669b

File tree

3 files changed

+32
-1
lines changed

3 files changed

+32
-1
lines changed

Diff for: pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
6161
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
6262
<nexus-staging-maven-plugin>1.6.8</nexus-staging-maven-plugin>
63-
<swagger-api.version>2.2.24</swagger-api.version>
63+
<swagger-api.version>2.2.25</swagger-api.version>
6464
<swagger-ui.version>5.17.14</swagger-ui.version>
6565
<gmavenplus-plugin.version>1.13.1</gmavenplus-plugin.version>
6666
<jjwt.version>0.9.1</jjwt.version>

Diff for: springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/DataRestDelegatingMethodParameterCustomizer.java

+9
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,10 @@ public boolean allowReserved() {
189189
@Override
190190
public Schema schema() {
191191
return new Schema() {
192+
@Override
193+
public SchemaResolution schemaResolution() {
194+
return parameterSchema.schemaResolution();
195+
}
192196

193197
private Schema parameterSchema = parameter.schema();
194198

@@ -938,6 +942,11 @@ public String[] examples() {
938942
public String _const() {
939943
return schema._const();
940944
}
945+
946+
@Override
947+
public SchemaResolution schemaResolution() {
948+
return schema.schemaResolution();
949+
}
941950
};
942951
}
943952

Diff for: springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/schema/Builder.java

+22
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import io.swagger.v3.oas.annotations.media.Schema.AccessMode;
3636
import io.swagger.v3.oas.annotations.media.Schema.AdditionalPropertiesValue;
3737
import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
38+
import io.swagger.v3.oas.annotations.media.Schema.SchemaResolution;
3839
import org.apache.commons.lang3.ArrayUtils;
3940

4041
/**
@@ -228,6 +229,11 @@ public class Builder {
228229
*/
229230
private Extension[] extensions = {};
230231

232+
/**
233+
* The Schema resolution.
234+
*/
235+
private SchemaResolution schemaResolution;
236+
231237
/**
232238
* Allows to specify the additionalProperties value
233239
* AdditionalPropertiesValue.TRUE: set to TRUE
@@ -818,6 +824,17 @@ public Builder requiredMode(RequiredMode requiredMode) {
818824
return this;
819825
}
820826

827+
/**
828+
* Schema resolution builder.
829+
*
830+
* @param schemaResolution the schema resolution
831+
* @return the builder
832+
*/
833+
public Builder schemaResolution(SchemaResolution schemaResolution) {
834+
this.schemaResolution = schemaResolution;
835+
return this;
836+
}
837+
821838
/**
822839
* Additional properties builder.
823840
*
@@ -1195,6 +1212,11 @@ public String[] examples() {
11951212
public String _const() {
11961213
return _const;
11971214
}
1215+
1216+
@Override
1217+
public SchemaResolution schemaResolution() {
1218+
return schemaResolution;
1219+
}
11981220
};
11991221
}
12001222
}

0 commit comments

Comments
 (0)