📐 Preserve order in maps accross the OAS model

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);
     }
 

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<String, Schema> schemas) {
 
     public Components addSchemas(String key, Schema schemasItem) {
         if (this.schemas == null) {
-            this.schemas = new HashMap<String, Schema>();
+            this.schemas = new LinkedHashMap<>();
         }
         this.schemas.put(key, schemasItem);
         return this;
@@ -96,7 +97,7 @@ public Components responses(Map<String, ApiResponse> responses) {
 
     public Components addResponses(String key, ApiResponse responsesItem) {
         if (this.responses == null) {
-            this.responses = new HashMap<String, ApiResponse>();
+            this.responses = new LinkedHashMap<>();
         }
         this.responses.put(key, responsesItem);
         return this;
@@ -123,7 +124,7 @@ public Components parameters(Map<String, Parameter> parameters) {
 
     public Components addParameters(String key, Parameter parametersItem) {
         if (this.parameters == null) {
-            this.parameters = new HashMap<String, Parameter>();
+            this.parameters = new LinkedHashMap<>();
         }
         this.parameters.put(key, parametersItem);
         return this;
@@ -150,7 +151,7 @@ public Components examples(Map<String, Example> examples) {
 
     public Components addExamples(String key, Example examplesItem) {
         if (this.examples == null) {
-            this.examples = new HashMap<String, Example>();
+            this.examples = new LinkedHashMap<>();
         }
         this.examples.put(key, examplesItem);
         return this;
@@ -177,7 +178,7 @@ public Components requestBodies(Map<String, RequestBody> requestBodies) {
 
     public Components addRequestBodies(String key, RequestBody requestBodiesItem) {
         if (this.requestBodies == null) {
-            this.requestBodies = new HashMap<String, RequestBody>();
+            this.requestBodies = new LinkedHashMap<>();
         }
         this.requestBodies.put(key, requestBodiesItem);
         return this;
@@ -204,7 +205,7 @@ public Components headers(Map<String, Header> headers) {
 
     public Components addHeaders(String key, Header headersItem) {
         if (this.headers == null) {
-            this.headers = new HashMap<String, Header>();
+            this.headers = new LinkedHashMap<>();
         }
         this.headers.put(key, headersItem);
         return this;
@@ -231,7 +232,7 @@ public Components securitySchemes(Map<String, SecurityScheme> securitySchemes) {
 
     public Components addSecuritySchemes(String key, SecurityScheme securitySchemesItem) {
         if (this.securitySchemes == null) {
-            this.securitySchemes = new HashMap<String, SecurityScheme>();
+            this.securitySchemes = new LinkedHashMap<>();
         }
         this.securitySchemes.put(key, securitySchemesItem);
         return this;
@@ -258,7 +259,7 @@ public Components links(Map<String, Link> links) {
 
     public Components addLinks(String key, Link linksItem) {
         if (this.links == null) {
-            this.links = new HashMap<String, Link>();
+            this.links = new LinkedHashMap<>();
         }
         this.links.put(key, linksItem);
         return this;
@@ -285,7 +286,7 @@ public Components callbacks(Map<String, Callback> callbacks) {
 
     public Components addCallbacks(String key, Callback callbacksItem) {
         if (this.callbacks == null) {
-            this.callbacks = new HashMap<String, Callback>();
+            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);
     }

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);
     }

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);
     }

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);
     }

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);
     }

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);
     }

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);
     }

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);
     }

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<String, Example> examples) {
 
     public Header addExample(String key, Example examplesItem) {
         if (this.examples == null) {
-            this.examples = new HashMap<String, Example>();
+            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);
     }

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);
     }

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);
     }

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);
     }

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<String, String> 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<String, Header> 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);
     }

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);
     }

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;

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);
     }

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<String, Header> 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);
     }

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<String, Example> examples) {
 
     public MediaType addExamples(String key, Example examplesItem) {
         if (this.examples == null) {
-            this.examples = new HashMap<String, Example>();
+            this.examples = new LinkedHashMap<>();
         }
         this.examples.put(key, examplesItem);
         return this;
@@ -121,7 +122,7 @@ public MediaType encoding(Map<String, Encoding> encoding) {
 
     public MediaType addEncoding(String key, Encoding encodingItem) {
         if (this.encoding == null) {
-            this.encoding = new HashMap<String, Encoding>();
+            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);
     }