From bf4b8e3ac93106cf2373dafb89d5373fc17ef507 Mon Sep 17 00:00:00 2001
From: Jennie Jia <Jennie.Jia@amdocs.com>
Date: Thu, 13 Sep 2018 02:36:10 +0000
Subject: Handle Missing AAI Data

Issue-ID: LOG-649
Change-Id: Ie393ac995ef6b4d8c8d819d8c4815be3acab579c
Signed-off-by: Jennie Jia <Jennie.Jia@amdocs.com>
---
 .../org/onap/pomba/contextbuilder/aai/service/SpringService.java  | 2 +-
 .../onap/pomba/contextbuilder/aai/service/SpringServiceImpl.java  | 6 +++---
 .../org/onap/pomba/contextbuilder/aai/service/rs/RestService.java | 4 +---
 .../onap/pomba/contextbuilder/aai/service/rs/RestServiceImpl.java | 8 ++++----
 4 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'src/main/java/org/onap/pomba/contextbuilder/aai/service')

diff --git a/src/main/java/org/onap/pomba/contextbuilder/aai/service/SpringService.java b/src/main/java/org/onap/pomba/contextbuilder/aai/service/SpringService.java
index 59ee36d..c59a24e 100644
--- a/src/main/java/org/onap/pomba/contextbuilder/aai/service/SpringService.java
+++ b/src/main/java/org/onap/pomba/contextbuilder/aai/service/SpringService.java
@@ -23,5 +23,5 @@ import org.onap.pomba.contextbuilder.aai.exception.AuditException;
 
 public interface SpringService {
 
-    public ModelContext getContext(String serviceInstanceId, String modelVersionId, String modelInvariantId, String transactionId) throws AuditException;
+    public ModelContext getContext(String serviceInstanceId, String transactionId) throws AuditException;
 }
diff --git a/src/main/java/org/onap/pomba/contextbuilder/aai/service/SpringServiceImpl.java b/src/main/java/org/onap/pomba/contextbuilder/aai/service/SpringServiceImpl.java
index bce3a2e..216ee3e 100644
--- a/src/main/java/org/onap/pomba/contextbuilder/aai/service/SpringServiceImpl.java
+++ b/src/main/java/org/onap/pomba/contextbuilder/aai/service/SpringServiceImpl.java
@@ -45,16 +45,16 @@ public class SpringServiceImpl implements SpringService {
         // needed for instantiation
     }
 
-    public ModelContext getContext(String serviceInstanceId, String modelVersionId, String modelInvariantId,  String tranId) throws AuditException {
+    public ModelContext getContext(String serviceInstanceId, String tranId) throws AuditException {
 
-        String url = "serviceInstanceId=" + serviceInstanceId + " modelVersion="+modelVersionId + " modelInvariantId="+ modelInvariantId ;
+        String url = "serviceInstanceId=" + serviceInstanceId;
         log.info(LogMessages.AAI_CONTEXT_BUILDER_URL, url);
 
         ModelContext context = null;
 
         // Retrieve the service instance information from AAI
         try {
-            context= RestUtil.retrieveAAIModelData(aaiClient, aaiBaseUrl, aaiPathToSearchNodeQuery, tranId, serviceInstanceId, modelVersionId, modelInvariantId, aaiBasicAuthorization);
+            context= RestUtil.retrieveAAIModelData(aaiClient, aaiBaseUrl, aaiPathToSearchNodeQuery, tranId, serviceInstanceId, aaiBasicAuthorization);
         } catch (AuditException ae) {
             throw ae;
         } catch (Exception e) {
diff --git a/src/main/java/org/onap/pomba/contextbuilder/aai/service/rs/RestService.java b/src/main/java/org/onap/pomba/contextbuilder/aai/service/rs/RestService.java
index 22efa35..ba4193a 100644
--- a/src/main/java/org/onap/pomba/contextbuilder/aai/service/rs/RestService.java
+++ b/src/main/java/org/onap/pomba/contextbuilder/aai/service/rs/RestService.java
@@ -53,8 +53,6 @@ public interface RestService {
                     @ApiResponse(code = 500, message = "Unexpected Runtime error")
             })
     public Response getContext(@Context HttpHeaders headers,
-            @QueryParam("serviceInstanceId") String serviceInstanceId,
-            @QueryParam("modelVersionId") String modelVersionId,
-            @QueryParam("modelInvariantId") String modelInvariantId
+            @QueryParam("serviceInstanceId") String serviceInstanceId
             );
 }
\ No newline at end of file
diff --git a/src/main/java/org/onap/pomba/contextbuilder/aai/service/rs/RestServiceImpl.java b/src/main/java/org/onap/pomba/contextbuilder/aai/service/rs/RestServiceImpl.java
index 824e251..b99c87b 100644
--- a/src/main/java/org/onap/pomba/contextbuilder/aai/service/rs/RestServiceImpl.java
+++ b/src/main/java/org/onap/pomba/contextbuilder/aai/service/rs/RestServiceImpl.java
@@ -43,9 +43,9 @@ public class RestServiceImpl implements RestService {
     private String httpBasicAuthorization;
 
     @Override
-    public Response getContext(HttpHeaders headers, String serviceInstanceId, String modelVersionId, String modelInvariantId) {
+    public Response getContext(HttpHeaders headers, String serviceInstanceId) {
 
-        String url = "serviceInstanceId=" + serviceInstanceId + " modelVersion="+modelVersionId + " modelInvariantId="+ modelInvariantId;
+        String url = "serviceInstanceId=" + serviceInstanceId;
         if(log.isDebugEnabled()) {
             log.debug(LogMessages.AAI_CONTEXT_BUILDER_URL, url);
         }
@@ -61,12 +61,12 @@ public class RestServiceImpl implements RestService {
             // Do some validation on Http headers and URL parameters
             RestUtil.validateBasicAuthorization(headers, httpBasicAuthorization);
             RestUtil.validateHeader(headers);
-            RestUtil.validateURL(serviceInstanceId, modelVersionId, modelInvariantId);
+            RestUtil.validateURL(serviceInstanceId);
 
             // Keep the same transaction id for logging purpose
             transactionId= RestUtil.extractTranIdHeader(headers);
 
-            aaiContext = service.getContext(serviceInstanceId, modelVersionId, modelInvariantId, transactionId);
+            aaiContext = service.getContext(serviceInstanceId,transactionId);
 
             if (aaiContext==null) {
                 // Return empty JSON
-- 
cgit 1.2.3-korg