rename class to JaxRsMetricLogClientFilter

Issue-ID: VID-253

Change-Id: I47727690015ab0183ba25a57b19fb280231c6fb3
Signed-off-by: Eylon Malin <eylon.malin@intl.att.com>

diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/util/AAIRestInterface.java b/vid-app-common/src/main/java/org/onap/vid/aai/util/AAIRestInterface.java
index aadfd58..daa1247 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/aai/util/AAIRestInterface.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/util/AAIRestInterface.java
@@ -41,7 +41,7 @@ import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.onap.vid.aai.ExceptionWithRequestInfo;
 import org.onap.vid.aai.ResponseWithRequestInfo;
 import org.onap.vid.aai.exceptions.InvalidPropertyException;
-import org.onap.vid.logging.VidMetricLogClientFilter;
+import org.onap.vid.logging.JaxRsMetricLogClientFilter;
 import org.onap.vid.utils.Logging;
 import org.onap.vid.utils.Unchecked;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -125,7 +125,7 @@ public class AAIRestInterface {
         if (client == null) {
             try {
                 client = httpsAuthClientFactory.getClient(HttpClientMode.WITH_KEYSTORE);
-                VidMetricLogClientFilter metricLogClientFilter = new VidMetricLogClientFilter();
+                JaxRsMetricLogClientFilter metricLogClientFilter = new JaxRsMetricLogClientFilter();
                 client.register(metricLogClientFilter);
             } catch (Exception e) {
                 logger.info(EELFLoggerDelegate.errorLogger, "Exception in REST call to DB in initRestClient" + e.toString());

diff --git a/vid-app-common/src/main/java/org/onap/vid/logging/VidMetricLogClientFilter.java b/vid-app-common/src/main/java/org/onap/vid/logging/JaxRsMetricLogClientFilter.java
similarity index 95%
rename from vid-app-common/src/main/java/org/onap/vid/logging/VidMetricLogClientFilter.java
rename to vid-app-common/src/main/java/org/onap/vid/logging/JaxRsMetricLogClientFilter.java
index 6b9222e..fbea381 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/logging/VidMetricLogClientFilter.java
+++ b/vid-app-common/src/main/java/org/onap/vid/logging/JaxRsMetricLogClientFilter.java
@@ -27,7 +27,7 @@ import javax.ws.rs.core.MultivaluedMap;
 import org.onap.logging.filter.base.MetricLogClientFilter;
 import org.onap.logging.ref.slf4j.ONAPLogConstants;
 
-public class VidMetricLogClientFilter extends MetricLogClientFilter {
+public class JaxRsMetricLogClientFilter extends MetricLogClientFilter {
 
     @Override
     protected void additionalPre(ClientRequestContext clientRequestContext, MultivaluedMap<String, Object> stringObjectMultivaluedMap) {

diff --git a/vid-app-common/src/main/java/org/onap/vid/mso/RestMsoImplementation.java b/vid-app-common/src/main/java/org/onap/vid/mso/RestMsoImplementation.java
index a2d71d9..2f5458d 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/mso/RestMsoImplementation.java
+++ b/vid-app-common/src/main/java/org/onap/vid/mso/RestMsoImplementation.java
@@ -40,7 +40,7 @@ import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.onap.vid.aai.util.HttpClientMode;
 import org.onap.vid.aai.util.HttpsAuthClient;
 import org.onap.vid.client.HttpBasicClient;
-import org.onap.vid.logging.VidMetricLogClientFilter;
+import org.onap.vid.logging.JaxRsMetricLogClientFilter;
 import org.onap.vid.utils.Logging;
 import org.onap.vid.utils.SystemPropertiesWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -131,7 +131,7 @@ public class RestMsoImplementation {
     }
 
     private void registerClientToMetricLogClientFilter(Client client) {
-        VidMetricLogClientFilter metricLogClientFilter = new VidMetricLogClientFilter();
+        JaxRsMetricLogClientFilter metricLogClientFilter = new JaxRsMetricLogClientFilter();
         client.register(metricLogClientFilter);
     }
 

diff --git a/vid-app-common/src/test/java/org/onap/vid/logging/VidMetricLogClientFilterTest.java b/vid-app-common/src/test/java/org/onap/vid/logging/JaxRsMetricLogClientFilterTest.java
similarity index 90%
rename from vid-app-common/src/test/java/org/onap/vid/logging/VidMetricLogClientFilterTest.java
rename to vid-app-common/src/test/java/org/onap/vid/logging/JaxRsMetricLogClientFilterTest.java
index aaf8eaf..56efeaf 100644 (file)
--- a/vid-app-common/src/test/java/org/onap/vid/logging/VidMetricLogClientFilterTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/logging/JaxRsMetricLogClientFilterTest.java
@@ -29,13 +29,13 @@ import org.slf4j.MDC;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-public class VidMetricLogClientFilterTest {
+public class JaxRsMetricLogClientFilterTest {
 
-    VidMetricLogClientFilter metricLogClientFilter;
+    JaxRsMetricLogClientFilter metricLogClientFilter;
 
     @BeforeMethod
     public void setup() {
-        this.metricLogClientFilter = new VidMetricLogClientFilter();
+        this.metricLogClientFilter = new JaxRsMetricLogClientFilter();
         MDC.clear();
     }