Revamping codes

Author: janithb

src/main/java/org/audit4j/core/AuditManager.java

@@ -117,6 +117,7 @@ public boolean audit(AnnotationAuditEvent annotationEvent) {
     public static AuditManager getInstance() {
         init();
         synchronized (AuditManager.class) {
+            
             if (auditManager == null) {
                 auditManager = new AuditManager();
             }
@@ -144,10 +145,9 @@ public static AuditManager getConfigurationInstance(Configuration configuration)
     }
 
     /**
-     * @deprecated
-     * This method allows to external plugins can inject the configurations.
-     * Since the security reasons, this allows to create one time configuration
-     * setting to Audit4j.
+     * @deprecated This method allows to external plugins can inject the
+     *             configurations. Since the security reasons, this allows to
+     *             create one time configuration setting to Audit4j.
      * 
      * @param configuration
      *            the configuration
@@ -160,7 +160,7 @@ public static AuditManager initWithConfiguration(Configuration configuration) {
         Context.setConfig(configuration);
         return getInstance();
     }
-    
+
     /**
      * This method allows to external plugins can inject the configurations.
      * Since the security reasons, this allows to create one time configuration
@@ -194,7 +194,7 @@ public static AuditManager startWithConfiguration(String configFilePath) {
         Context.setConfigFilePath(configFilePath);
         return getInstance();
     }
-    
+
     /**
      * Shutdown.
      */

src/main/java/org/audit4j/core/Context.java

@@ -71,9 +71,6 @@
  */
 public final class Context {
 
-    /** The initialize lock. */
-    private static boolean initialized = false;
-
     /** The Configuration instance. One time initialize. */
     private static Configuration conf;
 
@@ -99,10 +96,11 @@ public final class Context {
     final static void init() {
         StopWatch stopWatch = new StopWatch();
         stopWatch.start("Audit4jInit");
-        configContext = new ConcurrentConfigurationContext();
-        if (!initialized
-                && (configContext.getRunStatus().equals(RunStatus.READY) || configContext.getRunStatus().equals(
-                        RunStatus.STOPPED))) {
+        if (configContext == null) {
+            configContext = new ConcurrentConfigurationContext();
+        }
+        if (configContext.getRunStatus().equals(RunStatus.READY)
+                || configContext.getRunStatus().equals(RunStatus.STOPPED)) {
             Log.info("Initializing Audit4j...");
             // Check system environment;
             checkEnvironment();
@@ -159,7 +157,6 @@ final static void init() {
 
             configContext.setMetaData(conf.getMetaData());
 
-            initialized = true;
             configContext.setRunStatus(RunStatus.RUNNING);
 
             stopWatch.stop();
@@ -210,7 +207,6 @@ public static void initWithConfiguration(String configFilePath) {
     final static void stop() {
         if (configContext.getRunStatus().equals(RunStatus.RUNNING)) {
             configContext.setRunStatus(RunStatus.STOPPED);
-            initialized = false;
             Log.info("Preparing to shutdown Audit4j...");
 
             Log.info("Closing Streams...");
@@ -224,7 +220,8 @@ final static void stop() {
             }
 
             Log.info("Disposing configurations...");
-            
+            //configContext = null;
+            conf = null;
             Log.info("Audit4j shutdown completed.");
         } else {
             Log.info("No active Audit4j instance. Cancelling shutdown request.");
@@ -471,18 +468,6 @@ final static AnnotationAuditOutputStream getAnnotationStream() {
         return annotationAuditStream;
     }
 
-    /**
-     * Checks if is initialized.
-     * 
-     * @return true, if is initialized
-     * 
-     * @deprecated use {@link #getStatus()} instead.
-     */
-    @Deprecated
-    public boolean isInitialized() {
-        return initialized;
-    }
-
     /**
      * Gets the running status.
      * 

src/main/java/org/audit4j/core/ValidationManager.java

@@ -28,6 +28,7 @@
 import org.audit4j.core.dto.AuditEvent;
 import org.audit4j.core.exception.ValidationException;
 import org.audit4j.core.handler.Handler;
+import org.audit4j.core.handler.file.FileAuditHandler;
 import org.audit4j.core.util.Log;
 
 /**
@@ -159,4 +160,8 @@ private static boolean attemptToSerialize(final Object o) {
 
         return (true);
     }
+    
+    public static void main(String[] args) {
+        System.out.println(isSerializable(new FileAuditHandler()));
+    }
 }

src/main/java/org/audit4j/core/handler/file/FileAuditHandler.java

@@ -19,6 +19,7 @@
 package org.audit4j.core.handler.file;
 
 import java.io.FilePermission;
+import java.io.Serializable;
 import java.security.AccessControlException;
 import java.security.AccessController;
 
@@ -33,14 +34,15 @@
  * 
  * @since 1.0.0
  */
-public class FileAuditHandler extends Handler {
+public class FileAuditHandler extends Handler implements Serializable {
 
-	/** asdas. */
-	private static final long serialVersionUID = 1L;
+    /** The Constant serialVersionUID. */
+    private static final long serialVersionUID = -1137506723185823390L;
 
-	/** The writer. */
+    /** The writer. */
 	AuditFileWriter writer;
 
+	/** The archive. */
 	private String archive;
 
 	/** The date pattern. */
@@ -55,13 +57,19 @@ public class FileAuditHandler extends Handler {
 	/** The job. */
 	private AbstractArchiveJob job;
 
+	/** The audit file prefix. */
 	private String auditFilePrefix = "Audit_Log-";
 
 	/*
 	 * (non-Javadoc)
 	 * 
 	 * @see org.audit4j.core.handler.Handler#init()
 	 */
+	/**
+	 * Inits the.
+	 *
+	 * @throws InitializationException the initialization exception
+	 */
 	@Override
 	public void init() throws InitializationException {
 		writer = new ZeroCopyFileWriter(getProperty("log.file.location"));
@@ -91,6 +99,9 @@ public void init() throws InitializationException {
 	 * 
 	 * @see org.audit4j.core.handler.Handler#handle()
 	 */
+	/**
+	 * Handle.
+	 */
 	@Override
 	public void handle() {
 		writer.write(getQuery());
@@ -114,6 +125,11 @@ static boolean hasDiskAccess(final String path) {
 
 
 
+	/**
+	 * Sets the archive.
+	 *
+	 * @param archive the new archive
+	 */
 	public void setArchive(String archive) {
 		this.archive = archive;
 	}
@@ -145,10 +161,18 @@ public void setCronPattern(String cronPattern) {
 		this.cronPattern = cronPattern;
 	}
 
+	/**
+	 * Sets the audit file prefix.
+	 *
+	 * @param auditFilePrefix the new audit file prefix
+	 */
 	public void setAuditFilePrefix(String auditFilePrefix) {
         this.auditFilePrefix = auditFilePrefix;
     }
 
+    /**
+     * Stop.
+     */
     @Override
 	public void stop() {
 		writer.stop();