[#27] unknown providers and relation targets are added on the fly

.gitignore

@@ -4,4 +4,4 @@ docs/build
 _static
 _templates
 /.env
-/.iml
+*.iml

src/main/java/de/bonndan/nivio/input/Indexer.java

@@ -53,6 +53,7 @@ public ProcessLog reIndex(final LandscapeDescription input) {
             Map<ItemDescription, List<String>> templatesAndTargets = new HashMap<>();
             new SourceReferencesResolver(formatFactory, logger).resolve(input, templatesAndTargets);
             new TemplateResolver().processTemplates(input, templatesAndTargets);
+            new InstantItemResolver(logger).processTargets(input);
             new RelationResolver(logger).processRelations(input);
             input.getGroups().forEach((identifier, groupItem) -> {
                 Group g = new Group();

src/main/java/de/bonndan/nivio/input/InstantItemResolver.java

@@ -0,0 +1,88 @@
+package de.bonndan.nivio.input;
+
+import de.bonndan.nivio.input.dto.ItemDescription;
+import de.bonndan.nivio.input.dto.LandscapeDescription;
+import de.bonndan.nivio.model.*;
+import org.springframework.util.StringUtils;
+
+import java.util.*;
+
+/**
+ * If the landscape is configured as "greedy", new items are created on the fly by a reference name.
+ *
+ * @todo add hosts as soon as relation resolver supports hosts
+ */
+public class InstantItemResolver {
+
+    private final ProcessLog log;
+
+    public InstantItemResolver(ProcessLog log) {
+        this.log = log;
+    }
+
+    public void processTargets(LandscapeDescription landscape) {
+
+        if (!landscape.getConfig().isGreedy()) {
+            return;
+        }
+
+        List<ItemDescription> all = landscape.getItemDescriptions();
+
+        HashSet<ItemDescription> newItems = new HashSet<>();
+        all.forEach(itemDescription -> newItems.addAll(resolveTargets(itemDescription, all)));
+
+        landscape.addItems(newItems);
+    }
+
+    private List<ItemDescription> resolveTargets(ItemDescription description, List<ItemDescription> allItems) {
+
+        List<ItemDescription> newItems = new ArrayList<>();
+        //providers
+        description.getProvidedBy().forEach(term -> {
+            Optional<? extends LandscapeItem> provider = Items.query(term.toLowerCase(), allItems).stream().findFirst();
+
+            if (provider.isEmpty()) {
+                newItems.add(createItem(term));
+            }
+        });
+
+        //other relations
+        description.getRelations().forEach(rel -> {
+
+            //skip sources, since only the targets are in the list
+
+            //find targets
+            if (!StringUtils.isEmpty(rel.getTarget()) && !hasTarget(rel.getTarget().toLowerCase(), allItems)) {
+                newItems.add(createItem(rel.getTarget()));
+            }
+        });
+
+        return newItems;
+    }
+
+    /**
+     * Creates a new item description with source/target as identifier
+     */
+    private ItemDescription createItem(String term) {
+        ItemDescription itemDescription = new ItemDescription();
+        FullyQualifiedIdentifier fqi = FullyQualifiedIdentifier.from(term);
+        itemDescription.setGroup(fqi.getGroup());
+        itemDescription.setIdentifier(fqi.getIdentifier());
+        return itemDescription;
+    }
+
+    private boolean hasTarget(String term, List<ItemDescription> allItems) {
+
+        if (StringUtils.isEmpty(term)) {
+            return true;
+        }
+
+        Collection<? extends LandscapeItem> result = Items.query(term, allItems);
+        if (result.size() > 1) {
+            log.warn("Found ambiguous sources matching " + term);
+            return true;
+        }
+
+        return result.size() != 0;
+    }
+}

src/main/java/de/bonndan/nivio/input/dto/LandscapeDescription.java

@@ -55,7 +55,7 @@ public class LandscapeDescription implements Landscape {
      */
     private List<ItemDescription> itemDescriptions = new ArrayList<>();
 
-    private LandscapeConfig config;
+    private LandscapeConfig config = new LandscapeConfig();
 
     private boolean isPartial = false;
 
@@ -135,7 +135,7 @@ public LandscapeImpl toLandscape() {
         return landscape;
     }
 
-    public void addItems(List<ItemDescription> incoming) {
+    public void addItems(Collection<ItemDescription> incoming) {
         if (incoming == null)
             return;
 

src/main/java/de/bonndan/nivio/model/LandscapeConfig.java

@@ -2,6 +2,8 @@
 
 public class LandscapeConfig {
 
+    private boolean greedy = true;
+
     private JGraphXConfig jgraphx = new JGraphXConfig();
 
     public JGraphXConfig getJgraphx() {
@@ -12,6 +14,14 @@ public void setJgraphx(JGraphXConfig jgraphx) {
         this.jgraphx = jgraphx;
     }
 
+    public boolean isGreedy() {
+        return greedy;
+    }
+
+    public void setGreedy(boolean greedy) {
+        this.greedy = greedy;
+    }
+
     /**
      * @link https://jgraph.github.io/mxgraph/java/docs/com/mxgraph/layout/mxOrganicLayout.html
      */

src/main/resources/application.yml

@@ -32,8 +32,8 @@ logging:
   level:
     root: INFO
 
-#server:
-#  port: 8081
+server:
+  port: 8081
 ---
 spring:
   profiles: test

src/test/java/de/bonndan/nivio/input/InstantItemResolverTest.java

@@ -0,0 +1,84 @@
+package de.bonndan.nivio.input;
+
+import de.bonndan.nivio.input.dto.ItemDescription;
+import de.bonndan.nivio.input.dto.LandscapeDescription;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.mock;
+
+class InstantItemResolverTest {
+
+    private InstantItemResolver instantItemResolver;
+    private LandscapeDescription landscapeDescription;
+
+    @BeforeEach
+    public void setup() {
+
+        instantItemResolver = new InstantItemResolver(mock(ProcessLog.class));
+    }
+
+    @Test
+    public void addsNewItems() {
+
+        landscapeDescription = new LandscapeDescription();
+        ItemDescription a = new ItemDescription();
+        a.setIdentifier("a");
+        a.setGroup("a");
+        a.getProvidedBy().add("providerA");
+        landscapeDescription.getItemDescriptions().add(a);
+
+        ItemDescription b = new ItemDescription();
+        b.setIdentifier("b");
+        b.setGroup("b");
+        a.setRelations(Arrays.asList("adistanttarget"));
+
+        landscapeDescription.getItemDescriptions().add(b);
+        landscapeDescription.getConfig().setGreedy(true);
+
+        instantItemResolver.processTargets(landscapeDescription);
+        assertEquals(4, landscapeDescription.getItemDescriptions().size());
+    }
+
+    @Test
+    public void addsNewItemsOnlyOnce() {
+
+        landscapeDescription = new LandscapeDescription();
+        ItemDescription a = new ItemDescription();
+        a.setIdentifier("a");
+        a.setGroup("a");
+        a.getProvidedBy().add("providerA");
+        landscapeDescription.getItemDescriptions().add(a);
+
+        ItemDescription b = new ItemDescription();
+        b.setIdentifier("b");
+        b.setGroup("b");
+        a.setRelations(Arrays.asList("adistanttarget"));
+        landscapeDescription.getItemDescriptions().add(b);
+
+        ItemDescription c = new ItemDescription();
+        c.setIdentifier("c");
+        c.setGroup("c");
+        c.setRelations(Arrays.asList("adistanttarget"));
+        landscapeDescription.getItemDescriptions().add(c);
+
+        landscapeDescription.getConfig().setGreedy(true);
+
+
+        instantItemResolver.processTargets(landscapeDescription);
+
+        //3 given plus 2 resolved (like above)
+        assertEquals(5, landscapeDescription.getItemDescriptions().size());
+
+        assertTrue(landscapeDescription.getItemDescriptions().stream()
+                .anyMatch(itemDescription -> itemDescription.getIdentifier().equals("providera"))
+        );
+
+        assertTrue(landscapeDescription.getItemDescriptions().stream()
+                .anyMatch(itemDescription -> itemDescription.getIdentifier().equals("adistanttarget"))
+        );
+    }
+}

src/test/resources/example/example_env.yml

@@ -7,6 +7,7 @@ sources:
     format: nivio
 
 config:
+  greedy: false
   jgraphx:
     #nodeDistributionCostFactor: 9000000.0
     #edgeLengthCostFactor;