commit | a3fcf6754a23a46f2c7b7f856817ea8b4fc5cfb1 | [log] [tgz] |
---|---|---|
author | Jon Hall <jhall@ciena.com> | Tue Mar 28 16:53:22 2017 -0700 |
committer | Ray Milkey <ray@onlab.us> | Wed Apr 05 22:54:30 2017 +0000 |
tree | 2508a2f4bcff7c24cd4d9bcac29aa4e13bad48cd | |
parent | 634eb17ac5e522b94632e34fa797a8333f321892 [diff] |
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/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()); } }