Enforce naming convention regarding abbreviations
Change-Id: Ic81038d3869268a55624ccbbf66048545158b0da
diff --git a/providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/SnmpDeviceProvider.java b/providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/SnmpDeviceProvider.java
index f18ae72..c2e7f14 100644
--- a/providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/SnmpDeviceProvider.java
+++ b/providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/SnmpDeviceProvider.java
@@ -22,23 +22,6 @@
import com.btisystems.pronx.ems.core.snmp.ISnmpSessionFactory;
import com.btisystems.pronx.ems.core.snmp.SnmpSessionFactory;
import com.btisystems.pronx.ems.core.snmp.V2cSnmpConfiguration;
-import static com.google.common.base.Strings.isNullOrEmpty;
-import java.io.IOException;
-import static org.onlab.util.Tools.delay;
-import static org.onlab.util.Tools.get;
-import static org.onlab.util.Tools.groupedThreads;
-import static org.slf4j.LoggerFactory.getLogger;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Dictionary;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
@@ -63,6 +46,23 @@
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Dictionary;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import static com.google.common.base.Strings.isNullOrEmpty;
+import static org.onlab.util.Tools.delay;
+import static org.onlab.util.Tools.get;
+import static org.onlab.util.Tools.groupedThreads;
+import static org.slf4j.LoggerFactory.getLogger;
+
/**
* Provider which will try to fetch the details of SNMP devices from the core and run a capability discovery on each of
* the device.
@@ -374,10 +374,10 @@
try (ISnmpSession session = sessionFactory.createSession(config, ipAddress)) {
// Each session will be auto-closed.
- String deviceOID = session.identifyDevice();
+ String deviceOid = session.identifyDevice();
- if (providers.containsKey(deviceOID)) {
- desc = providers.get(deviceOID).populateDescription(session, desc);
+ if (providers.containsKey(deviceOid)) {
+ desc = providers.get(deviceOid).populateDescription(session, desc);
}
} catch (IOException | RuntimeException ex) {
@@ -392,10 +392,10 @@
* This will build a device id for the device.
*/
private DeviceId getDeviceId() throws URISyntaxException {
- String additionalSSP = new StringBuilder(
+ String additionalSsp = new StringBuilder(
device.getSnmpHost()).append(":")
.append(device.getSnmpPort()).toString();
- return DeviceId.deviceId(new URI(SCHEME, additionalSSP,
+ return DeviceId.deviceId(new URI(SCHEME, additionalSsp,
null));
}
}