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

1 files changed, 3 insertions, 1 deletions

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();
             }
         }