diff options
author | Tait,Trevor(rt0435) <rtait@amdocs.com> | 2019-03-01 14:15:33 -0500 |
---|---|---|
committer | Tait,Trevor(rt0435) <rtait@amdocs.com> | 2019-03-06 11:59:32 -0500 |
commit | 2ecb0d9cfcb4fab803da12787b6e75f68fdff280 (patch) | |
tree | 6182903d796d08c0cb779569b1caabdae3a586fb /src/main/java/org/onap/pomba/contextbuilder/aai/service/rs/RestServiceImpl.java | |
parent | f0c44b14013d7418c19ba4cd7f9a5a3043648d5c (diff) |
X-ONAP-RequestId and X-ONAP-PartnerName support
Also cleaned up a few hundred ONAP code audit issues related to:
- white space
- long lines
- naming conventions
Issue-ID: LOG-551
Change-Id: Ic2af0093e1b4d14c42b95fffe013247afbbadd52
Signed-off-by: Tait,Trevor(rt0435) <rtait@amdocs.com>
Diffstat (limited to 'src/main/java/org/onap/pomba/contextbuilder/aai/service/rs/RestServiceImpl.java')
-rw-r--r-- | src/main/java/org/onap/pomba/contextbuilder/aai/service/rs/RestServiceImpl.java | 18 |
1 files changed, 10 insertions, 8 deletions
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 19e81df..f5653f2 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 @@ -20,6 +20,8 @@ package org.onap.pomba.contextbuilder.aai.service.rs; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import java.util.UUID; +import javax.servlet.http.HttpServletRequest; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; @@ -31,7 +33,6 @@ import org.onap.pomba.contextbuilder.aai.util.RestUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import java.util.UUID; import org.springframework.stereotype.Component; @Component @@ -47,9 +48,10 @@ public class RestServiceImpl implements RestService { @Override public Response getContext(HttpHeaders headers, + HttpServletRequest req, String authorization, - String fromAppId, - String transactionId, + String partnerName, + String requestId, String serviceInstanceId) { String url = "serviceInstanceId=" + serviceInstanceId; @@ -57,9 +59,9 @@ public class RestServiceImpl implements RestService { log.debug(LogMessages.AAI_CONTEXT_BUILDER_URL, url); } - if (transactionId == null || transactionId.isEmpty()) { - transactionId = UUID.randomUUID().toString(); - log.info(String.format("%s is missing; using newly generated value: %s", org.onap.pomba.contextbuilder.aai.util.RestUtil.TRANSACTION_ID, transactionId)); + if (requestId == null || requestId.isEmpty()) { + requestId = UUID.randomUUID().toString(); + log.info(String.format("%s is missing; using newly generated value: %s", org.onap.pomba.contextbuilder.aai.util.RestUtil.TRANSACTION_ID, requestId)); } Response response = null; @@ -74,9 +76,9 @@ public class RestServiceImpl implements RestService { RestUtil.validateServiceInstanceId(serviceInstanceId); // Keep the same transaction id for logging purpose - transactionId= RestUtil.extractTranIdHeader(headers); + requestId= RestUtil.extractRequestIdHeader(headers); - aaiContext = service.getContext(serviceInstanceId,transactionId); + aaiContext = service.getContext(req, serviceInstanceId, requestId, partnerName); if (aaiContext==null) { // Return empty JSON |