diff options
| author |   Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-10-10 14:05:46 -0400 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-10-10 14:05:46 -0400 |
| commit | 91258ae501d8fdd73e8fe7ee43b831026f533482 (patch) | |
| tree | 378ca986bd283f0ae2ca5d62c2b91b14729d27bf /aai-service | |
| parent | 29924c8fd09d8b32d21a8e41f5a22f7fc282ec17 (diff) | |
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) <dtimoney@att.com>
Diffstat (limited to 'aai-service')
3 files changed, 9 insertions, 2 deletions
diff --git a/aai-service/provider/pom.xml b/aai-service/provider/pom.xml index 142e381d..5055c649 100755 --- a/aai-service/provider/pom.xml +++ b/aai-service/provider/pom.xml @@ -61,6 +61,11 @@ <version>${ccsdk.sli.core.version}</version> </dependency> <dependency> + <groupId>org.onap.logging-analytics</groupId> + <artifactId>logging-filter-base</artifactId> + <version>1.5.0</version> + </dependency> + <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> <scope>provided</scope> 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 c4f9464e..446ec4b6 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 a683a93b..c0dc5696 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"); } |