From 91258ae501d8fdd73e8fe7ee43b831026f533482 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Thu, 10 Oct 2019 14:05:46 -0400 Subject: Fix broken build MetricLogger no longer has its own static definitions for MDC fields - instead, these are in logging analytics class Change-Id: I3074cf6879120b1e03a5b14e6f38b13eef82ad77 Issue-ID: CCSDK-1824 Signed-off-by: Timoney, Dan (dt5972) --- .../java/org/onap/ccsdk/sli/adaptors/aai/AAIClientRESTExecutor.java | 3 ++- .../src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'aai-service/provider/src/main/java') diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIClientRESTExecutor.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIClientRESTExecutor.java index c4f9464e3..446ec4b6a 100755 --- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIClientRESTExecutor.java +++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIClientRESTExecutor.java @@ -58,6 +58,7 @@ import org.onap.ccsdk.sli.adaptors.aai.data.RequestError; import org.onap.ccsdk.sli.adaptors.aai.data.ResourceVersion; import org.onap.ccsdk.sli.adaptors.aai.data.ServiceException; import org.onap.ccsdk.sli.core.sli.MetricLogger; +import org.onap.logging.ref.slf4j.ONAPLogConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -714,7 +715,7 @@ public class AAIClientRESTExecutor implements AAIExecutorInterface { String mlId = ml.getRequestID(); if (mlId != null && !mlId.isEmpty()) { LOG.debug(String.format("MetricLogger requestId = %s", mlId)); - con.setRequestProperty(MetricLogger.REQUEST_ID, mlId); + con.setRequestProperty(ONAPLogConstants.MDCs.REQUEST_ID, mlId); } else { LOG.debug("MetricLogger requestId is null"); } diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java index a683a93b8..c0dc5696b 100755 --- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java +++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java @@ -86,6 +86,7 @@ import org.onap.aai.inventory.v16.PhysicalLink; import org.onap.aai.inventory.v16.ResultData; import org.onap.aai.inventory.v16.SearchResults; import org.onap.aai.inventory.v16.Vserver; +import org.onap.logging.ref.slf4j.ONAPLogConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.MDC; @@ -363,7 +364,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe String mlId = ml.getRequestID(); if(mlId != null && !mlId.isEmpty()) { LOG.debug(String.format("MetricLogger requestId = %s", mlId)); - con.setRequestProperty(MetricLogger.REQUEST_ID, mlId); + con.setRequestProperty(ONAPLogConstants.MDCs.REQUEST_ID, mlId); } else { LOG.debug("MetricLogger requestId is null"); } -- cgit 1.2.3-korg