Migrate users of Optional.get()

[openflowplugin.git] / test-provider / src / main / java / org / opendaylight / openflowplugin / test / TestProviderTransactionUtil.java

diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/TestProviderTransactionUtil.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/TestProviderTransactionUtil.java
index fa0c167856f4ab5e4532b1327d1c53da210753d6..c5705b28a8fc6b35f14cd4bffce04160a71f9d08 100644 (file)
--- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/TestProviderTransactionUtil.java
+++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/TestProviderTransactionUtil.java
@@ -5,13 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.openflowplugin.test;
 
-import com.google.common.base.Optional;
 import java.util.concurrent.ExecutionException;
-import org.opendaylight.controller.md.sal.binding.api.ReadTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.mdsal.binding.api.ReadTransaction;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
@@ -21,24 +19,19 @@ import org.slf4j.LoggerFactory;
  * Created by Martin Bobak mbobak@cisco.com on 8/20/14.
  */
 public final class TestProviderTransactionUtil {
-
     private static final Logger LOG = LoggerFactory.getLogger(TestProviderTransactionUtil.class);
 
     private TestProviderTransactionUtil() {
-        throw new AssertionError("TestProviderTransactionUtil was not meant to be instantiated.");
+        // Hidden on purpose
     }
 
-    public static <T extends DataObject> T getDataObject(ReadTransaction readOnlyTransaction, InstanceIdentifier<T> identifier) {
-        Optional<T> optionalData = null;
+    public static <T extends DataObject> T getDataObject(final ReadTransaction readOnlyTransaction,
+            final InstanceIdentifier<T> identifier) {
         try {
-            optionalData = readOnlyTransaction.read(LogicalDatastoreType.OPERATIONAL, identifier).get();
-            if (optionalData.isPresent()) {
-                return optionalData.get();
-            }
+            return readOnlyTransaction.read(LogicalDatastoreType.OPERATIONAL, identifier).get().orElse(null);
         } catch (ExecutionException | InterruptedException e) {
             LOG.error("Read transaction for identifier {} failed.", identifier, e);
+            return null;
         }
-        return null;
     }
-
 }