From 2b4be02dcafce829bacc93aed2001ebef1e3cc83 Mon Sep 17 00:00:00 2001
From: "tobias.pobocik" <tobias.pobocik@pantheon.tech>
Date: Mon, 4 Mar 2024 14:33:33 +0100
Subject: [PATCH] Remove (DOM)TransactionChainListener

https://github.com/opendaylight/mdsal/commit/82d49007372df18b968afa6d297c991b91bf1fc2
Signed-off-by: tobias.pobocik <tobias.pobocik@pantheon.tech>
---
 .../mountpoint/broker/GnmiDataBroker.java     | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/lighty-modules/lighty-gnmi/lighty-gnmi-sb/src/main/java/io/lighty/gnmi/southbound/mountpoint/broker/GnmiDataBroker.java b/lighty-modules/lighty-gnmi/lighty-gnmi-sb/src/main/java/io/lighty/gnmi/southbound/mountpoint/broker/GnmiDataBroker.java
index 7968da6d1d..a1b6fdcc44 100644
--- a/lighty-modules/lighty-gnmi/lighty-gnmi-sb/src/main/java/io/lighty/gnmi/southbound/mountpoint/broker/GnmiDataBroker.java
+++ b/lighty-modules/lighty-gnmi/lighty-gnmi-sb/src/main/java/io/lighty/gnmi/southbound/mountpoint/broker/GnmiDataBroker.java
@@ -8,21 +8,21 @@
 
 package io.lighty.gnmi.southbound.mountpoint.broker;
 
-import com.google.common.collect.ClassToInstanceMap;
-import com.google.common.collect.ImmutableClassToInstanceMap;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.ListenableFuture;
 import io.lighty.gnmi.southbound.mountpoint.ops.GnmiGet;
 import io.lighty.gnmi.southbound.mountpoint.ops.GnmiSet;
 import io.lighty.gnmi.southbound.mountpoint.transactions.ReadOnlyTx;
 import io.lighty.gnmi.southbound.mountpoint.transactions.ReadWriteTx;
 import io.lighty.gnmi.southbound.mountpoint.transactions.WriteOnlyTx;
+import java.util.concurrent.Executor;
 import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.mdsal.dom.api.DOMDataBrokerExtension;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeReadWriteTransaction;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction;
 import org.opendaylight.mdsal.dom.api.DOMTransactionChain;
-import org.opendaylight.mdsal.dom.api.DOMTransactionChainListener;
 import org.opendaylight.mdsal.dom.spi.PingPongMergingDOMDataBroker;
+import org.opendaylight.yangtools.yang.common.Empty;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -39,7 +39,7 @@ public GnmiDataBroker(final GnmiGet getProvider, final GnmiSet setProvider) {
     }
 
     @Override
-    public @NonNull DOMTransactionChain createTransactionChain(DOMTransactionChainListener listener) {
+    public @NonNull DOMTransactionChain createTransactionChain() {
         return new DOMTransactionChain() {
             @Override
             public DOMDataTreeReadTransaction newReadOnlyTransaction() {
@@ -51,6 +51,21 @@ public DOMDataTreeReadWriteTransaction newReadWriteTransaction() {
                 return GnmiDataBroker.this.newReadWriteTransaction();
             }
 
+            @Override
+            public void addCallback(FutureCallback<Empty> callback) {
+                DOMTransactionChain.super.addCallback(callback);
+            }
+
+            @Override
+            public void addCallback(FutureCallback<Empty> callback, Executor executor) {
+                DOMTransactionChain.super.addCallback(callback, executor);
+            }
+
+            @Override
+            public @NonNull ListenableFuture<Empty> future() {
+                return createMergingTransactionChain().future();
+            }
+
             @Override
             public DOMDataTreeWriteTransaction newWriteOnlyTransaction() {
                 return GnmiDataBroker.this.newWriteOnlyTransaction();
@@ -63,11 +78,6 @@ public void close() {
         };
     }
 
-    @Override
-    public @NonNull ClassToInstanceMap<DOMDataBrokerExtension> getExtensions() {
-        return ImmutableClassToInstanceMap.of();
-    }
-
     @Override
     public DOMDataTreeReadTransaction newReadOnlyTransaction() {
         return new ReadOnlyTx(gnmiGet);