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

3 files changed, 23 insertions, 9 deletions

diff --git a/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAIClient.java b/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAIClient.java
index 1cd23614b5..1f747e6c8c 100644
--- a/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAIClient.java
+++ b/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAIClient.java
@@ -21,11 +21,13 @@
 package org.onap.aaiclient.client.aai;
 
 import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
 import javax.ws.rs.NotFoundException;
 import javax.ws.rs.core.UriBuilder;
-import org.onap.so.client.RestClient;
 import org.onap.aaiclient.client.graphinventory.GraphInventoryClient;
 import org.onap.aaiclient.client.graphinventory.exceptions.GraphInventoryUriComputationException;
+import org.onap.so.client.RestClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -36,11 +38,20 @@ public class AAIClient extends GraphInventoryClient {
     protected AAIVersion version;
 
     protected AAIClient() {
-        super(AAIProperties.class);
+        super(AAIProperties.class, new HashMap<String, String>());
     }
 
     protected AAIClient(AAIVersion version) {
-        super(AAIProperties.class);
+        super(AAIProperties.class, new HashMap<String, String>());
+        this.version = version;
+    }
+
+    protected AAIClient(Map<String, String> additionalHeaders) {
+        super(AAIProperties.class, additionalHeaders);
+    }
+
+    protected AAIClient(AAIVersion version, Map<String, String> additionalHeaders) {
+        super(AAIProperties.class, additionalHeaders);
         this.version = version;
     }
 
@@ -54,7 +65,7 @@ public class AAIClient extends GraphInventoryClient {
     protected RestClient createClient(URI uri) {
         try {
 
-            return new AAIRestClient(getRestProperties(), constructPath(uri));
+            return new AAIRestClient(getRestProperties(), constructPath(uri), additionalHeaders);
         } catch (GraphInventoryUriComputationException | NotFoundException e) {
             logger.debug("failed to construct A&AI uri", e);
             throw e;
diff --git a/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAIDSLQueryClient.java b/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAIDSLQueryClient.java
index 238e87392f..378db87d9b 100644
--- a/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAIDSLQueryClient.java
+++ b/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAIDSLQueryClient.java
@@ -26,16 +26,17 @@ import org.onap.aaiclient.client.aai.entities.uri.AAIUriFactory;
 import org.onap.aaiclient.client.graphinventory.GraphInventoryQueryClient;
 import org.onap.aaiclient.client.graphinventory.entities.DSLQuery;
 import org.onap.aaiclient.client.graphinventory.entities.uri.GraphInventoryUri;
+import com.google.common.collect.ImmutableMap;
 
 public class AAIDSLQueryClient
         extends GraphInventoryQueryClient<AAIDSLQueryClient, DSLQuery, AAIResultWrapper, AAIObjectType> {
 
     public AAIDSLQueryClient() {
-        super(new AAIClient());
+        super(new AAIClient(ImmutableMap.of("X-DslApiVersion", "V2")));
     }
 
     public AAIDSLQueryClient(AAIVersion version) {
-        super(new AAIClient(version));
+        super(new AAIClient(version, ImmutableMap.of("X-DslApiVersion", "V2")));
     }
 
     @Override
@@ -53,5 +54,4 @@ public class AAIDSLQueryClient
     public AAIObjectType createType(String name, String uri) {
         return new AAIFluentTypeReverseLookup().fromName(name, uri);
     }
-
 }
diff --git a/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAIRestClient.java b/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAIRestClient.java
index 9a8a2a53c0..0f69b0cc8f 100644
--- a/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAIRestClient.java
+++ b/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAIRestClient.java
@@ -23,18 +23,20 @@ package org.onap.aaiclient.client.aai;
 import java.net.URI;
 import java.util.Map;
 import java.util.Optional;
-import org.onap.so.client.ResponseExceptionMapper;
 import org.onap.aaiclient.client.graphinventory.GraphInventoryPatchConverter;
 import org.onap.aaiclient.client.graphinventory.GraphInventoryRestClient;
 import org.onap.logging.filter.base.ONAPComponents;
+import org.onap.so.client.ResponseExceptionMapper;
 
 public class AAIRestClient extends GraphInventoryRestClient {
 
     private final AAIProperties aaiProperties;
+    private final Map<String, String> additionalHeaders;
 
-    protected AAIRestClient(AAIProperties props, URI uri) {
+    protected AAIRestClient(AAIProperties props, URI uri, Map<String, String> additionalHeaders) {
         super(props, uri);
         this.aaiProperties = props;
+        this.additionalHeaders = additionalHeaders;
     }
 
     @Override
@@ -46,6 +48,7 @@ public class AAIRestClient extends GraphInventoryRestClient {
     protected void initializeHeaderMap(Map<String, String> headerMap) {
         headerMap.put("X-FromAppId", aaiProperties.getSystemName());
         headerMap.put("X-TransactionId", requestId);
+        headerMap.putAll(additionalHeaders);
         String auth = aaiProperties.getAuth();
         String key = aaiProperties.getKey();