Update Data Router to support API V1

[aai/data-router.git] / src / main / java / org / onap / aai / datarouter / entity / POAServiceInstanceEntity.java

diff --git a/src/main/java/org/onap/aai/datarouter/entity/POAServiceInstanceEntity.java b/src/main/java/org/onap/aai/datarouter/entity/POAServiceInstanceEntity.java
index 419db87..810255c 100644 (file)
--- a/src/main/java/org/onap/aai/datarouter/entity/POAServiceInstanceEntity.java
+++ b/src/main/java/org/onap/aai/datarouter/entity/POAServiceInstanceEntity.java
@@ -36,20 +36,16 @@ import org.onap.aai.datarouter.service.AuditService;
 public class POAServiceInstanceEntity\r
 {\r
     private static final String ATTR_SERVICE_INST_ID = "serviceInstanceId";\r
-    private static final String ATTR_SERVICE_TYPE = "serviceType";\r
     private static final String ATTR_MODEL_VERSION_ID = "modelVersionId";\r
     private static final String ATTR_MODEL_INVARIANT_ID = "modelInvariantId";\r
-    private static final String ATTR_CUSTOMER_ID = "customerId";\r
 \r
     private static final Gson gson = new GsonBuilder().disableHtmlEscaping().create();\r
 \r
     private String xFromAppId;\r
     private String xTransactionId;\r
     private String serviceInstanceId;\r
-    private String serviceType;\r
     private String modelVersionId;\r
     private String modelInvariantId;\r
-    private String customerId;\r
 \r
     private static Logger logger = LoggerFactory.getInstance().getLogger(POAServiceInstanceEntity.class.getName());\r
 \r
@@ -78,14 +74,6 @@ public class POAServiceInstanceEntity
         this.serviceInstanceId = serviceInstanceId;\r
     }\r
 \r
-    public String getServiceType() {\r
-        return serviceType;\r
-    }\r
-\r
-    public void setServiceType(String serviceType) {\r
-        this.serviceType = serviceType;\r
-    }\r
-\r
     public String getModelVersionId() {\r
         return modelVersionId;\r
     }\r
@@ -102,15 +90,6 @@ public class POAServiceInstanceEntity
         this.modelInvariantId = modelInvariantId;\r
     }\r
 \r
-    public String getCustomerId() {\r
-        return customerId;\r
-    }\r
-\r
-    public void setCustomerId(String customerId) {\r
-        this.customerId = customerId;\r
-    }\r
-\r
-\r
     public String toJson() {\r
         return gson.toJson(this);\r
     }\r
@@ -142,11 +121,6 @@ public class POAServiceInstanceEntity
             throw new POAAuditException(error, Status.BAD_REQUEST, DataRouterMsgs.BAD_REST_REQUEST, error);\r
         }\r
 \r
-        if(serviceType == null || serviceType.isEmpty()) {\r
-            String error = "Missing attribute: " + ATTR_SERVICE_TYPE;\r
-            throw new POAAuditException(error, Status.BAD_REQUEST, DataRouterMsgs.BAD_REST_REQUEST, error);\r
-        }\r
-\r
         if(modelVersionId == null || modelVersionId.isEmpty()) {\r
             String error = "Missing attribute: " + ATTR_MODEL_VERSION_ID;\r
             throw new POAAuditException(error, Status.BAD_REQUEST, DataRouterMsgs.BAD_REST_REQUEST, error);\r
@@ -157,17 +131,13 @@ public class POAServiceInstanceEntity
             throw new POAAuditException(error, Status.BAD_REQUEST, DataRouterMsgs.BAD_REST_REQUEST, error);\r
         }\r
 \r
-        if(customerId == null || customerId.isEmpty()) {\r
-            String error = "Missing attribute: " + ATTR_CUSTOMER_ID;\r
-            throw new POAAuditException(error, Status.BAD_REQUEST, DataRouterMsgs.BAD_REST_REQUEST, error);\r
-        }\r
     }\r
 \r
 \r
     @Override\r
     public String toString() {\r
         return "ServiceInstance [xFromAppId=" + xFromAppId + ", xTransactionId=" + xTransactionId\r
-                + ", serviceInstanceId=" + serviceInstanceId + ", serviceType=" + serviceType + ", modelVersionId="\r
-                + modelVersionId + ", modelInvariantId=" + modelInvariantId + ", customerId=" + customerId + "]";\r
+                + ", serviceInstanceId=" + serviceInstanceId + ", modelVersionId="\r
+                + modelVersionId + ", modelInvariantId=" + modelInvariantId + "]";\r
     }\r
 }\r