Sonar fixes
Rule: Use isEmpty() to check whether the collection is empty or not.
Change-Id: Ib5ab56b2263623b297db56c5cac2c2ee80e12725
diff --git a/core/api/src/main/java/org/onosproject/net/driver/DefaultDriver.java b/core/api/src/main/java/org/onosproject/net/driver/DefaultDriver.java
index c54ca46..7ed674b 100644
--- a/core/api/src/main/java/org/onosproject/net/driver/DefaultDriver.java
+++ b/core/api/src/main/java/org/onosproject/net/driver/DefaultDriver.java
@@ -99,7 +99,7 @@
}
}));
}
- return new DefaultDriver(name, completeParents.size() > 0 ? completeParents : other.parents(),
+ return new DefaultDriver(name, !completeParents.isEmpty() ? completeParents : other.parents(),
manufacturer, hwVersion, swVersion,
ImmutableMap.copyOf(behaviours), properties.build());
}
diff --git a/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java b/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java
index 623ece1..1fd3935 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java
@@ -498,7 +498,7 @@
@Override
public TrafficTreatment build() {
- if (deferred.size() == 0 && immediate.size() == 0
+ if (deferred.isEmpty() && immediate.isEmpty()
&& table == null && !clear) {
immediate();
noAction();
diff --git a/core/api/src/main/java/org/onosproject/net/mcast/McastRouteInfo.java b/core/api/src/main/java/org/onosproject/net/mcast/McastRouteInfo.java
index f8d232b..9a47817 100644
--- a/core/api/src/main/java/org/onosproject/net/mcast/McastRouteInfo.java
+++ b/core/api/src/main/java/org/onosproject/net/mcast/McastRouteInfo.java
@@ -62,7 +62,7 @@
}
public boolean isComplete() {
- return ((sink.isPresent() || sinks.size() > 0) && source.isPresent());
+ return ((sink.isPresent() || !sinks.isEmpty()) && source.isPresent());
}
/**
diff --git a/core/api/src/main/java/org/onosproject/net/meter/DefaultMeter.java b/core/api/src/main/java/org/onosproject/net/meter/DefaultMeter.java
index e2e049d..f33c914 100644
--- a/core/api/src/main/java/org/onosproject/net/meter/DefaultMeter.java
+++ b/core/api/src/main/java/org/onosproject/net/meter/DefaultMeter.java
@@ -222,7 +222,7 @@
public DefaultMeter build() {
checkNotNull(deviceId, "Must specify a device");
checkNotNull(bands, "Must have bands.");
- checkArgument(bands.size() > 0, "Must have at least one band.");
+ checkArgument(!bands.isEmpty(), "Must have at least one band.");
checkNotNull(appId, "Must have an application id");
checkNotNull(id, "Must specify a meter id");
return new DefaultMeter(deviceId, id, appId, unit, burst, bands);
diff --git a/core/api/src/main/java/org/onosproject/net/meter/DefaultMeterRequest.java b/core/api/src/main/java/org/onosproject/net/meter/DefaultMeterRequest.java
index 7168928..1ca4466 100644
--- a/core/api/src/main/java/org/onosproject/net/meter/DefaultMeterRequest.java
+++ b/core/api/src/main/java/org/onosproject/net/meter/DefaultMeterRequest.java
@@ -165,7 +165,7 @@
private void validate() {
checkNotNull(deviceId, "Must specify a device");
checkNotNull(bands, "Must have bands.");
- checkArgument(bands.size() > 0, "Must have at least one band.");
+ checkArgument(!bands.isEmpty(), "Must have at least one band.");
checkNotNull(appId, "Must have an application id");
}
diff --git a/core/api/src/main/java/org/onosproject/net/resource/ContinuousResourceId.java b/core/api/src/main/java/org/onosproject/net/resource/ContinuousResourceId.java
index 0222051..46237e0 100644
--- a/core/api/src/main/java/org/onosproject/net/resource/ContinuousResourceId.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/ContinuousResourceId.java
@@ -93,7 +93,7 @@
@Override
public Optional<DiscreteResourceId> parent() {
- if (components.size() == 0) {
+ if (components.isEmpty()) {
return Optional.empty();
}
if (components.size() == 1) {
diff --git a/core/api/src/main/java/org/onosproject/ui/UiExtension.java b/core/api/src/main/java/org/onosproject/ui/UiExtension.java
index bc0dfc9..17201cb 100644
--- a/core/api/src/main/java/org/onosproject/ui/UiExtension.java
+++ b/core/api/src/main/java/org/onosproject/ui/UiExtension.java
@@ -165,7 +165,7 @@
*/
public Builder(ClassLoader cl, List<UiView> views) {
checkNotNull(cl, "Must provide a class loader");
- checkArgument(views.size() > 0, "Must provide at least one view");
+ checkArgument(!views.isEmpty(), "Must provide at least one view");
classLoader = cl;
viewList = views;
}
diff --git a/core/api/src/main/java/org/onosproject/ui/topo/NodeSelection.java b/core/api/src/main/java/org/onosproject/ui/topo/NodeSelection.java
index ce5680e..f906546 100644
--- a/core/api/src/main/java/org/onosproject/ui/topo/NodeSelection.java
+++ b/core/api/src/main/java/org/onosproject/ui/topo/NodeSelection.java
@@ -97,7 +97,7 @@
Set<String> unmatched = findLinks(ids);
unmatched = findDevices(unmatched);
unmatched = findHosts(unmatched);
- if (unmatched.size() > 0) {
+ if (!unmatched.isEmpty()) {
log.debug("Skipping unmatched IDs {}", unmatched);
}
diff --git a/core/common/src/main/java/org/onosproject/codec/impl/RoleInfoCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/RoleInfoCodec.java
index 2bed282..8e0f0b7 100644
--- a/core/common/src/main/java/org/onosproject/codec/impl/RoleInfoCodec.java
+++ b/core/common/src/main/java/org/onosproject/codec/impl/RoleInfoCodec.java
@@ -54,7 +54,7 @@
ArrayNode backups = context.mapper().createArrayNode();
roleInfo.backups().forEach(backup -> backups.add(backup.id()));
- if (roleInfo.backups().size() != 0) {
+ if (!roleInfo.backups().isEmpty()) {
result.set(BACKUPS, backups);
}
diff --git a/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java b/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
index 17df9c4..cd244ff 100644
--- a/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
+++ b/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
@@ -629,7 +629,7 @@
@Override
public synchronized void run() {
- if (stages.size() > 0) {
+ if (!stages.isEmpty()) {
process(stages.remove(0));
} else if (!hasFailed) {
fops.callback().onSuccess(fops);
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixLeaderElectorState.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixLeaderElectorState.java
index cb7d63a..369c191 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixLeaderElectorState.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixLeaderElectorState.java
@@ -449,7 +449,7 @@
.filter(r -> r.sessionId() != session.id())
.collect(Collectors.toList());
if (leader.sessionId() == session.id()) {
- if (updatedRegistrations.size() > 0) {
+ if (!updatedRegistrations.isEmpty()) {
return new ElectionState(updatedRegistrations,
updatedRegistrations.get(0),
termCounter.get(),
@@ -474,7 +474,7 @@
.filter(r -> !r.nodeId().equals(nodeId))
.collect(Collectors.toList());
if (leader.nodeId().equals(nodeId)) {
- if (updatedRegistrations.size() > 0) {
+ if (!updatedRegistrations.isEmpty()) {
return new ElectionState(updatedRegistrations,
updatedRegistrations.get(0),
termCounter.get(),