Sonar suggestions
Change-Id: I68d400185ffc885bf92b558a2565a49af149ef0c
diff --git a/apps/faultmanagement/fmcli/src/main/java/org/onosproject/faultmanagement/alarms/cli/completer/AlarmFieldValueCompleter.java b/apps/faultmanagement/fmcli/src/main/java/org/onosproject/faultmanagement/alarms/cli/completer/AlarmFieldValueCompleter.java
index b698d56..87b8282 100644
--- a/apps/faultmanagement/fmcli/src/main/java/org/onosproject/faultmanagement/alarms/cli/completer/AlarmFieldValueCompleter.java
+++ b/apps/faultmanagement/fmcli/src/main/java/org/onosproject/faultmanagement/alarms/cli/completer/AlarmFieldValueCompleter.java
@@ -45,6 +45,7 @@
case TIME_CLEARED:
case TIME_UPDATED:
choices.add(Instant.now().toString());
+ return choices;
default:
return choices;
}
diff --git a/apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/util/OpenstackVtapUtil.java b/apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/util/OpenstackVtapUtil.java
index 69919be..d88e132 100644
--- a/apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/util/OpenstackVtapUtil.java
+++ b/apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/util/OpenstackVtapUtil.java
@@ -28,7 +28,6 @@
import org.slf4j.Logger;
import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
import java.nio.charset.StandardCharsets;
import static org.onosproject.openstacknetworking.api.Constants.ANNOTATION_NETWORK_ID;
@@ -187,7 +186,6 @@
*/
public static void dumpStackTrace(Logger log, Exception e) {
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- e.printStackTrace(new PrintStream(outputStream));
log.error("\n{}", new String(outputStream.toByteArray(), StandardCharsets.UTF_8));
}
diff --git a/apps/pim/src/main/java/org/onosproject/pim/impl/PimApplication.java b/apps/pim/src/main/java/org/onosproject/pim/impl/PimApplication.java
index 8d76e31..36948c1 100644
--- a/apps/pim/src/main/java/org/onosproject/pim/impl/PimApplication.java
+++ b/apps/pim/src/main/java/org/onosproject/pim/impl/PimApplication.java
@@ -49,9 +49,6 @@
@Reference(cardinality = ReferenceCardinality.MANDATORY)
protected CoreService coreService;
- // Our application ID
- private static ApplicationId appId;
-
// Register to receive PIM packets, used to send packets as well
@Reference(cardinality = ReferenceCardinality.MANDATORY)
protected PacketService packetService;
@@ -75,7 +72,7 @@
@Activate
public void activate() {
// Get our application ID
- appId = coreService.registerApplication("org.onosproject.pim");
+ ApplicationId appId = coreService.registerApplication("org.onosproject.pim");
// Build the traffic selector for PIM packets
TrafficSelector.Builder selector = DefaultTrafficSelector.builder();
diff --git a/apps/workflow/api/src/main/java/org/onosproject/workflow/api/EventHintSupplier.java b/apps/workflow/api/src/main/java/org/onosproject/workflow/api/EventHintSupplier.java
index 076bfc0..3ad1847 100644
--- a/apps/workflow/api/src/main/java/org/onosproject/workflow/api/EventHintSupplier.java
+++ b/apps/workflow/api/src/main/java/org/onosproject/workflow/api/EventHintSupplier.java
@@ -22,5 +22,5 @@
*/
@FunctionalInterface
public interface EventHintSupplier {
- String apply(Event event) throws Throwable;
+ String apply(Event event);
}
diff --git a/apps/workflow/api/src/main/java/org/onosproject/workflow/api/TimerChain.java b/apps/workflow/api/src/main/java/org/onosproject/workflow/api/TimerChain.java
index 33c6aa3..1118568 100644
--- a/apps/workflow/api/src/main/java/org/onosproject/workflow/api/TimerChain.java
+++ b/apps/workflow/api/src/main/java/org/onosproject/workflow/api/TimerChain.java
@@ -16,6 +16,7 @@
package org.onosproject.workflow.api;
import java.util.Date;
+import java.util.Objects;
import java.util.PriorityQueue;
import java.util.Timer;
import java.util.TimerTask;
@@ -212,6 +213,24 @@
return date().compareTo(target.date());
}
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof TimerChainTask)) {
+ return false;
+ }
+ TimerChainTask that = (TimerChainTask) o;
+
+ return this.date().equals(that.date());
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(date);
+ }
+
/**
* Copies timer chain task.
* @return timer chain task
diff --git a/apps/workflow/app/src/main/java/org/onosproject/workflow/impl/WorkFlowEngine.java b/apps/workflow/app/src/main/java/org/onosproject/workflow/impl/WorkFlowEngine.java
index 15cd8cd..e4d545d 100644
--- a/apps/workflow/app/src/main/java/org/onosproject/workflow/impl/WorkFlowEngine.java
+++ b/apps/workflow/app/src/main/java/org/onosproject/workflow/impl/WorkFlowEngine.java
@@ -259,7 +259,7 @@
log.info("sleep {}", i);
Thread.sleep(10L * (i + 1));
} catch (InterruptedException e) {
- e.printStackTrace();
+ Thread.currentThread().interrupt();
}
}
}
diff --git a/apps/workflow/app/src/main/java/org/onosproject/workflow/impl/example/SampleWorkflow.java b/apps/workflow/app/src/main/java/org/onosproject/workflow/impl/example/SampleWorkflow.java
index c09bec2..20b3771 100644
--- a/apps/workflow/app/src/main/java/org/onosproject/workflow/impl/example/SampleWorkflow.java
+++ b/apps/workflow/app/src/main/java/org/onosproject/workflow/impl/example/SampleWorkflow.java
@@ -167,7 +167,7 @@
try {
Thread.sleep(ms);
} catch (InterruptedException e) {
- e.printStackTrace();
+ Thread.currentThread().interrupt();
}
}
}