Merge "Removed unused methods injectSNIROCallbacks() according to comments by maintainer"

[so.git] / common / src / main / java / org / onap / so / client / aai / AAIQueryClient.java

diff --git a/common/src/main/java/org/onap/so/client/aai/AAIQueryClient.java b/common/src/main/java/org/onap/so/client/aai/AAIQueryClient.java
index c3523e9..634a658 100644 (file)
--- a/common/src/main/java/org/onap/so/client/aai/AAIQueryClient.java
+++ b/common/src/main/java/org/onap/so/client/aai/AAIQueryClient.java
@@ -20,28 +20,41 @@
 
 package org.onap.so.client.aai;
 
+import org.onap.so.client.aai.entities.AAIResultWrapper;
+import org.onap.so.client.aai.entities.CustomQuery;
 import org.onap.so.client.aai.entities.uri.AAIUriFactory;
 import org.onap.so.client.graphinventory.GraphInventoryQueryClient;
 import org.onap.so.client.graphinventory.entities.uri.GraphInventoryUri;
 
-public class AAIQueryClient extends GraphInventoryQueryClient<AAIQueryClient> {
-
-       public AAIQueryClient() {
-               super(new AAIClient());
-       }
-       
-       public AAIQueryClient(AAIVersion version) {
-               super(new AAIClient(version));
-       }
-
-       @Override
-       protected GraphInventoryUri getQueryUri() {
-               return AAIUriFactory.createResourceUri(AAIObjectType.CUSTOM_QUERY);
-       }
-       
-       @Override
-       protected GraphInventoryUri setupQueryParams(GraphInventoryUri uri) {
-               return super.setupQueryParams(uri);
-       }
-       
+public class AAIQueryClient
+        extends GraphInventoryQueryClient<AAIQueryClient, CustomQuery, AAIResultWrapper, AAIObjectType> {
+
+    public AAIQueryClient() {
+        super(new AAIClient());
+    }
+
+    public AAIQueryClient(AAIVersion version) {
+        super(new AAIClient(version));
+    }
+
+    @Override
+    protected GraphInventoryUri getQueryUri() {
+        return AAIUriFactory.createResourceUri(AAIObjectType.CUSTOM_QUERY);
+    }
+
+    @Override
+    protected GraphInventoryUri setupQueryParams(GraphInventoryUri uri) {
+        return super.setupQueryParams(uri);
+    }
+
+    @Override
+    public AAIResultWrapper createWrapper(String json) {
+        return new AAIResultWrapper(json);
+    }
+
+    @Override
+    public AAIObjectType createType(String name) {
+        return AAIObjectType.fromTypeName(name);
+    }
+
 }