diff options
| author |   Prudence Au <prudence.au@amdocs.com> | 2018-08-30 13:24:55 -0400 |
|---|---|---|
| committer | Prudence Au <prudence.au@amdocs.com> | 2018-08-30 14:07:15 -0400 |
| commit | 45e403d89794720689be5c8ee71f4c7174c022c3 (patch) | |
| tree | 5ef6860e221d465a343b83b41547dafd36b583a3 /src/main | |
| parent | 9047e48a607fda3796b131f9c95b03efc73b538c (diff) | |
Add support for using the "old" headers
Change-Id: Ie4b302ca4325ee3b04fee0319efbc1a770d6c1ab
Signed-off-by: Prudence Au <prudence.au@amdocs.com>
Issue-ID: LOG-401
Diffstat (limited to 'src/main')
2 files changed, 18 insertions, 5 deletions
diff --git a/src/main/java/org/onap/pomba/contextbuilder/networkdiscovery/service/rs/RestService.java b/src/main/java/org/onap/pomba/contextbuilder/networkdiscovery/service/rs/RestService.java index 8825bc6..67c65d9 100644 --- a/src/main/java/org/onap/pomba/contextbuilder/networkdiscovery/service/rs/RestService.java +++ b/src/main/java/org/onap/pomba/contextbuilder/networkdiscovery/service/rs/RestService.java @@ -51,6 +51,7 @@ public interface RestService { @ApiResponse(code = 500, message = "Unexpected Runtime error") }) public Response getContext(@Context HttpServletRequest req, @HeaderParam("Authorization") String authorization, @HeaderParam("X-ONAP-PartnerName") String xpartnerName, @HeaderParam("X-ONAP-RequestID") String xRequestId, + @HeaderParam("X-FromAppId") String xFromAppId, @HeaderParam("X-TransactionId") String xTransactionId, @QueryParam("serviceInstanceId") String serviceInstanceId, @QueryParam("modelVersionId") String modelVersionId, @QueryParam("modelInvariantId") String modelInvariantId) throws DiscoveryException; diff --git a/src/main/java/org/onap/pomba/contextbuilder/networkdiscovery/service/rs/RestServiceImpl.java b/src/main/java/org/onap/pomba/contextbuilder/networkdiscovery/service/rs/RestServiceImpl.java index 87ef440..7046c2d 100644 --- a/src/main/java/org/onap/pomba/contextbuilder/networkdiscovery/service/rs/RestServiceImpl.java +++ b/src/main/java/org/onap/pomba/contextbuilder/networkdiscovery/service/rs/RestServiceImpl.java @@ -46,15 +46,27 @@ public class RestServiceImpl implements RestService { private SpringService service; @Override - public Response getContext(HttpServletRequest req, String authorization, String partnerName, String requestId, + public Response getContext(HttpServletRequest req, String authorization, String partnerName, String requestId, String fromAppId, String transactionId, String serviceInstanceId, String modelVersionId, String modelInvariantId) throws DiscoveryException { // Do some validation on Http headers and URL parameters - if (requestId == null || requestId.isEmpty()) { - requestId = UUID.randomUUID().toString(); - log.debug(HEADER_REQUEST_ID + " is missing; using newly generated value: " + requestId); - } + //The request ID in the header is not yet standardized to X-ONAP-RequestID. We would still support X-TransactionId until further notice. + if(requestId == null || requestId.isEmpty()) { + if(transactionId != null) { + requestId = transactionId; + } else { + requestId = UUID.randomUUID().toString(); + log.debug(HEADER_REQUEST_ID + " is missing; using newly generated value: " + requestId); + } + } + + //The partner name in the header is not yet standardized to X-PartnerName. We would still support X-FromAppId until further notice. + if(partnerName == null || partnerName.isEmpty()) { + if(fromAppId != null) { + partnerName = fromAppId; + } + } try { ModelContext sdContext = service.getContext(req, partnerName, authorization, requestId, serviceInstanceId, |