Enable checkstyle member and local variable checks
Enable checkstyle member and local variable name checks, and fix any violations that are detected.
Change-Id: I7524635cd39a9627b041e2ff6be169810f63913e
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 b2fcbc0..3c588f2 100644
--- a/src/main/java/net/onrc/onos/apps/bgproute/BgpRoute.java
+++ b/src/main/java/net/onrc/onos/apps/bgproute/BgpRoute.java
@@ -93,21 +93,21 @@
//We need to identify our flows somehow. But like it says in LearningSwitch.java,
//the controller/OS should hand out cookie IDs to prevent conflicts.
- private final long APP_COOKIE = 0xa0000000000000L;
+ private static final long APP_COOKIE = 0xa0000000000000L;
//Cookie for flows that do L2 forwarding within SDN domain to egress routers
- private final long L2_FWD_COOKIE = APP_COOKIE + 1;
+ private static final long L2_FWD_COOKIE = APP_COOKIE + 1;
//Cookie for flows in ingress switches that rewrite the MAC address
- private final long MAC_RW_COOKIE = APP_COOKIE + 2;
+ private static final long MAC_RW_COOKIE = APP_COOKIE + 2;
//Cookie for flows that setup BGP paths
- private final long BGP_COOKIE = APP_COOKIE + 3;
+ private static final long BGP_COOKIE = APP_COOKIE + 3;
//Forwarding uses priority 0, and the mac rewrite entries in ingress switches
//need to be higher priority than this otherwise the rewrite may not get done
- private final short SDNIP_PRIORITY = 10;
- private final short ARP_PRIORITY = 20;
+ private static final short SDNIP_PRIORITY = 10;
+ private static final short ARP_PRIORITY = 20;
- private final short BGP_PORT = 179;
+ private static final short BGP_PORT = 179;
- private final int TOPO_DETECTION_WAIT = 2; //seconds
+ private static final int TOPO_DETECTION_WAIT = 2; //seconds
//Configuration stuff
private List<String> switches;
@@ -347,17 +347,17 @@
response = response.replaceAll("\"", "'");
JSONObject jsonObj = (JSONObject) JSONSerializer.toJSON(response);
- JSONArray rib_json_array = jsonObj.getJSONArray("rib");
- String router_id = jsonObj.getString("router-id");
+ JSONArray ribJsonArray = jsonObj.getJSONArray("rib");
+ String routerId = jsonObj.getString("router-id");
- int size = rib_json_array.size();
+ int size = ribJsonArray.size();
log.info("Retrived RIB of {} entries from BGPd", size);
for (int j = 0; j < size; j++) {
- JSONObject second_json_object = rib_json_array.getJSONObject(j);
- String prefix = second_json_object.getString("prefix");
- String nexthop = second_json_object.getString("nexthop");
+ JSONObject secondJsonObject = ribJsonArray.getJSONObject(j);
+ String prefix = secondJsonObject.getString("prefix");
+ String nexthop = secondJsonObject.getString("nexthop");
//insert each rib entry into the local rib;
String[] substring = prefix.split("/");
@@ -375,7 +375,7 @@
continue;
}
- RibEntry rib = new RibEntry(router_id, nexthop);
+ RibEntry rib = new RibEntry(routerId, nexthop);
try {
ribUpdates.put(new RibUpdate(Operation.UPDATE, p, rib));
@@ -873,18 +873,18 @@
// Reversed BGP flow path for src-TCP-port
flowPath.setFlowId(new FlowId());
- DataPath reverse_dataPath = new DataPath();
+ DataPath reverseDataPath = new DataPath();
- SwitchPort reverse_dstPort = new SwitchPort();
- reverse_dstPort.setDpid(bgpdAttachmentPoint.dpid());
- reverse_dstPort.setPort(bgpdAttachmentPoint.port());
- reverse_dataPath.setDstPort(reverse_dstPort);
+ SwitchPort reverseDstPort = new SwitchPort();
+ reverseDstPort.setDpid(bgpdAttachmentPoint.dpid());
+ reverseDstPort.setPort(bgpdAttachmentPoint.port());
+ reverseDataPath.setDstPort(reverseDstPort);
- SwitchPort reverse_srcPort = new SwitchPort();
- reverse_srcPort.setDpid(new Dpid(peerInterface.getDpid()));
- reverse_srcPort.setPort(new Port(peerInterface.getSwitchPort().port()));
- reverse_dataPath.setSrcPort(reverse_srcPort);
- flowPath.setDataPath(reverse_dataPath);
+ SwitchPort reverseSrcPort = new SwitchPort();
+ reverseSrcPort.setDpid(new Dpid(peerInterface.getDpid()));
+ reverseSrcPort.setPort(new Port(peerInterface.getSwitchPort().port()));
+ reverseDataPath.setSrcPort(reverseSrcPort);
+ flowPath.setDataPath(reverseDataPath);
// reverse the dst IP and src IP addresses
flowEntryMatch.enableDstIPv4Net(srcIPv4Net);
@@ -940,7 +940,7 @@
flowPath.setFlowEntryMatch(flowEntryMatch);
- flowPath.setDataPath(reverse_dataPath);
+ flowPath.setDataPath(reverseDataPath);
log.debug("Reversed ICMP FlowPath: {}", flowPath.toString());
diff --git a/src/main/java/net/onrc/onos/apps/bgproute/PatriciaTrie.java b/src/main/java/net/onrc/onos/apps/bgproute/PatriciaTrie.java
index 817e571..0650012 100644
--- a/src/main/java/net/onrc/onos/apps/bgproute/PatriciaTrie.java
+++ b/src/main/java/net/onrc/onos/apps/bgproute/PatriciaTrie.java
@@ -320,22 +320,22 @@
}
}
- int common_len = i * 8;
+ int commonLen = i * 8;
int boundary = 0;
- if (common_len != key_bits) {
+ if (commonLen != key_bits) {
byte diff = (byte) (node.prefix.getAddress()[i] ^ key[i]);
byte mask = (byte) 0x80;
- int shift_mask = 0;
+ int shiftMask = 0;
- while (common_len < key_bits && ((mask & diff) == 0)) {
+ while (commonLen < key_bits && ((mask & diff) == 0)) {
boundary = 1;
- shift_mask = (mask & 0xff);
- shift_mask >>= 1;
- mask = (byte) shift_mask;
+ shiftMask = (mask & 0xff);
+ shiftMask >>= 1;
+ mask = (byte) shiftMask;
- common_len++;
+ commonLen++;
}
}
@@ -356,10 +356,10 @@
newPrefix[j] = node.prefix.getAddress()[j];
if (boundary != 0)
- newPrefix[j] = (byte) (node.prefix.getAddress()[j] & maskBits[common_len % 8]);
+ newPrefix[j] = (byte) (node.prefix.getAddress()[j] & maskBits[commonLen % 8]);
//return new Node(new Prefix(newPrefix, common_len), null);
- return new Node(new Prefix(newPrefix, common_len));
+ return new Node(new Prefix(newPrefix, commonLen));
//return add;
}
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 b56fa0c..b34364b 100644
--- a/src/main/java/net/onrc/onos/apps/bgproute/Ptree.java
+++ b/src/main/java/net/onrc/onos/apps/bgproute/Ptree.java
@@ -254,26 +254,26 @@
}
}
- int common_len = i * 8;
+ int commonLen = i * 8;
int boundary = 0;
- if (common_len != key_bits) {
+ if (commonLen != key_bits) {
byte diff = (byte) (node.key[i] ^ key[i]);
byte mask = (byte) 0x80;
- int shift_mask = 0;
+ int shiftMask = 0;
- while (common_len < key_bits && ((mask & diff) == 0)) {
+ while (commonLen < key_bits && ((mask & diff) == 0)) {
boundary = 1;
- shift_mask = (mask & 0xff);
- shift_mask >>= 1;
- mask = (byte) shift_mask;
+ shiftMask = (mask & 0xff);
+ shiftMask >>= 1;
+ mask = (byte) shiftMask;
- common_len++;
+ commonLen++;
}
}
- PtreeNode add = new PtreeNode(null, common_len, maxKeyOctets);
+ PtreeNode add = new PtreeNode(null, commonLen, maxKeyOctets);
int j;
for (j = 0; j < i; j++)
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 2ed8ba5..68bfaff 100644
--- a/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
+++ b/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
@@ -65,7 +65,7 @@
IForwardingService, IEventChannelListener<Long, IntentStateList> {
private final static Logger log = LoggerFactory.getLogger(Forwarding.class);
- private final int SLEEP_TIME_FOR_DB_DEVICE_INSTALLED = 100; // milliseconds
+ private static final int SLEEP_TIME_FOR_DB_DEVICE_INSTALLED = 100; // milliseconds
private final static int NUMBER_OF_THREAD_FOR_EXECUTOR = 1;
private final static ScheduledExecutorService executor = Executors.newScheduledThreadPool(NUMBER_OF_THREAD_FOR_EXECUTOR);