Remove a method checking if non-null by using Optional
Change-Id: Iec8d9016e09c6637574bf5b6f1aab5d8bfbec07a
diff --git a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java
index 3636f14..f87bd3d 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java
@@ -284,12 +284,6 @@
.collect(Collectors.toList());
}
- private void notifyDelegateIfNotNull(IntentEvent event) {
- if (event != null) {
- notifyDelegate(event);
- }
- }
-
private final class InternalCurrentListener implements
EventuallyConsistentMapListener<Key, IntentData> {
@Override
@@ -303,7 +297,7 @@
if (delegate != null && isMaster(event.value().intent().key())) {
delegate.onUpdate(new IntentData(intentData)); // copy for safety, likely unnecessary
}
- notifyDelegateIfNotNull(IntentEvent.getEvent(intentData));
+ IntentEvent.getEvent(intentData).ifPresent(e -> notifyDelegate(e));
}
}
}
@@ -323,7 +317,7 @@
}
}
- notifyDelegateIfNotNull(IntentEvent.getEvent(event.value()));
+ IntentEvent.getEvent(event.value()).ifPresent(e -> notifyDelegate(e));
}
}
}