diff options
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 | 8 | ||||
| -rw-r--r-- | src/main/java/org/onap/pomba/contextbuilder/aai/service/rs/RestServiceImpl.java | 11 |
2 files changed, 8 insertions, 11 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 dcc3382..22efa35 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 @@ -44,19 +44,17 @@ public interface RestService { value = "Respond AAIContext Model Data", notes = "Returns a JSON object which represents the AAIConetxt model data", response = GenericResponse.class - ) + ) @ApiResponses( value = { @ApiResponse(code = 200, message = "OK"), @ApiResponse(code = 400, message = "Bad Request"), @ApiResponse(code = 404, message = "Service not available"), @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("serviceType") String serviceType, - @QueryParam("customerId") String customerId + @QueryParam("modelInvariantId") String modelInvariantId ); }
\ 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 6fc2c8a..824e251 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,10 +43,9 @@ public class RestServiceImpl implements RestService { private String httpBasicAuthorization; @Override - public Response getContext(HttpHeaders headers, String serviceInstanceId, String modelVersionId, String modelInvariantId, String serviceType, String customerId) { + public Response getContext(HttpHeaders headers, String serviceInstanceId, String modelVersionId, String modelInvariantId) { - String url = "serviceInstanceId=" + serviceInstanceId + " modelVersion="+modelVersionId + - " modelInvariantId="+ modelInvariantId + " serviceType="+serviceType + " customerId="+ customerId; + String url = "serviceInstanceId=" + serviceInstanceId + " modelVersion="+modelVersionId + " modelInvariantId="+ modelInvariantId; if(log.isDebugEnabled()) { log.debug(LogMessages.AAI_CONTEXT_BUILDER_URL, url); } @@ -60,14 +59,14 @@ public class RestServiceImpl implements RestService { try { // Do some validation on Http headers and URL parameters - RestUtil.validateBasicAuthorization(headers, httpBasicAuthorization); + RestUtil.validateBasicAuthorization(headers, httpBasicAuthorization); RestUtil.validateHeader(headers); - RestUtil.validateURL(serviceInstanceId, modelVersionId, modelInvariantId, serviceType, customerId); + RestUtil.validateURL(serviceInstanceId, modelVersionId, modelInvariantId); // Keep the same transaction id for logging purpose transactionId= RestUtil.extractTranIdHeader(headers); - aaiContext = service.getContext(serviceInstanceId, modelVersionId, modelInvariantId, serviceType, customerId, transactionId); + aaiContext = service.getContext(serviceInstanceId, modelVersionId, modelInvariantId, transactionId); if (aaiContext==null) { // Return empty JSON |