Merge branch 'DevFactory-release/modifiers-declaration-order-fix-1' #453

Author: Igor Polevoy

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

@@ -36,7 +36,7 @@ public class Configuration {
     private Map<String, List<String>> modelsMap = new HashMap<String, List<String>>();
     private Properties properties = new Properties();
     private static CacheManager cacheManager;
-    private final static Logger logger = LoggerFactory.getLogger(Configuration.class);
+    private static final Logger logger = LoggerFactory.getLogger(Configuration.class);
 
     private Map<String, Dialect> dialects = new CaseInsensitiveMap<>();
 

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

@@ -27,7 +27,7 @@
  * @author Igor Polevoy
  */
 public class ConnectionsAccess {
-    private final static Logger logger = LoggerFactory.getLogger(ConnectionsAccess.class);
+    private static final Logger logger = LoggerFactory.getLogger(ConnectionsAccess.class);
     private static final ThreadLocal<HashMap<String, Connection>> connectionsTL = new ThreadLocal<HashMap<String, Connection>>();
 
     private ConnectionsAccess() {

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

@@ -42,7 +42,7 @@
  */
 public class DB {
 
-    private final static Logger logger = LoggerFactory.getLogger(DB.class);
+    private static final Logger logger = LoggerFactory.getLogger(DB.class);
     static final Pattern SELECT_PATTERN = Pattern.compile("^\\s*SELECT",
             Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
     static final Pattern INSERT_PATTERN = Pattern.compile("^\\s*INSERT",

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

@@ -29,7 +29,7 @@
 
 
 public class MetaModel implements Serializable {
-    private final static Logger logger = LoggerFactory.getLogger(MetaModel.class);
+    private static final Logger logger = LoggerFactory.getLogger(MetaModel.class);
     private static final ThreadLocal<HashMap<Class, String>> shardingTableNamesTL = new ThreadLocal<>();
 
     private Map<String, ColumnMetadata> columnMetadata;

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

@@ -26,7 +26,7 @@
  */
 class MetaModels {
 
-    private final static Logger logger = LoggerFactory.getLogger(MetaModels.class);
+    private static final Logger logger = LoggerFactory.getLogger(MetaModels.class);
 
     private final Map<String, MetaModel> metaModelsByTableName = new CaseInsensitiveMap<>();
     private final Map<Class<? extends Model>, MetaModel> metaModelsByClass = new HashMap<>();

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

@@ -57,7 +57,7 @@
  */
 public abstract class Model extends CallbackSupport implements Externalizable {
 
-    private final static Logger logger = LoggerFactory.getLogger(Model.class);
+    private static final Logger logger = LoggerFactory.getLogger(Model.class);
 
     private Map<String, Object> attributes = new CaseInsensitiveMap<Object>();
     private final Set<String> dirtyAttributeNames = new CaseInsensitiveSet();

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

@@ -36,7 +36,7 @@
  * @author Eric Nielsen
  */
 public final class ModelDelegate {
-    private final static Logger logger = LoggerFactory.getLogger(ModelDelegate.class);
+    private static final Logger logger = LoggerFactory.getLogger(ModelDelegate.class);
 
     private ModelDelegate() {
         // not instantiable

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

@@ -42,7 +42,7 @@ public enum Registry {
     //our singleton!
     INSTANCE;
 
-    private final static Logger logger = LoggerFactory.getLogger(Registry.class);
+    private static final Logger logger = LoggerFactory.getLogger(Registry.class);
 
     private final MetaModels metaModels = new MetaModels();
     private final Map<Class, ModelRegistry> modelRegistries = new HashMap<Class, ModelRegistry>();

activejdbc/src/main/java/org/javalite/activejdbc/cache/CacheManager.java

@@ -30,7 +30,7 @@
  * @author Igor Polevoy
  */
 public abstract class CacheManager {
-    private final static Logger logger = LoggerFactory.getLogger(CacheManager.class);
+    private static final Logger logger = LoggerFactory.getLogger(CacheManager.class);
 
     List<CacheEventListener> listeners = new ArrayList<CacheEventListener>();
 

activejdbc/src/main/java/org/javalite/activejdbc/cache/QueryCache.java

@@ -37,7 +37,7 @@
 public enum QueryCache {
     INSTANCE;
 
-    private final static Logger logger = LoggerFactory.getLogger(QueryCache.class);
+    private static final Logger logger = LoggerFactory.getLogger(QueryCache.class);
 
     private final boolean enabled = Registry.instance().getConfiguration().cacheEnabled();