Enable checkstyle rule for JLS modifier order
JLS specifies a preferred order for modifiers in
declarations. Enabled this rule and fixed the
problems that it encountered.
Change-Id: I5e8fa3d29f785ced4c61fbb8c7c8b168289f06e2
diff --git a/src/main/java/net/onrc/onos/core/intent/runtime/PathCalcRuntime.java b/src/main/java/net/onrc/onos/core/intent/runtime/PathCalcRuntime.java
index 234bea9..0600fe3 100644
--- a/src/main/java/net/onrc/onos/core/intent/runtime/PathCalcRuntime.java
+++ b/src/main/java/net/onrc/onos/core/intent/runtime/PathCalcRuntime.java
@@ -28,7 +28,7 @@
*/
public class PathCalcRuntime implements IFloodlightService {
private NetworkGraph graph;
- private final static Logger log = LoggerFactory.getLogger(PathCalcRuntime.class);
+ private static final Logger log = LoggerFactory.getLogger(PathCalcRuntime.class);
public PathCalcRuntime(NetworkGraph g) {
this.graph = g;
diff --git a/src/main/java/net/onrc/onos/core/intent/runtime/PersistIntent.java b/src/main/java/net/onrc/onos/core/intent/runtime/PersistIntent.java
index ba845ed..737aeae 100755
--- a/src/main/java/net/onrc/onos/core/intent/runtime/PersistIntent.java
+++ b/src/main/java/net/onrc/onos/core/intent/runtime/PersistIntent.java
@@ -31,12 +31,12 @@
* @author nickkaranatsios
*/
public class PersistIntent {
- private final static Logger log = LoggerFactory.getLogger(IntentResource.class);
+ private static final Logger log = LoggerFactory.getLogger(IntentResource.class);
private long range = 10000L;
private final IControllerRegistryService controllerRegistry;
NetworkGraph graph = null;
- private final static String INTENT_JOURNAL = "G:IntentJournal";
- private final static int VALUE_STORE_LIMIT = 1024 * 1024;
+ private static final String INTENT_JOURNAL = "G:IntentJournal";
+ private static final int VALUE_STORE_LIMIT = 1024 * 1024;
private IKVTable table;
private Kryo kryo;
private ByteArrayOutputStream stream;
diff --git a/src/main/java/net/onrc/onos/core/intent/runtime/PlanCalcRuntime.java b/src/main/java/net/onrc/onos/core/intent/runtime/PlanCalcRuntime.java
index 7ea3bab..a671d7a 100644
--- a/src/main/java/net/onrc/onos/core/intent/runtime/PlanCalcRuntime.java
+++ b/src/main/java/net/onrc/onos/core/intent/runtime/PlanCalcRuntime.java
@@ -31,7 +31,7 @@
public class PlanCalcRuntime {
// NetworkGraph graph;
- private final static Logger log = LoggerFactory.getLogger(PlanCalcRuntime.class);
+ private static final Logger log = LoggerFactory.getLogger(PlanCalcRuntime.class);
public PlanCalcRuntime(/*NetworkGraph graph*/) {
// this.graph = graph;
diff --git a/src/main/java/net/onrc/onos/core/intent/runtime/PlanInstallModule.java b/src/main/java/net/onrc/onos/core/intent/runtime/PlanInstallModule.java
index b4904c1..ba24ae5 100644
--- a/src/main/java/net/onrc/onos/core/intent/runtime/PlanInstallModule.java
+++ b/src/main/java/net/onrc/onos/core/intent/runtime/PlanInstallModule.java
@@ -36,7 +36,7 @@
private PlanInstallRuntime planInstall;
private EventListener eventListener;
private IEventChannel<Long, IntentStateList> intentStateChannel;
- private final static Logger log = LoggerFactory.getLogger(PlanInstallModule.class);
+ private static final Logger log = LoggerFactory.getLogger(PlanInstallModule.class);
private static final String PATH_INTENT_CHANNEL_NAME = "onos.pathintent";
diff --git a/src/main/java/net/onrc/onos/core/intent/runtime/PlanInstallRuntime.java b/src/main/java/net/onrc/onos/core/intent/runtime/PlanInstallRuntime.java
index f6d499b..7607373 100644
--- a/src/main/java/net/onrc/onos/core/intent/runtime/PlanInstallRuntime.java
+++ b/src/main/java/net/onrc/onos/core/intent/runtime/PlanInstallRuntime.java
@@ -28,7 +28,7 @@
// NetworkGraph graph;
IFlowPusherService pusher;
IFloodlightProviderService provider;
- private final static Logger log = LoggerFactory.getLogger(PlanInstallRuntime.class);
+ private static final Logger log = LoggerFactory.getLogger(PlanInstallRuntime.class);
public PlanInstallRuntime(//NetworkGraph graph,
IFloodlightProviderService provider,