polishing

Author: janithb

pom.xml

@@ -54,6 +54,7 @@
 		<junit.version>4.11</junit.version>
 		<audit4j.version>2.4.0</audit4j.version>
 		<spring.version>4.2.2.RELEASE</spring.version>
+		<spring.security.version>4.0.3.RELEASE</spring.security.version>
 		<aspectj.version>1.8.7</aspectj.version>
 	</properties>
 
@@ -81,6 +82,22 @@
 			<scope>provided</scope>
 		</dependency>
 
+		<!-- Spring Web -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+			<version>${spring.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- Spring Security -->
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-web</artifactId>
+			<version>${spring.security.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
 		<!-- Aspect J -->
 		<dependency>
 			<groupId>org.aspectj</groupId>

src/main/java/org/audit4j/integration/spring/SpringAudit4jConfig.java

@@ -51,28 +51,29 @@ public class SpringAudit4jConfig implements InitializingBean, DisposableBean {
 
     /** The commands. */
     private String commands;
-    
+
     /** The jmx. */
     private JMXConfig jmx;
-    
+
+    /** The actor session attribute name. */
     private String actorSessionAttributeName;
 
     /**
+     * Initialize audit4j when starting spring application context.
+     * 
      * {@inheritDoc}
      * 
      * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
-     * 
      */
     @Override
     public void afterPropertiesSet() throws Exception {
         Configuration configuration = Configuration.INSTANCE;
         configuration.setLayout(layout);
         configuration.setHandlers(handlers);
-        
         configuration.setFilters(filters);
         configuration.setCommands(commands);
         configuration.setJmx(jmx);
-        
+
         if (metaData == null) {
             if (actorSessionAttributeName == null) {
                 configuration.setMetaData(new SpringSecurityWebAuditMetaData());
@@ -93,7 +94,7 @@ public void afterPropertiesSet() throws Exception {
      */
     @Override
     public void destroy() throws Exception {
-        AuditManager.getInstance().shutdown();
+        AuditManager.shutdown();
     }
 
     /**
@@ -149,12 +150,18 @@ public void setCommands(String commands) {
     /**
      * Sets the jmx.
      *
-     * @param jmx the new jmx
+     * @param jmx
+     *            the new jmx
      */
     public void setJmx(JMXConfig jmx) {
         this.jmx = jmx;
     }
 
+    /**
+     * Sets the actor session attribute name.
+     *
+     * @param actorSessionAttributeName the new actor session attribute name
+     */
     public void setActorSessionAttributeName(String actorSessionAttributeName) {
         this.actorSessionAttributeName = actorSessionAttributeName;
     }

src/main/java/org/audit4j/integration/spring/WebSessionAuditMetaData.java

@@ -29,8 +29,8 @@ public class WebSessionAuditMetaData extends SpringWebAuditMetadata {
      */
     @Override
     public String getActor() {
-        String actor = (String) RequestContextHolder.currentRequestAttributes().getAttribute(actorSessionAttribute,
-                RequestAttributes.SCOPE_SESSION);
+        String actor = (String) RequestContextHolder.currentRequestAttributes()
+                .getAttribute(actorSessionAttribute, RequestAttributes.SCOPE_SESSION);
         if (actor != null) {
             return actor;
         }
@@ -46,5 +46,4 @@ public String getActor() {
     public void setActorSessionAttribute(String actorSessionAttribute) {
         this.actorSessionAttribute = actorSessionAttribute;
     }
-
 }