Fix sorting of #/components/schemas/* (#50)

openapi-tools · Jul 3, 2020 · c4fb402 · c4fb402
1 parent cef7685
commit c4fb402
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/src/main/java/io/openapitools/swagger/OpenAPISorter.java b/src/main/java/io/openapitools/swagger/OpenAPISorter.java
@@ -61,7 +61,7 @@ private static void sortComponents(Components components) {
             return;
         }
 
-        sortSchemas(components.getSchemas());
+        components.setSchemas(sortSchemas(components.getSchemas()));
 
         components.setResponses(createSorted(components.getResponses()));
         components.setParameters(createSorted(components.getParameters()));

diff --git a/src/test/java/io/openapitools/swagger/OpenApiSorterTest.java b/src/test/java/io/openapitools/swagger/OpenApiSorterTest.java
@@ -22,12 +22,17 @@ public class OpenApiSorterTest {
 
     @Test
     public void testSort() {
-        ObjectSchema schema = new ObjectSchema();
-        schema.addProperties("s2", new StringSchema());
-        schema.addProperties("s1", new StringSchema());
+        ObjectSchema schema1 = new ObjectSchema();
+        schema1.addProperties("s1-2", new StringSchema());
+        schema1.addProperties("s1-1", new StringSchema());
+
+        ObjectSchema schema2 = new ObjectSchema();
+        schema2.addProperties("s2-2", new StringSchema());
+        schema2.addProperties("s2-1", new StringSchema());
 
         Components components = new Components()
-                .addSchemas("s1", schema)
+                .addSchemas("s2", schema2)
+                .addSchemas("s1", schema1)
                 .addResponses("k2", new ApiResponse())
                 .addResponses("k1", new ApiResponse())
                 .addParameters("k2", new Parameter())
@@ -55,9 +60,13 @@ public void testSort() {
 
         api = OpenAPISorter.sort(api);
 
-        assertEquals("s1", api.getComponents().getSchemas()
+        assertEquals("s1-1", api.getComponents().getSchemas()
+                .values().stream()
+                .findFirst().get().getProperties()
+                .keySet().stream().findFirst().get());
+        assertEquals("s2-1", api.getComponents().getSchemas()
                 .values().stream()
-                .findAny().get().getProperties()
+                .skip(1).findFirst().get().getProperties()
                 .keySet().stream().findFirst().get());
         assertEquals("k1", api.getComponents().getResponses().keySet().stream().findFirst().get());
         assertEquals("k1", api.getComponents().getParameters().keySet().stream().findFirst().get());