commit 71670d11858e23418ea4dd780b5d6770c0b77f46
author Jian Li <pyguni@gmail.com> Fri Mar 02 21:31:07 2018 +0900
committer Jian Li <pyguni@gmail.com> Fri Mar 02 21:31:07 2018 +0900
tree 3c98d720305a6ee7972dc1030a5405ecc987c3ce
parent 02cfc7f2d68f86bc7d85f76243f16d0e4e25e863

Fix: resolve critical issues reported by sonar

Change-Id: I5ff9363b95608a96e324c294995dbcb79bba1fa9

apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingFloatingIpHandler.java

diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingFloatingIpHandler.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingFloatingIpHandler.java
index b34ae9c..16607b1 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingFloatingIpHandler.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingFloatingIpHandler.java
@@ -144,7 +144,8 @@
                                     boolean install) {
         Network osNet = osNetworkService.network(osPort.getNetworkId());
         if (osNet == null) {
-            final String error = String.format(ERR_FLOW + "no network(%s) exists",
+            final String errorFormat = ERR_FLOW + "no network(%s) exists";
+            final String error = String.format(errorFormat,
                     floatingIp.getFloatingIpAddress(),
                     osPort.getNetworkId());
             throw new IllegalStateException(error);
@@ -153,7 +154,8 @@
         MacAddress srcMac = MacAddress.valueOf(osPort.getMacAddress());
         InstancePort instPort = instancePortService.instancePort(srcMac);
         if (instPort == null) {
-            final String error = String.format(ERR_FLOW + "no host(MAC:%s) found",
+            final String errorFormat = ERR_FLOW + "no host(MAC:%s) found";
+            final String error = String.format(errorFormat,
                     floatingIp.getFloatingIpAddress(), srcMac);
             throw new IllegalStateException(error);
         }
@@ -222,13 +224,13 @@
             throw new IllegalStateException(error);
         }
         if (osNet.getNetworkType() == NetworkType.VXLAN && cNode.dataIp() == null) {
-            final String error = String.format(ERR_FLOW +
-                    "VXLAN mode is not ready for %s", floatingIp, cNode.hostname());
+            final String errorFormat = ERR_FLOW + "VXLAN mode is not ready for %s";
+            final String error = String.format(errorFormat, floatingIp, cNode.hostname());
             throw new IllegalStateException(error);
         }
         if (osNet.getNetworkType() == NetworkType.VLAN && cNode.vlanIntf() == null) {
-            final String error = String.format(ERR_FLOW +
-                    "VLAN mode is not ready for %s", floatingIp, cNode.hostname());
+            final String errorFormat = ERR_FLOW + "VLAN mode is not ready for %s";
+            final String error = String.format(errorFormat, floatingIp, cNode.hostname());
             throw new IllegalStateException(error);
         }
 
@@ -460,7 +462,8 @@
         private void associateFloatingIp(NetFloatingIP osFip) {
             Port osPort = osNetworkService.port(osFip.getPortId());
             if (osPort == null) {
-                final String error = String.format(ERR_FLOW + "port(%s) not found",
+                final String errorFormat = ERR_FLOW + "port(%s) not found";
+                final String error = String.format(errorFormat,
                         osFip.getFloatingIpAddress(), osFip.getPortId());
                 throw new IllegalStateException(error);
             }