Migrate Optional.get() callers

[transportpce.git] / test-common / src / main / java / org / opendaylight / transportpce / test / utils / TopologyDataUtils.java

diff --git a/test-common/src/main/java/org/opendaylight/transportpce/test/utils/TopologyDataUtils.java b/test-common/src/main/java/org/opendaylight/transportpce/test/utils/TopologyDataUtils.java
index 74ce4cc1824a2240e4aec36aba655342ada43d16..a67edb21e9987e95ec5232a9e20cdc63e1d16f28 100644 (file)
--- a/test-common/src/main/java/org/opendaylight/transportpce/test/utils/TopologyDataUtils.java
+++ b/test-common/src/main/java/org/opendaylight/transportpce/test/utils/TopologyDataUtils.java
@@ -50,11 +50,11 @@ public final class TopologyDataUtils {
                         "Could not transform the input %s into normalized nodes", fileName));
                 }
                 Optional<DataObject> dataObject = XMLDataObjectConverter.createWithDataStoreUtil(dataStoreContextUtil)
-                    .getDataObject(transformIntoNormalizedNode.get(), Networks.QNAME);
+                    .getDataObject(transformIntoNormalizedNode.orElseThrow(), Networks.QNAME);
                 if (!dataObject.isPresent()) {
                     throw new IllegalStateException("Could not transform normalized nodes into data object");
                 } else {
-                    networks = (Networks) dataObject.get();
+                    networks = (Networks) dataObject.orElseThrow();
                 }
             } catch (IOException e) {
                 LOG.error("An error occured while reading file {}", file, e);
@@ -66,7 +66,7 @@ public final class TopologyDataUtils {
             throw new IllegalStateException("Network is null cannot write it to datastore");
         }
         FluentFuture<? extends CommitInfo> commitFuture = writeTransaction(dataStoreContextUtil.getDataBroker(), ii,
-                networks.nonnullNetwork().values().stream().findFirst().get());
+                networks.nonnullNetwork().values().stream().findFirst().orElseThrow());
         commitFuture.get();
         LOG.info("extraction from {} stored with success in datastore", topoFile.getName());
     }
@@ -97,11 +97,11 @@ public final class TopologyDataUtils {
                         "Could not transform the input %s into normalized nodes", fileName));
                 }
                 Optional<DataObject> dataObject = XMLDataObjectConverter.createWithDataStoreUtil(dataStoreContextUtil)
-                    .getDataObject(transformIntoNormalizedNode.get(), Network.QNAME);
+                    .getDataObject(transformIntoNormalizedNode.orElseThrow(), Network.QNAME);
                 if (!dataObject.isPresent()) {
                     throw new IllegalStateException("Could not transform normalized nodes into data object");
                 } else {
-                    result = (Network) dataObject.get();
+                    result = (Network) dataObject.orElseThrow();
                 }
             } catch (IOException e) {
                 LOG.error("An error occured while reading file {}", file, e);