From 8fc90f019dc4811f859b184873902b156d85f0dd Mon Sep 17 00:00:00 2001 From: Michael O'Brien Date: Mon, 30 Jul 2018 10:42:42 -0400 Subject: decouple aop lib wrapper from war Change-Id: I8e34ca4c32fdd70646a99f66c880879bcd142224 Issue-ID: LOG-137 Signed-off-by: Michael O'Brien --- reference/logging-demo/pom.xml | 7 +- .../java/org/onap/demo/logging/LoggingAspect.java | 55 -------------- .../onap/logging/demo/ApplicationServiceTest.java | 2 +- reference/logging-library/.classpath | 6 ++ reference/logging-library/pom.xml | 86 +++++++++++++++++++++- .../org/onap/logging/library/LoggingAspect.java | 55 ++++++++++++++ 6 files changed, 149 insertions(+), 62 deletions(-) delete mode 100644 reference/logging-demo/src/main/java/org/onap/demo/logging/LoggingAspect.java create mode 100644 reference/logging-library/src/main/java/org/onap/logging/library/LoggingAspect.java diff --git a/reference/logging-demo/pom.xml b/reference/logging-demo/pom.xml index 60fbe98..9d8ae1f 100644 --- a/reference/logging-demo/pom.xml +++ b/reference/logging-demo/pom.xml @@ -11,7 +11,8 @@ 2.5.1 4.3.6.RELEASE - 1.2.3 + 1.2.3 + 1.2.2-SNAPSHOT @@ -72,12 +73,12 @@ org.onap.logging-analytics logging-library - 1.2.2-SNAPSHOT + ${onap.version} org.onap.logging-analytics logging-mock-service - 1.2.2-SNAPSHOT + ${onap.version} diff --git a/reference/logging-demo/src/main/java/org/onap/demo/logging/LoggingAspect.java b/reference/logging-demo/src/main/java/org/onap/demo/logging/LoggingAspect.java deleted file mode 100644 index 2901ce1..0000000 --- a/reference/logging-demo/src/main/java/org/onap/demo/logging/LoggingAspect.java +++ /dev/null @@ -1,55 +0,0 @@ -/** - * ============LICENSE_START======================================================= - * org.onap.logging - * ================================================================================ - * Copyright © 2018 Amdocs - * All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ -package org.onap.demo.logging; - -import javax.servlet.http.HttpServletRequest; - -import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.annotation.After; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Before; -import org.onap.logging.ref.slf4j.ONAPLogAdapter; -import org.slf4j.LoggerFactory; - -@Aspect -public class LoggingAspect { - - @Before("execution(* org.onap.demo.logging.*.*(..))") - public void logBefore(JoinPoint joinPoint) { - Object[] args = joinPoint.getArgs(); - Object servletRequest = args[0]; - ONAPLogAdapter.HttpServletRequestAdapter requestAdapter = - new ONAPLogAdapter.HttpServletRequestAdapter((HttpServletRequest)servletRequest); - final ONAPLogAdapter adapter = new ONAPLogAdapter( - LoggerFactory.getLogger(joinPoint.getTarget().getClass())); - try { - adapter.entering(requestAdapter); - } finally { - } - } - - @After("execution(* org.onap.demo.logging.*.*(..))") - public void logAfter(JoinPoint joinPoint) { - final ONAPLogAdapter adapter = new ONAPLogAdapter( - LoggerFactory.getLogger(joinPoint.getTarget().getClass())); - adapter.exiting(); - } -} diff --git a/reference/logging-demo/src/test/java/org/onap/logging/demo/ApplicationServiceTest.java b/reference/logging-demo/src/test/java/org/onap/logging/demo/ApplicationServiceTest.java index a263a1f..1835fd9 100644 --- a/reference/logging-demo/src/test/java/org/onap/logging/demo/ApplicationServiceTest.java +++ b/reference/logging-demo/src/test/java/org/onap/logging/demo/ApplicationServiceTest.java @@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletRequest; import org.junit.Test; import org.onap.demo.logging.test.JoinPointMock; import org.onap.demo.logging.ApplicationService; -import org.onap.demo.logging.LoggingAspect; +import org.onap.logging.library.LoggingAspect; import org.onap.demo.logging.RestApplication; import org.onap.demo.logging.RestHealthServiceImpl; import org.onap.demo.logging.RestServiceImpl; diff --git a/reference/logging-library/.classpath b/reference/logging-library/.classpath index 16bf974..3304b94 100644 --- a/reference/logging-library/.classpath +++ b/reference/logging-library/.classpath @@ -1,6 +1,12 @@ + + + + + + diff --git a/reference/logging-library/pom.xml b/reference/logging-library/pom.xml index ed07037..547ff43 100644 --- a/reference/logging-library/pom.xml +++ b/reference/logging-library/pom.xml @@ -9,6 +9,13 @@ logging-library jar logging-library + + + 4.3.6.RELEASE + 1.2.3 + 1.2.2-SNAPSHOT + + @@ -57,13 +64,86 @@ - - + + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + org.onap.logging-analytics logging-slf4j - 1.2.2-SNAPSHOT + ${onap.version} + + + org.springframework + spring-aop + ${spring.version} + + + org.springframework + spring-context + ${spring.version} + + + org.springframework + spring-core + ${spring.version} + + + org.springframework + spring-orm + ${spring.version} + + + org.springframework + spring-oxm + ${spring.version} + + + org.springframework + spring-test + ${spring.version} + + + + org.springframework + spring-aspects + ${spring.version} + + + org.aspectj + aspectjrt + 1.8.1 + + + org.springframework + spring-tx + ${spring.version} + + + org.springframework + spring-web + ${spring.version} + + + org.springframework + spring-webmvc + ${spring.version} + + ch.qos.logback + logback-core + ${logback.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + diff --git a/reference/logging-library/src/main/java/org/onap/logging/library/LoggingAspect.java b/reference/logging-library/src/main/java/org/onap/logging/library/LoggingAspect.java new file mode 100644 index 0000000..46b1fa7 --- /dev/null +++ b/reference/logging-library/src/main/java/org/onap/logging/library/LoggingAspect.java @@ -0,0 +1,55 @@ +/** + * ============LICENSE_START======================================================= + * org.onap.logging + * ================================================================================ + * Copyright © 2018 Amdocs + * All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ +package org.onap.logging.library; + +import javax.servlet.http.HttpServletRequest; + +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.annotation.After; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; +import org.onap.logging.ref.slf4j.ONAPLogAdapter; +import org.slf4j.LoggerFactory; + +@Aspect +public class LoggingAspect { + + @Before("execution(* org.onap.demo.logging.*.*(..))") + public void logBefore(JoinPoint joinPoint) { + Object[] args = joinPoint.getArgs(); + Object servletRequest = args[0]; + ONAPLogAdapter.HttpServletRequestAdapter requestAdapter = + new ONAPLogAdapter.HttpServletRequestAdapter((HttpServletRequest)servletRequest); + final ONAPLogAdapter adapter = new ONAPLogAdapter( + LoggerFactory.getLogger(joinPoint.getTarget().getClass())); + try { + adapter.entering(requestAdapter); + } finally { + } + } + + @After("execution(* org.onap.demo.logging.*.*(..))") + public void logAfter(JoinPoint joinPoint) { + final ONAPLogAdapter adapter = new ONAPLogAdapter( + LoggerFactory.getLogger(joinPoint.getTarget().getClass())); + adapter.exiting(); + } +} -- cgit 1.2.3-korg