From: Robert Varga Date: Fri, 21 Jun 2019 05:58:26 +0000 (+0200) Subject: Remove use of StringBuffer X-Git-Tag: release/sodium~27 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=e045f53e199e25cdd37601c34dfbbe011684153e;p=netvirt.git Remove use of StringBuffer StringBuilder is a faster replacement of StringBuffer, use that instead. Change-Id: I68fddef4afb04b0b7fbcd895625abbb7a9133a77 Signed-off-by: Robert Varga --- 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 51082bc517..b2108d91f5 100755 --- 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 9d52d641bc..32bde9e84e 100644 --- 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 ca22678a50..e368255f6b 100644 --- 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 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 8840664ca8..3568592c63 100755 --- 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 4c3fe7985b..bff5b4ed2d 100644 --- 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 17049240d7..0d0069a68b 100644 --- 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 fb435aa874..b8c562fb9d 100644 --- 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(); }