commit 5df613bf90ed052fdfc2865cc21fc95de81aa6a2
author Ray Milkey <ray@onlab.us> Tue Apr 15 10:50:56 2014 -0700
committer Ray Milkey <ray@onlab.us> Wed Apr 16 15:38:32 2014 -0700
tree 8f884999c9c96de80bdcc486064f8042b58c66d1
parent 805bc8f086d15fcdce104da7380ce1d41a59f20d

Enable checkstyle rule to catch variables that hide fields

Enable the checkstyle "HiddenFields" rule and fix any issues
that it detects.  Suppress these violations for parameters
to setters and constructors.

Added support for the checkstyle comment suppression module
// CHECKSTYLE:OFF and //CHECKSTYLE:ON are now
supported.

Suppressed HiddenField checks for net.onrc.onos.core.packet.*
rather than fix them.  These APIs are designed to
require formal parameters and local members having
the same name.

Change-Id: Ibc057603a934842d9c9b9b668f55bc5f5519e7f6

src/main/java/net/onrc/onos/apps/bgproute/BgpRoute.java

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 303f198..78f7a61 100644
--- a/src/main/java/net/onrc/onos/apps/bgproute/BgpRoute.java
+++ b/src/main/java/net/onrc/onos/apps/bgproute/BgpRoute.java
@@ -90,7 +90,8 @@
 
     private String bgpdRestIp;
     private String routerId;
-    private String configFilename = "config.json";
+    private static final String DEFAULT_CONFIG_FILENAME = "config.json";
+    private String currentConfigFilename = DEFAULT_CONFIG_FILENAME;
 
     private static final short ARP_PRIORITY = 20;
 
@@ -309,11 +310,11 @@
 
         String configFilenameParameter = context.getConfigParams(this).get("configfile");
         if (configFilenameParameter != null) {
-            configFilename = configFilenameParameter;
+            currentConfigFilename = configFilenameParameter;
         }
-        log.debug("Config file set to {}", configFilename);
+        log.debug("Config file set to {}", currentConfigFilename);
 
-        readConfiguration(configFilename);
+        readConfiguration(currentConfigFilename);
     }
 
     @Override
@@ -356,7 +357,7 @@
         response = response.replaceAll("\"", "'");
         JSONObject jsonObj = (JSONObject) JSONSerializer.toJSON(response);
         JSONArray ribArray = jsonObj.getJSONArray("rib");
-        String routerId = jsonObj.getString("router-id");
+        String inboundRouterId = jsonObj.getString("router-id");
 
         int size = ribArray.size();
 
@@ -383,7 +384,7 @@
                 continue;
             }
 
-            RibEntry rib = new RibEntry(routerId, nexthop);
+            RibEntry rib = new RibEntry(inboundRouterId, nexthop);
 
             try {
                 ribUpdates.put(new RibUpdate(Operation.UPDATE, p, rib));