Migrate Optional.get() callers

[transportpce.git] / networkmodel / src / main / java / org / opendaylight / transportpce / networkmodel / service / FrequenciesServiceImpl.java

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/FrequenciesServiceImpl.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/FrequenciesServiceImpl.java
index 09221559c72a1730d0e475b31ff1a9743ddd2139..418b20bf1947b6275b2b0fd56f933215ad1ef5f6 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/FrequenciesServiceImpl.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/FrequenciesServiceImpl.java
@@ -156,7 +156,7 @@ public class FrequenciesServiceImpl implements FrequenciesService {
                      nodeId, NetworkUtils.OVERLAY_NETWORK_ID);
                 return null;
             }
-            return optionalNode.get();
+            return optionalNode.orElseThrow();
         } catch (ExecutionException | TimeoutException e) {
             LOG.warn("Exception while getting network node for node id {} from {} topology",
                     nodeId, NetworkUtils.OVERLAY_NETWORK_ID, e);
@@ -188,7 +188,7 @@ public class FrequenciesServiceImpl implements FrequenciesService {
                         nodeId, NetworkUtils.OVERLAY_NETWORK_ID);
                 return null;
             }
-            return optionalNode.get();
+            return optionalNode.orElseThrow();
         } catch (ExecutionException | TimeoutException e) {
             LOG.warn("Exception while getting common network node for node id {} from {} topology",
                     nodeId, NetworkUtils.OVERLAY_NETWORK_ID, e);
@@ -227,7 +227,7 @@ public class FrequenciesServiceImpl implements FrequenciesService {
             Optional<TerminationPoint1> optionalTerminationPoint = readTx
                     .read(LogicalDatastoreType.CONFIGURATION, tpIID)
                     .get(Timeouts.DATASTORE_READ, TimeUnit.MILLISECONDS);
-            return optionalTerminationPoint.isEmpty() ? null : optionalTerminationPoint.get();
+            return optionalTerminationPoint.isEmpty() ? null : optionalTerminationPoint.orElseThrow();
         } catch (ExecutionException | TimeoutException e) {
             LOG.warn("Exception while getting termination {} for node id {} point from {} topology",
                     tpId, nodeId, NetworkUtils.OVERLAY_NETWORK_ID, e);
@@ -260,7 +260,7 @@ public class FrequenciesServiceImpl implements FrequenciesService {
                         tpId, nodeId, NetworkUtils.OVERLAY_NETWORK_ID);
                 return null;
             }
-            return optionalTerminationPoint.get();
+            return optionalTerminationPoint.orElseThrow();
         } catch (ExecutionException | TimeoutException e) {
             LOG.warn("Exception while getting common-network termination {} for node id {} point from {} topology",
                     tpId, nodeId, NetworkUtils.OVERLAY_NETWORK_ID, e);