From 7c28777349b02dc8c39deb9bf40cfdaf1e84cc3d Mon Sep 17 00:00:00 2001
From: Phillip Leigh <phillip.leigh@amdocs.com>
Date: Tue, 11 Sep 2018 11:02:53 -0400
Subject: Update Data Router to support API V1

Issue-ID: LOG-428
Change-Id: I6cf971539880f19ffb3e0e9cee5535d34c7b71df
Signed-off-by: Phillip Leigh <phillip.leigh@amdocs.com>
---
 .../entity/POAServiceInstanceEntity.java           | 34 ++--------------------
 1 file changed, 2 insertions(+), 32 deletions(-)

(limited to 'src/main/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
--- 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
 {
     private static final String ATTR_SERVICE_INST_ID = "serviceInstanceId";
-    private static final String ATTR_SERVICE_TYPE = "serviceType";
     private static final String ATTR_MODEL_VERSION_ID = "modelVersionId";
     private static final String ATTR_MODEL_INVARIANT_ID = "modelInvariantId";
-    private static final String ATTR_CUSTOMER_ID = "customerId";
 
     private static final Gson gson = new GsonBuilder().disableHtmlEscaping().create();
 
     private String xFromAppId;
     private String xTransactionId;
     private String serviceInstanceId;
-    private String serviceType;
     private String modelVersionId;
     private String modelInvariantId;
-    private String customerId;
 
     private static Logger logger = LoggerFactory.getInstance().getLogger(POAServiceInstanceEntity.class.getName());
 
@@ -78,14 +74,6 @@ public class POAServiceInstanceEntity
         this.serviceInstanceId = serviceInstanceId;
     }
 
-    public String getServiceType() {
-        return serviceType;
-    }
-
-    public void setServiceType(String serviceType) {
-        this.serviceType = serviceType;
-    }
-
     public String getModelVersionId() {
         return modelVersionId;
     }
@@ -102,15 +90,6 @@ public class POAServiceInstanceEntity
         this.modelInvariantId = modelInvariantId;
     }
 
-    public String getCustomerId() {
-        return customerId;
-    }
-
-    public void setCustomerId(String customerId) {
-        this.customerId = customerId;
-    }
-
-
     public String toJson() {
         return gson.toJson(this);
     }
@@ -142,11 +121,6 @@ public class POAServiceInstanceEntity
             throw new POAAuditException(error, Status.BAD_REQUEST, DataRouterMsgs.BAD_REST_REQUEST, error);
         }
 
-        if(serviceType == null || serviceType.isEmpty()) {
-            String error = "Missing attribute: " + ATTR_SERVICE_TYPE;
-            throw new POAAuditException(error, Status.BAD_REQUEST, DataRouterMsgs.BAD_REST_REQUEST, error);
-        }
-
         if(modelVersionId == null || modelVersionId.isEmpty()) {
             String error = "Missing attribute: " + ATTR_MODEL_VERSION_ID;
             throw new POAAuditException(error, Status.BAD_REQUEST, DataRouterMsgs.BAD_REST_REQUEST, error);
@@ -157,17 +131,13 @@ public class POAServiceInstanceEntity
             throw new POAAuditException(error, Status.BAD_REQUEST, DataRouterMsgs.BAD_REST_REQUEST, error);
         }
 
-        if(customerId == null || customerId.isEmpty()) {
-            String error = "Missing attribute: " + ATTR_CUSTOMER_ID;
-            throw new POAAuditException(error, Status.BAD_REQUEST, DataRouterMsgs.BAD_REST_REQUEST, error);
-        }
     }
 
 
     @Override
     public String toString() {
         return "ServiceInstance [xFromAppId=" + xFromAppId + ", xTransactionId=" + xTransactionId
-                + ", serviceInstanceId=" + serviceInstanceId + ", serviceType=" + serviceType + ", modelVersionId="
-                + modelVersionId + ", modelInvariantId=" + modelInvariantId + ", customerId=" + customerId + "]";
+                + ", serviceInstanceId=" + serviceInstanceId + ", modelVersionId="
+                + modelVersionId + ", modelInvariantId=" + modelInvariantId + "]";
     }
 }
-- 
cgit 1.2.3-korg