From add35f9de6cc3f50f630a15d96e1a5df32007aeb Mon Sep 17 00:00:00 2001
From: Tglman <tglman@tglman.com>
Date: Fri, 24 May 2019 17:49:09 +0100
Subject: [PATCH] enabled modifier order check and fixed all the relative
 issues

---
 _base/orient_checks.xml                       |  2 -
 .../common/collection/OLRUCache.java          |  2 +-
 .../concur/lock/OComparableLockManager.java   |  2 +-
 .../lock/OOneEntryPerKeyLockManager.java      |  2 +-
 .../concur/lock/OReadersWriterSpinLock.java   |  2 +-
 .../common/concur/lock/ScalableRWLock.java    | 18 ++---
 .../common/console/TTYConsoleReader.java      | 34 +++++-----
 .../common/log/OAnsiCode.java                 |  2 +-
 .../core/command/traverse/OTraversePath.java  |  2 +-
 .../orient/core/db/OExecutionThreadLocal.java |  4 +-
 .../core/db/document/ODatabaseDocument.java   |  2 +-
 .../core/db/record/OLazyRecordIterator.java   |  6 +-
 .../orient/core/db/record/ORecordLazyMap.java |  2 +-
 .../db/record/ORecordTrackedIterator.java     |  4 +-
 .../core/db/record/ORecordTrackedSet.java     |  2 +-
 .../orient/core/db/record/OTrackedMap.java    |  2 +-
 .../core/db/tool/ODatabaseImpExpAbstract.java |  2 +-
 .../core/index/OIndexManagerShared.java       |  2 +-
 .../orient/core/index/OIndexRemote.java       | 38 +++++------
 .../core/index/OIndexRemoteMultiValue.java    |  2 +-
 .../core/index/OIndexRemoteOneValue.java      |  2 +-
 .../core/index/ONullOutputListener.java       |  2 +-
 .../v1/OCellBTreeMultiValueIndexEngine.java   |  2 +-
 .../core/metadata/schema/OPropertyImpl.java   |  2 +-
 .../security/ODatabaseSecurityResources.java  | 68 +++++++++----------
 .../core/metadata/security/OIdentity.java     |  2 +-
 .../orient/core/metadata/security/ORole.java  | 18 ++---
 .../orient/core/metadata/security/ORule.java  |  2 +-
 .../orient/core/schedule/OScheduledEvent.java |  2 +-
 .../core/serialization/OStreamableHelper.java | 16 ++---
 .../functions/geo/OSQLFunctionDistance.java   |  2 +-
 .../orient/core/storage/OStorageAbstract.java |  2 +-
 .../storage/cache/local/twoq/O2QCache.java    |  2 +-
 .../cluster/v0/OPaginatedClusterV0.java       |  2 +-
 .../cluster/v1/OPaginatedClusterV1.java       |  2 +-
 .../storage/disk/OLocalPaginatedStorage.java  |  2 +-
 .../orient/core/storage/fs/OFileClassic.java  |  2 +-
 .../wal/cas/OCASDiskWriteAheadLog.java        |  2 +-
 .../OSessionStoragePerformanceStatistic.java  |  2 +-
 .../OHashIndexFileLevelMetadataPage.java      | 10 +--
 .../storage/index/sbtree/local/OSBTree.java   |  2 +-
 .../multivalue/v1/OCellBTreeMultiValueV1.java |  4 +-
 .../multivalue/v2/OCellBTreeMultiValueV2.java |  4 +-
 .../singlevalue/OCellBTreeSingleValue.java    |  4 +-
 .../orient/core/util/OURLHelper.java          |  4 +-
 .../transaction/OIndexKeyChange.java          |  4 +-
 .../transaction/OIndexKeyOperation.java       |  4 +-
 .../impl/task/OAbstractSyncDatabaseTask.java  |  2 +-
 .../impl/task/OAbstractSyncDatabaseTask.java  |  2 +-
 .../distributed/impl/task/OGossipTask.java    |  2 +-
 .../impl/task/OSyncClusterTask.java           |  2 +-
 .../etl/util/OMigrationConfigManager.java     |  4 +-
 .../jdbc/OrientJdbcDatabaseMetaData.java      |  2 +-
 .../jdbc/OrientJdbcResultSetMetaData.java     |  2 +-
 .../strategy/SpatialQueryBuilderAbstract.java | 10 +--
 .../orient/object/db/OObjectLazyIterator.java |  2 +-
 .../orient/object/jpa/OJPAProperties.java     |  8 +--
 .../jpa/parsing/PersistenceXmlUtil.java       |  4 +-
 .../OObjectSerializerContext.java             |  2 +-
 .../distributed/ORemoteServerChannel.java     |  2 +-
 .../distributed/ORemoteServerController.java  |  2 +-
 .../orient/console/OTableFormatter.java       |  4 +-
 .../stresstest/OConsoleProgressWriter.java    |  2 +-
 .../OStressTesterCommandLineParser.java       | 30 ++++----
 64 files changed, 191 insertions(+), 193 deletions(-)

diff --git a/_base/orient_checks.xml b/_base/orient_checks.xml
index fa8caba4dd3..b61f9762773 100644
--- a/_base/orient_checks.xml
+++ b/_base/orient_checks.xml
@@ -88,9 +88,7 @@
         <!--
         <module name="UpperEll"/>
         -->
-        <!--
         <module name="ModifierOrder"/>
-        -->
         <!--
         <module name="EmptyLineSeparator">
             <property name="allowNoEmptyLineBetweenFields" value="true"/>
diff --git a/core/src/main/java/com/orientechnologies/common/collection/OLRUCache.java b/core/src/main/java/com/orientechnologies/common/collection/OLRUCache.java
index 417487fe904..d5510187d87 100755
--- a/core/src/main/java/com/orientechnologies/common/collection/OLRUCache.java
+++ b/core/src/main/java/com/orientechnologies/common/collection/OLRUCache.java
@@ -29,7 +29,7 @@ public class OLRUCache<K, V> extends LinkedHashMap<K, V> {
 
   private static final long serialVersionUID = 0;
 
-  final private int         cacheSize;
+  private final int         cacheSize;
 
   public OLRUCache(final int iCacheSize) {
     super(16, (float) 0.75, true);
diff --git a/core/src/main/java/com/orientechnologies/common/concur/lock/OComparableLockManager.java b/core/src/main/java/com/orientechnologies/common/concur/lock/OComparableLockManager.java
index 64457dba2a0..d25fdcc1553 100644
--- a/core/src/main/java/com/orientechnologies/common/concur/lock/OComparableLockManager.java
+++ b/core/src/main/java/com/orientechnologies/common/concur/lock/OComparableLockManager.java
@@ -37,7 +37,7 @@ public enum LOCK {
   private         long                                    acquireTimeout;
   protected final ConcurrentSkipListMap<T, CountableLock> map;
   private final   boolean                                 enabled;
-  private final static Object NULL_KEY = new Object();
+  private static final Object NULL_KEY = new Object();
 
   @SuppressWarnings("serial")
   private static class CountableLock {
diff --git a/core/src/main/java/com/orientechnologies/common/concur/lock/OOneEntryPerKeyLockManager.java b/core/src/main/java/com/orientechnologies/common/concur/lock/OOneEntryPerKeyLockManager.java
index 00ba0f36979..b9ef52cf1d3 100755
--- a/core/src/main/java/com/orientechnologies/common/concur/lock/OOneEntryPerKeyLockManager.java
+++ b/core/src/main/java/com/orientechnologies/common/concur/lock/OOneEntryPerKeyLockManager.java
@@ -50,7 +50,7 @@ public enum LOCK {
   private final   boolean                                   enabled;
   private final   int                                       amountOfCachedInstances;
 
-  private final static Object NULL_KEY = new Object();
+  private static final Object NULL_KEY = new Object();
 
   @SuppressWarnings("serial")
   private static class CountableLock {
diff --git a/core/src/main/java/com/orientechnologies/common/concur/lock/OReadersWriterSpinLock.java b/core/src/main/java/com/orientechnologies/common/concur/lock/OReadersWriterSpinLock.java
index 2af9f6d645d..ed7157340a7 100755
--- a/core/src/main/java/com/orientechnologies/common/concur/lock/OReadersWriterSpinLock.java
+++ b/core/src/main/java/com/orientechnologies/common/concur/lock/OReadersWriterSpinLock.java
@@ -251,7 +251,7 @@ protected OModifiableInteger initialValue() {
     }
   }
 
-  private final static class WNode {
+  private static final class WNode {
     private final ConcurrentHashMap<Thread, Boolean> waitingReaders = new ConcurrentHashMap<Thread, Boolean>();
 
     private volatile boolean locked = true;
diff --git a/core/src/main/java/com/orientechnologies/common/concur/lock/ScalableRWLock.java b/core/src/main/java/com/orientechnologies/common/concur/lock/ScalableRWLock.java
index 0d72fbb4b78..636f41af01b 100755
--- a/core/src/main/java/com/orientechnologies/common/concur/lock/ScalableRWLock.java
+++ b/core/src/main/java/com/orientechnologies/common/concur/lock/ScalableRWLock.java
@@ -86,24 +86,24 @@ public class ScalableRWLock implements ReadWriteLock, java.io.Serializable {
   private static final long serialVersionUID = -7552055681918630764L;
 
   // Definition of an invalid thread-id (must be negative)
-  private final static int             SRWL_STATE_NOT_WRITING = 0;
-  private final static int             SRWL_STATE_WRITING     = 1;
-  private final static int             SRWL_STATE_NOT_READING = 0;
-  private final static int             SRWL_STATE_READING     = 1;
-  private final static AtomicInteger[] dummyArray             = new AtomicInteger[0];
+  private static final int             SRWL_STATE_NOT_WRITING = 0;
+  private static final int             SRWL_STATE_WRITING     = 1;
+  private static final int             SRWL_STATE_NOT_READING = 0;
+  private static final int             SRWL_STATE_READING     = 1;
+  private static final AtomicInteger[] dummyArray             = new AtomicInteger[0];
 
   /**
    * List of Reader's states that the Writer will scan when attempting to
    * acquire the lock in write-mode
    */
-  private transient final ConcurrentLinkedQueue<AtomicInteger> readersStateList;
+  private final transient ConcurrentLinkedQueue<AtomicInteger> readersStateList;
 
   /**
    * The thread-id of the Writer currently holding the lock in write-mode, or
    * SRWL_INVALID_TID if there is no Writer holding or attempting to acquire
    * the lock in write mode.
    */
-  private transient final StampedLock stampedLock;
+  private final transient StampedLock stampedLock;
 
   /**
    * Thread-local reference to the current thread's ReadersEntry instance.
@@ -111,9 +111,9 @@ public class ScalableRWLock implements ReadWriteLock, java.io.Serializable {
    * to determine where to store its own state, and the number of reentrant
    * read lock loops for that particular thread.
    */
-  private transient final ThreadLocal<ReadersEntry> entry;
+  private final transient ThreadLocal<ReadersEntry> entry;
 
-  private transient final AtomicReference<AtomicInteger[]> readersStateArrayRef;
+  private final transient AtomicReference<AtomicInteger[]> readersStateArrayRef;
 
   /**
    * The lock returned by method {@link ScalableRWLock#readLock}.
diff --git a/core/src/main/java/com/orientechnologies/common/console/TTYConsoleReader.java b/core/src/main/java/com/orientechnologies/common/console/TTYConsoleReader.java
index 67df55cb69f..1e5ec1e678b 100755
--- a/core/src/main/java/com/orientechnologies/common/console/TTYConsoleReader.java
+++ b/core/src/main/java/com/orientechnologies/common/console/TTYConsoleReader.java
@@ -48,23 +48,23 @@
  * Custom implementation of TTY reader. Supports arrow keys + history.
  */
 public class TTYConsoleReader implements OConsoleReader {
-  public final static  int    HORIZONTAL_TAB_CHAR = 9;
-  public final static  int    NEW_LINE_CHAR       = 10;
-  public final static  int    VERTICAL_TAB_CHAR   = 11;
-  public final static  int    ESC                 = 27;
-  public final static  int    UNIT_SEPARATOR_CHAR = 31;
-  public final static  int    CTRL                = 53;
-  public final static  int    SEMICOLON           = 59;
-  public final static  int    UP_CHAR             = 65;
-  public final static  int    DOWN_CHAR           = 66;
-  public final static  int    RIGHT_CHAR          = 67;
-  public final static  int    LEFT_CHAR           = 68;
-  public final static  int    END_CHAR            = 70;
-  public final static  int    BEGIN_CHAR          = 72;
-  public final static  int    BACKSLASH           = 92;
-  public final static  int    DEL_CHAR            = 126;
-  public final static  int    BACKSPACE_CHAR      = 127;
-  private final static int    MAX_HISTORY_ENTRIES = 50;
+  public static final  int    HORIZONTAL_TAB_CHAR = 9;
+  public static final  int    NEW_LINE_CHAR       = 10;
+  public static final  int    VERTICAL_TAB_CHAR   = 11;
+  public static final  int    ESC                 = 27;
+  public static final  int    UNIT_SEPARATOR_CHAR = 31;
+  public static final  int    CTRL                = 53;
+  public static final  int    SEMICOLON           = 59;
+  public static final  int    UP_CHAR             = 65;
+  public static final  int    DOWN_CHAR           = 66;
+  public static final  int    RIGHT_CHAR          = 67;
+  public static final  int    LEFT_CHAR           = 68;
+  public static final  int    END_CHAR            = 70;
+  public static final  int    BEGIN_CHAR          = 72;
+  public static final  int    BACKSLASH           = 92;
+  public static final  int    DEL_CHAR            = 126;
+  public static final  int    BACKSPACE_CHAR      = 127;
+  private static final int    MAX_HISTORY_ENTRIES = 50;
   private static final Object signalLock          = new Object();
   private static       String HISTORY_FILE_NAME   = ".orientdb_history";
   private static       String ORIENTDB_HOME_DIR   = ".orientdb";
diff --git a/core/src/main/java/com/orientechnologies/common/log/OAnsiCode.java b/core/src/main/java/com/orientechnologies/common/log/OAnsiCode.java
index 718e613d4ab..72248bd7256 100644
--- a/core/src/main/java/com/orientechnologies/common/log/OAnsiCode.java
+++ b/core/src/main/java/com/orientechnologies/common/log/OAnsiCode.java
@@ -60,7 +60,7 @@ public String toString() {
     return code;
   }
 
-  private final static boolean supportsColors;
+  private static final boolean supportsColors;
 
   public static boolean isSupportsColors() {
     return supportsColors;
diff --git a/core/src/main/java/com/orientechnologies/orient/core/command/traverse/OTraversePath.java b/core/src/main/java/com/orientechnologies/orient/core/command/traverse/OTraversePath.java
index e9b2ace795e..a1d91eaf2ae 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/command/traverse/OTraversePath.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/command/traverse/OTraversePath.java
@@ -77,7 +77,7 @@ public static OTraversePath empty() {
     return EMPTY_PATH;
   }
 
-  private static abstract class PathItem {
+  private abstract static class PathItem {
     protected final PathItem parentItem;
     protected final int      depth;
 
diff --git a/core/src/main/java/com/orientechnologies/orient/core/db/OExecutionThreadLocal.java b/core/src/main/java/com/orientechnologies/orient/core/db/OExecutionThreadLocal.java
index d9912153cab..3ccda2b2852 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/db/OExecutionThreadLocal.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/db/OExecutionThreadLocal.java
@@ -32,8 +32,8 @@
  */
 public class OExecutionThreadLocal extends ThreadLocal<OExecutionThreadLocal.OExecutionThreadData> {
   public class OExecutionThreadData {
-    volatile public OAsyncReplicationOk    onAsyncReplicationOk;
-    volatile public OAsyncReplicationError onAsyncReplicationError;
+    public volatile OAsyncReplicationOk    onAsyncReplicationOk;
+    public volatile OAsyncReplicationError onAsyncReplicationError;
   }
 
   @Override
diff --git a/core/src/main/java/com/orientechnologies/orient/core/db/document/ODatabaseDocument.java b/core/src/main/java/com/orientechnologies/orient/core/db/document/ODatabaseDocument.java
index a60ab5b5c24..492910291ab 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/db/document/ODatabaseDocument.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/db/document/ODatabaseDocument.java
@@ -42,7 +42,7 @@
  */
 public interface ODatabaseDocument extends ODatabase<ORecord> {
 
-  final static String TYPE = "document";
+  String TYPE = "document";
 
   /**
    * Browses all the records of the specified class and also all the subclasses. If you've a class Vehicle and Car that extends
diff --git a/core/src/main/java/com/orientechnologies/orient/core/db/record/OLazyRecordIterator.java b/core/src/main/java/com/orientechnologies/orient/core/db/record/OLazyRecordIterator.java
index 5cf08b1996c..a1e446d5747 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/db/record/OLazyRecordIterator.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/db/record/OLazyRecordIterator.java
@@ -37,10 +37,10 @@
  * 
  */
 public class OLazyRecordIterator implements OLazyIterator<OIdentifiable>, OResettable {
-  final private ORecord                           sourceRecord;
-  final private Iterable<? extends OIdentifiable> source;
+  private final ORecord                           sourceRecord;
+  private final Iterable<? extends OIdentifiable> source;
   private Iterator<? extends OIdentifiable>       underlying;
-  final private boolean                           autoConvert2Record;
+  private final boolean                           autoConvert2Record;
 
   public OLazyRecordIterator(final Iterator<? extends OIdentifiable> iIterator, final boolean iConvertToRecord) {
     this.sourceRecord = null;
diff --git a/core/src/main/java/com/orientechnologies/orient/core/db/record/ORecordLazyMap.java b/core/src/main/java/com/orientechnologies/orient/core/db/record/ORecordLazyMap.java
index 4a24276c519..6ad2e9ecab8 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/db/record/ORecordLazyMap.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/db/record/ORecordLazyMap.java
@@ -40,7 +40,7 @@
  */
 @SuppressWarnings({ "serial" })
 public class ORecordLazyMap extends OTrackedMap<OIdentifiable> implements ORecordLazyMultiValue {
-  final private byte                                      recordType;
+  private final byte                                      recordType;
   private ORecordMultiValueHelper.MULTIVALUE_CONTENT_TYPE status              = MULTIVALUE_CONTENT_TYPE.EMPTY;
   protected boolean                                       marshalling         = false;
   private boolean                                         autoConvertToRecord = true;
diff --git a/core/src/main/java/com/orientechnologies/orient/core/db/record/ORecordTrackedIterator.java b/core/src/main/java/com/orientechnologies/orient/core/db/record/ORecordTrackedIterator.java
index a29742cfa99..6cae76c0161 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/db/record/ORecordTrackedIterator.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/db/record/ORecordTrackedIterator.java
@@ -30,8 +30,8 @@
  * 
  */
 public class ORecordTrackedIterator implements Iterator<OIdentifiable> {
-  final private ORecord     sourceRecord;
-  final private Iterator<?> underlying;
+  private final ORecord     sourceRecord;
+  private final Iterator<?> underlying;
 
   public ORecordTrackedIterator(final ORecord iSourceRecord, final Iterator<?> iIterator) {
     this.sourceRecord = iSourceRecord;
diff --git a/core/src/main/java/com/orientechnologies/orient/core/db/record/ORecordTrackedSet.java b/core/src/main/java/com/orientechnologies/orient/core/db/record/ORecordTrackedSet.java
index 719d6fa2e71..d315b268c24 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/db/record/ORecordTrackedSet.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/db/record/ORecordTrackedSet.java
@@ -38,7 +38,7 @@ public class ORecordTrackedSet extends AbstractCollection<OIdentifiable> impleme
   protected final ORecord                                               sourceRecord;
   protected Map<OIdentifiable, Object>                                  map             = new HashMap<OIdentifiable, Object>();
   private STATUS                                                        status          = STATUS.NOT_LOADED;
-  protected final static Object                                         ENTRY_REMOVAL   = new Object();
+  protected static final Object                                         ENTRY_REMOVAL   = new Object();
   private List<OMultiValueChangeListener<OIdentifiable, OIdentifiable>> changeListeners;
 
   public ORecordTrackedSet(final ORecord iSourceRecord) {
diff --git a/core/src/main/java/com/orientechnologies/orient/core/db/record/OTrackedMap.java b/core/src/main/java/com/orientechnologies/orient/core/db/record/OTrackedMap.java
index 70da668fa85..1a5e9cf3d06 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/db/record/OTrackedMap.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/db/record/OTrackedMap.java
@@ -36,7 +36,7 @@
  */
 @SuppressWarnings("serial")
 public class OTrackedMap<T> extends LinkedHashMap<Object, T> implements ORecordElement, OTrackedMultiValue<Object, T>, Serializable {
-  final protected ORecord                            sourceRecord;
+  protected final ORecord                            sourceRecord;
   private STATUS                                     status          = STATUS.NOT_LOADED;
   private List<OMultiValueChangeListener<Object, T>> changeListeners = null;
   protected Class<?>                                 genericClass;
diff --git a/core/src/main/java/com/orientechnologies/orient/core/db/tool/ODatabaseImpExpAbstract.java b/core/src/main/java/com/orientechnologies/orient/core/db/tool/ODatabaseImpExpAbstract.java
index 193d4c9adc1..ec3ceb5e758 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/db/tool/ODatabaseImpExpAbstract.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/db/tool/ODatabaseImpExpAbstract.java
@@ -33,7 +33,7 @@
  * 
  */
 public abstract class ODatabaseImpExpAbstract extends ODatabaseTool {
-  protected final static String       DEFAULT_EXT               = ".json";
+  protected static final String       DEFAULT_EXT               = ".json";
   protected ODatabaseDocumentInternal database;
   protected String                    fileName;
   protected Set<String>               includeClusters;
diff --git a/core/src/main/java/com/orientechnologies/orient/core/index/OIndexManagerShared.java b/core/src/main/java/com/orientechnologies/orient/core/index/OIndexManagerShared.java
index 769590ad915..a86673afe58 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/index/OIndexManagerShared.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/index/OIndexManagerShared.java
@@ -61,7 +61,7 @@
  * @author Artem Orobets added composite index managemement
  */
 public class OIndexManagerShared extends OIndexManagerAbstract {
-  private volatile transient Thread   recreateIndexesThread = null;
+  private transient volatile Thread   recreateIndexesThread = null;
   private volatile           boolean  rebuildCompleted      = false;
   private final              OStorage storage;
 
diff --git a/core/src/main/java/com/orientechnologies/orient/core/index/OIndexRemote.java b/core/src/main/java/com/orientechnologies/orient/core/index/OIndexRemote.java
index 2adbeae0b35..388cb63de50 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/index/OIndexRemote.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/index/OIndexRemote.java
@@ -48,25 +48,25 @@ public abstract class OIndexRemote<T> implements OIndex<T> {
   public static final    String QUERY_GET_VALUES_BEETWEN_EXCLUSIVE_TO_CONDITION   = "key < ?";
   public static final    String QUERY_GET_VALUES_AND_OPERATOR                     = " and ";
   public static final    String QUERY_GET_VALUES_LIMIT                            = " limit ";
-  protected final static String QUERY_ENTRIES                                     = "select key, rid from index:`%s`";
-  protected final static String QUERY_ENTRIES_DESC                                = "select key, rid from index:`%s` order by key desc";
-
-  private final static String QUERY_ITERATE_ENTRIES = "select from index:`%s` where key in [%s] order by key %s ";
-  private final static String QUERY_GET_ENTRIES     = "select from index:`%s` where key in [%s]";
-
-  private final static String QUERY_PUT         = "insert into index:`%s` (key,rid) values (?,?)";
-  private final static String QUERY_REMOVE      = "delete from index:`%s` where key = ?";
-  private final static String QUERY_REMOVE2     = "delete from index:`%s` where key = ? and rid = ?";
-  private final static String QUERY_REMOVE3     = "delete from index:`%s` where rid = ?";
-  private final static String QUERY_CONTAINS    = "select count(*) as size from index:`%s` where key = ?";
-  private final static String QUERY_COUNT       = "select count(*) as size from index:`%s` where key = ?";
-  private final static String QUERY_COUNT_RANGE = "select count(*) as size from index:`%s` where ";
-  private final static String QUERY_SIZE        = "select count(*) as size from index:`%s`";
-  private final static String QUERY_KEY_SIZE    = "select indexKeySize('%s') as size";
-  private final static String QUERY_KEYS        = "select key from index:`%s`";
-  private final static String QUERY_REBUILD     = "rebuild index %s";
-  private final static String QUERY_CLEAR       = "delete from index:`%s`";
-  private final static String QUERY_DROP        = "drop index %s";
+  protected static final String QUERY_ENTRIES                                     = "select key, rid from index:`%s`";
+  protected static final String QUERY_ENTRIES_DESC                                = "select key, rid from index:`%s` order by key desc";
+
+  private static final String QUERY_ITERATE_ENTRIES = "select from index:`%s` where key in [%s] order by key %s ";
+  private static final String QUERY_GET_ENTRIES     = "select from index:`%s` where key in [%s]";
+
+  private static final String QUERY_PUT         = "insert into index:`%s` (key,rid) values (?,?)";
+  private static final String QUERY_REMOVE      = "delete from index:`%s` where key = ?";
+  private static final String QUERY_REMOVE2     = "delete from index:`%s` where key = ? and rid = ?";
+  private static final String QUERY_REMOVE3     = "delete from index:`%s` where rid = ?";
+  private static final String QUERY_CONTAINS    = "select count(*) as size from index:`%s` where key = ?";
+  private static final String QUERY_COUNT       = "select count(*) as size from index:`%s` where key = ?";
+  private static final String QUERY_COUNT_RANGE = "select count(*) as size from index:`%s` where ";
+  private static final String QUERY_SIZE        = "select count(*) as size from index:`%s`";
+  private static final String QUERY_KEY_SIZE    = "select indexKeySize('%s') as size";
+  private static final String QUERY_KEYS        = "select key from index:`%s`";
+  private static final String QUERY_REBUILD     = "rebuild index %s";
+  private static final String QUERY_CLEAR       = "delete from index:`%s`";
+  private static final String QUERY_DROP        = "drop index %s";
   protected final String           databaseName;
   private final   String           wrappedType;
   private final   String           algorithm;
diff --git a/core/src/main/java/com/orientechnologies/orient/core/index/OIndexRemoteMultiValue.java b/core/src/main/java/com/orientechnologies/orient/core/index/OIndexRemoteMultiValue.java
index bfaa28ba510..c210470e252 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/index/OIndexRemoteMultiValue.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/index/OIndexRemoteMultiValue.java
@@ -38,7 +38,7 @@
  */
 @SuppressWarnings("unchecked")
 public class OIndexRemoteMultiValue extends OIndexRemote<Collection<OIdentifiable>> {
-  protected final static String QUERY_GET = "select expand( rid ) from index:`%s` where key = ?";
+  protected static final String QUERY_GET = "select expand( rid ) from index:`%s` where key = ?";
 
   public OIndexRemoteMultiValue(final String iName, final String iWrappedType, final String algorithm, final ORID iRid,
       final OIndexDefinition iIndexDefinition, final ODocument iConfiguration, final Set<String> clustersToIndex, String database) {
diff --git a/core/src/main/java/com/orientechnologies/orient/core/index/OIndexRemoteOneValue.java b/core/src/main/java/com/orientechnologies/orient/core/index/OIndexRemoteOneValue.java
index d3abb1f71ad..10b1b0e1dea 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/index/OIndexRemoteOneValue.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/index/OIndexRemoteOneValue.java
@@ -37,7 +37,7 @@
  * @author Luca Garulli (l.garulli--(at)--orientdb.com)
  */
 public class OIndexRemoteOneValue extends OIndexRemote<OIdentifiable> {
-  protected final static String QUERY_GET = "select rid from index:`%s` where key = ?";
+  protected static final String QUERY_GET = "select rid from index:`%s` where key = ?";
 
   public OIndexRemoteOneValue(final String iName, final String iWrappedType, final String algorithm, final ORID iRid,
       final OIndexDefinition iIndexDefinition, final ODocument iConfiguration, final Set<String> clustersToIndex, String database) {
diff --git a/core/src/main/java/com/orientechnologies/orient/core/index/ONullOutputListener.java b/core/src/main/java/com/orientechnologies/orient/core/index/ONullOutputListener.java
index 9d4ce869eef..7ce3332dbc2 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/index/ONullOutputListener.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/index/ONullOutputListener.java
@@ -28,7 +28,7 @@
  * 
  */
 public class ONullOutputListener implements OProgressListener {
-  public final static ONullOutputListener INSTANCE = new ONullOutputListener();
+  public static final ONullOutputListener INSTANCE = new ONullOutputListener();
 
   @Override
   public void onBegin(Object iTask, long iTotal, Object metadata) {
diff --git a/core/src/main/java/com/orientechnologies/orient/core/index/engine/v1/OCellBTreeMultiValueIndexEngine.java b/core/src/main/java/com/orientechnologies/orient/core/index/engine/v1/OCellBTreeMultiValueIndexEngine.java
index 73f0d49927f..50eaa0e3e37 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/index/engine/v1/OCellBTreeMultiValueIndexEngine.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/index/engine/v1/OCellBTreeMultiValueIndexEngine.java
@@ -24,7 +24,7 @@
 import java.util.Set;
 
 public final class OCellBTreeMultiValueIndexEngine implements OMultiValueIndexEngine {
-  private final static int    BINARY_VERSION             = 2;
+  private static final int    BINARY_VERSION             = 2;
   public static final  String DATA_FILE_EXTENSION        = ".cbt";
   private static final String NULL_BUCKET_FILE_EXTENSION = ".nbt";
   public static final  String M_CONTAINER_EXTENSION      = ".mbt";
diff --git a/core/src/main/java/com/orientechnologies/orient/core/metadata/schema/OPropertyImpl.java b/core/src/main/java/com/orientechnologies/orient/core/metadata/schema/OPropertyImpl.java
index 8f9bc9b0384..d11de5ae8a3 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/metadata/schema/OPropertyImpl.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/metadata/schema/OPropertyImpl.java
@@ -52,7 +52,7 @@ public abstract class OPropertyImpl implements OProperty {
   protected final   OClassImpl owner;
   protected         OType      linkedType;
   protected         OClass     linkedClass;
-  transient private String     linkedClassName;
+  private transient String     linkedClassName;
 
   protected String              description;
   protected boolean             mandatory;
diff --git a/core/src/main/java/com/orientechnologies/orient/core/metadata/security/ODatabaseSecurityResources.java b/core/src/main/java/com/orientechnologies/orient/core/metadata/security/ODatabaseSecurityResources.java
index 3695f1f4a56..8513751f2a5 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/metadata/security/ODatabaseSecurityResources.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/metadata/security/ODatabaseSecurityResources.java
@@ -1,45 +1,45 @@
 /*
-  *
-  *  *  Copyright 2010-2016 OrientDB LTD (http://orientdb.com)
-  *  *
-  *  *  Licensed under the Apache License, Version 2.0 (the "License");
-  *  *  you may not use this file except in compliance with the License.
-  *  *  You may obtain a copy of the License at
-  *  *
-  *  *       http://www.apache.org/licenses/LICENSE-2.0
-  *  *
-  *  *  Unless required by applicable law or agreed to in writing, software
-  *  *  distributed under the License is distributed on an "AS IS" BASIS,
-  *  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  *  *  See the License for the specific language governing permissions and
-  *  *  limitations under the License.
-  *  *
-  *  * For more information: http://orientdb.com
-  *
-  */
+ *
+ *  *  Copyright 2010-2016 OrientDB LTD (http://orientdb.com)
+ *  *
+ *  *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  *  you may not use this file except in compliance with the License.
+ *  *  You may obtain a copy of the License at
+ *  *
+ *  *       http://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  *  Unless required by applicable law or agreed to in writing, software
+ *  *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  *  See the License for the specific language governing permissions and
+ *  *  limitations under the License.
+ *  *
+ *  * For more information: http://orientdb.com
+ *
+ */
 package com.orientechnologies.orient.core.metadata.security;
 
 /**
  * Contains all the resources used by the Database instance to check permissions
- * 
+ *
  * @author Luca Garulli (l.garulli--(at)--orientdb.com)
  * @see OUser, OSecurity
  */
 public class ODatabaseSecurityResources {
 
-  public final static String ALL               = "*";
-  public final static String DATABASE          = "database";
-  public final static String SCHEMA            = "database.schema";
-  public final static String CLASS             = "database.class";
-  public final static String ALL_CLASSES       = "database.class.*";
-  public final static String CLUSTER           = "database.cluster";
-  public final static String ALL_CLUSTERS      = "database.cluster.*";
-  public final static String SYSTEMCLUSTERS    = "database.systemclusters";
-  public final static String COMMAND           = "database.command";
-  public final static String COMMAND_GREMLIN   = "database.command.gremlin";
-  public final static String FUNCTION          = "database.function";
-  public final static String DATABASE_CONFIG   = "database.config";
-  public final static String BYPASS_RESTRICTED = "database.bypassRestricted";
-  public final static String RECORD_HOOK       = "database.hook.record";
-  public final static String SERVER_ADMIN      = "server.admin";
+  public static final String ALL               = "*";
+  public static final String DATABASE          = "database";
+  public static final String SCHEMA            = "database.schema";
+  public static final String CLASS             = "database.class";
+  public static final String ALL_CLASSES       = "database.class.*";
+  public static final String CLUSTER           = "database.cluster";
+  public static final String ALL_CLUSTERS      = "database.cluster.*";
+  public static final String SYSTEMCLUSTERS    = "database.systemclusters";
+  public static final String COMMAND           = "database.command";
+  public static final String COMMAND_GREMLIN   = "database.command.gremlin";
+  public static final String FUNCTION          = "database.function";
+  public static final String DATABASE_CONFIG   = "database.config";
+  public static final String BYPASS_RESTRICTED = "database.bypassRestricted";
+  public static final String RECORD_HOOK       = "database.hook.record";
+  public static final String SERVER_ADMIN      = "server.admin";
 }
diff --git a/core/src/main/java/com/orientechnologies/orient/core/metadata/security/OIdentity.java b/core/src/main/java/com/orientechnologies/orient/core/metadata/security/OIdentity.java
index 3370f2d95a0..28e7e69cc51 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/metadata/security/OIdentity.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/metadata/security/OIdentity.java
@@ -8,7 +8,7 @@
  * Created by luigidellaquila on 01/07/15.
  */
 public abstract class OIdentity extends ODocumentWrapper {
-  public final static String CLASS_NAME = "OIdentity";
+  public static final String CLASS_NAME = "OIdentity";
 
   public OIdentity() {
   }
diff --git a/core/src/main/java/com/orientechnologies/orient/core/metadata/security/ORole.java b/core/src/main/java/com/orientechnologies/orient/core/metadata/security/ORole.java
index 5b505a45f59..ebd7861b2a1 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/metadata/security/ORole.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/metadata/security/ORole.java
@@ -44,16 +44,16 @@
 public class ORole extends OIdentity implements OSecurityRole {
   public static final String                ADMIN              = "admin";
   public static final String                CLASS_NAME         = "ORole";
-  public final static int                   PERMISSION_NONE    = 0;
-  public final static int                   PERMISSION_CREATE  = registerPermissionBit(0, "Create");
-  public final static int                   PERMISSION_READ    = registerPermissionBit(1, "Read");
-  public final static int                   PERMISSION_UPDATE  = registerPermissionBit(2, "Update");
-  public final static int                   PERMISSION_DELETE  = registerPermissionBit(3, "Delete");
-  public final static int                   PERMISSION_EXECUTE = registerPermissionBit(4, "Execute");
-  public final static int                   PERMISSION_ALL     = PERMISSION_CREATE + PERMISSION_READ + PERMISSION_UPDATE
+  public static final int                   PERMISSION_NONE    = 0;
+  public static final int                   PERMISSION_CREATE  = registerPermissionBit(0, "Create");
+  public static final int                   PERMISSION_READ    = registerPermissionBit(1, "Read");
+  public static final int                   PERMISSION_UPDATE  = registerPermissionBit(2, "Update");
+  public static final int                   PERMISSION_DELETE  = registerPermissionBit(3, "Delete");
+  public static final int                   PERMISSION_EXECUTE = registerPermissionBit(4, "Execute");
+  public static final int                   PERMISSION_ALL     = PERMISSION_CREATE + PERMISSION_READ + PERMISSION_UPDATE
                                                                   + PERMISSION_DELETE + PERMISSION_EXECUTE;
-  protected final static byte               STREAM_DENY        = 0;
-  protected final static byte               STREAM_ALLOW       = 1;
+  protected static final byte               STREAM_DENY        = 0;
+  protected static final byte               STREAM_ALLOW       = 1;
   private static final long                 serialVersionUID   = 1L;
   // CRUD OPERATIONS
   private static Map<Integer, String>       PERMISSION_BIT_NAMES;
diff --git a/core/src/main/java/com/orientechnologies/orient/core/metadata/security/ORule.java b/core/src/main/java/com/orientechnologies/orient/core/metadata/security/ORule.java
index 6e9bbbb601a..9691b3fcf38 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/metadata/security/ORule.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/metadata/security/ORule.java
@@ -12,7 +12,7 @@
  */
 public class ORule implements Serializable {
 
-  public static abstract class ResourceGeneric implements Serializable {
+  public abstract static class ResourceGeneric implements Serializable {
     private static final long                             serialVersionUID     = 1L;
     private static final TreeMap<String, ResourceGeneric> nameToGenericMap     = new TreeMap<String, ResourceGeneric>();
     private static final TreeMap<String, ResourceGeneric> legacyToGenericMap   = new TreeMap<String, ResourceGeneric>();
diff --git a/core/src/main/java/com/orientechnologies/orient/core/schedule/OScheduledEvent.java b/core/src/main/java/com/orientechnologies/orient/core/schedule/OScheduledEvent.java
index 299ccc195b4..526aef13528 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/schedule/OScheduledEvent.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/schedule/OScheduledEvent.java
@@ -45,7 +45,7 @@
  */
 
 public class OScheduledEvent extends ODocumentWrapper {
-  public final static String CLASS_NAME = "OSchedule";
+  public static final String CLASS_NAME = "OSchedule";
 
   public static final String PROP_NAME      = "name";
   public static final String PROP_RULE      = "rule";
diff --git a/core/src/main/java/com/orientechnologies/orient/core/serialization/OStreamableHelper.java b/core/src/main/java/com/orientechnologies/orient/core/serialization/OStreamableHelper.java
index 20148e6ab14..67606943ce8 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/serialization/OStreamableHelper.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/serialization/OStreamableHelper.java
@@ -31,15 +31,15 @@
  * 
  */
 public class OStreamableHelper {
-  final static byte NULL         = 0;
-  final static byte STREAMABLE   = 1;
-  final static byte SERIALIZABLE = 2;
+  static final byte NULL         = 0;
+  static final byte STREAMABLE   = 1;
+  static final byte SERIALIZABLE = 2;
 
-  final static byte STRING       = 10;
-  final static byte INTEGER      = 11;
-  final static byte SHORT        = 12;
-  final static byte LONG         = 13;
-  final static byte BOOLEAN      = 14;
+  static final byte STRING       = 10;
+  static final byte INTEGER      = 11;
+  static final byte SHORT        = 12;
+  static final byte LONG         = 13;
+  static final byte BOOLEAN      = 14;
 
   private static ClassLoader streamableClassLoader;
 
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/functions/geo/OSQLFunctionDistance.java b/core/src/main/java/com/orientechnologies/orient/core/sql/functions/geo/OSQLFunctionDistance.java
index b2df7c9c34a..207e79e607d 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/sql/functions/geo/OSQLFunctionDistance.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/sql/functions/geo/OSQLFunctionDistance.java
@@ -32,7 +32,7 @@
 public class OSQLFunctionDistance extends OSQLFunctionAbstract {
   public static final String NAME = "distance";
 
-  private final static double EARTH_RADIUS = 6371;
+  private static final double EARTH_RADIUS = 6371;
 
   public OSQLFunctionDistance() {
     super(NAME, 4, 5);
diff --git a/core/src/main/java/com/orientechnologies/orient/core/storage/OStorageAbstract.java b/core/src/main/java/com/orientechnologies/orient/core/storage/OStorageAbstract.java
index 49835fc6e01..0d99e39865c 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/storage/OStorageAbstract.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/storage/OStorageAbstract.java
@@ -34,7 +34,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 
 public abstract class OStorageAbstract implements OStorage, OSharedContainer {
-  public final static ThreadGroup storageThreadGroup;
+  public static final ThreadGroup storageThreadGroup;
 
   static {
     ThreadGroup parentThreadGroup = Thread.currentThread().getThreadGroup();
diff --git a/core/src/main/java/com/orientechnologies/orient/core/storage/cache/local/twoq/O2QCache.java b/core/src/main/java/com/orientechnologies/orient/core/storage/cache/local/twoq/O2QCache.java
index 599240b6d87..38270f4df7a 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/storage/cache/local/twoq/O2QCache.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/storage/cache/local/twoq/O2QCache.java
@@ -1226,7 +1226,7 @@ public int hashCode() {
     }
   }
 
-  private final static class UpdateCacheResult {
+  private static final class UpdateCacheResult {
     private final boolean     removeColdPages;
     private final OCacheEntry cacheEntry;
 
diff --git a/core/src/main/java/com/orientechnologies/orient/core/storage/cluster/v0/OPaginatedClusterV0.java b/core/src/main/java/com/orientechnologies/orient/core/storage/cluster/v0/OPaginatedClusterV0.java
index 5fb40a83ff3..a3621358660 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/storage/cluster/v0/OPaginatedClusterV0.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/storage/cluster/v0/OPaginatedClusterV0.java
@@ -74,7 +74,7 @@ public final class OPaginatedClusterV0 extends OPaginatedCluster {
   private static final int BINARY_VERSION           = 0;
   private static final int DISK_PAGE_SIZE           = DISK_CACHE_PAGE_SIZE.getValueAsInteger();
   private static final int LOWEST_FREELIST_BOUNDARY = PAGINATED_STORAGE_LOWEST_FREELIST_BOUNDARY.getValueAsInteger();
-  private final static int FREE_LIST_SIZE           = DISK_PAGE_SIZE - LOWEST_FREELIST_BOUNDARY;
+  private static final int FREE_LIST_SIZE           = DISK_PAGE_SIZE - LOWEST_FREELIST_BOUNDARY;
   private static final int PAGE_INDEX_OFFSET        = 16;
   private static final int RECORD_POSITION_MASK     = 0xFFFF;
   private static final int ONE_KB                   = 1024;
diff --git a/core/src/main/java/com/orientechnologies/orient/core/storage/cluster/v1/OPaginatedClusterV1.java b/core/src/main/java/com/orientechnologies/orient/core/storage/cluster/v1/OPaginatedClusterV1.java
index 5f1abd40b83..3c96e466eef 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/storage/cluster/v1/OPaginatedClusterV1.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/storage/cluster/v1/OPaginatedClusterV1.java
@@ -76,7 +76,7 @@ public final class OPaginatedClusterV1 extends OPaginatedCluster {
 
   private static final int DISK_PAGE_SIZE           = DISK_CACHE_PAGE_SIZE.getValueAsInteger();
   private static final int LOWEST_FREELIST_BOUNDARY = PAGINATED_STORAGE_LOWEST_FREELIST_BOUNDARY.getValueAsInteger();
-  private final static int FREE_LIST_SIZE           = DISK_PAGE_SIZE - LOWEST_FREELIST_BOUNDARY;
+  private static final int FREE_LIST_SIZE           = DISK_PAGE_SIZE - LOWEST_FREELIST_BOUNDARY;
   private static final int PAGE_INDEX_OFFSET        = 16;
   private static final int RECORD_POSITION_MASK     = 0xFFFF;
   private static final int ONE_KB                   = 1024;
diff --git a/core/src/main/java/com/orientechnologies/orient/core/storage/disk/OLocalPaginatedStorage.java b/core/src/main/java/com/orientechnologies/orient/core/storage/disk/OLocalPaginatedStorage.java
index baf8b9614f4..e39b7fe2392 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/storage/disk/OLocalPaginatedStorage.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/storage/disk/OLocalPaginatedStorage.java
@@ -709,7 +709,7 @@ public Void call() {
     }
   }
 
-  private final static class SegmentAppenderFactory implements ThreadFactory {
+  private static final class SegmentAppenderFactory implements ThreadFactory {
     SegmentAppenderFactory() {
     }
 
diff --git a/core/src/main/java/com/orientechnologies/orient/core/storage/fs/OFileClassic.java b/core/src/main/java/com/orientechnologies/orient/core/storage/fs/OFileClassic.java
index a726490c6f1..cc47080c4ea 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/storage/fs/OFileClassic.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/storage/fs/OFileClassic.java
@@ -54,7 +54,7 @@
 import static com.orientechnologies.common.io.OIOUtils.writeByteBuffers;
 
 public final class OFileClassic implements OClosableItem {
-  public final static  String NAME            = "classic";
+  public static final  String NAME            = "classic";
   private static final int    CURRENT_VERSION = 2;
 
   public static final int HEADER_SIZE    = 1024;
diff --git a/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/wal/cas/OCASDiskWriteAheadLog.java b/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/wal/cas/OCASDiskWriteAheadLog.java
index c1d9ccd9d52..2a72426e000 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/wal/cas/OCASDiskWriteAheadLog.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/wal/cas/OCASDiskWriteAheadLog.java
@@ -81,7 +81,7 @@
 import java.util.zip.CRC32;
 
 public final class OCASDiskWriteAheadLog implements OWriteAheadLog {
-  private final static XXHashFactory xxHashFactory = XXHashFactory.fastestInstance();
+  private static final XXHashFactory xxHashFactory = XXHashFactory.fastestInstance();
   private static final int           XX_SEED       = 0x9747b28c;
 
   private static final int MASTER_RECORD_SIZE = 20;
diff --git a/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/statistic/OSessionStoragePerformanceStatistic.java b/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/statistic/OSessionStoragePerformanceStatistic.java
index e9758b83fe1..69408cf3491 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/statistic/OSessionStoragePerformanceStatistic.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/statistic/OSessionStoragePerformanceStatistic.java
@@ -2036,7 +2036,7 @@ public PerformanceCountersHolder newInstance() {
   /**
    * Snapshot of all performance data of current container.
    */
-  public final static class PerformanceSnapshot {
+  public static final class PerformanceSnapshot {
     public final PerformanceCountersHolder performanceCountersHolder;
     public final WritCacheCountersHolder   writCacheCountersHolder;
     public final StorageCountersHolder     storageCountersHolder;
diff --git a/core/src/main/java/com/orientechnologies/orient/core/storage/index/hashindex/local/OHashIndexFileLevelMetadataPage.java b/core/src/main/java/com/orientechnologies/orient/core/storage/index/hashindex/local/OHashIndexFileLevelMetadataPage.java
index b61cbf60e09..0f2059e380f 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/storage/index/hashindex/local/OHashIndexFileLevelMetadataPage.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/storage/index/hashindex/local/OHashIndexFileLevelMetadataPage.java
@@ -33,12 +33,12 @@
  */
 public class OHashIndexFileLevelMetadataPage extends ODurablePage {
 
-  private final static int RECORDS_COUNT_OFFSET       = NEXT_FREE_POSITION;
-  private final static int KEY_SERIALIZER_ID_OFFSET   = RECORDS_COUNT_OFFSET + OLongSerializer.LONG_SIZE;
-  private final static int VALUE_SERIALIZER_ID_OFFSET = KEY_SERIALIZER_ID_OFFSET + OByteSerializer.BYTE_SIZE;
-  private final static int METADATA_ARRAY_OFFSET      = VALUE_SERIALIZER_ID_OFFSET + OByteSerializer.BYTE_SIZE;
+  private static final int RECORDS_COUNT_OFFSET       = NEXT_FREE_POSITION;
+  private static final int KEY_SERIALIZER_ID_OFFSET   = RECORDS_COUNT_OFFSET + OLongSerializer.LONG_SIZE;
+  private static final int VALUE_SERIALIZER_ID_OFFSET = KEY_SERIALIZER_ID_OFFSET + OByteSerializer.BYTE_SIZE;
+  private static final int METADATA_ARRAY_OFFSET      = VALUE_SERIALIZER_ID_OFFSET + OByteSerializer.BYTE_SIZE;
 
-  private final static int ITEM_SIZE                  = OByteSerializer.BYTE_SIZE + 3 * OLongSerializer.LONG_SIZE;
+  private static final int ITEM_SIZE                  = OByteSerializer.BYTE_SIZE + 3 * OLongSerializer.LONG_SIZE;
 
   public OHashIndexFileLevelMetadataPage(OCacheEntry cacheEntry, boolean isNewPage) throws IOException {
     super(cacheEntry);
diff --git a/core/src/main/java/com/orientechnologies/orient/core/storage/index/sbtree/local/OSBTree.java b/core/src/main/java/com/orientechnologies/orient/core/storage/index/sbtree/local/OSBTree.java
index 98f84fd13b0..932c13ccc24 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/storage/index/sbtree/local/OSBTree.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/storage/index/sbtree/local/OSBTree.java
@@ -85,7 +85,7 @@ public class OSBTree<K, V> extends ODurableComponent {
 
   private static final int MAX_PATH_LENGTH = OGlobalConfiguration.SBTREE_MAX_DEPTH.getValueAsInteger();
 
-  private final static long                  ROOT_INDEX       = 0;
+  private static final long                  ROOT_INDEX       = 0;
   private final        Comparator<? super K> comparator       = ODefaultComparator.INSTANCE;
   private final        String                nullFileExtension;
   private              long                  fileId;
diff --git a/core/src/main/java/com/orientechnologies/orient/core/storage/index/sbtree/multivalue/v1/OCellBTreeMultiValueV1.java b/core/src/main/java/com/orientechnologies/orient/core/storage/index/sbtree/multivalue/v1/OCellBTreeMultiValueV1.java
index 828825c91bb..d1a1871924e 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/storage/index/sbtree/multivalue/v1/OCellBTreeMultiValueV1.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/storage/index/sbtree/multivalue/v1/OCellBTreeMultiValueV1.java
@@ -82,8 +82,8 @@ public final class OCellBTreeMultiValueV1<K> extends ODurableComponent implement
 
   private static final int MAX_PATH_LENGTH = OGlobalConfiguration.SBTREE_MAX_DEPTH.getValueAsInteger();
 
-  private final static int  ENTRY_POINT_INDEX = 0;
-  private final static long ROOT_INDEX        = 1;
+  private static final int  ENTRY_POINT_INDEX = 0;
+  private static final long ROOT_INDEX        = 1;
 
   private final Comparator<? super K> comparator = ODefaultComparator.INSTANCE;
   private final String                nullFileExtension;
diff --git a/core/src/main/java/com/orientechnologies/orient/core/storage/index/sbtree/multivalue/v2/OCellBTreeMultiValueV2.java b/core/src/main/java/com/orientechnologies/orient/core/storage/index/sbtree/multivalue/v2/OCellBTreeMultiValueV2.java
index e5285a4d721..80e57880d4a 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/storage/index/sbtree/multivalue/v2/OCellBTreeMultiValueV2.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/storage/index/sbtree/multivalue/v2/OCellBTreeMultiValueV2.java
@@ -86,8 +86,8 @@ public final class OCellBTreeMultiValueV2<K> extends ODurableComponent implement
 
   private static final int MAX_PATH_LENGTH = OGlobalConfiguration.SBTREE_MAX_DEPTH.getValueAsInteger();
 
-  private final static int  ENTRY_POINT_INDEX = 0;
-  private final static long ROOT_INDEX        = 1;
+  private static final int  ENTRY_POINT_INDEX = 0;
+  private static final long ROOT_INDEX        = 1;
 
   private final Comparator<? super K> comparator = ODefaultComparator.INSTANCE;
   private final String                nullFileExtension;
diff --git a/core/src/main/java/com/orientechnologies/orient/core/storage/index/sbtree/singlevalue/OCellBTreeSingleValue.java b/core/src/main/java/com/orientechnologies/orient/core/storage/index/sbtree/singlevalue/OCellBTreeSingleValue.java
index fa27e0abfbd..137e36bf1a6 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/storage/index/sbtree/singlevalue/OCellBTreeSingleValue.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/storage/index/sbtree/singlevalue/OCellBTreeSingleValue.java
@@ -84,8 +84,8 @@ public final class OCellBTreeSingleValue<K> extends ODurableComponent {
 
   private static final int MAX_PATH_LENGTH = OGlobalConfiguration.SBTREE_MAX_DEPTH.getValueAsInteger();
 
-  private final static int                   ENTRY_POINT_INDEX = 0;
-  private final static long                  ROOT_INDEX        = 1;
+  private static final int                   ENTRY_POINT_INDEX = 0;
+  private static final long                  ROOT_INDEX        = 1;
   private final        Comparator<? super K> comparator        = ODefaultComparator.INSTANCE;
 
   private final String               nullFileExtension;
diff --git a/core/src/main/java/com/orientechnologies/orient/core/util/OURLHelper.java b/core/src/main/java/com/orientechnologies/orient/core/util/OURLHelper.java
index ad20d4e5a1d..b0e044707c3 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/util/OURLHelper.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/util/OURLHelper.java
@@ -12,7 +12,7 @@
  */
 public class OURLHelper {
 
-  static public OURLConnection parse(String url) {
+  public static OURLConnection parse(String url) {
     if (url.endsWith("/"))
       url = url.substring(0, url.length() - 1);
     url = url.replace('\\', '/');
@@ -48,7 +48,7 @@ static public OURLConnection parse(String url) {
     return new OURLConnection(url, type, baseUrl, dbName);
   }
 
-  static public OURLConnection parseNew(String url) {
+  public static OURLConnection parseNew(String url) {
     if ((url.startsWith("'") && url.endsWith("'")) || (url.startsWith("\"") && url.endsWith("\""))) {
       url = url.substring(1, url.length() - 1);
     }
diff --git a/distributed-v2/src/main/java/com/orientechnologies/orient/distributed/impl/coordinator/transaction/OIndexKeyChange.java b/distributed-v2/src/main/java/com/orientechnologies/orient/distributed/impl/coordinator/transaction/OIndexKeyChange.java
index a27f1a9e0eb..2a0ece32a83 100644
--- a/distributed-v2/src/main/java/com/orientechnologies/orient/distributed/impl/coordinator/transaction/OIndexKeyChange.java
+++ b/distributed-v2/src/main/java/com/orientechnologies/orient/distributed/impl/coordinator/transaction/OIndexKeyChange.java
@@ -13,8 +13,8 @@
 public class OIndexKeyChange {
 
   // Key Type
-  private final static int SIMPLE    = 1;
-  private final static int COMPOSITE = 2;
+  private static final int SIMPLE    = 1;
+  private static final int COMPOSITE = 2;
 
   private Object                   key;
   private List<OIndexKeyOperation> operations;
diff --git a/distributed-v2/src/main/java/com/orientechnologies/orient/distributed/impl/coordinator/transaction/OIndexKeyOperation.java b/distributed-v2/src/main/java/com/orientechnologies/orient/distributed/impl/coordinator/transaction/OIndexKeyOperation.java
index 1c5509f929e..634d986d8bc 100644
--- a/distributed-v2/src/main/java/com/orientechnologies/orient/distributed/impl/coordinator/transaction/OIndexKeyOperation.java
+++ b/distributed-v2/src/main/java/com/orientechnologies/orient/distributed/impl/coordinator/transaction/OIndexKeyOperation.java
@@ -9,8 +9,8 @@
 
 public class OIndexKeyOperation {
   // Key Change Operation
-  public final static byte PUT    = 1;
-  public final static byte REMOVE = 2;
+  public static final byte PUT    = 1;
+  public static final byte REMOVE = 2;
 
   private byte type;
   private ORID value;
diff --git a/distributed-v2/src/main/java/com/orientechnologies/orient/distributed/impl/task/OAbstractSyncDatabaseTask.java b/distributed-v2/src/main/java/com/orientechnologies/orient/distributed/impl/task/OAbstractSyncDatabaseTask.java
index 05536589d99..2f3b72c5b0f 100644
--- a/distributed-v2/src/main/java/com/orientechnologies/orient/distributed/impl/task/OAbstractSyncDatabaseTask.java
+++ b/distributed-v2/src/main/java/com/orientechnologies/orient/distributed/impl/task/OAbstractSyncDatabaseTask.java
@@ -44,7 +44,7 @@
  * @author Luca Garulli (l.garulli--at--orientdb.com)
  */
 public abstract class OAbstractSyncDatabaseTask extends OAbstractReplicatedTask implements OCommandOutputListener {
-  public final static int    CHUNK_MAX_SIZE = 8388608;    // 8MB
+  public static final int    CHUNK_MAX_SIZE = 8388608;    // 8MB
   public static final String DEPLOYDB       = "deploydb.";
   public static final int    FACTORYID      = 14;
 
diff --git a/distributed/src/main/java/com/orientechnologies/orient/server/distributed/impl/task/OAbstractSyncDatabaseTask.java b/distributed/src/main/java/com/orientechnologies/orient/server/distributed/impl/task/OAbstractSyncDatabaseTask.java
index fdcfef2f0e6..766a1f87b42 100644
--- a/distributed/src/main/java/com/orientechnologies/orient/server/distributed/impl/task/OAbstractSyncDatabaseTask.java
+++ b/distributed/src/main/java/com/orientechnologies/orient/server/distributed/impl/task/OAbstractSyncDatabaseTask.java
@@ -44,7 +44,7 @@
  * @author Luca Garulli (l.garulli--at--orientdb.com)
  */
 public abstract class OAbstractSyncDatabaseTask extends OAbstractReplicatedTask implements OCommandOutputListener {
-  public final static int    CHUNK_MAX_SIZE = 8388608;    // 8MB
+  public static final int    CHUNK_MAX_SIZE = 8388608;    // 8MB
   public static final String DEPLOYDB       = "deploydb.";
   public static final int    FACTORYID      = 14;
 
diff --git a/distributed/src/main/java/com/orientechnologies/orient/server/distributed/impl/task/OGossipTask.java b/distributed/src/main/java/com/orientechnologies/orient/server/distributed/impl/task/OGossipTask.java
index 2bb7637930a..01a2c59744f 100644
--- a/distributed/src/main/java/com/orientechnologies/orient/server/distributed/impl/task/OGossipTask.java
+++ b/distributed/src/main/java/com/orientechnologies/orient/server/distributed/impl/task/OGossipTask.java
@@ -51,7 +51,7 @@ public class OGossipTask extends OAbstractRemoteTask {
   private long timestamp = System.currentTimeMillis();
   private String lockManagerServer;
 
-  private final static SimpleDateFormat dateFormat = new SimpleDateFormat(ODateHelper.DEF_DATETIME_FORMAT);
+  private static final SimpleDateFormat dateFormat = new SimpleDateFormat(ODateHelper.DEF_DATETIME_FORMAT);
 
   public OGossipTask() {
   }
diff --git a/distributed/src/main/java/com/orientechnologies/orient/server/distributed/impl/task/OSyncClusterTask.java b/distributed/src/main/java/com/orientechnologies/orient/server/distributed/impl/task/OSyncClusterTask.java
index a31e2bff2ce..a3a9798161f 100755
--- a/distributed/src/main/java/com/orientechnologies/orient/server/distributed/impl/task/OSyncClusterTask.java
+++ b/distributed/src/main/java/com/orientechnologies/orient/server/distributed/impl/task/OSyncClusterTask.java
@@ -59,7 +59,7 @@
  * @author Luca Garulli (l.garulli--at--orientdb.com)
  */
 public class OSyncClusterTask extends OAbstractReplicatedTask {
-  public final static int    CHUNK_MAX_SIZE = 4194304;         // 4MB
+  public static final int    CHUNK_MAX_SIZE = 4194304;         // 4MB
   public static final String DEPLOYCLUSTER  = "deploycluster.";
   public static final int    FACTORYID      = 12;
 
diff --git a/etl/src/main/java/com/orientechnologies/orient/etl/util/OMigrationConfigManager.java b/etl/src/main/java/com/orientechnologies/orient/etl/util/OMigrationConfigManager.java
index c75b8bcbc20..0d8d7f7ac46 100644
--- a/etl/src/main/java/com/orientechnologies/orient/etl/util/OMigrationConfigManager.java
+++ b/etl/src/main/java/com/orientechnologies/orient/etl/util/OMigrationConfigManager.java
@@ -35,8 +35,8 @@
 public class OMigrationConfigManager {
 
   // config info
-  private final static String configurationDirectoryName = "etl-config/";
-  private final static String configFileDefaultName      = "migration-config.json";           // path ORIENTDB_HOME/<db-name>/teleporter-config/migration-config.json
+  private static final String configurationDirectoryName = "etl-config/";
+  private static final String configFileDefaultName      = "migration-config.json";           // path ORIENTDB_HOME/<db-name>/teleporter-config/migration-config.json
 
 
   /**
diff --git a/jdbc/src/main/java/com/orientechnologies/orient/jdbc/OrientJdbcDatabaseMetaData.java b/jdbc/src/main/java/com/orientechnologies/orient/jdbc/OrientJdbcDatabaseMetaData.java
index 159c42a5316..8271fcb2d78 100755
--- a/jdbc/src/main/java/com/orientechnologies/orient/jdbc/OrientJdbcDatabaseMetaData.java
+++ b/jdbc/src/main/java/com/orientechnologies/orient/jdbc/OrientJdbcDatabaseMetaData.java
@@ -39,7 +39,7 @@
  * @author Luca Garulli (l.garulli--(at)--orientdb.com) (OrientDB - l.garulli--at--orientdb.com)
  */
 public class OrientJdbcDatabaseMetaData implements DatabaseMetaData {
-  protected final static List<String> TABLE_TYPES = Arrays.asList("TABLE", "SYSTEM TABLE");
+  protected static final List<String> TABLE_TYPES = Arrays.asList("TABLE", "SYSTEM TABLE");
   private final OrientJdbcConnection connection;
   private final ODatabaseDocument    database;
   private final OMetadata            metadata;
diff --git a/jdbc/src/main/java/com/orientechnologies/orient/jdbc/OrientJdbcResultSetMetaData.java b/jdbc/src/main/java/com/orientechnologies/orient/jdbc/OrientJdbcResultSetMetaData.java
index dd107a500b9..ef3f2968754 100644
--- a/jdbc/src/main/java/com/orientechnologies/orient/jdbc/OrientJdbcResultSetMetaData.java
+++ b/jdbc/src/main/java/com/orientechnologies/orient/jdbc/OrientJdbcResultSetMetaData.java
@@ -34,7 +34,7 @@
 
 public class OrientJdbcResultSetMetaData implements ResultSetMetaData {
 
-  private final static Map<OType, Integer> typesSqlTypes = new HashMap<>();
+  private static final Map<OType, Integer> typesSqlTypes = new HashMap<>();
 
   static {
     typesSqlTypes.put(OType.STRING, Types.VARCHAR);
diff --git a/lucene/src/main/java/com/orientechnologies/spatial/strategy/SpatialQueryBuilderAbstract.java b/lucene/src/main/java/com/orientechnologies/spatial/strategy/SpatialQueryBuilderAbstract.java
index 74c523d2cdb..d3c8cfb38bb 100644
--- a/lucene/src/main/java/com/orientechnologies/spatial/strategy/SpatialQueryBuilderAbstract.java
+++ b/lucene/src/main/java/com/orientechnologies/spatial/strategy/SpatialQueryBuilderAbstract.java
@@ -32,11 +32,11 @@
  */
 public abstract class SpatialQueryBuilderAbstract {
 
-  public final static String GEO_FILTER   = "geo_filter";
-  public final static String SHAPE        = "shape";
-  public final static String SHAPE_TYPE   = "type";
-  public final static String COORDINATES  = "coordinates";
-  public final static String MAX_DISTANCE = "maxDistance";
+  public static final String GEO_FILTER   = "geo_filter";
+  public static final String SHAPE        = "shape";
+  public static final String SHAPE_TYPE   = "type";
+  public static final String COORDINATES  = "coordinates";
+  public static final String MAX_DISTANCE = "maxDistance";
   protected OLuceneSpatialIndexContainer manager;
   protected OShapeBuilder                factory;
 
diff --git a/object/src/main/java/com/orientechnologies/orient/object/db/OObjectLazyIterator.java b/object/src/main/java/com/orientechnologies/orient/object/db/OObjectLazyIterator.java
index f6432a40985..17d3f252913 100644
--- a/object/src/main/java/com/orientechnologies/orient/object/db/OObjectLazyIterator.java
+++ b/object/src/main/java/com/orientechnologies/orient/object/db/OObjectLazyIterator.java
@@ -46,7 +46,7 @@ public class OObjectLazyIterator<TYPE> implements Iterator<TYPE>, Serializable {
   private final OObjectDatabaseTx          database;
   private final Iterator<? extends Object> underlying;
   private       String                     fetchPlan;
-  final private boolean                    autoConvert2Object;
+  private final boolean                    autoConvert2Object;
   private       OIdentifiable              currentElement;
   private boolean orphanRemoval = false;
 
diff --git a/object/src/main/java/com/orientechnologies/orient/object/jpa/OJPAProperties.java b/object/src/main/java/com/orientechnologies/orient/object/jpa/OJPAProperties.java
index 1f2d9bd4789..be086f969de 100644
--- a/object/src/main/java/com/orientechnologies/orient/object/jpa/OJPAProperties.java
+++ b/object/src/main/java/com/orientechnologies/orient/object/jpa/OJPAProperties.java
@@ -31,13 +31,13 @@
 final class OJPAProperties extends Properties {
 	private static final long		serialVersionUID				= -8158054712863843518L;
 
-	public final static String	URL											= "javax.persistence.jdbc.url";
-	public final static String	USER										= "javax.persistence.jdbc.user";
-	public final static String	PASSWORD								= "javax.persistence.jdbc.password";
+	public static final String	URL											= "javax.persistence.jdbc.url";
+	public static final String	USER										= "javax.persistence.jdbc.user";
+	public static final String	PASSWORD								= "javax.persistence.jdbc.password";
 	/**
 	 * OrientDB specific
 	 */
-	public final static String	ENTITY_CLASSES_PACKAGE	= "com.orientdb.entityClasses";
+	public static final String	ENTITY_CLASSES_PACKAGE	= "com.orientdb.entityClasses";
 
 	public OJPAProperties() {
 	}
diff --git a/object/src/main/java/com/orientechnologies/orient/object/jpa/parsing/PersistenceXmlUtil.java b/object/src/main/java/com/orientechnologies/orient/object/jpa/parsing/PersistenceXmlUtil.java
index 5551804587e..68678a53e65 100644
--- a/object/src/main/java/com/orientechnologies/orient/object/jpa/parsing/PersistenceXmlUtil.java
+++ b/object/src/main/java/com/orientechnologies/orient/object/jpa/parsing/PersistenceXmlUtil.java
@@ -53,8 +53,8 @@ public final class PersistenceXmlUtil {
    */
   public static final String            PERSISTENCE_NS_URI        = "http://java.sun.com/xml/ns/persistence";
 
-  private final static SchemaFactory    schemaFactory             = SchemaFactory.newInstance(W3C_XML_SCHEMA_NS_URI);
-  private final static SAXParserFactory parserFactory             = SAXParserFactory.newInstance();
+  private static final SchemaFactory    schemaFactory             = SchemaFactory.newInstance(W3C_XML_SCHEMA_NS_URI);
+  private static final SAXParserFactory parserFactory             = SAXParserFactory.newInstance();
   static {
     parserFactory.setNamespaceAware(true);
   }
diff --git a/object/src/main/java/com/orientechnologies/orient/object/serialization/OObjectSerializerContext.java b/object/src/main/java/com/orientechnologies/orient/object/serialization/OObjectSerializerContext.java
index ac605e4cc20..c4e164eab50 100644
--- a/object/src/main/java/com/orientechnologies/orient/object/serialization/OObjectSerializerContext.java
+++ b/object/src/main/java/com/orientechnologies/orient/object/serialization/OObjectSerializerContext.java
@@ -34,7 +34,7 @@
 // the parameter iFieldValue (which is of type Object) to the defined type LOCAL_TYPE.
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class OObjectSerializerContext implements OObjectSerializer<Object, Object> {
-  final private Map<Class<?>, OObjectSerializer> customSerializers = new LinkedHashMap<Class<?>, OObjectSerializer>();
+  private final Map<Class<?>, OObjectSerializer> customSerializers = new LinkedHashMap<Class<?>, OObjectSerializer>();
 
   public void bind(final OObjectSerializer serializer, ODatabase database) {
     final Type[] actualTypes = OReflectionHelper.getGenericTypes(serializer.getClass());
diff --git a/server/src/main/java/com/orientechnologies/orient/server/distributed/ORemoteServerChannel.java b/server/src/main/java/com/orientechnologies/orient/server/distributed/ORemoteServerChannel.java
index d6c605b4ed3..ef8ca2e4e35 100755
--- a/server/src/main/java/com/orientechnologies/orient/server/distributed/ORemoteServerChannel.java
+++ b/server/src/main/java/com/orientechnologies/orient/server/distributed/ORemoteServerChannel.java
@@ -70,7 +70,7 @@ public class ORemoteServerChannel {
   private              Date                  createdOn     = new Date();
 
   private volatile     int             totalConsecutiveErrors = 0;
-  private final static int             MAX_CONSECUTIVE_ERRORS = 10;
+  private static final int             MAX_CONSECUTIVE_ERRORS = 10;
   private              ExecutorService executor;
 
   public ORemoteServerChannel(final ORemoteServerAvailabilityCheck check, String localNodeName, final String iServer,
diff --git a/server/src/main/java/com/orientechnologies/orient/server/distributed/ORemoteServerController.java b/server/src/main/java/com/orientechnologies/orient/server/distributed/ORemoteServerController.java
index e159be541d7..dc05b4722da 100644
--- a/server/src/main/java/com/orientechnologies/orient/server/distributed/ORemoteServerController.java
+++ b/server/src/main/java/com/orientechnologies/orient/server/distributed/ORemoteServerController.java
@@ -37,7 +37,7 @@ public class ORemoteServerController {
   private volatile int                    responseChannelIndex = 0;
 
   private             int protocolVersion          = -1;
-  public final static int CURRENT_PROTOCOL_VERSION = 2;
+  public static final int CURRENT_PROTOCOL_VERSION = 2;
 
   public ORemoteServerController(final ORemoteServerAvailabilityCheck check, String localNodeName, final String iServer,
       final String iURL, final String user, final String passwd) throws IOException {
diff --git a/tools/src/main/java/com/orientechnologies/orient/console/OTableFormatter.java b/tools/src/main/java/com/orientechnologies/orient/console/OTableFormatter.java
index 27d27336c21..af4ad172375 100755
--- a/tools/src/main/java/com/orientechnologies/orient/console/OTableFormatter.java
+++ b/tools/src/main/java/com/orientechnologies/orient/console/OTableFormatter.java
@@ -41,8 +41,8 @@ public enum ALIGNMENT {
     LEFT, CENTER, RIGHT
   }
 
-  protected final static String           MORE           = "...";
-  protected final static SimpleDateFormat DEF_DATEFORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
+  protected static final String           MORE           = "...";
+  protected static final SimpleDateFormat DEF_DATEFORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
 
   protected       OPair<String, Boolean>           columnSorting   = null;
   protected final Map<String, ALIGNMENT>           columnAlignment = new HashMap<String, ALIGNMENT>();
diff --git a/tools/src/main/java/com/orientechnologies/orient/stresstest/OConsoleProgressWriter.java b/tools/src/main/java/com/orientechnologies/orient/stresstest/OConsoleProgressWriter.java
index 9782a3de472..7f1bf43d962 100644
--- a/tools/src/main/java/com/orientechnologies/orient/stresstest/OConsoleProgressWriter.java
+++ b/tools/src/main/java/com/orientechnologies/orient/stresstest/OConsoleProgressWriter.java
@@ -30,7 +30,7 @@
  */
 public class OConsoleProgressWriter extends OSoftThread {
 
-  final private OWorkload workload;
+  private final OWorkload workload;
   private String          lastResult = null;
 
   public OConsoleProgressWriter(final OWorkload workload) {
diff --git a/tools/src/main/java/com/orientechnologies/orient/stresstest/OStressTesterCommandLineParser.java b/tools/src/main/java/com/orientechnologies/orient/stresstest/OStressTesterCommandLineParser.java
index eaa9b6692bb..be6f11cfecd 100755
--- a/tools/src/main/java/com/orientechnologies/orient/stresstest/OStressTesterCommandLineParser.java
+++ b/tools/src/main/java/com/orientechnologies/orient/stresstest/OStressTesterCommandLineParser.java
@@ -37,27 +37,27 @@ public class OStressTesterCommandLineParser {
   public static final String TEMP_DATABASE_NAME             = "stress-test-db-";
   public static final String CONSOLE_REMOTE_PASSWORD_PROMPT = "OrientDB Server (%s:%d) - Please insert the root password to create the test database: ";
 
-  public final static String OPTION_CONCURRENCY                    = "c";
-  public final static String OPTION_MODE                           = "m";
-  public final static String OPTION_WORKLOAD                       = "w";
-  public final static String OPTION_TRANSACTIONS                   = "tx";
-  public final static String OPTION_DELAY                          = "delay";
-  public final static String OPTION_KEEP_DATABASE_AFTER_TEST       = "k";
-  public final static String OPTION_OUTPUT_FILE                    = "o";
+  public static final String OPTION_CONCURRENCY                    = "c";
+  public static final String OPTION_MODE                           = "m";
+  public static final String OPTION_WORKLOAD                       = "w";
+  public static final String OPTION_TRANSACTIONS                   = "tx";
+  public static final String OPTION_DELAY                          = "delay";
+  public static final String OPTION_KEEP_DATABASE_AFTER_TEST       = "k";
+  public static final String OPTION_OUTPUT_FILE                    = "o";
   public static final String OPTION_PLOCAL_PATH                    = "d";
-  public final static String OPTION_LOAD_BALANCING                 = "lb";
-  public final static String OPTION_DBNAME                         = "db";
-  public final static String OPTION_CHECK_DATABASE                 = "chk";
-  public final static String OPTION_ROOT_PASSWORD                  = "root-password";
+  public static final String OPTION_LOAD_BALANCING                 = "lb";
+  public static final String OPTION_DBNAME                         = "db";
+  public static final String OPTION_CHECK_DATABASE                 = "chk";
+  public static final String OPTION_ROOT_PASSWORD                  = "root-password";
   public static final String ERROR_OPENING_CONSOLE                 =
       "An error has occurred opening the console. Please supply the root password as the -" + OPTION_ROOT_PASSWORD + " parameter.";
-  public final static String OPTION_REMOTE_IP                      = "remote-ip";
-  public final static String OPTION_HA_METRICS                     = "ha-metrics";
+  public static final String OPTION_REMOTE_IP                      = "remote-ip";
+  public static final String OPTION_HA_METRICS                     = "ha-metrics";
   public static final String COMMAND_LINE_PARSER_MISSING_REMOTE_IP =
       "The mode is [" + OStressTester.OMode.REMOTE + "] but the param --" + OPTION_REMOTE_IP + " wasn't passed.";
-  public final static String OPTION_REMOTE_PORT                    = "remote-port";
+  public static final String OPTION_REMOTE_PORT                    = "remote-port";
 
-  public final static String MAIN_OPTIONS =
+  public static final String MAIN_OPTIONS =
       OPTION_MODE + OPTION_CONCURRENCY + OPTION_WORKLOAD + OPTION_TRANSACTIONS + OPTION_DELAY + OPTION_OUTPUT_FILE
           + OPTION_PLOCAL_PATH + OPTION_KEEP_DATABASE_AFTER_TEST + OPTION_CHECK_DATABASE + OPTION_LOAD_BALANCING + OPTION_DBNAME;