diff --git a/modules/swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/examples/ExamplesTest.java b/modules/swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/examples/ExamplesTest.java index 965c9dd888..75a9581333 100644 --- a/modules/swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/examples/ExamplesTest.java +++ b/modules/swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/examples/ExamplesTest.java @@ -1,8 +1,6 @@ package io.swagger.v3.jaxrs2.annotations.examples; -import io.swagger.v3.jaxrs2.Reader; import io.swagger.v3.jaxrs2.annotations.AbstractAnnotationTest; -import io.swagger.v3.jaxrs2.matchers.SerializationMatchers; import io.swagger.v3.jaxrs2.resources.model.User; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -13,7 +11,6 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.parameters.RequestBody; import io.swagger.v3.oas.annotations.responses.ApiResponse; -import io.swagger.v3.oas.models.OpenAPI; import org.testng.annotations.Test; import javax.ws.rs.Consumes; @@ -24,7 +21,6 @@ public class ExamplesTest extends AbstractAnnotationTest { - @Test public void testRequestBodyContentExample() { compareToYamlFile(ExamplesTest.RequestBodyContentExample.class, "examples/"); @@ -411,6 +407,11 @@ public void testFullExample() { " externalValue: Subscription Response value 1\n" + "components:\n" + " schemas:\n" + + " SubscriptionResponse:\n" + + " type: object\n" + + " properties:\n" + + " subscriptionId:\n" + + " type: string\n" + " User:\n" + " type: object\n" + " properties:\n" + @@ -434,12 +435,7 @@ public void testFullExample() { " description: User Status\n" + " format: int32\n" + " xml:\n" + - " name: User\n" + - " SubscriptionResponse:\n" + - " type: object\n" + - " properties:\n" + - " subscriptionId:\n" + - " type: string"; + " name: User"; assertEquals(extractedYAML, expectedYAML); } diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/Components.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/Components.java index a5edbc0640..84c76ec1a7 100644 --- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/Components.java +++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/Components.java @@ -27,6 +27,7 @@ import io.swagger.v3.oas.models.security.SecurityScheme; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import java.util.Objects; @@ -69,7 +70,7 @@ public Components schemas(Map schemas) { public Components addSchemas(String key, Schema schemasItem) { if (this.schemas == null) { - this.schemas = new HashMap(); + this.schemas = new LinkedHashMap<>(); } this.schemas.put(key, schemasItem); return this; @@ -96,7 +97,7 @@ public Components responses(Map responses) { public Components addResponses(String key, ApiResponse responsesItem) { if (this.responses == null) { - this.responses = new HashMap(); + this.responses = new LinkedHashMap<>(); } this.responses.put(key, responsesItem); return this; @@ -123,7 +124,7 @@ public Components parameters(Map parameters) { public Components addParameters(String key, Parameter parametersItem) { if (this.parameters == null) { - this.parameters = new HashMap(); + this.parameters = new LinkedHashMap<>(); } this.parameters.put(key, parametersItem); return this; @@ -150,7 +151,7 @@ public Components examples(Map examples) { public Components addExamples(String key, Example examplesItem) { if (this.examples == null) { - this.examples = new HashMap(); + this.examples = new LinkedHashMap<>(); } this.examples.put(key, examplesItem); return this; @@ -177,7 +178,7 @@ public Components requestBodies(Map requestBodies) { public Components addRequestBodies(String key, RequestBody requestBodiesItem) { if (this.requestBodies == null) { - this.requestBodies = new HashMap(); + this.requestBodies = new LinkedHashMap<>(); } this.requestBodies.put(key, requestBodiesItem); return this; @@ -204,7 +205,7 @@ public Components headers(Map headers) { public Components addHeaders(String key, Header headersItem) { if (this.headers == null) { - this.headers = new HashMap(); + this.headers = new LinkedHashMap<>(); } this.headers.put(key, headersItem); return this; @@ -231,7 +232,7 @@ public Components securitySchemes(Map securitySchemes) { public Components addSecuritySchemes(String key, SecurityScheme securitySchemesItem) { if (this.securitySchemes == null) { - this.securitySchemes = new HashMap(); + this.securitySchemes = new LinkedHashMap<>(); } this.securitySchemes.put(key, securitySchemesItem); return this; @@ -258,7 +259,7 @@ public Components links(Map links) { public Components addLinks(String key, Link linksItem) { if (this.links == null) { - this.links = new HashMap(); + this.links = new LinkedHashMap<>(); } this.links.put(key, linksItem); return this; @@ -285,7 +286,7 @@ public Components callbacks(Map callbacks) { public Components addCallbacks(String key, Callback callbacksItem) { if (this.callbacks == null) { - this.callbacks = new HashMap(); + this.callbacks = new LinkedHashMap<>(); } this.callbacks.put(key, callbacksItem); return this; @@ -326,7 +327,7 @@ public void addExtension(String name, Object value) { return; } if (this.extensions == null) { - this.extensions = new java.util.HashMap<>(); + this.extensions = new java.util.LinkedHashMap<>(); } this.extensions.put(name, value); } diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/ExternalDocumentation.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/ExternalDocumentation.java index 81e2b720e7..24a0fbfecf 100644 --- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/ExternalDocumentation.java +++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/ExternalDocumentation.java @@ -95,7 +95,7 @@ public void addExtension(String name, Object value) { return; } if (this.extensions == null) { - this.extensions = new java.util.HashMap<>(); + this.extensions = new java.util.LinkedHashMap<>(); } this.extensions.put(name, value); } diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/OpenAPI.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/OpenAPI.java index 10f7d20bd9..6b34386407 100644 --- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/OpenAPI.java +++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/OpenAPI.java @@ -283,7 +283,7 @@ public void addExtension(String name, Object value) { return; } if (this.extensions == null) { - this.extensions = new java.util.HashMap<>(); + this.extensions = new java.util.LinkedHashMap<>(); } this.extensions.put(name, value); } diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/Operation.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/Operation.java index 66ce10d992..680cdf8162 100644 --- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/Operation.java +++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/Operation.java @@ -347,7 +347,7 @@ public void addExtension(String name, Object value) { return; } if (this.extensions == null) { - this.extensions = new java.util.HashMap<>(); + this.extensions = new java.util.LinkedHashMap<>(); } this.extensions.put(name, value); } diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/PathItem.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/PathItem.java index a6690f17d9..1d18490f5b 100644 --- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/PathItem.java +++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/PathItem.java @@ -401,7 +401,7 @@ public void addExtension(String name, Object value) { return; } if (this.extensions == null) { - this.extensions = new java.util.HashMap<>(); + this.extensions = new java.util.LinkedHashMap<>(); } this.extensions.put(name, value); } diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/Paths.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/Paths.java index 3ae21ff311..df58dc90a3 100644 --- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/Paths.java +++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/Paths.java @@ -63,7 +63,7 @@ public void addExtension(String name, Object value) { return; } if (this.extensions == null) { - this.extensions = new java.util.HashMap<>(); + this.extensions = new java.util.LinkedHashMap<>(); } this.extensions.put(name, value); } diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/callbacks/Callback.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/callbacks/Callback.java index bec3558baf..b991851be9 100644 --- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/callbacks/Callback.java +++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/callbacks/Callback.java @@ -95,7 +95,7 @@ public void addExtension(String name, Object value) { return; } if (this.extensions == null) { - this.extensions = new java.util.HashMap<>(); + this.extensions = new java.util.LinkedHashMap<>(); } this.extensions.put(name, value); } diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/examples/Example.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/examples/Example.java index cdc7334585..4055e78b5e 100644 --- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/examples/Example.java +++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/examples/Example.java @@ -129,7 +129,7 @@ public void addExtension(String name, Object value) { return; } if (this.extensions == null) { - this.extensions = new java.util.HashMap<>(); + this.extensions = new java.util.LinkedHashMap<>(); } this.extensions.put(name, value); } diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/headers/Header.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/headers/Header.java index 2c2d65ade8..28b86208b6 100644 --- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/headers/Header.java +++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/headers/Header.java @@ -21,6 +21,7 @@ import io.swagger.v3.oas.models.media.Schema; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import java.util.Objects; @@ -197,7 +198,7 @@ public Header examples(Map examples) { public Header addExample(String key, Example examplesItem) { if (this.examples == null) { - this.examples = new HashMap(); + this.examples = new LinkedHashMap<>(); } this.examples.put(key, examplesItem); return this; @@ -277,7 +278,7 @@ public void addExtension(String name, Object value) { return; } if (this.extensions == null) { - this.extensions = new java.util.HashMap<>(); + this.extensions = new java.util.LinkedHashMap<>(); } this.extensions.put(name, value); } diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/info/Contact.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/info/Contact.java index cfe477799d..bc20f57d66 100644 --- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/info/Contact.java +++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/info/Contact.java @@ -116,7 +116,7 @@ public void addExtension(String name, Object value) { return; } if (this.extensions == null) { - this.extensions = new java.util.HashMap<>(); + this.extensions = new java.util.LinkedHashMap<>(); } this.extensions.put(name, value); } diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/info/Info.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/info/Info.java index d77c8fa8ce..9c6f5e3021 100644 --- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/info/Info.java +++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/info/Info.java @@ -177,7 +177,7 @@ public void addExtension(String name, Object value) { return; } if (this.extensions == null) { - this.extensions = new java.util.HashMap<>(); + this.extensions = new java.util.LinkedHashMap<>(); } this.extensions.put(name, value); } diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/info/License.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/info/License.java index 1255b240b1..0bc59fc0f2 100644 --- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/info/License.java +++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/info/License.java @@ -95,7 +95,7 @@ public void addExtension(String name, Object value) { return; } if (this.extensions == null) { - this.extensions = new java.util.HashMap<>(); + this.extensions = new java.util.LinkedHashMap<>(); } this.extensions.put(name, value); } diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/links/Link.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/links/Link.java index f87ced772d..274aab1b23 100644 --- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/links/Link.java +++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/links/Link.java @@ -21,6 +21,7 @@ import io.swagger.v3.oas.models.servers.Server; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; /** @@ -126,7 +127,7 @@ public void setParameters(Map parameters) { public Link parameters(String name, String parameter) { if (this.parameters == null) { - this.parameters = new HashMap<>(); + this.parameters = new LinkedHashMap<>(); } this.parameters.put(name, parameter); @@ -154,7 +155,7 @@ public Link headers(Map headers) { public Link addHeaderObject(String name, Header header) { if (this.headers == null) { - headers = new HashMap<>(); + headers = new LinkedHashMap<>(); } headers.put(name, header); return this; @@ -257,7 +258,7 @@ public void addExtension(String name, Object value) { return; } if (this.extensions == null) { - this.extensions = new java.util.HashMap<>(); + this.extensions = new java.util.LinkedHashMap<>(); } this.extensions.put(name, value); } diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/links/LinkParameter.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/links/LinkParameter.java index 438c79a051..0f226a2c18 100644 --- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/links/LinkParameter.java +++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/links/LinkParameter.java @@ -72,7 +72,7 @@ public void addExtension(String name, Object value) { return; } if (this.extensions == null) { - this.extensions = new java.util.HashMap<>(); + this.extensions = new java.util.LinkedHashMap<>(); } this.extensions.put(name, value); } diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/media/Discriminator.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/media/Discriminator.java index 51780ca567..4df2216d7e 100644 --- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/media/Discriminator.java +++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/media/Discriminator.java @@ -1,6 +1,7 @@ package io.swagger.v3.oas.models.media; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; public class Discriminator { @@ -22,7 +23,7 @@ public void setPropertyName(String propertyName) { public Discriminator mapping(String name, String value) { if (this.mapping == null) { - this.mapping = new HashMap<>(); + this.mapping = new LinkedHashMap<>(); } this.mapping.put(name, value); return this; diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/media/Encoding.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/media/Encoding.java index cdca3f2a47..c8e40b0209 100644 --- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/media/Encoding.java +++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/media/Encoding.java @@ -130,7 +130,7 @@ public void addExtension(String name, Object value) { return; } if (this.extensions == null) { - this.extensions = new java.util.HashMap<>(); + this.extensions = new java.util.LinkedHashMap<>(); } this.extensions.put(name, value); } diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/media/EncodingProperty.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/media/EncodingProperty.java index 0e86f8cc10..879843db15 100644 --- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/media/EncodingProperty.java +++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/media/EncodingProperty.java @@ -19,6 +19,7 @@ import io.swagger.v3.oas.models.headers.Header; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import java.util.Objects; @@ -101,7 +102,7 @@ public EncodingProperty headers(Map headers) { public EncodingProperty addHeaderObject(String name, Header header) { if (this.headers == null) { - headers = new HashMap<>(); + headers = new LinkedHashMap<>(); } headers.put(name, header); return this; @@ -195,7 +196,7 @@ public void addExtension(String name, Object value) { return; } if (this.extensions == null) { - this.extensions = new java.util.HashMap<>(); + this.extensions = new java.util.LinkedHashMap<>(); } this.extensions.put(name, value); } diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/media/MediaType.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/media/MediaType.java index a263937af5..dac234a198 100644 --- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/media/MediaType.java +++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/media/MediaType.java @@ -19,6 +19,7 @@ import io.swagger.v3.oas.models.examples.Example; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import java.util.Objects; @@ -75,7 +76,7 @@ public MediaType examples(Map examples) { public MediaType addExamples(String key, Example examplesItem) { if (this.examples == null) { - this.examples = new HashMap(); + this.examples = new LinkedHashMap<>(); } this.examples.put(key, examplesItem); return this; @@ -121,7 +122,7 @@ public MediaType encoding(Map encoding) { public MediaType addEncoding(String key, Encoding encodingItem) { if (this.encoding == null) { - this.encoding = new HashMap(); + this.encoding = new LinkedHashMap<>(); } this.encoding.put(key, encodingItem); return this; @@ -157,7 +158,7 @@ public void addExtension(String name, Object value) { return; } if (this.extensions == null) { - this.extensions = new java.util.HashMap<>(); + this.extensions = new java.util.LinkedHashMap<>(); } this.extensions.put(name, value); } diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/media/Schema.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/media/Schema.java index d6106e1c7c..e9792f179c 100644 --- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/media/Schema.java +++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/media/Schema.java @@ -525,7 +525,7 @@ public Schema properties(Map properties) { public Schema addProperties(String key, Schema propertiesItem) { if (this.properties == null) { - this.properties = new LinkedHashMap(); + this.properties = new LinkedHashMap<>(); } this.properties.put(key, propertiesItem); return this; @@ -806,7 +806,7 @@ public void addExtension(String name, Object value) { return; } if (this.extensions == null) { - this.extensions = new java.util.HashMap<>(); + this.extensions = new java.util.LinkedHashMap<>(); } this.extensions.put(name, value); } diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/media/XML.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/media/XML.java index 71b70bca30..a9c646b793 100644 --- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/media/XML.java +++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/media/XML.java @@ -158,7 +158,7 @@ public void addExtension(String name, Object value) { return; } if (this.extensions == null) { - this.extensions = new java.util.HashMap<>(); + this.extensions = new java.util.LinkedHashMap<>(); } this.extensions.put(name, value); } diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/parameters/Parameter.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/parameters/Parameter.java index 20091d1db3..44a9c2b28e 100644 --- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/parameters/Parameter.java +++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/parameters/Parameter.java @@ -21,6 +21,7 @@ import io.swagger.v3.oas.models.media.Schema; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import java.util.Objects; @@ -286,7 +287,7 @@ public Parameter examples(Map examples) { public Parameter addExample(String key, Example examplesItem) { if (this.examples == null) { - this.examples = new HashMap(); + this.examples = new LinkedHashMap<>(); } this.examples.put(key, examplesItem); return this; @@ -386,7 +387,7 @@ public void addExtension(String name, Object value) { return; } if (this.extensions == null) { - this.extensions = new java.util.HashMap<>(); + this.extensions = new java.util.LinkedHashMap<>(); } this.extensions.put(name, value); } diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/parameters/RequestBody.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/parameters/RequestBody.java index 7e09d26baa..2b0021c92d 100644 --- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/parameters/RequestBody.java +++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/parameters/RequestBody.java @@ -97,7 +97,7 @@ public void addExtension(String name, Object value) { return; } if (this.extensions == null) { - this.extensions = new java.util.HashMap<>(); + this.extensions = new java.util.LinkedHashMap<>(); } this.extensions.put(name, value); } diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/responses/ApiResponse.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/responses/ApiResponse.java index 697f902620..15d140f323 100644 --- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/responses/ApiResponse.java +++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/responses/ApiResponse.java @@ -21,6 +21,7 @@ import io.swagger.v3.oas.models.media.Content; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import java.util.Objects; @@ -78,7 +79,7 @@ public ApiResponse headers(Map headers) { public ApiResponse addHeaderObject(String name, Header header) { if (this.headers == null) { - headers = new HashMap<>(); + headers = new LinkedHashMap<>(); } headers.put(name, header); return this; @@ -119,7 +120,7 @@ public void setLinks(java.util.Map links) { public ApiResponse link(String name, Link link) { if (this.links == null) { - this.links = new HashMap<>(); + this.links = new LinkedHashMap<>(); } this.links.put(name, link); return this; @@ -177,7 +178,7 @@ public void addExtension(String name, Object value) { return; } if (this.extensions == null) { - this.extensions = new java.util.HashMap<>(); + this.extensions = new java.util.LinkedHashMap<>(); } this.extensions.put(name, value); } diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/responses/ApiResponses.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/responses/ApiResponses.java index 8451ec5707..4a4a807e13 100644 --- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/responses/ApiResponses.java +++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/responses/ApiResponses.java @@ -64,7 +64,7 @@ public void addExtension(String name, Object value) { return; } if (this.extensions == null) { - this.extensions = new java.util.HashMap<>(); + this.extensions = new java.util.LinkedHashMap<>(); } this.extensions.put(name, value); } diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/security/OAuthFlow.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/security/OAuthFlow.java index 47a382da2f..30802c6b7d 100644 --- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/security/OAuthFlow.java +++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/security/OAuthFlow.java @@ -137,7 +137,7 @@ public void addExtension(String name, Object value) { return; } if (this.extensions == null) { - this.extensions = new java.util.HashMap<>(); + this.extensions = new java.util.LinkedHashMap<>(); } this.extensions.put(name, value); } diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/security/OAuthFlows.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/security/OAuthFlows.java index 83ffbfc860..a9d5b9470b 100644 --- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/security/OAuthFlows.java +++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/security/OAuthFlows.java @@ -137,7 +137,7 @@ public void addExtension(String name, Object value) { return; } if (this.extensions == null) { - this.extensions = new java.util.HashMap<>(); + this.extensions = new java.util.LinkedHashMap<>(); } this.extensions.put(name, value); } diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/security/Scopes.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/security/Scopes.java index 1d469f7c5f..a7543bf633 100644 --- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/security/Scopes.java +++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/security/Scopes.java @@ -71,7 +71,7 @@ public void addExtension(String name, Object value) { return; } if (this.extensions == null) { - this.extensions = new java.util.HashMap<>(); + this.extensions = new java.util.LinkedHashMap<>(); } this.extensions.put(name, value); } diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/security/SecurityScheme.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/security/SecurityScheme.java index 03d651c62d..1d5fca7907 100644 --- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/security/SecurityScheme.java +++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/security/SecurityScheme.java @@ -239,7 +239,7 @@ public void addExtension(String name, Object value) { return; } if (this.extensions == null) { - this.extensions = new java.util.HashMap<>(); + this.extensions = new java.util.LinkedHashMap<>(); } this.extensions.put(name, value); } diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/servers/Server.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/servers/Server.java index 9df0aa792a..c6bc0da7a8 100644 --- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/servers/Server.java +++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/servers/Server.java @@ -116,7 +116,7 @@ public void addExtension(String name, Object value) { return; } if (this.extensions == null) { - this.extensions = new java.util.HashMap<>(); + this.extensions = new java.util.LinkedHashMap<>(); } this.extensions.put(name, value); } diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/servers/ServerVariable.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/servers/ServerVariable.java index 3241a4816b..c35b694f68 100644 --- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/servers/ServerVariable.java +++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/servers/ServerVariable.java @@ -126,7 +126,7 @@ public void addExtension(String name, Object value) { return; } if (this.extensions == null) { - this.extensions = new java.util.HashMap<>(); + this.extensions = new java.util.LinkedHashMap<>(); } this.extensions.put(name, value); } diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/servers/ServerVariables.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/servers/ServerVariables.java index adaa2aa7a5..fd28ead8fb 100644 --- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/servers/ServerVariables.java +++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/servers/ServerVariables.java @@ -71,7 +71,7 @@ public void addExtension(String name, Object value) { return; } if (this.extensions == null) { - this.extensions = new java.util.HashMap<>(); + this.extensions = new java.util.LinkedHashMap<>(); } this.extensions.put(name, value); } diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/tags/Tag.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/tags/Tag.java index bc63dfbc8a..f727c1c305 100644 --- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/tags/Tag.java +++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/tags/Tag.java @@ -118,7 +118,7 @@ public void addExtension(String name, Object value) { return; } if (this.extensions == null) { - this.extensions = new java.util.HashMap<>(); + this.extensions = new java.util.LinkedHashMap<>(); } this.extensions.put(name, value); }