From e2c77490982e448fb94477cebc5b7d4b8110321d Mon Sep 17 00:00:00 2001
From: "Smokowski, Steve (ss835w)" <ss835w@us.att.com>
Date: Tue, 4 Sep 2018 15:31:38 -0400
Subject: Client Logging

Update Client Logging to use interceptor
Move CXF to own project due to dependency hell

Issue-ID: SO-947

Change-Id: I2597ff6d32231b8625b04ef63ab5e8f589e2545c
Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
---
 adapters/mso-sdnc-adapter/pom.xml                           | 10 +++++-----
 .../java/org/onap/so/adapters/sdnc/CXFConfiguration.java    | 13 ++++---------
 2 files changed, 9 insertions(+), 14 deletions(-)

(limited to 'adapters/mso-sdnc-adapter')

diff --git a/adapters/mso-sdnc-adapter/pom.xml b/adapters/mso-sdnc-adapter/pom.xml
index 0337c2613e..7723ffa691 100644
--- a/adapters/mso-sdnc-adapter/pom.xml
+++ b/adapters/mso-sdnc-adapter/pom.xml
@@ -149,11 +149,6 @@
 			<version>1.0.4</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>janino</groupId>
-			<artifactId>janino</artifactId>
-			<version>2.5.15</version>
-		</dependency>
 		<dependency>
 			<groupId>io.micrometer</groupId>
 			<artifactId>micrometer-spring-legacy</artifactId>
@@ -164,5 +159,10 @@
 			<artifactId>micrometer-registry-prometheus</artifactId>
 			<version>1.0.5</version>
 		</dependency>
+		<dependency>
+			<groupId>org.onap.so</groupId>
+			<artifactId>cxf-logging</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/CXFConfiguration.java b/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/CXFConfiguration.java
index f6fd8d5f0d..766a48a3c4 100644
--- a/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/CXFConfiguration.java
+++ b/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/CXFConfiguration.java
@@ -64,15 +64,10 @@ public class CXFConfiguration {
 	
 	@Autowired 
 	private SNIROResponse sniroResponse;
-
-	@Autowired
-	private SOAPLoggingInInterceptor soapInInterceptor;
-	    
-	@Autowired
-	private SOAPLoggingOutInterceptor soapOutInterceptor;
     
 	@Autowired
 	private ObjectMapper mapper;
+	
     @Bean
     public Server rsServer() {
         endpoint = new JAXRSServerFactoryBean();
@@ -93,9 +88,9 @@ public class CXFConfiguration {
     @Bean
     public Endpoint sndcAdapter() {
         EndpointImpl wsdlEndpoint = new EndpointImpl(bus, sdncAdapterPortImpl);
-        wsdlEndpoint.getInInterceptors().add(soapInInterceptor);
-        wsdlEndpoint.getOutInterceptors().add(soapOutInterceptor);
-        wsdlEndpoint.getOutFaultInterceptors().add(soapOutInterceptor);
+        wsdlEndpoint.getInInterceptors().add(new SOAPLoggingInInterceptor());
+        wsdlEndpoint.getOutInterceptors().add(new SOAPLoggingOutInterceptor());
+        wsdlEndpoint.getOutFaultInterceptors().add(new SOAPLoggingOutInterceptor());
         wsdlEndpoint.publish("/SDNCAdapter");
         return wsdlEndpoint;
     }
-- 
cgit 1.2.3-korg