ovsdb enable checkstyle on error

[ovsdb.git] / southbound / southbound-impl / src / main / java / org / opendaylight / ovsdb / southbound / ovsdb / transact / TransactInvokerImpl.java

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TransactInvokerImpl.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TransactInvokerImpl.java
index 07f70e6cf1c793995294384d3af06fe074deb6fa..0ab60549d142860d0a8a050444893ebed76bc0d7 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TransactInvokerImpl.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TransactInvokerImpl.java
@@ -7,19 +7,23 @@
  */
 package org.opendaylight.ovsdb.southbound.ovsdb.transact;
 
+import com.google.common.util.concurrent.ListenableFuture;
+import java.util.Collection;
 import java.util.List;
-
+import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
+import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
 import org.opendaylight.ovsdb.lib.operations.OperationResult;
 import org.opendaylight.ovsdb.lib.operations.TransactionBuilder;
 import org.opendaylight.ovsdb.lib.schema.DatabaseSchema;
 import org.opendaylight.ovsdb.southbound.OvsdbConnectionInstance;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.util.concurrent.ListenableFuture;
-
 public class TransactInvokerImpl implements TransactInvoker {
-    private static final Logger LOG = LoggerFactory.getLogger(BridgeUpdateCommand.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TransactInvokerImpl.class);
     private OvsdbConnectionInstance connectionInstance;
     private DatabaseSchema dbSchema;
 
@@ -29,15 +33,32 @@ public class TransactInvokerImpl implements TransactInvoker {
     }
 
     @Override
-    public void invoke(TransactCommand command) {
+    public void invoke(TransactCommand command, BridgeOperationalState state,
+                       AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> events) {
+        TransactionBuilder tb = new TransactionBuilder(connectionInstance, dbSchema);
+        command.execute(tb, state, events);
+        invoke(command, tb);
+    }
+
+    @Override
+    public void invoke(TransactCommand command, BridgeOperationalState state,
+                       Collection<DataTreeModification<Node>> modifications) {
         TransactionBuilder tb = new TransactionBuilder(connectionInstance, dbSchema);
-        command.execute(tb);
+        command.execute(tb, state, modifications);
+        invoke(command, tb);
+    }
+
+    private void invoke(TransactCommand command, TransactionBuilder tb) {
         ListenableFuture<List<OperationResult>> result = tb.execute();
-        try {
-            List<OperationResult> got = result.get();
-            LOG.debug("OVSDB transaction result: {}", got);
-        } catch (Exception e) {
-            LOG.warn("Transact execution exception: ",e);
+        LOG.debug("invoke: command: {}, tb: {}", command, tb);
+        if (tb.getOperations().size() > 0) {
+            try {
+                List<OperationResult> got = result.get();
+                LOG.debug("OVSDB transaction result: {}", got);
+            } catch (Exception e) {
+                LOG.warn("Transact execution exception: ", e);
+            }
+            LOG.trace("invoke exit command: {}, tb: {}", command, tb);
         }
     }