Migrate users of Optional.get()

[openflowplugin.git] / applications / forwardingrules-sync / src / main / java / org / opendaylight / openflowplugin / applications / frsync / dao / FlowCapableNodeSnapshotDao.java

diff --git a/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/dao/FlowCapableNodeSnapshotDao.java b/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/dao/FlowCapableNodeSnapshotDao.java
index e362ff52971b8478668384353c6a5623c52c2541..5b22407ef81173be23d7be8d1ed49871f7c51fa9 100644 (file)
--- a/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/dao/FlowCapableNodeSnapshotDao.java
+++ b/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/dao/FlowCapableNodeSnapshotDao.java
@@ -17,20 +17,18 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
  * Adding cache to data access object of {@link FlowCapableNode}.
  */
 public class FlowCapableNodeSnapshotDao implements FlowCapableNodeDao {
-
     private final ConcurrentHashMap<String, FlowCapableNode> cache = new ConcurrentHashMap<>();
 
-    public void updateCache(@NonNull NodeId nodeId, Optional<FlowCapableNode> dataAfter) {
+    public void updateCache(final @NonNull NodeId nodeId, final Optional<FlowCapableNode> dataAfter) {
         if (dataAfter.isPresent()) {
-            cache.put(nodeId.getValue(), dataAfter.get());
+            cache.put(nodeId.getValue(), dataAfter.orElseThrow());
         } else {
             cache.remove(nodeId.getValue());
         }
     }
 
     @Override
-    public Optional<FlowCapableNode> loadByNodeId(@NonNull NodeId nodeId) {
-        final FlowCapableNode node = cache.get(nodeId.getValue());
-        return Optional.ofNullable(node);
+    public Optional<FlowCapableNode> loadByNodeId(final NodeId nodeId) {
+        return Optional.ofNullable(cache.get(nodeId.getValue()));
     }
 }