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/apps/bgproute/BgpRoute.java b/src/main/java/net/onrc/onos/apps/bgproute/BgpRoute.java
index 7202895..f07e6e4 100644
--- a/src/main/java/net/onrc/onos/apps/bgproute/BgpRoute.java
+++ b/src/main/java/net/onrc/onos/apps/bgproute/BgpRoute.java
@@ -76,7 +76,7 @@
IArpRequester,
IOFSwitchListener, IConfigInfoService {
- private final static Logger log = LoggerFactory.getLogger(BgpRoute.class);
+ private static final Logger log = LoggerFactory.getLogger(BgpRoute.class);
private IFloodlightProviderService floodlightProvider;
private ILinkDiscoveryService linkDiscoveryService;
diff --git a/src/main/java/net/onrc/onos/apps/bgproute/BgpRouteResource.java b/src/main/java/net/onrc/onos/apps/bgproute/BgpRouteResource.java
index 5c14db1..7337a79 100644
--- a/src/main/java/net/onrc/onos/apps/bgproute/BgpRouteResource.java
+++ b/src/main/java/net/onrc/onos/apps/bgproute/BgpRouteResource.java
@@ -12,7 +12,7 @@
import org.slf4j.LoggerFactory;
public class BgpRouteResource extends ServerResource {
- private final static Logger log = LoggerFactory.getLogger(BgpRouteResource.class);
+ private static final Logger log = LoggerFactory.getLogger(BgpRouteResource.class);
@Get
public String get(String fmJson) {
diff --git a/src/main/java/net/onrc/onos/apps/bgproute/BgpRouteResourceSynch.java b/src/main/java/net/onrc/onos/apps/bgproute/BgpRouteResourceSynch.java
index 13434dc..21ada96 100644
--- a/src/main/java/net/onrc/onos/apps/bgproute/BgpRouteResourceSynch.java
+++ b/src/main/java/net/onrc/onos/apps/bgproute/BgpRouteResourceSynch.java
@@ -7,7 +7,7 @@
import org.slf4j.LoggerFactory;
public class BgpRouteResourceSynch extends ServerResource {
- private final static Logger log = LoggerFactory.getLogger(BgpRouteResourceSynch.class);
+ private static final Logger log = LoggerFactory.getLogger(BgpRouteResourceSynch.class);
@Post
public String store(String fmJson) {
diff --git a/src/main/java/net/onrc/onos/apps/bgproute/FlowCache.java b/src/main/java/net/onrc/onos/apps/bgproute/FlowCache.java
index 305cc87..d5aff78 100644
--- a/src/main/java/net/onrc/onos/apps/bgproute/FlowCache.java
+++ b/src/main/java/net/onrc/onos/apps/bgproute/FlowCache.java
@@ -19,7 +19,7 @@
import org.slf4j.LoggerFactory;
public class FlowCache {
- private final static Logger log = LoggerFactory.getLogger(FlowCache.class);
+ private static final Logger log = LoggerFactory.getLogger(FlowCache.class);
private final IFloodlightProviderService floodlightProvider;
diff --git a/src/main/java/net/onrc/onos/apps/bgproute/Ptree.java b/src/main/java/net/onrc/onos/apps/bgproute/Ptree.java
index f85c49c..da8501f 100644
--- a/src/main/java/net/onrc/onos/apps/bgproute/Ptree.java
+++ b/src/main/java/net/onrc/onos/apps/bgproute/Ptree.java
@@ -175,7 +175,7 @@
return null;
}
- static public int bit_to_octet(int key_bits) {
+ public static int bit_to_octet(int key_bits) {
return Math.max((key_bits + 7) / 8, 1);
}
diff --git a/src/main/java/net/onrc/onos/apps/bgproute/PtreeNode.java b/src/main/java/net/onrc/onos/apps/bgproute/PtreeNode.java
index c872a4e..0c0358d 100644
--- a/src/main/java/net/onrc/onos/apps/bgproute/PtreeNode.java
+++ b/src/main/java/net/onrc/onos/apps/bgproute/PtreeNode.java
@@ -14,7 +14,7 @@
public int refCount;
public RibEntry rib;
- protected final static Logger log = LoggerFactory.getLogger(BgpRoute.class);
+ private static final Logger log = LoggerFactory.getLogger(BgpRoute.class);
PtreeNode(byte[] key, int key_bits, int max_key_octet) {
parent = null;
diff --git a/src/main/java/net/onrc/onos/apps/bgproute/RestClient.java b/src/main/java/net/onrc/onos/apps/bgproute/RestClient.java
index e0976cc..338b599 100644
--- a/src/main/java/net/onrc/onos/apps/bgproute/RestClient.java
+++ b/src/main/java/net/onrc/onos/apps/bgproute/RestClient.java
@@ -12,7 +12,7 @@
import org.slf4j.LoggerFactory;
public final class RestClient {
- private final static Logger log = LoggerFactory.getLogger(RestClient.class);
+ private static final Logger log = LoggerFactory.getLogger(RestClient.class);
private RestClient() {
// Private constructor to prevent instantiation
diff --git a/src/main/java/net/onrc/onos/apps/bgproute/RibEntry.java b/src/main/java/net/onrc/onos/apps/bgproute/RibEntry.java
index 8e4e12e..ae16c8f 100644
--- a/src/main/java/net/onrc/onos/apps/bgproute/RibEntry.java
+++ b/src/main/java/net/onrc/onos/apps/bgproute/RibEntry.java
@@ -22,7 +22,7 @@
* The user of this class should make sure they don't check this data
* if they don't provide it.
*/
- private final static long NULL_TIME = -1;
+ private static final long NULL_TIME = -1;
public RibEntry(InetAddress routerId, InetAddress nextHop) {
this.routerId = routerId;
diff --git a/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java b/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
index 3ba545c..4624617 100644
--- a/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
+++ b/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
@@ -63,12 +63,12 @@
public class Forwarding implements IOFMessageListener, IFloodlightModule,
IForwardingService, IEventChannelListener<Long, IntentStateList> {
- private final static Logger log = LoggerFactory.getLogger(Forwarding.class);
+ private static final Logger log = LoggerFactory.getLogger(Forwarding.class);
private static final int SLEEP_TIME_FOR_DB_DEVICE_INSTALLED = 100; // milliseconds
- private final static int NUMBER_OF_THREAD_FOR_EXECUTOR = 1;
+ private static final int NUMBER_OF_THREAD_FOR_EXECUTOR = 1;
- private final static ScheduledExecutorService EXECUTOR_SERVICE = Executors.newScheduledThreadPool(NUMBER_OF_THREAD_FOR_EXECUTOR);
+ private static final ScheduledExecutorService EXECUTOR_SERVICE = Executors.newScheduledThreadPool(NUMBER_OF_THREAD_FOR_EXECUTOR);
private final String callerId = "Forwarding";