Merge pull request #41 from DevFactory/release/members-of-an-interface-in-order-fix-1

Fixing squid:S1213 - The members of an interface declaration or class should appear in a pre-defined order

Author: janithb

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

@@ -35,15 +35,15 @@
  */
 public final class AuditManager implements IAuditManager {
 
+    /** The audit manager. */
+    private static volatile IAuditManager auditManager;
+    
     /**
      * Instantiates a new audit manager.
      */
     private AuditManager() {
     }
 
-    /** The audit manager. */
-    private static volatile IAuditManager auditManager;
-    
     /**
      * Audit.
      * 

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

@@ -64,13 +64,6 @@ public class Configuration implements Serializable {
     /** The jmx configurations. */
     private JMXConfig jmx;
 
-    /**
-     * Instantiates a new configuration.
-     */
-    public Configuration() {
-
-    }
-    
     /** Return new static instance. 
      * 
      * @since 2.3.1
@@ -83,6 +76,13 @@ public Configuration() {
      * */
     public static Configuration DEFAULT = getDefault();
 
+    /**
+     * Instantiates a new configuration.
+     */
+    public Configuration() {
+
+    }
+    
     /**
      * Gets the default.
      *

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

@@ -94,6 +94,13 @@ public final class Context {
 
 	private static AnnotationTransformer annotationTransformer;
 
+	/**
+	 * Private singalton.
+	 */
+	private Context() {
+		// Nothing here. Private Constructor
+	}
+	
 	/**
 	 * Initialize the Audit4j instance. This will ensure the single audit4j
 	 * instance and single Configuration repository load in to the memory.
@@ -459,10 +466,4 @@ public static RunStatus getStatus() {
 		return lifeCycle.getStatus();
 	}
 
-	/**
-	 * Private singalton.
-	 */
-	private Context() {
-		// Nothing here. Private Constructor
-	}
 }

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

@@ -18,6 +18,12 @@ public final class LifeCycleContext {
     /** The instance. */
     private static LifeCycleContext instance;
 
+    /**
+     * Instantiates a new context life cycle.
+     */
+    private LifeCycleContext() {
+    }
+    
     /**
      * Gets the status.
      * 
@@ -67,12 +73,6 @@ void setStatus(RunStatus status) {
         this.status = status;
     }
 
-    /**
-     * Instantiates a new context life cycle.
-     */
-    private LifeCycleContext() {
-    }
-
     /**
      * Gets the single instance of ContextLifeCycle.
      *

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

@@ -51,6 +51,13 @@ public final class PreConfigurationContext {
     /** The Constant preAnnotationFilters. */
     private static final List<AuditAnnotationFilter> preAnnotationFilters = new ArrayList<AuditAnnotationFilter>();
 
+    /**
+     * Instantiates a new registry.
+     */
+    private PreConfigurationContext() {
+        // Private Constructor
+    }
+
     static {
         ScanAnnotatedCommand scanAnnotated = new ScanAnnotatedCommand();
         availableCommands.add(scanAnnotated.getCommand());
@@ -132,11 +139,4 @@ public static List<AuditAnnotationFilter> getPreannotationfilters() {
         return preAnnotationFilters;
     }
 
-    /**
-     * Instantiates a new registry.
-     */
-    private PreConfigurationContext() {
-        // Private Constructor
-    }
-
 }

src/main/java/org/audit4j/core/command/CommandProcessor.java

@@ -39,7 +39,14 @@ public final class CommandProcessor {
 
     /** The instance. */
     private static CommandProcessor instance;
-
+    
+    /**
+     * Instantiates a new command processor.
+     */
+    private CommandProcessor(){
+        //Private Constructor.
+    }
+    
     /**
      * Process.
      *
@@ -82,13 +89,6 @@ public void process(String commandText) {
         process(commands);
     }
 
-    /**
-     * Instantiates a new command processor.
-     */
-    private CommandProcessor(){
-        //Private Constructor.
-    }
-    
     /**
      * Gets the single instance of CommandProcessor.
      *

src/main/java/org/audit4j/core/handler/file/archive/ArchiveType.java

@@ -14,15 +14,6 @@ public enum ArchiveType {
     /** The name. */
     private String name;
 
-    /**
-     * Gets the name.
-     * 
-     * @return the name
-     */
-    public String getName() {
-        return name;
-    }
-
     /**
      * Instantiates a new archive type.
      * 
@@ -32,4 +23,14 @@ public String getName() {
     private ArchiveType(String name) {
         this.name = name;
     }
+    
+    /**
+     * Gets the name.
+     * 
+     * @return the name
+     */
+    public String getName() {
+        return name;
+    }
+
 }

src/main/java/org/audit4j/core/handler/file/archive/Compression.java

@@ -14,20 +14,21 @@ public enum Compression {
     private String extention;
 
     /**
-     * Gets the extention.
+     * Instantiates a new compression type.
      *
-     * @return the extention
+     * @param extention the extention
      */
-    public String getExtention() {
-        return extention;
+    Compression(String extention) {
+        this.extention = extention;
     }
 
     /**
-     * Instantiates a new compression type.
+     * Gets the extention.
      *
-     * @param extention the extention
+     * @return the extention
      */
-    Compression(String extention) {
-        this.extention = extention;
+    public String getExtention() {
+        return extention;
     }
+
 }

src/main/java/org/audit4j/core/schedule/TaskUtils.java

@@ -17,13 +17,6 @@
  */
 public abstract class TaskUtils {
 
-	/**
-     * private constructor to avoid instantiation of this class
-     */
-    private TaskUtils(){
-    	
-    }
-
     /**
      * An ErrorHandler strategy that will log the Exception but perform no
      * further handling. This will suppress the error so that subsequent
@@ -37,6 +30,13 @@ private TaskUtils(){
      */
     public static final ErrorHandler LOG_AND_PROPAGATE_ERROR_HANDLER = new PropagatingErrorHandler();
 
+    /**
+     * private constructor to avoid instantiation of this class
+     */
+    private TaskUtils(){
+    	
+    }
+
     /**
      * Decorate the task for error handling. If the provided
      *

src/main/java/org/audit4j/core/util/Base64Coder.java

@@ -27,13 +27,6 @@
  */
 public class Base64Coder {
 
-   /**
-    * Instantiates a new base64 coder.
-    */
-   private Base64Coder() {
-
-   }
-
    /** Holds The Constant LINE_SEPARATOR Value. */
    public static final String LINE_SEPARATOR = "line.separator";
 
@@ -101,6 +94,13 @@ private Base64Coder() {
        }
    }
 
+   /**
+    * Instantiates a new base64 coder.
+    */
+   private Base64Coder() {
+
+   }
+
    /**
     * Encode string.
     *