summaryrefslogtreecommitdiffstats
path: root/reference/logging-demo
diff options
context:
space:
mode:
authorAvdhut Kholkar <avdhut.kholkar@amdocs.com>2018-08-18 08:40:05 +0000
committerGerrit Code Review <gerrit@onap.org>2018-08-18 08:40:05 +0000
commit25fc709eb9d8b9bc79f46000005f5dbd49c2871c (patch)
tree518c2cbf63f39d52392fcbfe99314e0fb165ab78 /reference/logging-demo
parent201add0e57d434726af198f54734f044dfd3d4f0 (diff)
parent8fc90f019dc4811f859b184873902b156d85f0dd (diff)
Merge "decouple aop lib wrapper from war"
Diffstat (limited to 'reference/logging-demo')
-rw-r--r--reference/logging-demo/pom.xml7
-rw-r--r--reference/logging-demo/src/main/java/org/onap/demo/logging/LoggingAspect.java55
-rw-r--r--reference/logging-demo/src/test/java/org/onap/logging/demo/ApplicationServiceTest.java2
3 files changed, 5 insertions, 59 deletions
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 @@
<properties>
<jackson-2-version>2.5.1</jackson-2-version>
<spring.version>4.3.6.RELEASE</spring.version>
- <logback.version>1.2.3</logback.version>
+ <logback.version>1.2.3</logback.version>
+ <onap.version>1.2.2-SNAPSHOT</onap.version>
</properties>
<build>
<plugins>
@@ -72,12 +73,12 @@
<dependency>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-library</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>${onap.version}</version>
</dependency>
<dependency>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-mock-service</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>${onap.version}</version>
</dependency>
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;