diff options
| author |   Smokowski, Steve (ss835w) <ss835w@us.att.com> | 2018-09-04 15:31:38 -0400 |
|---|---|---|
| committer | Smokowski, Steve (ss835w) <ss835w@us.att.com> | 2018-09-05 10:51:55 -0400 |
| commit | e2c77490982e448fb94477cebc5b7d4b8110321d (patch) | |
| tree | 1cc4a77f04856d366edb327e4402678de7df32e3 /adapters/mso-requests-db-adapter | |
| parent | 43e02724c56abd460e41a1715ff5057b036e6270 (diff) | |
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>
Diffstat (limited to 'adapters/mso-requests-db-adapter')
3 files changed, 10 insertions, 15 deletions
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 @@ -72,11 +72,6 @@ <optional>true</optional> </dependency> <dependency> - <groupId>janino</groupId> - <artifactId>janino</artifactId> - <version>2.5.15</version> - </dependency> - <dependency> <groupId>ch.vorburger.mariaDB4j</groupId> <artifactId>mariaDB4j</artifactId> <version>2.2.3</version> @@ -110,6 +105,11 @@ <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> <build> 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<String> entity = new HttpEntity<String>(null, headers); ResponseEntity<String> 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) { |