Fix Sonar issue:
Strings literals should be placed on the left side when checking for
equality
Change-Id: I4537e08936731ace55aeecb3ad941269ec1eb191
diff --git a/drivers/ciena/src/main/java/org/onosproject/drivers/ciena/CienaWaveserverDeviceDescription.java b/drivers/ciena/src/main/java/org/onosproject/drivers/ciena/CienaWaveserverDeviceDescription.java
index 7b75590..591b65e 100644
--- a/drivers/ciena/src/main/java/org/onosproject/drivers/ciena/CienaWaveserverDeviceDescription.java
+++ b/drivers/ciena/src/main/java/org/onosproject/drivers/ciena/CienaWaveserverDeviceDescription.java
@@ -124,7 +124,7 @@
XmlConfigParser.loadXml(controller.get(deviceId, wsportInfoRequest, XML)),
annotations.set(AnnotationKeys.PORT_NAME, rxName)
.build()));
- } else if (!portId.equals("5") && !portId.equals("49")) {
+ } else if (!"5".equals(portId) && !"49".equals(portId)) {
DefaultAnnotations.Builder annotations = DefaultAnnotations.builder()
.set(AnnotationKeys.PORT_NAME, name);
//FIXME change when all optical types have two way information methods, see jira tickets
@@ -154,13 +154,13 @@
final String gridTypePath = "ptp-config.adv-config.wl-spacing";
final String frequencyPath = "ptp-config.adv-config.frequency";
- boolean isEnabled = config.getString(transmitterPath).equals("enabled");
+ boolean isEnabled = "enabled".equals(config.getString(transmitterPath));
boolean isTunable = tunableType.contains(config.getString(tunablePath));
//FIXME change when all optical types have two way information methods, see jira tickets
final int speed100GbpsinMbps = 100000;
OduSignalType oduSignalType = oduPortSpeed == speed100GbpsinMbps ? OduSignalType.ODU4 : null;
- GridType gridType = config.getString(gridTypePath).equals("FlexGrid") ? GridType.FLEX : null;
+ GridType gridType = "FlexGrid".equals(config.getString(gridTypePath)) ? GridType.FLEX : null;
ChannelSpacing chSpacing = gridType == GridType.FLEX ? ChannelSpacing.CHL_6P25GHZ : null;
//Working in Ghz //(Nominal central frequency - 193.1)/channelSpacing = spacingMultiplier
diff --git a/drivers/cisco/src/main/java/org/onosproject/drivers/cisco/TextBlockParserCisco.java b/drivers/cisco/src/main/java/org/onosproject/drivers/cisco/TextBlockParserCisco.java
index 2f533b5..b47411b 100644
--- a/drivers/cisco/src/main/java/org/onosproject/drivers/cisco/TextBlockParserCisco.java
+++ b/drivers/cisco/src/main/java/org/onosproject/drivers/cisco/TextBlockParserCisco.java
@@ -185,8 +185,8 @@
long portSpeed = getPortSpeed(textStr);
DefaultAnnotations.Builder annotations = DefaultAnnotations.builder()
.set(AnnotationKeys.PORT_NAME, firstWord);
- return port.equals("-1") ? null : new DefaultPortDescription(PortNumber.portNumber(port),
- isEnabled, type, portSpeed, annotations.build());
+ return "-1".equals(port) ? null : new DefaultPortDescription(PortNumber.portNumber(port),
+ isEnabled, type, portSpeed, annotations.build());
}
/**
diff --git a/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuT100DeviceDescription.java b/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuT100DeviceDescription.java
index 5fc3a65..d00fc87 100644
--- a/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuT100DeviceDescription.java
+++ b/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuT100DeviceDescription.java
@@ -112,9 +112,9 @@
for (HierarchicalConfiguration portConfig : subtrees) {
if (!portConfig.getString("name").contains("LCN") &&
!portConfig.getString("name").contains("LMP") &&
- portConfig.getString("type").equals("ianaift:ethernetCsmacd")) {
+ "ianaift:ethernetCsmacd".equals(portConfig.getString("type"))) {
portDescriptions.add(parseT100OduPort(portConfig, counter.getAndIncrement()));
- } else if (portConfig.getString("type").equals("ianaift:otnOtu")) {
+ } else if ("ianaift:otnOtu".equals(portConfig.getString("type"))) {
portDescriptions.add(parseT100OchPort(portConfig, counter.getAndIncrement()));
}
}
@@ -124,8 +124,8 @@
private static PortDescription parseT100OchPort(HierarchicalConfiguration cfg, long count) {
PortNumber portNumber = PortNumber.portNumber(count);
HierarchicalConfiguration otuConfig = cfg.configurationAt("otu");
- boolean enabled = otuConfig.getString("administrative-state").equals("up");
- OduSignalType signalType = otuConfig.getString("rate").equals("OTU4") ? OduSignalType.ODU4 : null;
+ boolean enabled = "up".equals(otuConfig.getString("administrative-state"));
+ OduSignalType signalType = "OTU4".equals(otuConfig.getString("rate")) ? OduSignalType.ODU4 : null;
//Unsure how to retreive, outside knowledge it is tunable.
boolean isTunable = true;
OchSignal lambda = new OchSignal(GridType.DWDM, ChannelSpacing.CHL_50GHZ, 0, 4);
@@ -138,9 +138,9 @@
private static PortDescription parseT100OduPort(HierarchicalConfiguration cfg, long count) {
PortNumber portNumber = PortNumber.portNumber(count);
HierarchicalConfiguration ethernetConfig = cfg.configurationAt("ethernet");
- boolean enabled = ethernetConfig.getString("administrative-state").equals("up");
+ boolean enabled = "up".equals(ethernetConfig.getString("administrative-state"));
//Rate is in kbps
- CltSignalType signalType = ethernetConfig.getString("rate").equals("100000000") ?
+ CltSignalType signalType = "100000000".equals(ethernetConfig.getString("rate")) ?
CltSignalType.CLT_100GBE : null;
DefaultAnnotations annotations = DefaultAnnotations.builder().
set(AnnotationKeys.PORT_NAME, cfg.getString("name")).
diff --git a/drivers/juniper/src/main/java/org/onosproject/drivers/juniper/JuniperUtils.java b/drivers/juniper/src/main/java/org/onosproject/drivers/juniper/JuniperUtils.java
index d6a1918..76f5f3b 100644
--- a/drivers/juniper/src/main/java/org/onosproject/drivers/juniper/JuniperUtils.java
+++ b/drivers/juniper/src/main/java/org/onosproject/drivers/juniper/JuniperUtils.java
@@ -207,7 +207,7 @@
private static DefaultPortDescription parseDefaultPort(HierarchicalConfiguration cfg) {
PortNumber portNumber = portNumber(cfg.getString(LO_INDEX));
- boolean enabled = cfg.getString(STATUS).equals("up");
+ boolean enabled = "up".equals(cfg.getString(STATUS));
int speed = parseInt(cfg.getString(SPEED).replaceAll(MBPS, ""));
diff --git a/drivers/utilities/src/main/java/org/onosproject/drivers/utilities/YangXmlUtils.java b/drivers/utilities/src/main/java/org/onosproject/drivers/utilities/YangXmlUtils.java
index c1e8771..62a2c57 100644
--- a/drivers/utilities/src/main/java/org/onosproject/drivers/utilities/YangXmlUtils.java
+++ b/drivers/utilities/src/main/java/org/onosproject/drivers/utilities/YangXmlUtils.java
@@ -131,7 +131,7 @@
private void addProperties(HierarchicalConfiguration cfg, HierarchicalConfiguration complete) {
cfg.getKeys().forEachRemaining(key -> {
String property = (String) cfg.getProperty(key);
- if (!property.equals("")) {
+ if (!"".equals(property)) {
complete.setProperty(key, property);
}
});
diff --git a/drivers/utilities/src/test/java/org/onosproject/drivers/utilities/XmlConfigParserTest.java b/drivers/utilities/src/test/java/org/onosproject/drivers/utilities/XmlConfigParserTest.java
index d344a5c..044a15a 100644
--- a/drivers/utilities/src/test/java/org/onosproject/drivers/utilities/XmlConfigParserTest.java
+++ b/drivers/utilities/src/test/java/org/onosproject/drivers/utilities/XmlConfigParserTest.java
@@ -51,7 +51,7 @@
InputStream stream = getClass().getResourceAsStream("/testConfig.xml");
String switchId = XmlConfigParser.parseSwitchId(XmlConfigParser
.loadXml(stream));
- assertTrue(switchId.equals("ofc-bridge"));
+ assertTrue("ofc-bridge".equals(switchId));
}
@Test
@@ -59,7 +59,7 @@
InputStream stream = getClass().getResourceAsStream("/testConfig.xml");
String capableSwitchId = XmlConfigParser
.parseCapableSwitchId(XmlConfigParser.loadXml(stream));
- assertTrue(capableSwitchId.equals("openvswitch"));
+ assertTrue("openvswitch".equals(capableSwitchId));
}
@Test