Fix Sonar issue:
Strings literals should be placed on the left side when checking for
equality
Change-Id: I4537e08936731ace55aeecb3ad941269ec1eb191
diff --git a/web/api/src/main/java/org/onosproject/rest/resources/ApiDocResource.java b/web/api/src/main/java/org/onosproject/rest/resources/ApiDocResource.java
index 69e5aad..7c76c44 100644
--- a/web/api/src/main/java/org/onosproject/rest/resources/ApiDocResource.java
+++ b/web/api/src/main/java/org/onosproject/rest/resources/ApiDocResource.java
@@ -147,7 +147,7 @@
StringBuilder sb = new StringBuilder();
service.getDocProviders().forEach(p -> {
sb.append("<option value=\"").append(p.key()).append("\"")
- .append(p.key().equals("/onos/v1") ? " selected>" : ">")
+ .append("/onos/v1".equals(p.key()) ? " selected>" : ">")
.append(p.name())
.append("</option>");
});
@@ -164,7 +164,7 @@
@GET
@Path("{resource: .*}")
public Response getResource(@PathParam("resource") String resource) throws IOException {
- if (resource != null && resource.equals("")) {
+ if ("".equals(resource)) {
return getIndex();
}
InputStream stream = getClass().getClassLoader().getResourceAsStream(DOCS + resource);
diff --git a/web/api/src/test/java/org/onosproject/rest/resources/IntentsResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/IntentsResourceTest.java
index 8d5c55f..ef08c9f 100644
--- a/web/api/src/test/java/org/onosproject/rest/resources/IntentsResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/IntentsResourceTest.java
@@ -364,14 +364,14 @@
// check intent type
final String jsonType = jsonIntent.get("type").asString();
- if (!jsonType.equals("MockIntent")) {
+ if (!"MockIntent".equals(jsonType)) {
reason = "type MockIntent";
return false;
}
// check state field
final String jsonState = jsonIntent.get("state").asString();
- if (!jsonState.equals("INSTALLED")) {
+ if (!"INSTALLED".equals(jsonState)) {
reason = "state INSTALLED";
return false;
}
diff --git a/web/api/src/test/java/org/onosproject/rest/resources/NetworkConfigWebResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/NetworkConfigWebResourceTest.java
index 21b7ca4..c14ba8c 100644
--- a/web/api/src/test/java/org/onosproject/rest/resources/NetworkConfigWebResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/NetworkConfigWebResourceTest.java
@@ -142,9 +142,9 @@
@Override
public SubjectFactory getSubjectFactory(String subjectClassKey) {
- if (subjectClassKey.equals("devices")) {
+ if ("devices".equals(subjectClassKey)) {
return mockDevicesSubjectFactory;
- } else if (subjectClassKey.equals("links")) {
+ } else if ("links".equals(subjectClassKey)) {
return mockLinksSubjectFactory;
}
return null;
diff --git a/web/api/src/test/java/org/onosproject/rest/resources/TopologyResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/TopologyResourceTest.java
index 7ed3519..5aafed3 100644
--- a/web/api/src/test/java/org/onosproject/rest/resources/TopologyResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/TopologyResourceTest.java
@@ -140,12 +140,12 @@
@Override
public boolean isInfrastructure(Topology topology, ConnectPoint connectPoint) {
- return connectPoint.elementId().toString().equals("dev2");
+ return "dev2".equals(connectPoint.elementId().toString());
}
@Override
public boolean isBroadcastPoint(Topology topology, ConnectPoint connectPoint) {
- return connectPoint.elementId().toString().equals("dev1");
+ return "dev1".equals(connectPoint.elementId().toString());
}
}
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
index bd2574b..7fb5d95 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
@@ -489,7 +489,7 @@
.id(hostId.toString())
.addProp(Properties.MAC, host.mac())
.addProp(Properties.IP, host.ipAddresses(), "[\\[\\]]")
- .addProp(Properties.VLAN, vlan.equals("-1") ? "none" : vlan)
+ .addProp(Properties.VLAN, "-1".equals(vlan) ? "none" : vlan)
.addSeparator()
.addProp(Properties.LATITUDE, annot.value(AnnotationKeys.LATITUDE))
.addProp(Properties.LONGITUDE, annot.value(AnnotationKeys.LONGITUDE));