update logging to match onap logging library

Updated to use changes added to logging library in ONAP
Updated RestClient to set mdc rather than extend filter
Updated filter removal to include new spring filter
Updated to exclude filter causing failure in catdb
Excluded filter causing failures in requestdb
Updated requestdbatt to exclude filter
Updated check for spring filters to fix failing tests

Issue-ID: SO-2353
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: Idb081a0f5527690f9dc41c7914a2d721f9022aea

4 files changed, 21 insertions, 4 deletions

diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/WebMvcConfig.java b/adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/WebMvcConfig.java
index ff0f8dc432..cd3b2a377b 100644
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/WebMvcConfig.java
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/WebMvcConfig.java
@@ -22,6 +22,7 @@ package org.onap.so.adapters.catalogdb;
 
 
 import org.onap.logging.filter.spring.LoggingInterceptor;
+import org.onap.logging.filter.spring.StatusLoggingInterceptor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -34,11 +35,18 @@ import org.springframework.web.servlet.handler.MappedInterceptor;
 public class WebMvcConfig extends WebMvcConfigurerAdapter {
 
     @Autowired
-    LoggingInterceptor loggingInterceptor;
+    private LoggingInterceptor loggingInterceptor;
+
+    @Autowired
+    private StatusLoggingInterceptor statusLoggingInterceptor;
 
     @Bean
     public MappedInterceptor mappedLoggingInterceptor() {
         return new MappedInterceptor(new String[] {"/**"}, loggingInterceptor);
     }
 
+    @Bean
+    public MappedInterceptor mappedStatusLoggingInterceptor() {
+        return new MappedInterceptor(new String[] {"/**"}, statusLoggingInterceptor);
+    }
 }
diff --git a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/application/MSORequestDBApplication.java b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/application/MSORequestDBApplication.java
index e1dc4cab66..3a14b2ff84 100644
--- a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/application/MSORequestDBApplication.java
+++ b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/application/MSORequestDBApplication.java
@@ -41,7 +41,6 @@ import net.javacrumbs.shedlock.spring.ScheduledLockConfigurationBuilder;
  * @since Version 1.0
  *
  */
-
 @SpringBootApplication(scanBasePackages = {"org.onap.so", "org.onap.logging.filter"})
 @EnableScheduling
 @EnableMBeanExport(registration = RegistrationPolicy.IGNORE_EXISTING)
diff --git a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/application/WebMvcConfig.java b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/application/WebMvcConfig.java
index c0dfbe08ef..9135d31ac3 100644
--- a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/application/WebMvcConfig.java
+++ b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/application/WebMvcConfig.java
@@ -22,6 +22,7 @@ package org.onap.so.adapters.requestsdb.application;
 
 
 import org.onap.logging.filter.spring.LoggingInterceptor;
+import org.onap.logging.filter.spring.StatusLoggingInterceptor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -34,11 +35,18 @@ import org.springframework.web.servlet.handler.MappedInterceptor;
 public class WebMvcConfig extends WebMvcConfigurerAdapter {
 
     @Autowired
-    LoggingInterceptor loggingInterceptor;
+    private LoggingInterceptor loggingInterceptor;
+
+    @Autowired
+    private StatusLoggingInterceptor statusLoggingInterceptor;
 
     @Bean
     public MappedInterceptor mappedLoggingInterceptor() {
         return new MappedInterceptor(new String[] {"/**"}, loggingInterceptor);
     }
 
+    @Bean
+    public MappedInterceptor mappedStatusLoggingInterceptor() {
+        return new MappedInterceptor(new String[] {"/**"}, statusLoggingInterceptor);
+    }
 }
diff --git a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/extclients/vnfm/VnfmServiceProviderConfiguration.java b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/extclients/vnfm/VnfmServiceProviderConfiguration.java
index b621759b59..ae9316cfdf 100644
--- a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/extclients/vnfm/VnfmServiceProviderConfiguration.java
+++ b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/extclients/vnfm/VnfmServiceProviderConfiguration.java
@@ -42,6 +42,7 @@ import org.apache.http.impl.client.HttpClients;
 import org.apache.http.ssl.SSLContextBuilder;
 import org.onap.aai.domain.yang.EsrSystemInfo;
 import org.onap.aai.domain.yang.EsrVnfm;
+import org.onap.logging.filter.spring.SpringClientPayloadFilter;
 import org.onap.so.adapters.vnfmadapter.extclients.vnfm.lcn.JSON;
 import org.onap.so.configuration.rest.BasicHttpHeadersProvider;
 import org.onap.so.logging.jaxrs.filter.SOSpringClientFilter;
@@ -173,7 +174,8 @@ public class VnfmServiceProviderConfiguration {
     private void removeSpringClientFilter(final RestTemplate restTemplate) {
         ListIterator<ClientHttpRequestInterceptor> interceptorIterator = restTemplate.getInterceptors().listIterator();
         while (interceptorIterator.hasNext()) {
-            if (interceptorIterator.next() instanceof SOSpringClientFilter) {
+            ClientHttpRequestInterceptor interceptor = interceptorIterator.next();
+            if (interceptor instanceof SOSpringClientFilter || interceptor instanceof SpringClientPayloadFilter) {
                 interceptorIterator.remove();
             }
         }