SONAR suggestion - problems with string format calls
Change-Id: Ie6b985d2e4db79d6398b17e38a680920f52366b3
diff --git a/cli/src/main/java/org/onosproject/cli/net/DpisListCommand.java b/cli/src/main/java/org/onosproject/cli/net/DpisListCommand.java
index 6bdcedb..d34c9ed 100644
--- a/cli/src/main/java/org/onosproject/cli/net/DpisListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/DpisListCommand.java
@@ -213,7 +213,7 @@
}
private void printDpiStatisticsJson(int number, DpiStatistics ds) {
- String index = number < 0 ? String.format(" - ") : String.format("%5d", number);
+ String index = number < 0 ? " - " : String.format("%5d", number);
if ("".equals(ds.receivedTime())) {
print("ReceivedTime is null, No valid DPI Statistics!");
return;
@@ -226,7 +226,7 @@
private void printDpiStatisticsClass(int number, DpiStatistics ds) {
String printLine = "";
- String index = number < 0 ? String.format(" - ") : String.format("%5d", number);
+ String index = number < 0 ? " - " : String.format("%5d", number);
DpiStatInfo dsi = ds.dpiStatInfo();
if (dsi == null) {
diff --git a/cli/src/main/java/org/onosproject/cli/net/IntentsListCommand.java b/cli/src/main/java/org/onosproject/cli/net/IntentsListCommand.java
index 8fb3714..595599d 100644
--- a/cli/src/main/java/org/onosproject/cli/net/IntentsListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/IntentsListCommand.java
@@ -119,7 +119,7 @@
*/
private static final String SUMMARY_TITLES =
BOLD + format(
- "\n%1s%21s%14s%14s%14s%14s%14s%14s%14s%14s%14s%14s",
+ "%n%1s%21s%14s%14s%14s%14s%14s%14s%14s%14s%14s%14s",
"Intent type",
"Total",
"Installed",
@@ -355,7 +355,7 @@
StringBuilder builder = new StringBuilder();
builder.append(format(
- "\n%1s%s%14d%14d%14d%14d%14d%14d%14d%14d%14d%14d",
+ "%n%1s%s%14d%14d%14d%14d%14d%14d%14d%14d%14d%14d",
BOLD + intentType + RESET,
Strings.padStart(String.valueOf(total),
(32 - intentType.length()),
diff --git a/core/security/src/main/java/org/onosproject/security/impl/SecurityModeManager.java b/core/security/src/main/java/org/onosproject/security/impl/SecurityModeManager.java
index 8590256..c3278e7 100644
--- a/core/security/src/main/java/org/onosproject/security/impl/SecurityModeManager.java
+++ b/core/security/src/main/java/org/onosproject/security/impl/SecurityModeManager.java
@@ -186,7 +186,7 @@
appId -> store.isSecured(appId) &&
appAdminService.getState(appId) == ApplicationState.ACTIVE).forEach(appId -> {
store.requestPermission(appId, permission);
- print("[POLICY VIOLATION] APP: %s / Bundle: %s / Permission: %s ",
+ log.debug("[POLICY VIOLATION] APP: %s / Bundle: %s / Permission: %s ",
appId.name(), location, permission.toString());
});
}
@@ -264,7 +264,7 @@
private List<Permission> getMaximumPermissions(ApplicationId appId) {
Application app = appAdminService.getApplication(appId);
if (app == null) {
- print("Unknown application.");
+ log.debug("Unknown application.");
return null;
}
List<Permission> appPerms;
@@ -284,12 +284,6 @@
return appPerms;
}
-
- private void print(String format, Object... args) {
- System.out.println(String.format("SM-ONOS: " + format, args));
- log.warn(String.format(format, args));
- }
-
private PermissionAdmin getPermissionAdmin() {
BundleContext context = getBundleContext();
return (PermissionAdmin) context.getService(context.getServiceReference(PermissionAdmin.class.getName()));
diff --git a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/HexDump.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/HexDump.java
index 0ee620b..777dc61 100644
--- a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/HexDump.java
+++ b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/HexDump.java
@@ -40,7 +40,7 @@
StringBuilder sb = new StringBuilder();
for (int k = 0; (k < 16) && (buff.readableBytes() != 0); ++k) {
if (0 == k % 4) {
- sb.append(String.format(" ")); // blank after 4 bytes
+ sb.append(" "); // blank after 4 bytes
}
sb.append(String.format("%02X ", buff.readByte()));
}
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/util/HexDump.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/util/HexDump.java
index b5897d5..79f3815 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/util/HexDump.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/util/HexDump.java
@@ -41,7 +41,7 @@
StringBuilder sb = new StringBuilder();
for (int k = 0; (k < 16) && (iStartIndex < iEndIndex); ++k) {
if (0 == k % 4) {
- sb.append(String.format(" ")); //blank after 4 bytes
+ sb.append(" "); //blank after 4 bytes
}
sb.append(String.format("%02X ", yTemp[iStartIndex++]));
}
diff --git a/utils/misc/src/main/java/org/onlab/util/HexDump.java b/utils/misc/src/main/java/org/onlab/util/HexDump.java
index 692d688..853a597 100644
--- a/utils/misc/src/main/java/org/onlab/util/HexDump.java
+++ b/utils/misc/src/main/java/org/onlab/util/HexDump.java
@@ -43,7 +43,7 @@
StringBuilder sb = new StringBuilder();
for (int k = 0; (k < 16) && (buff.readableBytes() != 0); ++k) {
if (0 == k % 4) {
- sb.append(String.format(" ")); // blank after 4 bytes
+ sb.append(" "); // blank after 4 bytes
}
sb.append(String.format("%02X ", buff.readByte()));
}