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/OpenstackRoutingHandler.java

diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingHandler.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingHandler.java
index 11b3247..6d2f70b 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingHandler.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingHandler.java
@@ -108,7 +108,6 @@
 
     private static final String MSG_ENABLED = "Enabled ";
     private static final String MSG_DISABLED = "Disabled ";
-    private static final String ERR_SET_FLOWS = "Failed to set flows for router %s:";
     private static final String ERR_UNSUPPORTED_NET_TYPE = "Unsupported network type";
     private static final boolean USE_STATEFUL_SNAT = false;
 
@@ -237,7 +236,7 @@
         Subnet osSubnet = osNetworkService.subnet(osRouterIface.getSubnetId());
         if (osSubnet == null) {
             final String error = String.format(
-                    ERR_SET_FLOWS + "subnet %s does not exist",
+                    "Failed to set flows for router %s: subnet %s does not exist",
                     osRouterIface.getId(),
                     osRouterIface.getSubnetId());
             throw new IllegalStateException(error);
@@ -261,7 +260,7 @@
         Subnet osSubnet = osNetworkService.subnet(osRouterIface.getSubnetId());
         if (osSubnet == null) {
             final String error = String.format(
-                    ERR_SET_FLOWS + "subnet %s does not exist",
+                    "Failed to set flows for router %s: subnet %s does not exist",
                     osRouterIface.getId(),
                     osRouterIface.getSubnetId());
             throw new IllegalStateException(error);
@@ -421,8 +420,8 @@
                                 install));
                 break;
             default:
-                final String error = String.format(
-                        ERR_UNSUPPORTED_NET_TYPE + "%s",
+                final String error = String.format("%s %s",
+                        ERR_UNSUPPORTED_NET_TYPE,
                         network.getNetworkType().toString());
                 throw new IllegalStateException(error);
         }
@@ -615,8 +614,8 @@
                         install);
                 break;
             default:
-                final String error = String.format(
-                        ERR_UNSUPPORTED_NET_TYPE + "%s",
+                final String error = String.format("%s %s",
+                        ERR_UNSUPPORTED_NET_TYPE,
                         networkType.toString());
                 throw new IllegalStateException(error);
         }
@@ -645,8 +644,8 @@
                 sBuilder.matchVlanId(VlanId.vlanId(segmentId));
                 break;
             default:
-                final String error = String.format(
-                        ERR_UNSUPPORTED_NET_TYPE + "%s",
+                final String error = String.format("%s %s",
+                        ERR_UNSUPPORTED_NET_TYPE,
                         networkType.toString());
                 throw new IllegalStateException(error);
         }
@@ -811,8 +810,8 @@
                         .matchEthDst(osNodeService.node(deviceId).vlanPortMac());
                 break;
             default:
-                final String error = String.format(
-                        ERR_UNSUPPORTED_NET_TYPE + "%s",
+                final String error = String.format("%s %s",
+                        ERR_UNSUPPORTED_NET_TYPE,
                         networkType.toString());
                 throw new IllegalStateException(error);
         }
@@ -870,8 +869,8 @@
                 sBuilder.matchVlanId(VlanId.vlanId(segmentId));
                 break;
             default:
-                final String error = String.format(
-                        ERR_UNSUPPORTED_NET_TYPE + "%s",
+                final String error = String.format("%s %s",
+                        ERR_UNSUPPORTED_NET_TYPE,
                         networkType.toString());
                 throw new IllegalStateException(error);
         }