dsl query builder now supports filters

dsl query builder now supports filters

Issue-ID: SO-3068
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I5b959381c6c0cf8a66109fa510a805ec5e0c1e50

1 files changed, 21 insertions, 1 deletions

diff --git a/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/graphinventory/entities/DSLNodeBase.java b/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/graphinventory/entities/DSLNodeBase.java
index c071e24391..5c88e8e42e 100644
--- a/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/graphinventory/entities/DSLNodeBase.java
+++ b/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/graphinventory/entities/DSLNodeBase.java
@@ -22,13 +22,17 @@ package org.onap.aaiclient.client.graphinventory.entities;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.stream.Collectors;
 import org.onap.aaiclient.client.aai.entities.QueryStep;
 import org.onap.aaiclient.client.graphinventory.GraphInventoryObjectName;
 
 public abstract class DSLNodeBase<T extends DSLNodeBase<?>> implements QueryStep {
 
     protected final String nodeName;
+    protected final Collection<String> fields;
     protected final List<DSLNodeKey> nodeKeys;
     protected final StringBuilder query;
     protected boolean output = false;
@@ -37,6 +41,7 @@ public abstract class DSLNodeBase<T extends DSLNodeBase<?>> implements QueryStep
         this.nodeName = "";
         this.nodeKeys = new ArrayList<>();
         this.query = new StringBuilder();
+        this.fields = new LinkedHashSet<>();
 
     }
 
@@ -44,6 +49,7 @@ public abstract class DSLNodeBase<T extends DSLNodeBase<?>> implements QueryStep
         this.nodeName = name.typeName();
         this.nodeKeys = new ArrayList<>();
         this.query = new StringBuilder();
+        this.fields = new LinkedHashSet<>();
         query.append(nodeName);
     }
 
@@ -51,6 +57,7 @@ public abstract class DSLNodeBase<T extends DSLNodeBase<?>> implements QueryStep
         this.nodeName = name.typeName();
         this.nodeKeys = Arrays.asList(key);
         this.query = new StringBuilder();
+        this.fields = new LinkedHashSet<>();
         query.append(nodeName);
     }
 
@@ -58,6 +65,7 @@ public abstract class DSLNodeBase<T extends DSLNodeBase<?>> implements QueryStep
         this.nodeName = copy.nodeName;
         this.nodeKeys = copy.nodeKeys;
         this.query = new StringBuilder(copy.query);
+        this.fields = copy.fields;
         this.output = copy.output;
     }
 
@@ -67,6 +75,12 @@ public abstract class DSLNodeBase<T extends DSLNodeBase<?>> implements QueryStep
         return new DSLOutputNode(this);
     }
 
+    public DSLOutputNode output(String... fields) {
+        this.output = true;
+        this.fields.addAll(Arrays.asList(fields));
+        return new DSLOutputNode(this);
+    }
+
     public T and(DSLNodeKey... key) {
         this.nodeKeys.addAll(Arrays.asList(key));
 
@@ -77,7 +91,13 @@ public abstract class DSLNodeBase<T extends DSLNodeBase<?>> implements QueryStep
     public String build() {
         StringBuilder result = new StringBuilder(query);
         if (output) {
-            result.append("*");
+            if (fields.isEmpty()) {
+                result.append("*");
+            } else {
+                String items =
+                        fields.stream().map(item -> String.format("'%s'", item)).collect(Collectors.joining(", "));
+                result.append("{").append(items).append("}");
+            }
         }
         for (DSLNodeKey key : nodeKeys) {
             result.append(key.build());