Cleanup: use plain String concatenation 76/48176/4
authorStephen Kitt <skitt@redhat.com>
Wed, 9 Nov 2016 16:25:18 +0000 (17:25 +0100)
committerStephen Kitt <skitt@redhat.com>
Thu, 10 Nov 2016 17:15:16 +0000 (18:15 +0100)
This is the most efficient method of String construction nowadays for
straightfoward concatenation.

Change-Id: I1279ccb58c6cbdcb88ca3a66e768a7649a755651
Signed-off-by: Stephen Kitt <skitt@redhat.com>
21 files changed:
alivenessmonitor/alivenessmonitor-impl/src/main/java/org/opendaylight/genius/alivenessmonitor/internal/AlivenessMonitor.java
alivenessmonitor/alivenessmonitor-impl/src/main/java/org/opendaylight/genius/alivenessmonitor/internal/AlivenessProtocolHandlerARP.java
alivenessmonitor/alivenessmonitor-impl/src/main/java/org/opendaylight/genius/alivenessmonitor/internal/AlivenessProtocolHandlerLLDP.java
alivenessmonitor/alivenessmonitor-impl/src/main/java/org/opendaylight/genius/alivenessmonitor/internal/HwVtepTunnelsStateHandler.java
idmanager/idmanager-impl/src/test/java/org/opendaylight/genius/idmanager/test/IdManagerTest.java
interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/commons/InterfaceManagerCommonUtils.java
interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/listeners/InterfaceConfigListener.java
interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/listeners/InterfaceInventoryStateListener.java
interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/hwvtep/utilities/SouthboundUtils.java
interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/rpcservice/InterfaceManagerRpcService.java
interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/utilities/FlowBasedServicesUtils.java
interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestUtil.java
itm/itm-impl/src/main/java/org/opendaylight/genius/itm/cli/TepCommandHelper.java
itm/itm-impl/src/main/java/org/opendaylight/genius/itm/cli/VtepSchemaShow.java
itm/itm-impl/src/main/java/org/opendaylight/genius/itm/impl/ItmUtils.java
itm/itm-impl/src/main/java/org/opendaylight/genius/itm/listeners/VtepConfigSchemaListener.java
itm/itm-impl/src/main/java/org/opendaylight/genius/itm/monitoring/ItmTunnelEventListener.java
itm/itm-impl/src/main/java/org/opendaylight/genius/itm/rpc/ItmManagerRpcService.java
mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/MatchFieldType.java
mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/hwvtep/HwvtepSouthboundUtils.java
mdsalutil/mdsalutil-impl/src/test/java/org/opendaylight/genius/test/MdSalUtilTest.java

index f095039f6ee75bd9a323bde27f2e8891d40b3910..37dfbcbf1992ef51bf7568af50d20ed9f961c66f 100644 (file)
@@ -1063,10 +1063,10 @@ public class AlivenessMonitor implements AlivenessMonitorService, PacketProcessi
 
     private String getUniqueProfileKey(Long failureThreshold, Long monitorInterval, Long monitorWindow,
                                        EtherTypes ethType) {
-        return new StringBuilder().append(failureThreshold).append(AlivenessMonitorConstants.SEPERATOR)
-                                  .append(monitorInterval).append(AlivenessMonitorConstants.SEPERATOR)
-                                  .append(monitorWindow).append(AlivenessMonitorConstants.SEPERATOR)
-                                  .append(ethType).append(AlivenessMonitorConstants.SEPERATOR).toString();
+        return String.valueOf(failureThreshold) + AlivenessMonitorConstants.SEPERATOR +
+                monitorInterval + AlivenessMonitorConstants.SEPERATOR +
+                monitorWindow + AlivenessMonitorConstants.SEPERATOR +
+                ethType + AlivenessMonitorConstants.SEPERATOR;
     }
 
     @Override
index 108c1e96b89f49aae120433126dd06d7fd6791a6..4c4d9e9f449429b7b809237700ad553401ebf4bf 100644 (file)
@@ -187,8 +187,8 @@ public class AlivenessProtocolHandlerARP extends AbstractAlivenessProtocolHandle
     }
 
     private String getMonitoringKey(String interfaceName, String sourceIp, String targetIp) {
-        return new StringBuilder().append(interfaceName).append(SEPERATOR).append(sourceIp)
-                .append(SEPERATOR).append(targetIp).append(SEPERATOR).append(EtherTypes.Arp).toString();
+        return interfaceName + SEPERATOR + sourceIp +
+                SEPERATOR + targetIp + SEPERATOR + EtherTypes.Arp;
     }
 
     private String getIpAddress(EndpointType source) {
index a7edf665d7e8d5bfd7c6f5601e70b32cb949a2ca..c0387f6590f8d3245ab2270f1343e0699e367060 100644 (file)
@@ -113,7 +113,7 @@ public class AlivenessProtocolHandlerLLDP extends AbstractAlivenessProtocolHandl
         }
 
         if(!Strings.isNullOrEmpty(interfaceName)) {
-            String monitorKey = new StringBuilder().append(interfaceName).append(EtherTypes.LLDP).toString();
+            String monitorKey = interfaceName + EtherTypes.LLDP;
             return monitorKey;
         } else {
             LOG.debug("No associated interface found to handle received LLDP Packet");
@@ -266,7 +266,7 @@ public class AlivenessProtocolHandlerLLDP extends AbstractAlivenessProtocolHandl
     @Override
     public String getUniqueMonitoringKey(MonitoringInfo monitorInfo) {
         String interfaceName = getInterfaceName(monitorInfo.getSource().getEndpointType());
-        return new StringBuilder().append(interfaceName).append(EtherTypes.LLDP).toString();
+        return interfaceName + EtherTypes.LLDP;
     }
 
     private String getInterfaceName(EndpointType endpoint) {
index 64fcc0182a14a5dcbbd5b231939fa5f511cfba32..4d38f49eca4bb3e274a923d2bfaab56447659175 100644 (file)
@@ -341,7 +341,7 @@ public class HwVtepTunnelsStateHandler extends HwvtepAbstractDataTreeChangeListe
     }
 
     private String getBfdMonitorKey(String interfaceName) {
-        return new StringBuilder().append(interfaceName).append("bfd").toString();
+        return interfaceName + "bfd";
     }
 
     private String getInterfaceName(EndpointType endpoint) {
index 1e34ecae9f2b7cdc1702858e2823b9fa197784a1..9762d581d6bf6d77f9bc2e64e8c03e4ba699358a 100644 (file)
@@ -118,7 +118,7 @@ public class IdManagerTest {
     }
 
     private String getLocalPoolName(String poolName) {
-        return new StringBuilder(poolName).append(".").append(BLADE_ID).toString();
+        return poolName + "." + BLADE_ID;
     }
 
     private void setupMocks(List<IdPool> idPools) {
index 75fdc04d0dfe2f85f577d9600db2d433ad5a04b4..0fc48f3473f35fbf98d43b6523a61c3bc2e0bc31 100644 (file)
@@ -218,7 +218,7 @@ public class InterfaceManagerCommonUtils {
     }
 
     public static String getTunnelInterfaceFlowRef(BigInteger dpnId, short tableId, String ifName) {
-        return new StringBuilder().append(dpnId).append(tableId).append(ifName).toString();
+        return String.valueOf(dpnId) + tableId + ifName;
     }
 
     public static void setOpStateForInterface(DataBroker broker, String interfaceName,
index 18e1683ddc28a86151cd7973451cf7d82f6c1208..cc6da35cc1d63c5be74b85469979ed7912ef238f 100644 (file)
@@ -135,10 +135,9 @@ public class InterfaceConfigListener extends AsyncClusteredDataTreeChangeListene
 
     private static ParentRefs updateParentInterface(boolean isTunnelInterface, ParentRefs parentRefs) {
         if (!isTunnelInterface && parentRefs.getDatapathNodeIdentifier() != null) {
-            StringBuilder parentInterface = new StringBuilder(parentRefs.getDatapathNodeIdentifier().toString());
-            parentInterface.append(IfmConstants.OF_URI_SEPARATOR);
-            parentInterface.append(parentRefs.getParentInterface());
-            parentRefs = new ParentRefsBuilder(parentRefs).setParentInterface(parentInterface.toString()).build();
+            String parentInterface = parentRefs.getDatapathNodeIdentifier().toString() + IfmConstants.OF_URI_SEPARATOR +
+                    parentRefs.getParentInterface();
+            parentRefs = new ParentRefsBuilder(parentRefs).setParentInterface(parentInterface).build();
         }
         return parentRefs;
     }
index 2a962b601d9a6d7b3950fdcb1de561bc938c50e6..f4e489ec8a2f978fbc46cca62f0e3ad5330262b1 100644 (file)
@@ -154,10 +154,9 @@ public class InterfaceInventoryStateListener extends AsyncClusteredDataTreeChang
     }
 
     private String getDpnPrefixedPortName(NodeConnectorId nodeConnectorId, String portName) {
-        portName = new StringBuilder(
-                (IfmUtil.getDpnFromNodeConnectorId(nodeConnectorId)).toString())
-                        .append(IfmConstants.OF_URI_SEPARATOR)
-                        .append(portName).toString();
+        portName = (IfmUtil.getDpnFromNodeConnectorId(nodeConnectorId)).toString() +
+                IfmConstants.OF_URI_SEPARATOR +
+                portName;
         return portName;
     }
     private class InterfaceStateAddWorker implements Callable {
index 970ab5dc5ca0e638702e8e3b3f9575ee0eef0124..fe4f9f5c2d8ca60de3ed10e57be3818cdc6e1b87 100644 (file)
@@ -134,8 +134,8 @@ public class SouthboundUtils {
     public static String getTerminationPointKeyString(String ipAddress) {
         String tpKeyStr = null;
         if(ipAddress != null) {
-            tpKeyStr = new StringBuilder(TEP_PREFIX).
-                    append(ipAddress).toString();
+            tpKeyStr = TEP_PREFIX +
+                    ipAddress;
         }
         return tpKeyStr;
     }
index a8d4ca1f575f0634fc34a12277e4f6442cfc9753..304f76816527aaea3e7f6b3d3b98bf09e04e4582 100644 (file)
@@ -497,7 +497,7 @@ public class InterfaceManagerRpcService implements OdlInterfaceRpcService {
     }
 
     private String getFlowRef(BigInteger dpnId, short tableId, BigInteger tunnelKey) {
-        return new StringBuffer().append(IfmConstants.TUNNEL_TABLE_FLOWID_PREFIX).append(dpnId).append(NwConstants.FLOWID_SEPARATOR)
-                .append(tableId).append(NwConstants.FLOWID_SEPARATOR).append(tunnelKey).toString();
+        return IfmConstants.TUNNEL_TABLE_FLOWID_PREFIX + dpnId + NwConstants.FLOWID_SEPARATOR +
+                tableId + NwConstants.FLOWID_SEPARATOR + tunnelKey;
     }
 }
index cc9ea077d63a597b752b829a14bfc70a6782fda3..a7851c1e6b0de6f4b6f5b1a4fc81a033cc51ba70 100644 (file)
@@ -454,8 +454,8 @@ public class FlowBasedServicesUtils {
     }
 
     private static String getFlowRef(BigInteger dpnId, short tableId, String iface, BoundServices service, short currentServiceIndex) {
-        return new StringBuffer().append(dpnId).append(tableId).append(NwConstants.FLOWID_SEPARATOR)
-                .append(iface).append(NwConstants.FLOWID_SEPARATOR).append(currentServiceIndex).toString();
+        return String.valueOf(dpnId) + tableId + NwConstants.FLOWID_SEPARATOR +
+                iface + NwConstants.FLOWID_SEPARATOR + currentServiceIndex;
     }
 
     private static String getSplitHorizonFlowRef(BigInteger dpnId, short tableId, String iface, short currentServiceIndex, BigInteger shFlag) {
index 90cc2771a506d5e15b405adb0bb091cfcda1a2fb..609a7d518d0035f0f6e489d221668fabc70b7cce 100644 (file)
@@ -233,8 +233,8 @@ public class InterfaceManagerTestUtil {
     }
 
     public static String buildFlowRef(BigInteger dpnId, short tableId, String iface, short currentServiceIndex) {
-        return new StringBuffer().append(dpnId).append(tableId).append(NwConstants.FLOWID_SEPARATOR)
-                .append(iface).append(NwConstants.FLOWID_SEPARATOR).append(currentServiceIndex).toString();
+        return String.valueOf(dpnId) + tableId + NwConstants.FLOWID_SEPARATOR +
+                iface + NwConstants.FLOWID_SEPARATOR + currentServiceIndex;
     }
 
     public static NodeConnector buildNodeConnector(NodeConnectorId ncId) {
@@ -267,9 +267,9 @@ public class InterfaceManagerTestUtil {
     }
 
     public static String buildNodeConnectorString(BigInteger dpn, long portNo){
-        return new StringBuffer().append(IfmConstants.OF_URI_PREFIX).
-                append(dpn).append(IfmConstants.OF_URI_SEPARATOR).
-                append(portNo).toString();
+        return IfmConstants.OF_URI_PREFIX +
+                dpn + IfmConstants.OF_URI_SEPARATOR +
+                portNo;
     }
 
     public static InstanceIdentifier<BridgeInterfaceEntry> buildBridgeEntryId(BigInteger dpn, String interfaceName){
index 008d3324bf6753e62ee0177c4cf20c8407c0dd4b..db59e4ff3e89ca67563061fa7a8f9d4c2804bcc7 100644 (file)
@@ -225,9 +225,8 @@ public class TepCommandHelper {
         if (isConfiguredTepGreType && isGreType) {
             for (Vteps vtep : vtepList) {
                 if (vtep.getDpnId().equals(dpnId)) {
-                    String errMsg = new StringBuilder("DPN [").append(dpnId)
-                            .append("] already configured with GRE TEP. Mutiple GRE TEP's on a single DPN are not allowed.")
-                            .toString();
+                    String errMsg = "DPN [" + dpnId +
+                            "] already configured with GRE TEP. Mutiple GRE TEP's on a single DPN are not allowed.";
                     Preconditions.checkArgument(false, errMsg);
                 }
             }
@@ -822,10 +821,10 @@ public void showCache(String cacheName) {
         // if (tZone != null) {
         if (tZoneFromConfigDS != null) {
             if( (!tZoneFromConfigDS.getTunnelType().equals(tunType))  && ItmUtils.isNotEmpty(tZoneFromConfigDS.getSubnets())) {
-                String errorMsg = new StringBuilder("Changing the tunnel type from ").append(tZoneFromConfigDS.getTunnelType())
-                        .append(" to ").append(strTunnelType)
-                        .append(" is not allowed for already configured transport zone [").append(tZoneName)
-                        .append("].").toString();
+                String errorMsg = "Changing the tunnel type from " + tZoneFromConfigDS.getTunnelType() +
+                        " to " + strTunnelType +
+                        " is not allowed for already configured transport zone [" + tZoneName +
+                        "].";
                 Preconditions.checkArgument(false, errorMsg);
             }
         }
index c167da843cd0d67cd4add2b531db35d457b3365c..c0bf3699752ea4f7f9ce040ca2598987db7db23a 100644 (file)
@@ -165,11 +165,11 @@ public class VtepSchemaShow extends OsgiCommandSupport {
      * @return the vtep config schema header output
      */
     private String getHeaderOutput() {
-        StringBuilder headerBuilder = new StringBuilder();
-        headerBuilder.append(String.format(VTEP_CONFIG_SCHEMA_CLI_FORMAT, "SchemaName", "PortName", "VlanID", "Subnet",
-                "GatewayIP", "TransportZone", "TunnelType", "DPN-IDS", "ExcludeIpFilter"));
-        headerBuilder.append('\n');
-        headerBuilder.append(HEADER_UNDERLINE);
-        return headerBuilder.toString();
+        String headerBuilder =
+                String.format(VTEP_CONFIG_SCHEMA_CLI_FORMAT, "SchemaName", "PortName", "VlanID", "Subnet",
+                        "GatewayIP", "TransportZone", "TunnelType", "DPN-IDS", "ExcludeIpFilter") +
+                        '\n' +
+                        HEADER_UNDERLINE;
+        return headerBuilder;
     }
 }
index 1cb5fea849beb32036a8c3e730e7eefb8e704d6e..1ba95ae6b7927eeb3da11157e5f4ee9cdc670e33 100644 (file)
@@ -458,7 +458,7 @@ public class ItmUtils {
     }
 
     private static String getFlowRef(long termSvcTable, int svcId) {
-        return new StringBuffer().append(termSvcTable).append(svcId).toString();
+        return String.valueOf(termSvcTable) + svcId;
     }
     public static InstanceIdentifier<VtepConfigSchema> getVtepConfigSchemaIdentifier(String schemaName) {
         return InstanceIdentifier.builder(VtepConfigSchemas.class)
@@ -482,8 +482,8 @@ public class ItmUtils {
             if (!StringUtils.equalsIgnoreCase(schema.getSchemaName(), existingSchema.getSchemaName())
                     && schema.getSubnet().equals(existingSchema.getSubnet())) {
                 String subnetCidr = getSubnetCidrAsString(schema.getSubnet());
-                Preconditions.checkArgument(false, new StringBuilder("VTEP schema with subnet [").append(subnetCidr)
-                        .append("] already exists. Multiple VTEP schemas with same subnet is not allowed.").toString());
+                Preconditions.checkArgument(false, "VTEP schema with subnet [" + subnetCidr +
+                        "] already exists. Multiple VTEP schemas with same subnet is not allowed.");
             }
         }
         if (isNotEmpty(getDpnIdList(validSchema.getDpnIds()))) {
@@ -492,9 +492,8 @@ public class ItmUtils {
                     getDpnIdList(validSchema.getDpnIds()), existingSchemas);
             if (!lstDpns.isEmpty()) {
                 Preconditions.checkArgument(false,
-                        new StringBuilder("DPN's ").append(lstDpns).append(" already configured for transport zone ")
-                                .append(tzone).append(". Only one end point per transport Zone per Dpn is allowed.")
-                                .toString());
+                        "DPN's " + lstDpns + " already configured for transport zone " +
+                                tzone + ". Only one end point per transport Zone per Dpn is allowed.");
             }
             if (schema.getTunnelType().equals(TunnelTypeGre.class)){
                 validateForSingleGreTep(validSchema.getSchemaName(), getDpnIdList(validSchema.getDpnIds()), existingSchemas);
@@ -510,9 +509,8 @@ public class ItmUtils {
                 List<BigInteger> lstConflictingDpns = new ArrayList<>(getDpnIdList(existingSchema.getDpnIds()));
                 lstConflictingDpns.retainAll(emptyIfNull(lstDpnsForAdd));
                 if (!lstConflictingDpns.isEmpty()) {
-                    String errMsg = new StringBuilder("DPN's ").append(lstConflictingDpns)
-                            .append(" already configured with GRE TEP. Mutiple GRE TEP's on a single DPN are not allowed.")
-                            .toString();
+                    String errMsg = "DPN's " + lstConflictingDpns +
+                            " already configured with GRE TEP. Mutiple GRE TEP's on a single DPN are not allowed.";
                     Preconditions.checkArgument(false, errMsg);
                 }
             }
@@ -532,8 +530,8 @@ public class ItmUtils {
         if (gatewayIp != null) {
             String strGatewayIp = String.valueOf(gatewayIp.getValue());
             if (!strGatewayIp.equals(ITMConstants.DUMMY_IP_ADDRESS) && !subnetUtils.getInfo().isInRange(strGatewayIp)) {
-                Preconditions.checkArgument(false, new StringBuilder("Gateway IP address ").append(strGatewayIp)
-                        .append(" is not in subnet range ").append(subnetCidr).toString());
+                Preconditions.checkArgument(false, "Gateway IP address " + strGatewayIp +
+                        " is not in subnet range " + subnetCidr);
             }
         }
         ItmUtils.getExcludeIpAddresses(schema.getExcludeIpFilter(), subnetUtils.getInfo());
@@ -544,9 +542,8 @@ public class ItmUtils {
             tunnelType = ITMConstants.TUNNEL_TYPE_VXLAN;
         } else {
             tunnelType = StringUtils.upperCase(tunnelType);
-            String error = new StringBuilder("Invalid tunnel type. Valid values: ")
-                    .append(ITMConstants.TUNNEL_TYPE_VXLAN).append(" | ").append(ITMConstants.TUNNEL_TYPE_GRE)
-                    .toString();
+            String error = "Invalid tunnel type. Valid values: " +
+                    ITMConstants.TUNNEL_TYPE_VXLAN + " | " + ITMConstants.TUNNEL_TYPE_GRE;
             Preconditions.checkArgument(ITMConstants.TUNNEL_TYPE_VXLAN.equals(tunnelType)
                     || ITMConstants.TUNNEL_TYPE_GRE.equals(tunnelType), error);
         }
@@ -595,23 +592,20 @@ public class ItmUtils {
                 String strStartIp = StringUtils.trim(arrIpRange[0]);
                 String strEndIp = StringUtils.trim(arrIpRange[1]);
                 Preconditions.checkArgument(InetAddresses.isInetAddress(strStartIp),
-                        new StringBuilder("Invalid exclude IP filter: invalid IP address value ").append(strStartIp)
-                                .toString());
+                        "Invalid exclude IP filter: invalid IP address value " + strStartIp);
                 Preconditions.checkArgument(InetAddresses.isInetAddress(strEndIp),
-                        new StringBuilder("Invalid exclude IP filter: invalid IP address value ").append(strEndIp)
-                                .toString());
+                        "Invalid exclude IP filter: invalid IP address value " + strEndIp);
                 Preconditions.checkArgument(subnetInfo.isInRange(strStartIp),
-                        new StringBuilder("Invalid exclude IP filter: IP address [").append(strStartIp)
-                                .append("] not in subnet range ").append(subnetInfo.getCidrSignature()).toString());
+                        "Invalid exclude IP filter: IP address [" + strStartIp +
+                                "] not in subnet range " + subnetInfo.getCidrSignature());
                 Preconditions.checkArgument(subnetInfo.isInRange(strEndIp),
-                        new StringBuilder("Invalid exclude IP filter: IP address [").append(strEndIp)
-                                .append("] not in subnet range ").append(subnetInfo.getCidrSignature()).toString());
+                        "Invalid exclude IP filter: IP address [" + strEndIp +
+                                "] not in subnet range " + subnetInfo.getCidrSignature());
                 int startIp = subnetInfo.asInteger(strStartIp);
                 int endIp = subnetInfo.asInteger(strEndIp);
 
                 Preconditions.checkArgument(startIp < endIp,
-                        new StringBuilder("Invalid exclude IP filter: Invalid range [").append(ip).append("] ")
-                                .toString());
+                        "Invalid exclude IP filter: Invalid range [" + ip + "] ");
                 for (int i = startIp; i <= endIp; i++) {
                     String ipAddress = ipFormat(toIpArray(i));
                     validateAndAddIpAddressToList(subnetInfo, lstIpAddress, ipAddress);
@@ -626,10 +620,10 @@ public class ItmUtils {
                                                       String ipAddress) {
         String ip = StringUtils.trim(ipAddress);
         Preconditions.checkArgument(InetAddresses.isInetAddress(ip),
-                new StringBuilder("Invalid exclude IP filter: invalid IP address value ").append(ip).toString());
+                "Invalid exclude IP filter: invalid IP address value " + ip);
         Preconditions.checkArgument(subnetInfo.isInRange(ip),
-                new StringBuilder("Invalid exclude IP filter: IP address [").append(ip).append("] not in subnet range ")
-                        .append(subnetInfo.getCidrSignature()).toString());
+                "Invalid exclude IP filter: IP address [" + ip + "] not in subnet range " +
+                        subnetInfo.getCidrSignature());
         lstIpAddress.add(new IpAddress(ip.toCharArray()));
     }
     private static int[] toIpArray(int val) {
@@ -655,13 +649,12 @@ public class ItmUtils {
         if ((lstDpnsForAdd == null || lstDpnsForAdd.isEmpty())
                 && (lstDpnsForDelete == null || lstDpnsForDelete.isEmpty())) {
             Preconditions.checkArgument(false,
-                    new StringBuilder("DPN ID list for add | delete is null or empty in schema ").append(schemaName)
-                            .toString());
+                    "DPN ID list for add | delete is null or empty in schema " + schemaName);
         }
         VtepConfigSchema schema = itmProvider.getVtepConfigSchema(schemaName);
         if (schema == null) {
-            Preconditions.checkArgument(false, new StringBuilder("Specified VTEP Schema [").append(schemaName)
-                    .append("] doesn't exists!").toString());
+            Preconditions.checkArgument(false, "Specified VTEP Schema [" + schemaName +
+                    "] doesn't exists!");
         }
         List<BigInteger> existingDpnIds = getDpnIdList(schema.getDpnIds());
         if (isNotEmpty(lstDpnsForAdd)) {
@@ -669,8 +662,8 @@ public class ItmUtils {
             List<BigInteger> lstAlreadyExistingDpns = new ArrayList<>(existingDpnIds);
             lstAlreadyExistingDpns.retainAll(lstDpnsForAdd);
             Preconditions.checkArgument(lstAlreadyExistingDpns.isEmpty(),
-                    new StringBuilder("DPN ID's ").append(lstAlreadyExistingDpns)
-                            .append(" already exists in VTEP schema [").append(schemaName).append("]").toString());
+                    "DPN ID's " + lstAlreadyExistingDpns +
+                            " already exists in VTEP schema [" + schemaName + "]");
             //    }
             if (schema.getTunnelType().equals(TunnelTypeGre.class)) {
                 validateForSingleGreTep(schema.getSchemaName(), lstDpnsForAdd, itmProvider.getAllVtepConfigSchemas());
@@ -678,17 +671,17 @@ public class ItmUtils {
         }
         if (isNotEmpty(lstDpnsForDelete)) {
             if (existingDpnIds == null || existingDpnIds.isEmpty()) {
-                StringBuilder builder = new StringBuilder("DPN ID's ").append(lstDpnsForDelete)
-                        .append(" specified for delete from VTEP schema [").append(schemaName)
-                        .append("] are not configured in the schema.");
-                Preconditions.checkArgument(false, builder.toString());
+                String builder = "DPN ID's " + lstDpnsForDelete +
+                        " specified for delete from VTEP schema [" + schemaName +
+                        "] are not configured in the schema.";
+                Preconditions.checkArgument(false, builder);
             } else if (!existingDpnIds.containsAll(lstDpnsForDelete)) {
                 List<BigInteger> lstConflictingDpns = new ArrayList<>(lstDpnsForDelete);
                 lstConflictingDpns.removeAll(existingDpnIds);
-                StringBuilder builder = new StringBuilder("DPN ID's ").append(lstConflictingDpns)
-                        .append(" specified for delete from VTEP schema [").append(schemaName)
-                        .append("] are not configured in the schema.");
-                Preconditions.checkArgument(false, builder.toString());
+                String builder = "DPN ID's " + lstConflictingDpns +
+                        " specified for delete from VTEP schema [" + schemaName +
+                        "] are not configured in the schema.";
+                Preconditions.checkArgument(false, builder);
             }
         }
         return schema;
index 49b142228389d42d26ae92e7ee92691dde89ad53..361ea29000687cda7d1eb53e23279bd76ad4b0f8 100644 (file)
@@ -141,8 +141,7 @@ public class VtepConfigSchemaListener extends AbstractDataChangeListener<VtepCon
             String subnetCidr = ItmUtils.getSubnetCidrAsString(schema.getSubnet());
             deleteVtepIpPool(subnetCidr);
         } catch (Exception e) {
-            String error = new StringBuilder("Failed to handle DCN for delete VtepConfigSchema: ").append(schema)
-                    .toString();
+            String error = "Failed to handle DCN for delete VtepConfigSchema: " + schema;
             LOG.error(error, e);
         }
     }
@@ -177,8 +176,8 @@ public class VtepConfigSchemaListener extends AbstractDataChangeListener<VtepCon
             handleUpdateOfDpnIds(orignalSchema, updatedSchema);
 
         } catch (Exception e) {
-            String error = new StringBuilder("Failed to handle DCN for update VtepConfigSchema original:")
-                    .append(original).append(", updated: ").append(updated).toString();
+            String error = "Failed to handle DCN for update VtepConfigSchema original:" +
+                    original + ", updated: " + updated;
             LOG.error(error, e);
         }
     }
index a8dee2fead52d3f3f5a16b10c54e60cd70964dcb..2c48eed9eae41c3fc3db287004aaeb5255438e17 100644 (file)
@@ -92,10 +92,10 @@ public class ItmTunnelEventListener extends AbstractDataChangeListener<Interface
                     clearInternalDataPathAlarm(srcDpId.toString(),dstDpId.toString(),tunnelType);
                 }else {
                     logger.trace("ITM Tunnel State is DOWN b/w srcDpn: {} and dstDpn: {}", srcDpId, dstDpId);
-                    StringBuilder alarmText = new StringBuilder();
-                    alarmText.append("Data Path Connectivity is lost b/w ").append("openflow:").append(srcDpId).append(" and openflow:")
-                            .append(dstDpId).append(" for tunnelType:").append(tunnelType);
-                    raiseInternalDataPathAlarm(srcDpId.toString(), dstDpId.toString(), tunnelType,alarmText.toString());
+                    String alarmText =
+                            "Data Path Connectivity is lost b/w " + "openflow:" + srcDpId + " and openflow:" +
+                                    dstDpId + " for tunnelType:" + tunnelType;
+                    raiseInternalDataPathAlarm(srcDpId.toString(), dstDpId.toString(), tunnelType, alarmText);
                 }
             }else{
                 ExternalTunnel externalTunnel = ItmUtils.getExternalTunnel(ifName,broker);
@@ -103,10 +103,10 @@ public class ItmTunnelEventListener extends AbstractDataChangeListener<Interface
                     String srcNode = externalTunnel.getSourceDevice();
                     String dstNode = externalTunnel.getDestinationDevice();
                     if(!srcNode.contains("hwvtep")){
-                        srcNode = new StringBuilder().append("openflow:").append(externalTunnel.getSourceDevice()).toString() ;
+                        srcNode = "openflow:" + externalTunnel.getSourceDevice();
                     }
                     if(!dstNode.contains("hwvtep")){
-                        dstNode = new StringBuilder().append("openflow:").append(externalTunnel.getDestinationDevice()).toString() ;
+                        dstNode = "openflow:" + externalTunnel.getDestinationDevice();
                     }
                     String tunnelType = ItmUtils.convertTunnelTypetoString(externalTunnel.getTransportType());
                     logger.trace("ITM Tunnel state event changed from :{} to :{} for Tunnel Interface - {}", isTunnelInterfaceUp(original), isTunnelInterfaceUp(update), ifName);
@@ -115,11 +115,10 @@ public class ItmTunnelEventListener extends AbstractDataChangeListener<Interface
                         clearExternalDataPathAlarm(srcNode, dstNode,tunnelType);
                     }else {
                         logger.trace("ITM Tunnel State is DOWN b/w srcNode: {} and dstNode: {}", srcNode, dstNode);
-                        StringBuilder alarmText = new StringBuilder();
-                        alarmText.append("DataPath lost b/w").append(srcNode).append(" and ").append(dstNode);
                         //alarmText.append("Data Path Connectivity is lost between ").append(srcNode).append(" and ").append(
                         //              dstNode).append(" for tunnelType:").append(tunnelType);
-                        raiseExternalDataPathAlarm(srcNode, dstNode, tunnelType,alarmText.toString());
+                        raiseExternalDataPathAlarm(srcNode, dstNode, tunnelType,
+                                "DataPath lost b/w" + srcNode + " and " + dstNode);
                     }
                 }
             }
@@ -137,10 +136,10 @@ public class ItmTunnelEventListener extends AbstractDataChangeListener<Interface
                 String tunnelType = ItmUtils.convertTunnelTypetoString(internalTunnel.getTransportType());
                 if(!isTunnelInterfaceUp(add)) {
                     logger.trace("ITM Tunnel State during tep add is DOWN b/w srcDpn: {} and dstDpn: {} for tunnelType: {}", srcDpId, dstDpId, tunnelType);
-                    StringBuilder alarmText = new StringBuilder();
-                    alarmText.append("DataPath is down between ").append("openflow:").append(srcDpId).append(" and openflow:")
-                            .append(dstDpId).append(" for ").append(tunnelType).append("tunnel initially");
-                    raiseInternalDataPathAlarm(srcDpId.toString(), dstDpId.toString(), tunnelType, alarmText.toString());
+
+                    String alarmText = "DataPath is down between " + "openflow:" + srcDpId + " and openflow:" +
+                            dstDpId + " for " + tunnelType + "tunnel initially";
+                    raiseInternalDataPathAlarm(srcDpId.toString(), dstDpId.toString(), tunnelType, alarmText);
                 }
             }else {
                 ExternalTunnel externalTunnel = ItmUtils.getExternalTunnel(ifName,broker);
@@ -148,18 +147,18 @@ public class ItmTunnelEventListener extends AbstractDataChangeListener<Interface
                     String srcNode = externalTunnel.getSourceDevice();
                     String dstNode = externalTunnel.getDestinationDevice();
                     if(!srcNode.contains("hwvtep")){
-                        srcNode = new StringBuilder().append("openflow:").append(externalTunnel.getSourceDevice()).toString() ;
+                        srcNode = "openflow:" + externalTunnel.getSourceDevice();
                     }
                     if(!dstNode.contains("hwvtep")){
-                        dstNode = new StringBuilder().append("openflow:").append(externalTunnel.getDestinationDevice()).toString() ;
+                        dstNode = "openflow:" + externalTunnel.getDestinationDevice();
                     }
                     String tunnelType = ItmUtils.convertTunnelTypetoString(externalTunnel.getTransportType());
                     if(!isTunnelInterfaceUp(add)) {
                         logger.trace("ITM Tunnel State during tep add is DOWN b/w srcNode: {} and dstNode: {} for tunnelType: {}", srcNode, dstNode, tunnelType);
-                        StringBuilder alarmText = new StringBuilder();
+
                         //alarmText.append("DataPath is down between ").append(srcNode).append(" and ").append(dstNode).append(" for ").append(tunnelType).append("tunnel initially");
-                        alarmText.append("Path down").append(srcNode).append(" and ").append(dstNode).append(" initially");
-                        raiseExternalDataPathAlarm(srcNode, dstNode, tunnelType,alarmText.toString());
+                        raiseExternalDataPathAlarm(srcNode, dstNode, tunnelType,
+                                "Path down" + srcNode + " and " + dstNode + " initially");
                     }
                 }
             }
@@ -210,13 +209,10 @@ public class ItmTunnelEventListener extends AbstractDataChangeListener<Interface
 
     public void clearExternalDataPathAlarm(String srcDevice,String dstDevice,String tunnelType) {
 
-        StringBuilder source = new StringBuilder();
-
-        source.append("srcDevice=").append(srcDevice).append("-dstDevice=").append(dstDevice).append("-tunnelType").append(tunnelType);
-
         //logger.trace("Clearing DataPathConnectionFailure alarm of source {} ", source);
         //Invokes JMX clearAlarm method
-        alarmAgent.invokeFMclearmethod("DataPathConnectionFailure", "Clearing ITM Tunnel down alarm", source.toString());
+        alarmAgent.invokeFMclearmethod("DataPathConnectionFailure", "Clearing ITM Tunnel down alarm",
+                "srcDevice=" + srcDevice + "-dstDevice=" + dstDevice + "-tunnelType" + tunnelType);
 
     }
 
index 824f0f9ab37830b7b30d356af16e1cd8bac695ff..43c45787e079047cf77ebcb9e9296b162e406698 100644 (file)
@@ -346,7 +346,7 @@ public class ItmManagerRpcService implements ItmRpcService {
     }
 
     private String getFlowRef(long termSvcTable, int svcId) {
-        return new StringBuffer().append(termSvcTable).append(svcId).toString();
+        return String.valueOf(termSvcTable) + svcId;
     }
 
     @Override
index 8fec1e42ab4412277599df1090d55d70a601564c..9e68d98e5f11a7a48d6694a7b6645724e704eb6c 100644 (file)
@@ -180,9 +180,10 @@ public enum MatchFieldType {
         @Override
         public void setMatch(MatchBuilder matchBuilderInOut, MatchInfo matchInfo, Map<Class<?>, Object> mapMatchBuilder) {
 
-            StringBuffer nodeConnectorId = new StringBuffer().append("openflow:").append(matchInfo.getBigMatchValues()[0])
-            .append(':').append(matchInfo.getBigMatchValues()[1]);
-            matchBuilderInOut.setInPort(new NodeConnectorId(nodeConnectorId.toString()));
+
+            String nodeConnectorId = "openflow:" + matchInfo.getBigMatchValues()[0] +
+                    ':' + matchInfo.getBigMatchValues()[1];
+            matchBuilderInOut.setInPort(new NodeConnectorId(nodeConnectorId));
         }
     },
 
index dd4f14f9f2afaf5abcf77e3559df5019a62ae72b..4370d864b41b6fadfc546ef706a4b6b9b67ba2dc 100644 (file)
@@ -390,8 +390,8 @@ public class HwvtepSouthboundUtils {
     public static String getTerminationPointKeyString(String ipAddress) {
         String tpKeyStr = null;
         if(ipAddress != null) {
-            tpKeyStr = new StringBuilder(HwvtepSouthboundConstants.TEP_PREFIX).
-                    append(ipAddress).toString();
+            tpKeyStr = HwvtepSouthboundConstants.TEP_PREFIX +
+                    ipAddress;
         }
         return tpKeyStr;
     }
index 5727933eb1c08d0a1b5f9dbd2ec3d27d89f32555..5458c3e9fb44f1c8d8806247d4ee0ed5082e882a 100644 (file)
@@ -200,7 +200,7 @@ public class MdSalUtilTest extends AbstractDataBrokerTest {
         }
 
         private String getFlowRef(short termSvcTable, int svcId) {
-            return new StringBuffer().append(termSvcTable).append(svcId).toString();
+            return String.valueOf(termSvcTable) + svcId;
         }
 
         public GroupEntity createGroupEntity(String Nodeid, String inport, int vlanid) {