Visit topological neighbors alphabetically

iancaffey · Aug 28, 2020 · 8ab2c73 · 8ab2c73
1 parent 0bc2ce9
commit 8ab2c73
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/smithy-codegen-core/src/main/java/software/amazon/smithy/codegen/core/TopologicalIndex.java b/smithy-codegen-core/src/main/java/software/amazon/smithy/codegen/core/TopologicalIndex.java
@@ -22,6 +22,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
+import java.util.TreeSet;
 import software.amazon.smithy.model.Model;
 import software.amazon.smithy.model.knowledge.KnowledgeIndex;
 import software.amazon.smithy.model.knowledge.NeighborProviderIndex;
@@ -108,14 +109,20 @@ private void computeRecursiveShapes(Model model) {
     private void visitShape(NeighborProvider provider, Shape shape) {
         // Visit members before visiting containers. Note that no 'visited'
         // set is needed since only non-recursive shapes are traversed.
+        // We sort the neighbors to better order the result.
+        Set<Shape> neighbors = new TreeSet<>();
         for (Relationship rel : provider.getNeighbors(shape)) {
             if (rel.getRelationshipType().getDirection() == RelationshipDirection.DIRECTED) {
                 if (!rel.getNeighborShapeId().equals(shape.getId()) && rel.getNeighborShape().isPresent()) {
-                    visitShape(provider, rel.getNeighborShape().get());
+                    neighbors.add(rel.getNeighborShape().get());
                 }
             }
         }
 
+        for (Shape neighbor : neighbors) {
+            visitShape(provider, neighbor);
+        }
+
         shapes.add(shape);
     }
 

diff --git a/...-codegen-core/src/test/java/software/amazon/smithy/codegen/core/TopologicalIndexTest.java b/...-codegen-core/src/test/java/software/amazon/smithy/codegen/core/TopologicalIndexTest.java
@@ -50,12 +50,12 @@ public void sortsTopologically() {
                 "smithy.example#MyString",
                 "smithy.example#BamList$member",
                 "smithy.example#BamList",
+                "smithy.example#Bar$bam",
                 "smithy.api#Integer",
                 "smithy.example#Bar$baz",
-                "smithy.example#Bar$bam",
                 "smithy.example#Bar",
-                "smithy.example#Foo$foo",
                 "smithy.example#Foo$bar",
+                "smithy.example#Foo$foo",
                 "smithy.example#Foo"));
 
         assertThat(recursive, contains(