dsbackend spotbugs cleanup
[lispflowmapping.git] / mappingservice / dsbackend / src / main / java / org / opendaylight / lispflowmapping / dsbackend / DataStoreBackEnd.java
index 446ef60660080993c92da64d7d4812b414a465af..66a62ee88e8e010c0924f9c2e7d074277bacdb3f 100644 (file)
@@ -7,24 +7,24 @@
  */
 package org.opendaylight.lispflowmapping.dsbackend;
 
-import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.CheckedFuture;
 import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import org.opendaylight.controller.md.sal.binding.api.BindingTransactionChain;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionChain;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListener;
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
 import org.opendaylight.lispflowmapping.lisp.util.LispAddressStringifier;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.ReadTransaction;
+import org.opendaylight.mdsal.binding.api.Transaction;
+import org.opendaylight.mdsal.binding.api.TransactionChain;
+import org.opendaylight.mdsal.binding.api.TransactionChainListener;
+import org.opendaylight.mdsal.binding.api.WriteTransaction;
+import org.opendaylight.mdsal.common.api.CommitInfo;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.XtrId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.MappingDatabase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.MappingOrigin;
@@ -45,17 +45,23 @@ import org.slf4j.LoggerFactory;
  *
  */
 public class DataStoreBackEnd implements TransactionChainListener {
-    protected static final Logger LOG = LoggerFactory.getLogger(DataStoreBackEnd.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DataStoreBackEnd.class);
     private static final InstanceIdentifier<MappingDatabase> DATABASE_ROOT =
             InstanceIdentifier.create(MappingDatabase.class);
     private static final InstanceIdentifier<LastUpdated> LAST_UPDATED =
             InstanceIdentifier.create(MappingDatabase.class).child(LastUpdated.class);
-    private BindingTransactionChain txChain;
+    private final DataBroker broker;
+    private TransactionChain txChain;
 
     public DataStoreBackEnd(DataBroker broker) {
-        this.txChain = broker.createTransactionChain(this);
+        this.broker = broker;
+        createTransactionChain();
     }
 
+    public void createTransactionChain() {
+        LOG.debug("Creating DataStoreBackEnd transaction chain...");
+        txChain = broker.createMergingTransactionChain(this);
+    }
 
     public void addAuthenticationKey(AuthenticationKey authenticationKey) {
         if (LOG.isDebugEnabled()) {
@@ -186,7 +192,7 @@ public class DataStoreBackEnd implements TransactionChainListener {
     public List<Mapping> getAllMappings(LogicalDatastoreType logicalDataStore) {
         LOG.debug("MD-SAL: Get all mappings from {} datastore",
                 logicalDataStore == LogicalDatastoreType.CONFIGURATION ? "config" : "operational");
-        List<Mapping> mappings = new ArrayList<Mapping>();
+        List<Mapping> mappings = new ArrayList<>();
         MappingDatabase mdb = readTransaction(DATABASE_ROOT, logicalDataStore);
 
         if (mdb != null && mdb.getVirtualNetworkIdentifier() != null) {
@@ -203,7 +209,7 @@ public class DataStoreBackEnd implements TransactionChainListener {
 
     public List<AuthenticationKey> getAllAuthenticationKeys() {
         LOG.debug("MD-SAL: Get all authentication keys from datastore");
-        List<AuthenticationKey> authKeys = new ArrayList<AuthenticationKey>();
+        List<AuthenticationKey> authKeys = new ArrayList<>();
         MappingDatabase mdb = readTransaction(DATABASE_ROOT, LogicalDatastoreType.CONFIGURATION);
 
         if (mdb != null && mdb.getVirtualNetworkIdentifier() != null) {
@@ -253,30 +259,33 @@ public class DataStoreBackEnd implements TransactionChainListener {
             InstanceIdentifier<U> addIID, U data, LogicalDatastoreType logicalDatastoreType, String errMsg) {
         WriteTransaction writeTx = txChain.newWriteOnlyTransaction();
         writeTx.put(logicalDatastoreType, addIID, data, true);
-        Futures.addCallback(writeTx.submit(), new FutureCallback<Void>() {
+        writeTx.commit().addCallback(new FutureCallback<CommitInfo>() {
 
-            public void onSuccess(Void result) {
+            @Override
+            public void onSuccess(CommitInfo result) {
             }
 
+            @Override
             public void onFailure(Throwable throwable) {
                 LOG.error("Transaction failed:", throwable);
             }
-        });
+        }, MoreExecutors.directExecutor());
     }
 
     private <U extends org.opendaylight.yangtools.yang.binding.DataObject> U readTransaction(
             InstanceIdentifier<U> readIID, LogicalDatastoreType logicalDatastoreType) {
-        ReadOnlyTransaction readTx = txChain.newReadOnlyTransaction();
-        CheckedFuture<Optional<U>, ReadFailedException> readFuture = readTx.read(logicalDatastoreType, readIID);
-        readTx.close();
+        final ListenableFuture<Optional<U>> readFuture;
+        try (ReadTransaction readTx = txChain.newReadOnlyTransaction()) {
+            readFuture = readTx.read(logicalDatastoreType, readIID);
+        }
         try {
-            Optional<U> optionalDataObject = readFuture.checkedGet();
+            Optional<U> optionalDataObject = readFuture.get();
             if (optionalDataObject != null && optionalDataObject.isPresent()) {
                 return optionalDataObject.get();
             } else {
                 LOG.debug("{}: Failed to read", Thread.currentThread().getStackTrace()[1]);
             }
-        } catch (ReadFailedException e) {
+        } catch (InterruptedException | ExecutionException e) {
             LOG.warn("Failed to ....", e);
         }
         return null;
@@ -287,24 +296,31 @@ public class DataStoreBackEnd implements TransactionChainListener {
 
         WriteTransaction writeTx = txChain.newWriteOnlyTransaction();
         writeTx.delete(logicalDatastoreType, deleteIID);
-        Futures.addCallback(writeTx.submit(), new FutureCallback<Void>() {
-
-            public void onSuccess(Void result) {
+        writeTx.commit().addCallback(new FutureCallback<CommitInfo>() {
+            @Override
+            public void onSuccess(CommitInfo result) {
             }
 
+            @Override
             public void onFailure(Throwable throwable) {
                 LOG.error("Transaction failed:", throwable);
             }
-        });
+        }, MoreExecutors.directExecutor());
     }
 
-    public void onTransactionChainFailed(TransactionChain<?, ?> chain, AsyncTransaction<?, ?> transaction,
-            Throwable cause) {
+    @Override
+    public void onTransactionChainFailed(TransactionChain chain, Transaction transaction, Throwable cause) {
         LOG.error("Broken chain {} in DataStoreBackEnd, transaction {}, cause {}", chain, transaction.getIdentifier(),
-                cause);
+                cause.getMessage());
     }
 
-    public void onTransactionChainSuccessful(TransactionChain<?, ?> chain) {
+    @Override
+    public void onTransactionChainSuccessful(TransactionChain chain) {
         LOG.info("DataStoreBackEnd closed successfully, chain {}", chain);
     }
+
+    public void closeTransactionChain() {
+        LOG.debug("Closing DataStoreBackEnd transaction chain...");
+        txChain.close();
+    }
 }