Remove use of StringBuffer

StringBuilder is a faster replacement of StringBuffer, use that
instead.

Change-Id: I68fddef4afb04b0b7fbcd895625abbb7a9133a77
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnServiceChainUtils.java b/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnServiceChainUtils.java
index 51082bc517c12832a2d5b9f01648e6e0e6fb27d7..b2108d91f5f217ca220fb47a22a350051cdbb044 100755 (executable)
--- a/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnServiceChainUtils.java
+++ b/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnServiceChainUtils.java
@@ -475,7 +475,8 @@ public final class VpnServiceChainUtils {
      * this kind of flows.
      */
     public static String getL3VpnToScfLportDispatcherFlowRef(Integer lportTag) {
-        return new StringBuffer(64).append(CloudServiceChainConstants.VPN_PSEUDO_VPN2SCF_FLOWID_PREFIX).append(lportTag)
+        return new StringBuilder(64).append(CloudServiceChainConstants.VPN_PSEUDO_VPN2SCF_FLOWID_PREFIX)
+                                   .append(lportTag)
                                    .append(NwConstants.FLOWID_SEPARATOR)
                                    .append(ServiceIndex.getIndex(NwConstants.SCF_SERVICE_NAME,
                                                                  NwConstants.SCF_SERVICE_INDEX))
@@ -490,7 +491,7 @@ public final class VpnServiceChainUtils {
      *
      */
     public static String getScfToL3VpnLportDispatcherFlowRef(Integer lportTag) {
-        return new StringBuffer().append(CloudServiceChainConstants.VPN_PSEUDO_SCF2VPN_FLOWID_PREFIX).append(lportTag)
+        return new StringBuilder().append(CloudServiceChainConstants.VPN_PSEUDO_SCF2VPN_FLOWID_PREFIX).append(lportTag)
                                  .append(NwConstants.FLOWID_SEPARATOR)
                                  .append(ServiceIndex.getIndex(NwConstants.L3VPN_SERVICE_NAME,
                                                                NwConstants.L3VPN_SERVICE_INDEX))

diff --git a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceUtils.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceUtils.java
index 9d52d641bc603c42c2b8ef32931a348c7efa9386..32bde9e84e814d8256754138c21edde5802325d3 100644 (file)
--- a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceUtils.java
+++ b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceUtils.java
@@ -148,14 +148,14 @@ public final class DhcpServiceUtils {
     }
 
     private static String getDhcpFlowRef(BigInteger dpId, long tableId, String vmMacAddress) {
-        return new StringBuffer().append(DhcpMConstants.FLOWID_PREFIX)
+        return new StringBuilder().append(DhcpMConstants.FLOWID_PREFIX)
                 .append(dpId).append(NwConstants.FLOWID_SEPARATOR)
                 .append(tableId).append(NwConstants.FLOWID_SEPARATOR)
                 .append(vmMacAddress).toString();
     }
 
     private static String getDhcpArpFlowRef(BigInteger dpId, long tableId, long lportTag, String ipAddress) {
-        return new StringBuffer().append(DhcpMConstants.FLOWID_PREFIX)
+        return new StringBuilder().append(DhcpMConstants.FLOWID_PREFIX)
                 .append(dpId).append(NwConstants.FLOWID_SEPARATOR)
                 .append(tableId).append(NwConstants.FLOWID_SEPARATOR)
                 .append(lportTag).append(NwConstants.FLOWID_SEPARATOR)

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceManager.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceManager.java
index ca22678a500e21507ba4e70ba2eb85087fda80c3..e368255f6b96606918af4d7d2cdf622b9febf40d 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceManager.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceManager.java
@@ -1483,7 +1483,7 @@ public class ElanInterfaceManager extends AsyncDataTreeChangeListenerBase<ElanIn
     }
 
     private static String getFlowRef(long tableId, long elanTag, String flowName) {
-        return new StringBuffer().append(tableId).append(NwConstants.FLOWID_SEPARATOR).append(elanTag)
+        return new StringBuilder().append(tableId).append(NwConstants.FLOWID_SEPARATOR).append(elanTag)
                 .append(NwConstants.FLOWID_SEPARATOR).append(flowName).toString();
     }
 

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanNodeListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanNodeListener.java
index fb017ebe082d352e04e0a9b728890590bf00e08c..ed78174704b0984247e67850e7f7ad17b314cc74 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanNodeListener.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanNodeListener.java
@@ -255,7 +255,7 @@ public class ElanNodeListener extends AsyncDataTreeChangeListenerBase<Node, Elan
         mkMatches.add(new NxMatchRegister(NxmNxReg4.class, LEARN_MATCH_REG4_VALUE));
         List<InstructionInfo> mkInstructions = new ArrayList<>();
         mkInstructions.add(new InstructionGotoTable(NwConstants.ELAN_DMAC_TABLE));
-        String flowRef = new StringBuffer().append(NwConstants.ELAN_SMAC_TABLE).append(NwConstants.FLOWID_SEPARATOR)
+        String flowRef = new StringBuilder().append(NwConstants.ELAN_SMAC_TABLE).append(NwConstants.FLOWID_SEPARATOR)
                 .append(LEARN_MATCH_REG4_VALUE).toString();
         FlowEntity flowEntity =
                 MDSALUtil.buildFlowEntity(dpId, NwConstants.ELAN_SMAC_TABLE, flowRef, 10, "ELAN sMac Table Reg4 Flow",

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java
index 8840664ca8c9410feac78e1e679f1897794b4f64..3568592c6396706be65f655e54b438cbe90ef600 100755 (executable)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java
@@ -679,7 +679,7 @@ public class ElanUtils {
      * @return the Internal tunnel
      */
     public static String getIntTunnelTableFlowRef(short tableId, int elanTag) {
-        return new StringBuffer().append(tableId).append(elanTag).toString();
+        return new StringBuilder().append(tableId).append(elanTag).toString();
     }
 
     /**

diff --git a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTest.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTest.java
index 4c3fe7985bbeb787f885b3cd9c2f1c4f57416cf0..bff5b4ed2d9746dbda4011c487c4b780de6e6936 100644 (file)
--- a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTest.java
+++ b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTest.java
@@ -139,7 +139,7 @@ public class ElanServiceTest extends  ElanServiceTestBase {
     private @Inject CacheProvider cacheProvider;
 
     private L2GatewayListener l2gwListener;
-    private MetricProvider metricProvider = new TestMetricProviderImpl();
+    private final MetricProvider metricProvider = new TestMetricProviderImpl();
 
     private Verifications verifications;
     private L2gwBuilders l2gwBuilders;
@@ -210,7 +210,7 @@ public class ElanServiceTest extends  ElanServiceTestBase {
         awaitForData(LogicalDatastoreType.CONFIGURATION, l2gwBuilders.buildL2gwIid(l2gwName));
 
         //Create l2gwconn
-        singleTxdataBroker.syncWrite(dataBroker, LogicalDatastoreType.CONFIGURATION,
+        SingleTransactionDataBroker.syncWrite(dataBroker, LogicalDatastoreType.CONFIGURATION,
                 l2gwBuilders.buildConnectionIid(connectionName), l2gwBuilders.buildConnection(connectionName,
                         l2gwName, ExpectedObjects.ELAN1, 100));
         awaitForData(LogicalDatastoreType.CONFIGURATION, l2gwBuilders.buildConnectionIid(connectionName));
@@ -231,7 +231,7 @@ public class ElanServiceTest extends  ElanServiceTestBase {
         ElanInstance actualElanInstances = singleTxdataBroker.syncRead(CONFIGURATION, elanInstanceIid);
 
         // Read and Compare SMAC flow
-        String flowId =  new StringBuffer()
+        String flowId = new StringBuilder()
                 .append(NwConstants.ELAN_SMAC_TABLE)
                 .append(actualElanInstances.getElanTag())
                 .append(DPN1_ID)
@@ -264,7 +264,7 @@ public class ElanServiceTest extends  ElanServiceTestBase {
         ElanInstance actualElanInstances = singleTxdataBroker.syncRead(CONFIGURATION, elanInstanceIid);
 
         // Read DMAC Flow in DPN1
-        String flowId =  new StringBuffer()
+        String flowId = new StringBuilder()
                 .append(NwConstants.ELAN_DMAC_TABLE)
                 .append(actualElanInstances.getElanTag())
                 .append(DPN1_ID)

diff --git a/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6ServiceUtils.java b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6ServiceUtils.java
index 17049240d7b61b7ffc8b37bd1840fb3cb0eac78c..0d0069a68b23f59a1110c5ea47f8c756e801ed59 100644 (file)
--- a/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6ServiceUtils.java
+++ b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6ServiceUtils.java
@@ -199,7 +199,7 @@ public class Ipv6ServiceUtils {
     }
 
     private static String getIPv6FlowRef(BigInteger dpId, Long elanTag, String flowType) {
-        return new StringBuffer().append(Ipv6ServiceConstants.FLOWID_PREFIX)
+        return new StringBuilder().append(Ipv6ServiceConstants.FLOWID_PREFIX)
                 .append(dpId).append(Ipv6ServiceConstants.FLOWID_SEPARATOR)
                 .append(elanTag).append(Ipv6ServiceConstants.FLOWID_SEPARATOR)
                 .append(flowType).toString();

diff --git a/vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnSubnetRouteHandlerTest.java b/vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnSubnetRouteHandlerTest.java
index fb435aa874c89655c39070f3007d5f3763d2e4f5..b8c562fb9d95503687511cdadf4b36fcdacef2dd 100644 (file)
--- a/vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnSubnetRouteHandlerTest.java
+++ b/vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnSubnetRouteHandlerTest.java
@@ -8,7 +8,7 @@
 
 package org.opendaylight.netvirt.vpnmanager.test;
 
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -414,7 +414,7 @@ public class VpnSubnetRouteHandlerTest {
     }
 
     public static String buildNodeConnectorString(BigInteger dpn, long portNo) {
-        return new StringBuffer().append(IfmConstants.OF_URI_PREFIX).append(dpn)
+        return new StringBuilder().append(IfmConstants.OF_URI_PREFIX).append(dpn)
             .append(IfmConstants.OF_URI_SEPARATOR).append(portNo).toString();
     }