Remove a method checking if non-null by using Optional
Change-Id: Iec8d9016e09c6637574bf5b6f1aab5d8bfbec07a
diff --git a/core/api/src/main/java/org/onosproject/net/intent/IntentEvent.java b/core/api/src/main/java/org/onosproject/net/intent/IntentEvent.java
index b27a507..e3eb84a 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/IntentEvent.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/IntentEvent.java
@@ -18,6 +18,8 @@
import com.google.common.annotations.Beta;
import org.onosproject.event.AbstractEvent;
+import java.util.Optional;
+
/**
* A class to represent an intent related event.
*/
@@ -95,7 +97,7 @@
* @param data the intent data to create an event for
* @return new intent event if the state is valid, otherwise null.
*/
- public static IntentEvent getEvent(IntentData data) {
+ public static Optional<IntentEvent> getEvent(IntentData data) {
return getEvent(data.state(), data.intent());
}
@@ -107,7 +109,7 @@
* @param intent intent to put in event
* @return new intent event if the state is valid, otherwise null.
*/
- public static IntentEvent getEvent(IntentState state, Intent intent) {
+ public static Optional<IntentEvent> getEvent(IntentState state, Intent intent) {
Type type;
switch (state) {
case INSTALL_REQ:
@@ -138,9 +140,9 @@
case RECOMPILING:
case WITHDRAWING:
default:
- return null;
+ return Optional.empty();
}
- return new IntentEvent(type, intent);
+ return Optional.of(new IntentEvent(type, intent));
}
}