From 8fc90f019dc4811f859b184873902b156d85f0dd Mon Sep 17 00:00:00 2001
From: Michael O'Brien <frank.obrien@amdocs.com>
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 <frank.obrien@amdocs.com>
---
 reference/logging-library/.classpath               |  6 ++
 reference/logging-library/pom.xml                  | 86 +++++++++++++++++++++-
 .../org/onap/logging/library/LoggingAspect.java    | 55 ++++++++++++++
 3 files changed, 144 insertions(+), 3 deletions(-)
 create mode 100644 reference/logging-library/src/main/java/org/onap/logging/library/LoggingAspect.java

(limited to 'reference/logging-library')

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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
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 @@
   <artifactId>logging-library</artifactId>
   <packaging>jar</packaging>
   <name>logging-library</name>
+  
+    <properties>
+       <spring.version>4.3.6.RELEASE</spring.version>
+       <logback.version>1.2.3</logback.version> 
+       <onap.version>1.2.2-SNAPSHOT</onap.version>         
+  </properties>
+  
   <build>
       <plugins>
       <plugin>
@@ -57,13 +64,86 @@
       	</plugins>
       </pluginManagement>
   </build>
-    <properties>
-    </properties>
+  
   <dependencies>
+      <!--  decouple HttpServlet parameters from both this project and slf4j later -->
+      <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>javax.servlet-api</artifactId>
+        <version>3.0.1</version>
+        <scope>provided</scope>
+    </dependency>
           <dependency>
             <groupId>org.onap.logging-analytics</groupId>
             <artifactId>logging-slf4j</artifactId>
-            <version>1.2.2-SNAPSHOT</version>
+            <version>${onap.version}</version>
+        </dependency>
+               <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-oxm</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${spring.version}</version>
+            <!--scope>test</scope-->
+        </dependency>
+        <dependency> 
+     <groupId>org.springframework</groupId> 
+     <artifactId>spring-aspects</artifactId> 
+     <version>${spring.version}</version> 
+        </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjrt</artifactId>
+            <version>1.8.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>${spring.version}</version>
         </dependency>
+                <dependency>
+                        <groupId>ch.qos.logback</groupId>
+                        <artifactId>logback-core</artifactId>
+                        <version>${logback.version}</version>
+                </dependency>
+                <dependency>
+                        <groupId>ch.qos.logback</groupId>
+                        <artifactId>logback-classic</artifactId>
+                        <version>${logback.version}</version>
+                </dependency>  
+ 
   </dependencies>
 </project>
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