From 03a6609e1ffb981e7222fe938b6dd6337b287b87 Mon Sep 17 00:00:00 2001 From: "Leigh, Phillip (pl876u)" Date: Mon, 4 Feb 2019 14:59:54 -0500 Subject: Log request when no XFromAppId/ServiceInstance Issue-ID: LOG-688 Change-Id: I909e589b0c1c5dc5998a2e2129585c900210b2c6 Signed-off-by: Leigh, Phillip (pl876u) --- .../contextbuilder/aai/service/rs/RestServiceImpl.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'src/main/java/org/onap/pomba/contextbuilder/aai/service/rs/RestServiceImpl.java') 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 b99c87b..7fd27fb 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 @@ -31,6 +31,7 @@ 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; public class RestServiceImpl implements RestService { private static Logger log = LoggerFactory.getLogger(RestService.class); @@ -43,16 +44,23 @@ public class RestServiceImpl implements RestService { private String httpBasicAuthorization; @Override - public Response getContext(HttpHeaders headers, String serviceInstanceId) { + public Response getContext(HttpHeaders headers, + String authorization, + String fromAppId, + String transactionId, + String serviceInstanceId) { String url = "serviceInstanceId=" + serviceInstanceId; if(log.isDebugEnabled()) { 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)); + } Response response = null; - String transactionId = null; ModelContext aaiContext= null; Gson gson = new GsonBuilder().create(); @@ -61,7 +69,7 @@ public class RestServiceImpl implements RestService { // Do some validation on Http headers and URL parameters RestUtil.validateBasicAuthorization(headers, httpBasicAuthorization); RestUtil.validateHeader(headers); - RestUtil.validateURL(serviceInstanceId); + RestUtil.validateServiceInstanceId(serviceInstanceId); // Keep the same transaction id for logging purpose transactionId= RestUtil.extractTranIdHeader(headers); -- cgit 1.2.3-korg