Migrate Optional.get() callers

[transportpce.git] / networkmodel / src / test / java / org / opendaylight / transportpce / networkmodel / util / TpceNetworkTest.java

diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/TpceNetworkTest.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/TpceNetworkTest.java
index a8d7aabcadbbcc7784ed7683653d189707ba0d7c..da15d45b757f847b9026a8aeee7c76bf08841bf3 100644 (file)
--- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/TpceNetworkTest.java
+++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/TpceNetworkTest.java
@@ -38,7 +38,7 @@ public class TpceNetworkTest extends AbstractTest {
         InstanceIdentifier<Network> nwIID = InstanceIdentifier.create(Networks.class)
             .child(Network.class, new NetworkKey(new NetworkId("clli-network")));
         Network createdClli = getDataBroker().newReadOnlyTransaction()
-            .read(LogicalDatastoreType.CONFIGURATION, nwIID).get().get();
+            .read(LogicalDatastoreType.CONFIGURATION, nwIID).get().orElseThrow();
         assertNotNull(createdClli, "Clli layer should be created and not null");
 
         Augmentation<NetworkTypes> ordClli = new NetworkTypes1Builder()
@@ -56,7 +56,7 @@ public class TpceNetworkTest extends AbstractTest {
         InstanceIdentifier<Network> nwIID = InstanceIdentifier.create(Networks.class)
             .child(Network.class, new NetworkKey(new NetworkId("openroadm-network")));
         Network createdOrdNetwork = getDataBroker().newReadOnlyTransaction()
-            .read(LogicalDatastoreType.CONFIGURATION, nwIID).get().get();
+            .read(LogicalDatastoreType.CONFIGURATION, nwIID).get().orElseThrow();
         assertNotNull(createdOrdNetwork, "openroadm-network layer should be created and not null");
         commonNetworkAugmentationTest(createdOrdNetwork);
     }
@@ -67,7 +67,7 @@ public class TpceNetworkTest extends AbstractTest {
         InstanceIdentifier<Network> nwIID = InstanceIdentifier.create(Networks.class)
             .child(Network.class, new NetworkKey(new NetworkId("openroadm-topology")));
         Network createdOrdNetwork = getDataBroker().newReadOnlyTransaction()
-            .read(LogicalDatastoreType.CONFIGURATION, nwIID).get().get();
+            .read(LogicalDatastoreType.CONFIGURATION, nwIID).get().orElseThrow();
         assertNotNull(createdOrdNetwork, "openroadm-logpology layer should be created and not null");
         commonNetworkAugmentationTest(createdOrdNetwork);
     }
@@ -78,7 +78,7 @@ public class TpceNetworkTest extends AbstractTest {
         InstanceIdentifier<Network> nwIID = InstanceIdentifier.create(Networks.class)
             .child(Network.class, new NetworkKey(new NetworkId("otn-topology")));
         Network createdOrdNetwork = getDataBroker().newReadOnlyTransaction()
-            .read(LogicalDatastoreType.CONFIGURATION, nwIID).get().get();
+            .read(LogicalDatastoreType.CONFIGURATION, nwIID).get().orElseThrow();
         assertNotNull(createdOrdNetwork, "otn-logpology layer should be created and not null");
         commonNetworkAugmentationTest(createdOrdNetwork);
     }
@@ -89,7 +89,7 @@ public class TpceNetworkTest extends AbstractTest {
         InstanceIdentifier<Network> nwIID = InstanceIdentifier.create(Networks.class)
             .child(Network.class, new NetworkKey(new NetworkId("toto")));
         Network createdOrdNetwork = getDataBroker().newReadOnlyTransaction()
-            .read(LogicalDatastoreType.CONFIGURATION, nwIID).get().get();
+            .read(LogicalDatastoreType.CONFIGURATION, nwIID).get().orElseThrow();
         assertNotNull(createdOrdNetwork, "toto layer should be created and not null");
         assertNull(createdOrdNetwork.getNetworkTypes().augmentation(NetworkTypes1.class),
             "toto layer should not have any network-type augmentation");