commit d9df7bd278935c3d72ac6eeb0ff44efe1edde567
author Jonathan Hart <jono@onlab.us> Tue Nov 10 17:10:25 2015 -0800
committer Jonathan Hart <jono@onlab.us> Fri Nov 13 16:28:02 2015 -0800
tree 9310edb5ea8fbbda963b265bfd3821da7fde1298
parent 710293f3afa03540a1fd3be038da0ea6a488765c

Fix naming convention issues in preparation for stricter checkstyle enforcement

Change-Id: I918b7b1dcf6424a526b6b26b89acc9a57d807fec

core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
index 85e67de..a9a9098 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
@@ -1040,7 +1040,7 @@
 
         checkArgument(!providerDescs.isEmpty(), "No device descriptions supplied");
 
-        ProviderId primary = pickPrimaryPID(providerDescs);
+        ProviderId primary = pickPrimaryPid(providerDescs);
 
         DeviceDescriptions desc = providerDescs.get(primary);
 
@@ -1103,7 +1103,7 @@
     private Port composePort(Device device, PortNumber number,
                              Map<ProviderId, DeviceDescriptions> descsMap) {
 
-        ProviderId primary = pickPrimaryPID(descsMap);
+        ProviderId primary = pickPrimaryPid(descsMap);
         DeviceDescriptions primDescs = descsMap.get(primary);
         // if no primary, assume not enabled
         boolean isEnabled = false;
@@ -1149,7 +1149,7 @@
     /**
      * @return primary ProviderID, or randomly chosen one if none exists
      */
-    private ProviderId pickPrimaryPID(
+    private ProviderId pickPrimaryPid(
             Map<ProviderId, DeviceDescriptions> providerDescs) {
         ProviderId fallBackPrimary = null;
         for (Entry<ProviderId, DeviceDescriptions> e : providerDescs.entrySet()) {
@@ -1165,7 +1165,7 @@
 
     private DeviceDescriptions getPrimaryDescriptions(
             Map<ProviderId, DeviceDescriptions> providerDescs) {
-        ProviderId pid = pickPrimaryPID(providerDescs);
+        ProviderId pid = pickPrimaryPid(providerDescs);
         return providerDescs.get(pid);
     }