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

diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingSnatHandler.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingSnatHandler.java
index 5ea8442..9f792bd 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingSnatHandler.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingSnatHandler.java
@@ -285,8 +285,8 @@
                                        TpPort patPort, IpAddress externalIp, MacAddress externalPeerRouterMac) {
         Network osNet = osNetworkService.network(srcInstPort.networkId());
         if (osNet == null) {
-            final String error = String.format(ERR_PACKETIN + "network %s not found",
-                    srcInstPort.networkId());
+            final String error = String.format("%s network %s not found",
+                                        ERR_PACKETIN, srcInstPort.networkId());
             throw new IllegalStateException(error);
         }
 
@@ -333,9 +333,8 @@
                         .setEthSrc(DEFAULT_GATEWAY_MAC);
                 break;
             default:
-                final String error = String.format(
-                        ERR_UNSUPPORTED_NET_TYPE + "%s",
-                        networkType.toString());
+                final String error = String.format("%s %s",
+                        ERR_UNSUPPORTED_NET_TYPE, networkType.toString());
                 throw new IllegalStateException(error);
         }
 
@@ -373,8 +372,8 @@
                     tmpBuilder.setOutput(gNode.vlanPortNum());
                     break;
                 default:
-                    final String error = String.format(ERR_UNSUPPORTED_NET_TYPE + "%s",
-                            networkType.toString());
+                    final String error = String.format("%s %s",
+                            ERR_UNSUPPORTED_NET_TYPE, networkType.toString());
                     throw new IllegalStateException(error);
             }
 
@@ -412,8 +411,8 @@
                 tBuilder.popVlan();
                 break;
             default:
-                final String error = String.format(ERR_UNSUPPORTED_NET_TYPE + "%s",
-                        networkType.toString());
+                final String error = String.format("%s %s",
+                        ERR_UNSUPPORTED_NET_TYPE, networkType.toString());
                 throw new IllegalStateException(error);
         }