diff options
author | Jennie Jia <Jennie.Jia@amdocs.com> | 2018-09-13 02:36:10 +0000 |
---|---|---|
committer | Jennie Jia <Jennie.Jia@amdocs.com> | 2018-09-13 17:32:54 +0000 |
commit | bf4b8e3ac93106cf2373dafb89d5373fc17ef507 (patch) | |
tree | 58457c0cc0be0b3b72958cdd7dccc95dd401208d /src/main/java/org/onap/pomba/contextbuilder/aai/service/rs | |
parent | 5a34dbbd091db590a9a38e5398140933ae9ed639 (diff) |
Handle Missing AAI Data
Issue-ID: LOG-649
Change-Id: Ie393ac995ef6b4d8c8d819d8c4815be3acab579c
Signed-off-by: Jennie Jia <Jennie.Jia@amdocs.com>
Diffstat (limited to 'src/main/java/org/onap/pomba/contextbuilder/aai/service/rs')
-rw-r--r-- | src/main/java/org/onap/pomba/contextbuilder/aai/service/rs/RestService.java | 4 | ||||
-rw-r--r-- | src/main/java/org/onap/pomba/contextbuilder/aai/service/rs/RestServiceImpl.java | 8 |
2 files changed, 5 insertions, 7 deletions
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 |