BUG-2771: String.split() replaced by Guava's Splitter for

1. statistics-manager - following commit
https://git.opendaylight.org/gerrit/#/c/39019/
2. lithium ofplugin test
3. inventoryDataServiceUtil - portNoStringfromNodeConnectorID

Change-Id: If12d09a2b2fb03912cefd6a2851eee77c568f941
Signed-off-by: Shuva Kar <shuva.jyoti.kar@ericsson.com>

diff --git a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/util/ReconcileUtilTest.java b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/util/ReconcileUtilTest.java
index b5d68931b916609f0763fd1d82452d87e0536181..75aa3b23bcd36e0f8dbe863aeff8bbbf99e5336c 100644 (file)
--- a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/util/ReconcileUtilTest.java
+++ b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/util/ReconcileUtilTest.java
@@ -8,6 +8,7 @@
 
 package org.opendaylight.openflowplugin.applications.frsync.util;
 
+import com.google.common.base.Splitter;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
@@ -63,6 +64,7 @@ public class ReconcileUtilTest {
     private static final NodeId NODE_ID = new NodeId("unit-node-id");
     private InstanceIdentifier<Node> NODE_IDENT = InstanceIdentifier.create(Nodes.class)
             .child(Node.class, new NodeKey(NODE_ID));
+    private static final Splitter COMMA_SPLITTER = Splitter.on(",");
 
     @Rule
     public ExpectedException thrown = ExpectedException.none();
@@ -328,8 +330,8 @@ public class ReconcileUtilTest {
 
     private ItemSyncBox<String> createSyncBox(final String pushes, final String updates) {
         ItemSyncBox<String> syncBox1 = new ItemSyncBox<>();
-        syncBox1.getItemsToPush().addAll(Arrays.asList(pushes.split(",")));
-        for (String orig : updates.split(",")) {
+        syncBox1.getItemsToPush().addAll(COMMA_SPLITTER.splitToList(pushes));
+        for (String orig : COMMA_SPLITTER.splitToList(updates)) {
             syncBox1.getItemsToUpdate().add(new ItemSyncBox.ItemUpdateTuple<>(orig, orig + "_updated"));
         }
         return syncBox1;

diff --git a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatNodeRegistrationImpl.java b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatNodeRegistrationImpl.java
index 0b91579b5edc914988b65b7970d2e5dcf0729779..b590f3356eb90ba89feadd77f298454dc5848106 100644 (file)
--- a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatNodeRegistrationImpl.java
+++ b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatNodeRegistrationImpl.java
@@ -245,7 +245,6 @@ public class StatNodeRegistrationImpl implements StatNodeRegistration,EntityOwne
         NodeIdentifierWithPredicates niWPredicates = (NodeIdentifierWithPredicates)yId.getLastPathArgument();
         Map<QName, Object> keyValMap = niWPredicates.getKeyValues();
         String nodeIdStr = (String)(keyValMap.get(ENTITY_NAME));
-        BigInteger dpId = new BigInteger(nodeIdStr.split(":")[1]);
         NodeId nodeId = new NodeId(nodeIdStr);
         setNodeOwnership(nodeId, ownershipChange.isOwner());
     }

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/util/InventoryDataServiceUtil.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/util/InventoryDataServiceUtil.java
index e4cb1c0c85afb33e433384a4f49f9385acad6e2b..fa2b8a8177827c6b6f8f089e15bda6cb957cfeb7 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/util/InventoryDataServiceUtil.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/util/InventoryDataServiceUtil.java
@@ -11,6 +11,8 @@ import com.google.common.base.Optional;
 import java.math.BigInteger;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
+
+import com.google.common.base.Splitter;
 import org.apache.commons.lang3.StringUtils;
 import org.opendaylight.controller.md.sal.binding.api.ReadTransaction;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
@@ -37,6 +39,7 @@ import org.slf4j.LoggerFactory;
 
 public abstract class InventoryDataServiceUtil {
     public static final  String OF_URI_PREFIX = "openflow:";
+    private static final Splitter COLON_SPLITTER = Splitter.on(":");
     private static final Logger LOG = LoggerFactory.getLogger(InventoryDataServiceUtil.class);
 
     /*
@@ -132,13 +135,14 @@ public abstract class InventoryDataServiceUtil {
     }
 
     public static String portNoStringfromNodeConnectorID(final String ncID) {
-       String[] split = ncID.split(":");
+
+        List<String> splitStringList = COLON_SPLITTER.splitToList(ncID);
 
         // It can happen that token length will be just 1 i.e 2 or CONTROLLER
         // If the length is just one then this cannot be the new MD-SAL style node connector Id which
         // is of the form openflow:1:3.
 
-        return split[split.length - 1];
+        return splitStringList.get(splitStringList.size()-1);
     }
 
     public static Long portNumberfromNodeConnectorId(final OpenflowVersion ofVersion, final String ncId) {