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

cli/src/main/java/org/onosproject/cli/net/ConnectivityIntentCommand.java

diff --git a/cli/src/main/java/org/onosproject/cli/net/ConnectivityIntentCommand.java b/cli/src/main/java/org/onosproject/cli/net/ConnectivityIntentCommand.java
index a33af76..fbce964 100644
--- a/cli/src/main/java/org/onosproject/cli/net/ConnectivityIntentCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/ConnectivityIntentCommand.java
@@ -15,12 +15,6 @@
  */
 package org.onosproject.cli.net;
 
-import static com.google.common.base.Strings.isNullOrEmpty;
-import static org.onosproject.net.flow.DefaultTrafficTreatment.builder;
-
-import java.util.LinkedList;
-import java.util.List;
-
 import org.apache.karaf.shell.commands.Option;
 import org.onlab.packet.Ip6Address;
 import org.onlab.packet.IpAddress;
@@ -47,6 +41,12 @@
 import org.onosproject.net.intent.constraint.PartialFailureConstraint;
 import org.onosproject.net.resource.link.BandwidthResource;
 
+import java.util.LinkedList;
+import java.util.List;
+
+import static com.google.common.base.Strings.isNullOrEmpty;
+import static org.onosproject.net.flow.DefaultTrafficTreatment.builder;
+
 /**
  * Base class for command line operations for connectivity based intents.
  */
@@ -99,11 +99,11 @@
 
     @Option(name = "--ndSLL", description = "IPv6 Neighbor Discovery Source Link-Layer",
             required = false, multiValued = false)
-    private String ndSLLString = null;
+    private String ndSllString = null;
 
     @Option(name = "--ndTLL", description = "IPv6 Neighbor Discovery Target Link-Layer",
             required = false, multiValued = false)
-    private String ndTLLString = null;
+    private String ndTllString = null;
 
     @Option(name = "--tcpSrc", description = "Source TCP Port",
             required = false, multiValued = false)
@@ -264,12 +264,12 @@
             selectorBuilder.matchIPv6NDTargetAddress(Ip6Address.valueOf(ndTargetString));
         }
 
-        if (!isNullOrEmpty(ndSLLString)) {
-            selectorBuilder.matchIPv6NDSourceLinkLayerAddress(MacAddress.valueOf(ndSLLString));
+        if (!isNullOrEmpty(ndSllString)) {
+            selectorBuilder.matchIPv6NDSourceLinkLayerAddress(MacAddress.valueOf(ndSllString));
         }
 
-        if (!isNullOrEmpty(ndTLLString)) {
-            selectorBuilder.matchIPv6NDTargetLinkLayerAddress(MacAddress.valueOf(ndTLLString));
+        if (!isNullOrEmpty(ndTllString)) {
+            selectorBuilder.matchIPv6NDTargetLinkLayerAddress(MacAddress.valueOf(ndTllString));
         }
 
         if (!isNullOrEmpty(srcTcpString)) {