Switch DOMExtensibleService to require getExtensions()

With all implementations switched over to provide getExtensions(),
remove getSupportedExtensions().

Change-Id: I16d2a30a28bd565d91cacc32b49ed5cb1a8388bf
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/util/MockSchemaService.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/util/MockSchemaService.java
index 12ed0d3ed33700b0c8a153d392deeb8153a4510a..4c78c46c043e925934447de33685850020150794 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/util/MockSchemaService.java
+++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/util/MockSchemaService.java
@@ -7,7 +7,10 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter.test.util;
 
+import com.google.common.collect.ClassToInstanceMap;
+import com.google.common.collect.ImmutableClassToInstanceMap;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
+import org.opendaylight.mdsal.dom.api.DOMSchemaServiceExtension;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.util.ListenerRegistry;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
@@ -41,6 +44,11 @@ public final class MockSchemaService implements DOMSchemaService, SchemaContextP
         return schemaContext;
     }
 
+    @Override
+    public ClassToInstanceMap<DOMSchemaServiceExtension> getExtensions() {
+        return ImmutableClassToInstanceMap.of();
+    }
+
     public synchronized void changeSchema(final SchemaContext newContext) {
         schemaContext = newContext;
         for (ListenerRegistration<SchemaContextListener> listener : listeners) {

diff --git a/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/data/BindingDOMDataBrokerAdapter.java b/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/data/BindingDOMDataBrokerAdapter.java
index b3459d400e2220e955cca65af0d2c21124ffeb87..1857c67c4f4c77e3e5132c60983f7a246dce0df2 100644 (file)
--- a/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/data/BindingDOMDataBrokerAdapter.java
+++ b/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/data/BindingDOMDataBrokerAdapter.java
@@ -58,8 +58,9 @@ public class BindingDOMDataBrokerAdapter extends AbstractForwardedDataBroker imp
 
     public BindingDOMDataBrokerAdapter(final DOMDataBroker domDataBroker, final BindingToNormalizedNodeCodec codec) {
         super(domDataBroker, codec);
+        // FIXME: this is an invalid lookup
         final DOMDataTreeService domTreeChange =
-                (DOMDataTreeService) domDataBroker.getSupportedExtensions().get(DOMDataTreeService.class);
+                (DOMDataTreeService) domDataBroker.getExtensions().get(DOMDataTreeService.class);
         if (domTreeChange != null) {
             treeService = BindingDOMDataTreeServiceAdapter.create(domTreeChange, codec);
         } else {

diff --git a/binding2/mdsal-binding2-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/spi/loader/BindingDOMAdapterLoaderTest.java b/binding2/mdsal-binding2-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/spi/loader/BindingDOMAdapterLoaderTest.java
index 54229cc148ef93992f4bbe3acacd9d3a89034815..e9beef113381550482658e69adf0830c13ca1875 100644 (file)
--- a/binding2/mdsal-binding2-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/spi/loader/BindingDOMAdapterLoaderTest.java
+++ b/binding2/mdsal-binding2-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/spi/loader/BindingDOMAdapterLoaderTest.java
@@ -11,8 +11,10 @@ package org.opendaylight.mdsal.binding.javav2.dom.adapter.spi.loader;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.MockitoAnnotations.initMocks;
 
+import com.google.common.collect.ImmutableClassToInstanceMap;
 import javax.annotation.Nullable;
 import org.junit.Before;
 import org.junit.Test;
@@ -39,6 +41,8 @@ public class BindingDOMAdapterLoaderTest {
     @Before
     public void setUp() throws Exception {
         initMocks(this);
+        doReturn(ImmutableClassToInstanceMap.of()).when(domService).getExtensions();
+
         bindingDOMAdapterLoader = new BindingDOMAdapterLoader(
                 new BindingToNormalizedNodeCodec((GeneratedClassLoadingStrategy)
                         GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy(), mockCodecRegistry)) {

diff --git a/binding2/mdsal-binding2-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/test/MockSchemaService.java b/binding2/mdsal-binding2-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/test/MockSchemaService.java
index b6ec477c03c7b7389ed12b9e31d64b1bcba961e8..2b65bfa4c3d837c7031226131dc1e2b905f5219b 100644 (file)
--- a/binding2/mdsal-binding2-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/test/MockSchemaService.java
+++ b/binding2/mdsal-binding2-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/test/MockSchemaService.java
@@ -8,7 +8,10 @@
 package org.opendaylight.mdsal.binding.javav2.dom.adapter.test;
 
 import com.google.common.annotations.Beta;
+import com.google.common.collect.ClassToInstanceMap;
+import com.google.common.collect.ImmutableClassToInstanceMap;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
+import org.opendaylight.mdsal.dom.api.DOMSchemaServiceExtension;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.util.ListenerRegistry;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
@@ -43,6 +46,11 @@ public final class MockSchemaService implements DOMSchemaService, SchemaContextP
         return schemaContext;
     }
 
+    @Override
+    public ClassToInstanceMap<DOMSchemaServiceExtension> getExtensions() {
+        return ImmutableClassToInstanceMap.of();
+    }
+
     public synchronized void changeSchema(final SchemaContext newContext) {
         schemaContext = newContext;
         for (final ListenerRegistration<SchemaContextListener> listener : listeners) {

diff --git a/binding2/mdsal-binding2-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/transaction/BindingDOMTransactionChainAdapterTest.java b/binding2/mdsal-binding2-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/transaction/BindingDOMTransactionChainAdapterTest.java
index bcd0bcc53b55212c4f3cf5c3083136c0bb3ecc30..1f70f10bb1b741ca2a581d14771a53f51504f8b9 100644 (file)
--- a/binding2/mdsal-binding2-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/transaction/BindingDOMTransactionChainAdapterTest.java
+++ b/binding2/mdsal-binding2-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/transaction/BindingDOMTransactionChainAdapterTest.java
@@ -16,6 +16,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.MockitoAnnotations.initMocks;
 
+import com.google.common.collect.ImmutableClassToInstanceMap;
 import javax.annotation.Nullable;
 import org.junit.Before;
 import org.junit.Test;
@@ -50,6 +51,7 @@ public class BindingDOMTransactionChainAdapterTest {
     public void setUp() throws Exception {
         initMocks(this);
         doReturn(transactionChain).when(domService).createTransactionChain(any());
+        doReturn(ImmutableClassToInstanceMap.of()).when(domService).getExtensions();
         BindingDOMAdapterLoader bindingDOMAdapterLoader = new BindingDOMAdapterLoader(
                 new BindingToNormalizedNodeCodec((GeneratedClassLoadingStrategy)
                         GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy(), mockCodecRegistry)) {

diff --git a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMExtensibleService.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMExtensibleService.java
index 76ca070f54731ebac7a6d92b28c27b879bcbb6bb..acc09dc94267c1ec529ef8d7f0032ea74dac2a5c 100644 (file)
--- a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMExtensibleService.java
+++ b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMExtensibleService.java
@@ -9,8 +9,6 @@ package org.opendaylight.mdsal.dom.api;
 
 import com.google.common.annotations.Beta;
 import com.google.common.collect.ClassToInstanceMap;
-import com.google.common.collect.ImmutableClassToInstanceMap;
-import java.util.Map;
 import org.eclipse.jdt.annotation.NonNull;
 
 /**
@@ -28,18 +26,6 @@ public interface DOMExtensibleService<T extends DOMExtensibleService<T, E>,
      * which provide access to the specific functionality bound to this service.
      *
      * @return A map of supported functionality.
-     * @deprecated Use {@link #getExtensions()} instead.
      */
-    @Deprecated
-    @NonNull Map<Class<? extends E>, E> getSupportedExtensions();
-
-    /**
-     * Return a map of currently-supported extensions, along with accessor services
-     * which provide access to the specific functionality bound to this service.
-     *
-     * @return A map of supported functionality.
-     */
-    default @NonNull ClassToInstanceMap<E> getExtensions() {
-        return ImmutableClassToInstanceMap.copyOf(getSupportedExtensions());
-    }
+    @NonNull ClassToInstanceMap<E> getExtensions();
 }

diff --git a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMSchemaService.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMSchemaService.java
index 39b103b5f1cf55f997a4d01b06f1c0adb57bb68f..8066671d6d285c19945d166214ae9e6b779d5914 100644 (file)
--- a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMSchemaService.java
+++ b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMSchemaService.java
@@ -7,8 +7,6 @@
  */
 package org.opendaylight.mdsal.dom.api;
 
-import com.google.common.collect.ImmutableClassToInstanceMap;
-import java.util.Map;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.SchemaContextListener;
@@ -35,10 +33,4 @@ public interface DOMSchemaService extends DOMExtensibleService<DOMSchemaService,
      * @return Listener registration handle
      */
     ListenerRegistration<SchemaContextListener> registerSchemaContextListener(SchemaContextListener listener);
-
-    @Override
-    @Deprecated
-    default Map<Class<? extends DOMSchemaServiceExtension>, DOMSchemaServiceExtension> getSupportedExtensions() {
-        return ImmutableClassToInstanceMap.of();
-    }
 }

diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/AbstractDOMDataBroker.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/AbstractDOMDataBroker.java
index f64ff8daf75da3ec019545b96f1cfff9aaab860f..1ef0c5ceefc2755396dffdc88e79057f6265639a 100644 (file)
--- a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/AbstractDOMDataBroker.java
+++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/AbstractDOMDataBroker.java
@@ -92,12 +92,6 @@ public abstract class AbstractDOMDataBroker extends AbstractDOMForwardedTransact
         return "DOM-" + txNum.getAndIncrement();
     }
 
-    @Override
-    @Deprecated
-    public Map<Class<? extends DOMDataBrokerExtension>, DOMDataBrokerExtension> getSupportedExtensions() {
-        return extensions;
-    }
-
     @Override
     public ClassToInstanceMap<DOMDataBrokerExtension> getExtensions() {
         return extensions;

diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataBrokerAdapter.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataBrokerAdapter.java
index 8320d9007e058969c5dc6c7061a3357db582a1e9..4c9b669598a341eae3edece0318b963f6d0a1f0b 100644 (file)
--- a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataBrokerAdapter.java
+++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataBrokerAdapter.java
@@ -5,12 +5,10 @@
  * 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.mdsal.dom.broker;
 
 import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.ImmutableClassToInstanceMap;
-import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 import org.opendaylight.mdsal.common.api.TransactionChainListener;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
@@ -31,12 +29,6 @@ public class ShardedDOMDataBrokerAdapter implements DOMDataBroker {
         this.service = service;
     }
 
-    @Override
-    @Deprecated
-    public Map<Class<? extends DOMDataBrokerExtension>, DOMDataBrokerExtension> getSupportedExtensions() {
-        return ImmutableClassToInstanceMap.of();
-    }
-
     @Override
     public ClassToInstanceMap<DOMDataBrokerExtension> getExtensions() {
         return ImmutableClassToInstanceMap.of();

diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTree.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTree.java
index f54f39266fcc913edbebdc87947cf46d2b90f315..804beedb6a29a5a31a8f31d7c26fd46d2b36b8c7 100644 (file)
--- a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTree.java
+++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTree.java
@@ -133,12 +133,6 @@ public final class ShardedDOMDataTree implements DOMDataTreeService, DOMDataTree
         }
     }
 
-    @Override
-    @Deprecated
-    public Map<Class<? extends DOMDataTreeServiceExtension>, DOMDataTreeServiceExtension> getSupportedExtensions() {
-        return ImmutableClassToInstanceMap.of();
-    }
-
     @Override
     public ClassToInstanceMap<DOMDataTreeServiceExtension> getExtensions() {
         return ImmutableClassToInstanceMap.of();

diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMTransactionChainAdapter.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMTransactionChainAdapter.java
index 4a88f463a67dd3822ab7d3decdd011b117bc23dd..f8296be0f4c647c368a1921520d5606a7a654b59 100644 (file)
--- a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMTransactionChainAdapter.java
+++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMTransactionChainAdapter.java
@@ -186,12 +186,6 @@ public class ShardedDOMTransactionChainAdapter implements DOMTransactionChain {
             return delegateTreeService.registerListener(listener, subtrees, allowRxMerges, producers);
         }
 
-        @Override
-        @Deprecated
-        public Map<Class<? extends DOMDataTreeServiceExtension>, DOMDataTreeServiceExtension> getSupportedExtensions() {
-            return delegateTreeService.getSupportedExtensions();
-        }
-
         @Override
         public ClassToInstanceMap<DOMDataTreeServiceExtension> getExtensions() {
             return delegateTreeService.getExtensions();

diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/pingpong/PingPongDataBroker.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/pingpong/PingPongDataBroker.java
index 6d5ba92f4a153a34f43be84fa751925a00b57952..093b3cb69c8a3448addaae527160000f53fff4ef 100644 (file)
--- a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/pingpong/PingPongDataBroker.java
+++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/pingpong/PingPongDataBroker.java
@@ -57,8 +57,8 @@ public final class PingPongDataBroker extends ForwardingDOMDataBroker implements
     @Override
     public <L extends DOMDataTreeChangeListener> ListenerRegistration<L> registerDataTreeChangeListener(
             final DOMDataTreeIdentifier treeId, final L listener) {
-        final DOMDataTreeChangeService treeService = (DOMDataTreeChangeService) delegate.getSupportedExtensions()
-                .get(DOMDataTreeChangeService.class);
+        final DOMDataTreeChangeService treeService = delegate.getExtensions()
+                .getInstance(DOMDataTreeChangeService.class);
         if (treeService != null) {
             return treeService.registerDataTreeChangeListener(treeId, listener);
         }

diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/schema/ScanningSchemaServiceProvider.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/schema/ScanningSchemaServiceProvider.java
index 7a9f07df184f0135682c3cee9a8eb10e9fae444b..7ee339542117a4d617350e58c3e327c20ced9a51 100644 (file)
--- a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/schema/ScanningSchemaServiceProvider.java
+++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/schema/ScanningSchemaServiceProvider.java
@@ -10,14 +10,12 @@ package org.opendaylight.mdsal.dom.broker.schema;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.ImmutableClassToInstanceMap;
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
 import com.google.common.util.concurrent.ListenableFuture;
 import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import javax.annotation.concurrent.GuardedBy;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
@@ -144,12 +142,6 @@ public class ScanningSchemaServiceProvider
         return ImmutableClassToInstanceMap.of(DOMYangTextSourceProvider.class, this);
     }
 
-    @Override
-    @Deprecated
-    public Map<Class<? extends DOMSchemaServiceExtension>, DOMSchemaServiceExtension> getSupportedExtensions() {
-        return ImmutableMap.of(DOMYangTextSourceProvider.class, this);
-    }
-
     @Override
     public void close() {
         synchronized (lock) {

diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/ShardedDOMReadTransactionAdapterTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/ShardedDOMReadTransactionAdapterTest.java
index bf956e3deabd5bc8b9d219832020ff3b4ddcfe9f..726f282b79120a0c4d343b954547a1c9e3b70c96 100644 (file)
--- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/ShardedDOMReadTransactionAdapterTest.java
+++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/ShardedDOMReadTransactionAdapterTest.java
@@ -63,13 +63,6 @@ public class ShardedDOMReadTransactionAdapterTest {
     }
 
     private static class TestTreeService implements DOMDataTreeService {
-
-        @Override
-        @Deprecated
-        public Map<Class<? extends DOMDataTreeServiceExtension>, DOMDataTreeServiceExtension> getSupportedExtensions() {
-            return ImmutableClassToInstanceMap.of();
-        }
-
         @Override
         public ClassToInstanceMap<DOMDataTreeServiceExtension> getExtensions() {
             return ImmutableClassToInstanceMap.of();

diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataBroker.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataBroker.java
index d71b55d8d6747f06f215254e813bb6417f8a6264..5575cb15abbd8ccc07d9aa81fbbe620ae2bb67a2 100644 (file)
--- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataBroker.java
+++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataBroker.java
@@ -9,7 +9,6 @@ package org.opendaylight.mdsal.dom.spi;
 
 import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.ForwardingObject;
-import java.util.Map;
 import javax.annotation.Nonnull;
 import org.opendaylight.mdsal.common.api.TransactionChainListener;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
@@ -49,12 +48,6 @@ public abstract class ForwardingDOMDataBroker extends ForwardingObject implement
         return delegate().createTransactionChain(listener);
     }
 
-    @Override
-    @Deprecated
-    public Map<Class<? extends DOMDataBrokerExtension>, DOMDataBrokerExtension> getSupportedExtensions() {
-        return delegate().getSupportedExtensions();
-    }
-
     @Override
     public ClassToInstanceMap<DOMDataBrokerExtension> getExtensions() {
         return delegate().getExtensions();

diff --git a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataBrokerTest.java b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataBrokerTest.java
index e92e8f43ff76f7eb7d8da38a6be9df8502229d8d..b5fc59f8643cd438250e922fed2f3875985768c7 100644 (file)
--- a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataBrokerTest.java
+++ b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataBrokerTest.java
@@ -36,10 +36,6 @@ public class ForwardingDOMDataBrokerTest extends ForwardingDOMDataBroker {
         this.getExtensions();
         verify(domDataBroker).getExtensions();
 
-        doReturn(ImmutableClassToInstanceMap.of()).when(domDataBroker).getSupportedExtensions();
-        this.getSupportedExtensions();
-        verify(domDataBroker).getSupportedExtensions();
-
         doReturn(null).when(domDataBroker).newReadOnlyTransaction();
         this.newReadOnlyTransaction();
         verify(domDataBroker).newReadOnlyTransaction();