Use stateless transaction commands

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

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/ProtocolUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/ProtocolUpdateCommand.java
index f32cfac2df7d29d50959175861cd2306c1cc8acd..a42c6a4890a25ad69ecfd7b1248b6d50d68cb7b6 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/ProtocolUpdateCommand.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/ProtocolUpdateCommand.java
@@ -30,30 +30,29 @@ import org.slf4j.LoggerFactory;
 import com.google.common.base.Optional;
 import com.google.common.collect.Sets;
 
-public class ProtocolUpdateCommand extends AbstractTransactCommand {
+public class ProtocolUpdateCommand implements TransactCommand {
 
     private static final Logger LOG = LoggerFactory.getLogger(ProtocolUpdateCommand.class);
-    private Map<InstanceIdentifier<ProtocolEntry>, ProtocolEntry> protocols;
-    private Map<InstanceIdentifier<OvsdbBridgeAugmentation>, OvsdbBridgeAugmentation> bridges;
 
-    public ProtocolUpdateCommand(BridgeOperationalState state,
-            AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes) {
-        super(state, changes);
-        protocols = TransactUtils.extractCreatedOrUpdated(getChanges(), ProtocolEntry.class);
-        bridges = TransactUtils.extractCreatedOrUpdated(getChanges(), OvsdbBridgeAugmentation.class);
+    @Override
+    public void execute(TransactionBuilder transaction, BridgeOperationalState state,
+                        AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> events) {
+        execute(transaction, state, TransactUtils.extractCreatedOrUpdated(events, ProtocolEntry.class),
+                TransactUtils.extractCreatedOrUpdated(events, OvsdbBridgeAugmentation.class));
     }
 
-    @Override
-    public void execute(TransactionBuilder transaction) {
+    private void execute(TransactionBuilder transaction, BridgeOperationalState state,
+                         Map<InstanceIdentifier<ProtocolEntry>, ProtocolEntry> protocols,
+                         Map<InstanceIdentifier<OvsdbBridgeAugmentation>, OvsdbBridgeAugmentation> bridges) {
         for (Entry<InstanceIdentifier<ProtocolEntry>, ProtocolEntry> entry: protocols.entrySet()) {
             Optional<ProtocolEntry> operationalProtocolEntryOptional =
-                    getOperationalState().getProtocolEntry(entry.getKey());
+                    state.getProtocolEntry(entry.getKey());
             if (!operationalProtocolEntryOptional.isPresent()) {
                 InstanceIdentifier<OvsdbBridgeAugmentation> bridgeIid =
                         entry.getKey().firstIdentifierOf(OvsdbBridgeAugmentation.class);
                 Optional<OvsdbBridgeAugmentation> bridgeOptional =
-                        getOperationalState().getOvsdbBridgeAugmentation(bridgeIid);
-                OvsdbBridgeAugmentation ovsdbBridge = null;
+                        state.getOvsdbBridgeAugmentation(bridgeIid);
+                OvsdbBridgeAugmentation ovsdbBridge;
                 if (bridgeOptional.isPresent()) {
                     ovsdbBridge = bridgeOptional.get();
                 } else {
@@ -74,7 +73,8 @@ public class ProtocolUpdateCommand extends AbstractTransactCommand {
                                 .where(bridge.getNameColumn().getSchema().opEqual(bridge.getNameColumn().getData()))
                                 .build());
                         } catch (SchemaVersionMismatchException e) {
-                            LOG.warn("protocol not supported by this version of ovsdb", e);
+                            // We don't care about the exception stack trace here
+                            LOG.warn("protocol not supported by this version of ovsdb: {}", e.getMessage());
                         }
                     }
                 }