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

diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingHandler.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingHandler.java
index 37cabf4..3cba0e3 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingHandler.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingHandler.java
@@ -74,7 +74,7 @@
 
     private final Logger log = getLogger(getClass());
 
-    private static final String ERR_SET_FLOWS = "Failed to set flows for %s: ";
+    private static final String ERR_SET_FLOWS_VNI = "Failed to set flows for %s: Failed to get VNI for %s";
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     CoreService coreService;
@@ -341,9 +341,9 @@
         Network osNet = osNetworkService.network(instPort.networkId());
 
         if (osNet == null || Strings.isNullOrEmpty(osNet.getProviderSegID())) {
-            final String error = String.format(
-                    ERR_SET_FLOWS + "Failed to get VNI for %s",
-                    instPort, osNet == null ? "<none>" : osNet.getName());
+            final String error =
+                    String.format(ERR_SET_FLOWS_VNI,
+                        instPort, osNet == null ? "<none>" : osNet.getName());
             throw new IllegalStateException(error);
         }
 
@@ -354,9 +354,9 @@
     private Long getVni(InstancePort instPort) {
         Network osNet = osNetworkService.network(instPort.networkId());
         if (osNet == null || Strings.isNullOrEmpty(osNet.getProviderSegID())) {
-            final String error = String.format(
-                    ERR_SET_FLOWS + "Failed to get VNI for %s",
-                    instPort, osNet == null ? "<none>" : osNet.getName());
+            final String error =
+                    String.format(ERR_SET_FLOWS_VNI,
+                        instPort, osNet == null ? "<none>" : osNet.getName());
             throw new IllegalStateException(error);
         }
         return Long.valueOf(osNet.getProviderSegID());