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

Author: Faisal Hameed

activejdbc-instrumentation/src/main/java/org/javalite/instrumentation/InstrumentationModelFinder.java

@@ -43,6 +43,7 @@ public class InstrumentationModelFinder {
     private final CtClass modelClass;
     private final List<CtClass> models = new ArrayList<CtClass>();
     private final ClassPool cp;
+    private String currentDirectoryPath;
 
 
     protected InstrumentationModelFinder() throws NotFoundException, ClassNotFoundException {
@@ -92,8 +93,6 @@ private void processFilePath(File file) {
         }
     }
 
-    private String currentDirectoryPath;
-
     protected void processDirectoryPath(File directory) throws IOException, ClassNotFoundException {
         currentDirectoryPath = directory.getCanonicalPath();
         processDirectory(directory);

activejdbc/src/main/java/org/javalite/activejdbc/DBException.java

@@ -27,6 +27,11 @@
 public class DBException extends RuntimeException{
 
     final String message;
+    
+    public DBException() {
+        super();
+        this.message = null;
+    }
 
     public DBException(Throwable cause) {
         super(cause);
@@ -67,9 +72,5 @@ public DBException(String query, Object[] params, Throwable cause) {
     public String getMessage() {
         return message == null ? super.getMessage() : message;
     }
-
-    public DBException() {
-        super();
-        this.message = null;
-    }
+    
 }

activejdbc/src/main/java/org/javalite/activejdbc/StatementCache.java

@@ -32,11 +32,11 @@
 enum StatementCache {
     INSTANCE;
 
-    static StatementCache instance() { return INSTANCE; }
-
     private final ConcurrentMap<Connection, Map<String, PreparedStatement>> statementCache = new ConcurrentHashMap<Connection, Map<String, PreparedStatement>>();
 
     private StatementCache() { }
+    
+    static StatementCache instance() { return INSTANCE; }
 
     PreparedStatement getPreparedStatement(Connection connection, String query) {
         if (!statementCache.containsKey(connection)) {

app-config/src/main/java/org/javalite/app_config/AppConfig.java

@@ -39,6 +39,10 @@ public class AppConfig implements Map<String, String> {
     private static Logger LOGGER = LoggerFactory.getLogger(AppConfig.class);
     private static HashMap<String, Property> props = new HashMap<String, Property>();
     private static HashMap<String, String> plainProps = new HashMap<String, String>();
+    
+    public AppConfig() {
+        init();
+    }
 
     public static synchronized void init() {
         if (isInited()) return;
@@ -157,11 +161,6 @@ public static Map<String, String> getAllProperties() {
 
     /////////// Implementation of Map interface below ///////////////////
 
-
-    public AppConfig() {
-        init();
-    }
-
     @Override
     public int size() {
         return props.size();

javalite-common/src/main/java/org/javalite/common/Base64.java

@@ -176,13 +176,6 @@ public static class Encoder {
         private final boolean isURL;
         private final boolean doPadding;
 
-        private Encoder(boolean isURL, byte[] newline, int linemax, boolean doPadding) {
-            this.isURL = isURL;
-            this.newline = newline;
-            this.linemax = linemax;
-            this.doPadding = doPadding;
-        }
-
         /**
          * This array is a lookup table that translates 6-bit positive integer
          * index values into their "Base64 Alphabet" equivalents as specified
@@ -215,6 +208,13 @@ private Encoder(boolean isURL, byte[] newline, int linemax, boolean doPadding) {
         static final Encoder RFC4648 = new Encoder(false, null, -1, true);
         static final Encoder RFC4648_URLSAFE = new Encoder(true, null, -1, true);
         static final Encoder RFC2045 = new Encoder(false, CRLF, MIMELINEMAX, true);
+        
+        private Encoder(boolean isURL, byte[] newline, int linemax, boolean doPadding) {
+            this.isURL = isURL;
+            this.newline = newline;
+            this.linemax = linemax;
+            this.doPadding = doPadding;
+        }
 
         private final int outLength(int srclen) {
             int len = 0;
@@ -451,11 +451,6 @@ public static class Decoder {
         private final boolean isURL;
         private final boolean isMIME;
 
-        private Decoder(boolean isURL, boolean isMIME) {
-            this.isURL = isURL;
-            this.isMIME = isMIME;
-        }
-
         /**
          * Lookup table for decoding unicode characters drawn from the
          * "Base64 Alphabet" (as specified in Table 1 of RFC 2045) into
@@ -488,6 +483,11 @@ private Decoder(boolean isURL, boolean isMIME) {
         static final Decoder RFC4648         = new Decoder(false, false);
         static final Decoder RFC4648_URLSAFE = new Decoder(true, false);
         static final Decoder RFC2045         = new Decoder(false, true);
+        
+        private Decoder(boolean isURL, boolean isMIME) {
+            this.isURL = isURL;
+            this.isMIME = isMIME;
+        }
 
         /**
          * Decodes all bytes from the input byte array using the {@link Base64}
@@ -856,14 +856,14 @@ private static class DecInputStream extends InputStream {
         private boolean eof;
         private boolean closed;
 
+        private byte[] sbBuf = new byte[1];
+        
         DecInputStream(InputStream is, int[] base64, boolean isMIME) {
             this.is = is;
             this.base64 = base64;
             this.isMIME = isMIME;
         }
 
-        private byte[] sbBuf = new byte[1];
-
         @Override
         public int read() throws IOException {
             return read(sbBuf, 0, 1) == -1 ? -1 : sbBuf[0] & 0xff;