diff options
Diffstat (limited to 'src/main/java/org/onap/pomba/contextbuilder/sdnc/service/rs/RestServiceImpl.java')
-rw-r--r-- | src/main/java/org/onap/pomba/contextbuilder/sdnc/service/rs/RestServiceImpl.java | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/main/java/org/onap/pomba/contextbuilder/sdnc/service/rs/RestServiceImpl.java b/src/main/java/org/onap/pomba/contextbuilder/sdnc/service/rs/RestServiceImpl.java index d3b6378..a70012f 100644 --- a/src/main/java/org/onap/pomba/contextbuilder/sdnc/service/rs/RestServiceImpl.java +++ b/src/main/java/org/onap/pomba/contextbuilder/sdnc/service/rs/RestServiceImpl.java @@ -20,6 +20,7 @@ package org.onap.pomba.contextbuilder.sdnc.service.rs; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import javax.servlet.http.HttpServletRequest; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; @@ -43,20 +44,22 @@ public class RestServiceImpl implements RestService { } @Override - public Response getContext(HttpHeaders headers, String serviceInstanceId) { + public Response getContext(HttpServletRequest request, HttpHeaders headers, String serviceInstanceId) { Response response = null; ModelContext sdncContext= null; Gson gson = new GsonBuilder().create(); try { - // Do some validation on Http headers and URL parameters - RestUtil.validateHeader(headers, service.getSdncAuthoriztion()); + // Validate URL parameters RestUtil.validateURL(serviceInstanceId); + // Validate Headers and extract Partner Name + String partnerName = RestUtil.validateHeader(headers, service.getSdncAuthoriztion()); + // Keep the same transaction id for logging purposeString transactionId - String transactionId = RestUtil.extractTranIdHeader(headers); + String transactionId = RestUtil.extractTranactionIdHeader(headers); - sdncContext = service.getContext(serviceInstanceId, transactionId); + sdncContext = service.getContext(request, serviceInstanceId, transactionId, partnerName); if (sdncContext==null) { // Return empty JSON @@ -78,4 +81,10 @@ public class RestServiceImpl implements RestService { return response; } + @Override + public Response getV1Context(HttpServletRequest request, HttpHeaders headers, String serviceInstanceId) { + return getContext(request, headers, serviceInstanceId); + } + + } |