From e2c77490982e448fb94477cebc5b7d4b8110321d Mon Sep 17 00:00:00 2001 From: "Smokowski, Steve (ss835w)" 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) --- adapters/mso-openstack-adapters/pom.xml | 5 +++ .../so/adapters/openstack/CXFConfiguration.java | 44 ++++++++++------------ adapters/mso-requests-db-adapter/pom.xml | 10 ++--- .../requestsdb/application/CXFConfiguration.java | 12 ++---- .../adapters/HealthCheckHandlerTest.java | 3 +- adapters/mso-sdnc-adapter/pom.xml | 10 ++--- .../onap/so/adapters/sdnc/CXFConfiguration.java | 13 ++----- 7 files changed, 43 insertions(+), 54 deletions(-) (limited to 'adapters') diff --git a/adapters/mso-openstack-adapters/pom.xml b/adapters/mso-openstack-adapters/pom.xml index 01c1df304e..fb104fcab3 100644 --- a/adapters/mso-openstack-adapters/pom.xml +++ b/adapters/mso-openstack-adapters/pom.xml @@ -272,5 +272,10 @@ org.flywaydb flyway-core + + org.onap.so + cxf-logging + ${project.version} + diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/openstack/CXFConfiguration.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/openstack/CXFConfiguration.java index 2b21381041..996e2c2712 100644 --- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/openstack/CXFConfiguration.java +++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/openstack/CXFConfiguration.java @@ -86,13 +86,7 @@ public class CXFConfiguration { private MsoVnfCloudifyAdapterImpl vnfCloudifyAdapterImpl; @Autowired private JettisonStyleMapperProvider jettisonStyleObjectMapper; - - @Autowired - private SOAPLoggingInInterceptor soapInInterceptor; - - @Autowired - private SOAPLoggingOutInterceptor soapOutInterceptor; - + @Bean(name=Bus.DEFAULT_BUS_ID) public SpringBus springBus() { return new SpringBus(); @@ -114,9 +108,9 @@ public class CXFConfiguration { EndpointImpl endpoint = new EndpointImpl(springBus(), networkAdapterImpl); endpoint.publish("/NetworkAdapter"); endpoint.setWsdlLocation("NetworkAdapter.wsdl"); - endpoint.getInInterceptors().add(soapInInterceptor); - endpoint.getOutInterceptors().add(soapOutInterceptor); - endpoint.getOutFaultInterceptors().add(soapOutInterceptor); + endpoint.getInInterceptors().add(new SOAPLoggingInInterceptor()); + endpoint.getOutInterceptors().add(new SOAPLoggingOutInterceptor()); + endpoint.getOutFaultInterceptors().add(new SOAPLoggingOutInterceptor()); return endpoint; } @@ -125,9 +119,9 @@ public class CXFConfiguration { EndpointImpl endpoint = new EndpointImpl(springBus(), networkAdapterAsyncImpl); endpoint.publish("/NetworkAdapterAsync"); endpoint.setWsdlLocation("NetworkAdapterAsync.wsdl"); - endpoint.getInInterceptors().add(soapInInterceptor); - endpoint.getOutInterceptors().add(soapOutInterceptor); - endpoint.getOutFaultInterceptors().add(soapOutInterceptor); + endpoint.getInInterceptors().add(new SOAPLoggingInInterceptor()); + endpoint.getOutInterceptors().add(new SOAPLoggingOutInterceptor()); + endpoint.getOutFaultInterceptors().add(new SOAPLoggingOutInterceptor()); return endpoint; } @@ -139,9 +133,9 @@ public class CXFConfiguration { EndpointImpl endpoint = new EndpointImpl(springBus(), tenantAdapterImpl); endpoint.publish("/TenantAdapter"); endpoint.setWsdlLocation("TenantAdapter.wsdl"); - endpoint.getInInterceptors().add(soapInInterceptor); - endpoint.getOutInterceptors().add(soapOutInterceptor); - endpoint.getOutFaultInterceptors().add(soapOutInterceptor); + endpoint.getInInterceptors().add(new SOAPLoggingInInterceptor()); + endpoint.getOutInterceptors().add(new SOAPLoggingOutInterceptor()); + endpoint.getOutFaultInterceptors().add(new SOAPLoggingOutInterceptor()); return endpoint; } @@ -155,9 +149,9 @@ public class CXFConfiguration { EndpointImpl endpoint = new EndpointImpl(springBus(), vnfAdapterImpl); endpoint.publish("/VnfAdapter"); endpoint.setWsdlLocation("VnfAdapter.wsdl"); - endpoint.getInInterceptors().add(soapInInterceptor); - endpoint.getOutInterceptors().add(soapOutInterceptor); - endpoint.getOutFaultInterceptors().add(soapOutInterceptor); + endpoint.getInInterceptors().add(new SOAPLoggingInInterceptor()); + endpoint.getOutInterceptors().add(new SOAPLoggingOutInterceptor()); + endpoint.getOutFaultInterceptors().add(new SOAPLoggingOutInterceptor()); return endpoint; } @@ -166,9 +160,9 @@ public class CXFConfiguration { EndpointImpl endpoint = new EndpointImpl(springBus(), vnfAdapterAsyncImpl); endpoint.publish("/VnfAsyncAdapter"); endpoint.setWsdlLocation("VnfAsyncAdapter.wsdl"); - endpoint.getInInterceptors().add(soapInInterceptor); - endpoint.getOutInterceptors().add(soapOutInterceptor); - endpoint.getOutFaultInterceptors().add(soapOutInterceptor); + endpoint.getInInterceptors().add(new SOAPLoggingInInterceptor()); + endpoint.getOutInterceptors().add(new SOAPLoggingOutInterceptor()); + endpoint.getOutFaultInterceptors().add(new SOAPLoggingOutInterceptor()); return endpoint; } @@ -177,9 +171,9 @@ public class CXFConfiguration { EndpointImpl endpoint = new EndpointImpl(springBus(), vnfCloudifyAdapterImpl); endpoint.publish("/VnfCloudifyAdapterImpl"); endpoint.setWsdlLocation("VnfCloudifyAdapterImpl.wsdl"); - endpoint.getInInterceptors().add(soapInInterceptor); - endpoint.getOutInterceptors().add(soapOutInterceptor); - endpoint.getOutFaultInterceptors().add(soapOutInterceptor); + endpoint.getInInterceptors().add(new SOAPLoggingInInterceptor()); + endpoint.getOutInterceptors().add(new SOAPLoggingOutInterceptor()); + endpoint.getOutFaultInterceptors().add(new SOAPLoggingOutInterceptor()); return endpoint; } diff --git a/adapters/mso-requests-db-adapter/pom.xml b/adapters/mso-requests-db-adapter/pom.xml index 934e2a544f..955a4d81fa 100644 --- a/adapters/mso-requests-db-adapter/pom.xml +++ b/adapters/mso-requests-db-adapter/pom.xml @@ -71,11 +71,6 @@ spring-boot-starter-data-jpa true - - janino - janino - 2.5.15 - ch.vorburger.mariaDB4j mariaDB4j @@ -110,6 +105,11 @@ micrometer-registry-prometheus 1.0.5 + + org.onap.so + cxf-logging + ${project.version} + diff --git a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/application/CXFConfiguration.java b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/application/CXFConfiguration.java index 0404c10760..23a769bc21 100644 --- a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/application/CXFConfiguration.java +++ b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/application/CXFConfiguration.java @@ -45,12 +45,6 @@ public class CXFConfiguration { @Autowired private MsoRequestsDbAdapter requestDbAdapterImpl; - @Autowired - private SOAPLoggingInInterceptor soapInInterceptor; - - @Autowired - private SOAPLoggingOutInterceptor soapOutInterceptor; - @Bean public ServletRegistrationBean cxfServlet() { @@ -65,9 +59,9 @@ public class CXFConfiguration { logFeature.setPrettyLogging(true); logFeature.initialize(bus); endpoint.getFeatures().add(logFeature); - endpoint.getInInterceptors().add(soapInInterceptor); - endpoint.getOutInterceptors().add(soapOutInterceptor); - endpoint.getOutFaultInterceptors().add(soapOutInterceptor); + endpoint.getInInterceptors().add(new SOAPLoggingInInterceptor()); + endpoint.getOutInterceptors().add(new SOAPLoggingOutInterceptor()); + endpoint.getOutFaultInterceptors().add(new SOAPLoggingOutInterceptor()); return endpoint; } diff --git a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/adapters/HealthCheckHandlerTest.java b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/adapters/HealthCheckHandlerTest.java index 159eb015de..4e00ced841 100644 --- a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/adapters/HealthCheckHandlerTest.java +++ b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/adapters/HealthCheckHandlerTest.java @@ -58,7 +58,7 @@ public class HealthCheckHandlerTest { @Test public void testHealthcheck() throws JSONException { - + TestAppender.events.clear(); HttpEntity entity = new HttpEntity(null, headers); ResponseEntity response = restTemplate.exchange( @@ -87,6 +87,7 @@ public class HealthCheckHandlerTest { assertEquals("/manage/health",mdc.get(ONAPLogConstants.MDCs.SERVICE_NAME)); assertEquals("COMPLETED",mdc.get(ONAPLogConstants.MDCs.RESPONSE_STATUS_CODE)); } + TestAppender.events.clear(); } private String createURLWithPort(String uri) { 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 @@ 1.0.4 test - - janino - janino - 2.5.15 - io.micrometer micrometer-spring-legacy @@ -164,5 +159,10 @@ micrometer-registry-prometheus 1.0.5 + + org.onap.so + cxf-logging + ${project.version} + \ 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