SONAR suggestion - indexOf() > 0 ignores the first character in a string
Change-Id: Ie26333eb65db6c9fcb6d6eab44f8f1d12ae3b16e
diff --git a/drivers/cisco/netconf/src/main/java/org/onosproject/drivers/cisco/TextBlockParserCisco.java b/drivers/cisco/netconf/src/main/java/org/onosproject/drivers/cisco/TextBlockParserCisco.java
index 6e0be07..a4a68ec 100644
--- a/drivers/cisco/netconf/src/main/java/org/onosproject/drivers/cisco/TextBlockParserCisco.java
+++ b/drivers/cisco/netconf/src/main/java/org/onosproject/drivers/cisco/TextBlockParserCisco.java
@@ -94,7 +94,7 @@
String processor = SPACE;
int i;
for (i = 0; i < textStr.length; i++) {
- if (textStr[i].indexOf(PHRASE) > 0) {
+ if (textStr[i].contains(PHRASE)) {
String[] lineStr = textStr[i].trim().split(SPACE);
processor = lineStr[1];
break;
@@ -114,7 +114,7 @@
String[] textStr = version.split(NEWLINE_SPLITTER);
int i;
for (i = 0; i < textStr.length; i++) {
- if (textStr[i].indexOf(VERSION) > 0) {
+ if (textStr[i].contains(VERSION)) {
break;
}
}
@@ -141,7 +141,7 @@
String[] textStr = version.split(NEWLINE_SPLITTER);
int i;
for (i = 0; i < textStr.length; i++) {
- if (textStr[i].indexOf(PROCESSOR_BOARD) > 0) {
+ if (textStr[i].contains(PROCESSOR_BOARD)) {
break;
}
}
@@ -264,7 +264,7 @@
private static String getPort(String[] textStr) {
String port;
try {
- if (textStr[0].indexOf(PORT_DELIMITER) > 0) {
+ if (textStr[0].contains(PORT_DELIMITER)) {
port = textStr[0].substring(textStr[0].lastIndexOf(PORT_DELIMITER) + 1,
textStr[0].indexOf(SPACE));
} else {
@@ -286,7 +286,7 @@
String result;
int lastLine = textStr.length - 1;
for (int i = 0; i < lastLine; i++) {
- if ((textStr[i].indexOf(BANDWIDTH) > 0) && (textStr[i].indexOf(SPEED) > 0)) {
+ if (textStr[i].contains(BANDWIDTH) && textStr[i].contains(SPEED)) {
result = textStr[i].substring(textStr[i].indexOf(BANDWIDTH) + 3, textStr[i].indexOf(SPEED));
portSpeed = Long.valueOf(result);
break;
diff --git a/drivers/huawei/src/main/java/org/onosproject/drivers/huawei/HuaweiXmlParser.java b/drivers/huawei/src/main/java/org/onosproject/drivers/huawei/HuaweiXmlParser.java
index 5ba8b059..111d1a9 100644
--- a/drivers/huawei/src/main/java/org/onosproject/drivers/huawei/HuaweiXmlParser.java
+++ b/drivers/huawei/src/main/java/org/onosproject/drivers/huawei/HuaweiXmlParser.java
@@ -201,7 +201,7 @@
if (!portName.contains(DELIMITER)) {
portInc++;
port = String.valueOf(portInc) + portName;
- } else if (portName.indexOf(DELIMITER) > 0) {
+ } else if (portName.contains(DELIMITER)) {
try {
port = portName.substring(
portName.lastIndexOf(DELIMITER) + 1);