1 files changed, 24 insertions, 8 deletions

diff --git a/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAIObjectPlurals.java b/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAIObjectPlurals.java
index fcda3c8ad4..5b68d0c69a 100644
--- a/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAIObjectPlurals.java
+++ b/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAIObjectPlurals.java
@@ -77,12 +77,18 @@ public class AAIObjectPlurals implements AAIObjectBase, GraphInventoryObjectPlur
 
     private final String uriTemplate;
     private final String partialUri;
-    private final AAIObjectType type;
+    private final String name;
 
     protected AAIObjectPlurals(AAIObjectType type, String parentUri, String partialUri) {
         this.uriTemplate = parentUri + partialUri;
         this.partialUri = partialUri;
-        this.type = type;
+        this.name = type.typeName();
+    }
+
+    public AAIObjectPlurals(String name, String parentUri, String partialUri) {
+        this.uriTemplate = parentUri + partialUri;
+        this.partialUri = partialUri;
+        this.name = name;
     }
 
     @Override
@@ -101,17 +107,27 @@ public class AAIObjectPlurals implements AAIObjectBase, GraphInventoryObjectPlur
     }
 
     @Override
-    public AAIObjectType getType() {
-        return this.type;
+    public String typeName() {
+        return this.typeName(CaseFormat.LOWER_HYPHEN);
     }
 
     @Override
-    public String typeName() {
-        return this.getType().typeName();
+    public String typeName(CaseFormat format) {
+        return CaseFormat.LOWER_HYPHEN.to(format, this.name.replace("default-", ""));
     }
 
     @Override
-    public String typeName(CaseFormat format) {
-        return this.getType().typeName(format);
+    public int hashCode() {
+        return this.typeName().hashCode();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+
+        if (o instanceof AAIObjectBase) {
+            return this.typeName().equals(((AAIObjectBase) o).typeName());
+        }
+
+        return false;
     }
 }