Skip to content

fix: remove redundant test setup/cleanup and centralize maxYamlCodePo… #2304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
daniel-kmiecik wants to merge 3 commits into from
Closed

fix: remove redundant test setup/cleanup and centralize maxYamlCodePo… #2304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f58e0e5
Revert "chore: upgrade jackson from 2.19.0 to 2.21.1 (#2285)"
daniel-kmiecik Apr 9, 2026
b15033c
Revert "chore: bump core version to 2.2.45 (#2288)"
daniel-kmiecik Apr 9, 2026
eb7ae5f
Revert "fix: distinguish between default and example set to null and …
daniel-kmiecik Apr 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/swagger-parser-v2-converter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson-annotations-version}</version>
<version>${jackson-version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
8 changes: 2 additions & 6 deletions ...er-parser-v2-converter/src/main/java/io/swagger/v3/parser/converter/SwaggerConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,9 +786,7 @@ private Schema convert(SerializableParameter sp) {

if (sp instanceof AbstractSerializableParameter) {
AbstractSerializableParameter ap = (AbstractSerializableParameter) sp;
if (ap.getDefault() != null) {
schema.setDefault(ap.getDefault());
}
schema.setDefault(ap.getDefault());
}
return schema;
}
Expand Down Expand Up @@ -1165,9 +1163,7 @@ public Parameter convert(io.swagger.models.parameters.Parameter v2Parameter) {

if (sp instanceof AbstractSerializableParameter) {
AbstractSerializableParameter ap = (AbstractSerializableParameter) sp;
if (ap.getDefault() != null) {
schema.setDefault(ap.getDefault());
}
schema.setDefault(ap.getDefault());
}
}

Expand Down
311 changes: 0 additions & 311 deletions ...parser-v2-converter/src/test/java/io/swagger/parser/test/V2ConverterNullHandlingTest.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion modules/swagger-parser-v3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson-annotations-version}</version>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down
2 changes: 2 additions & 0 deletions modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/OpenAPIDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2994,6 +2994,8 @@ at the moment path passed as string (basePath) from upper components can be both
if (defaultObject != null) {
schema.setDefault(defaultObject);
}
} else {
schema.setDefault(null);
}

Map<String, Object> extensions = getExtensions(node);
Expand Down
12 changes: 4 additions & 8 deletions modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/ResolverFully.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,10 +437,7 @@ public Schema resolveSchema(Schema schema) {
aggregateSchemaCombinators(composedSchema, combinedModel, composedSchema.getAnyOf(), examples, defaultValues);
}
if (defaultValues.size() == 1) {
Object defaultValue = defaultValues.iterator().next();
if (defaultValue != null) {
combinedModel.setDefault(defaultValue);
}
combinedModel.setDefault(defaultValues.iterator().next());
}

if (schema.getExample() != null) {
Expand Down Expand Up @@ -603,11 +600,10 @@ private void aggregateSchemaCombinators(ComposedSchema sourceSchema, Schema targ
if (resolved.getExample() != null) {
examples.add(resolved.getExample());
}
if (resolved.getDefault() != null) {
defaultValues.add(resolved.getDefault());
} else if (sourceSchema.getDefault() != null) {
if (sourceSchema.getDefault() != null && resolved.getDefault() == null)
defaultValues.add(sourceSchema.getDefault());
}
else
defaultValues.add(resolved.getDefault());

if (resolved.getExtensions() != null) {
Map<String, Object> extensions = resolved.getExtensions();
Expand Down
Loading
Loading