added recursive depth

Author: William Armiros

validator/src/main/java/com/amazon/aoc/helpers/SortUtils.java

@@ -5,6 +5,7 @@
 import java.util.List;
 
 public final class SortUtils {
+  private static final int MAX_RESURSIVE_DEPTH = 10;
 
   /**
    * Given a list of entities, which are X-Ray segments or subsegments, recursively sort each of
@@ -13,13 +14,18 @@ public final class SortUtils {
    * @param entities - list of X-Ray entities to sort recursively. Modified in place.
    */
   public static void recursiveEntitySort(List<Entity> entities) {
-    if (entities == null || entities.size() == 0) {
+    recursiveEntitySort(entities, 0);
+  }
+
+  private static void recursiveEntitySort(List<Entity> entities, int depth) {
+    if (entities == null || entities.size() == 0 || depth >= MAX_RESURSIVE_DEPTH) {
       return;
     }
+    int currDepth = depth + 1;
 
     for (Entity entity : entities) {
-      if (entity.getSubsegments() != null && entity.getSubsegments().size() > 1) {
-        recursiveEntitySort(entity.getSubsegments());
+      if (entity.getSubsegments() != null && !entity.getSubsegments().isEmpty()) {
+        recursiveEntitySort(entity.getSubsegments(), currDepth);
       }
     }
 

validator/src/main/java/com/amazon/aoc/models/xray/Entity.java

@@ -37,6 +37,8 @@ public class Entity {
   private boolean inProgress;
   @JsonInclude(JsonInclude.Include.NON_DEFAULT)
   private boolean inferred;
+  @JsonInclude(JsonInclude.Include.NON_DEFAULT)
+  private boolean stubbed;
 
   private String namespace;
 

validator/src/test/java/com/amazon/aoc/helpers/SortUtilsTest.java

@@ -68,6 +68,19 @@ public void testNestedEntitySort() {
     assertThat(bottomEntities).containsSequence(generated.get(6), generated.get(7));
   }
 
+  @Test
+  public void testInfiniteLoop() {
+    Entity current = new Entity();
+    List<Entity> entityList = new ArrayList<>();
+    entityList.add(current);
+    current.setSubsegments(entityList);  // set up an infinite children loop
+
+    SortUtils.recursiveEntitySort(entityList);
+
+    // Not really testing anything, just making sure we don't infinite loop
+    assertThat(entityList).hasSize(1);
+  }
+
   private List<Entity> generateEntities(int n) {
     List<Entity> ret = new ArrayList<>();