Eliminate getSupportedExtensions()

blueprint does not like the default method, run a straight-up
removal.

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

diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/MockSchemaService.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/MockSchemaService.java
index 6662e2d2249ff79380e11372952add912953eea8..39a6db28d079cc94e3402dc67f90c39a2104e787 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/MockSchemaService.java
+++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/MockSchemaService.java
@@ -9,7 +9,6 @@ package org.opendaylight.controller.sal.binding.test.util;
 
 import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.ImmutableClassToInstanceMap;
 
 import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.ImmutableClassToInstanceMap;

-import java.util.Map;

 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.mdsal.dom.api.DOMSchemaServiceExtension;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.mdsal.dom.api.DOMSchemaServiceExtension;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;


@@ -45,12 +44,6 @@ public final class MockSchemaService implements DOMSchemaService, SchemaContextP
         return schemaContext;
     }
 
         return schemaContext;
     }
 

-    @Override
-    @Deprecated
-    public Map<Class<? extends DOMSchemaServiceExtension>, DOMSchemaServiceExtension> getSupportedExtensions() {
-        return ImmutableClassToInstanceMap.of();
-    }
-

     @Override
     public ClassToInstanceMap<DOMSchemaServiceExtension> getExtensions() {
         return ImmutableClassToInstanceMap.of();
     @Override
     public ClassToInstanceMap<DOMSchemaServiceExtension> getExtensions() {
         return ImmutableClassToInstanceMap.of();

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBroker.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBroker.java
index 119ac79c7e41094d4a13e36c40b5bdc7c8046aba..9905893f9f550b05279ccb4bb2c4e2412ff9843b 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBroker.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBroker.java
@@ -102,12 +102,6 @@ public abstract class AbstractDOMBroker extends AbstractDOMTransactionFactory<DO
         return "DOM-" + txNum.getAndIncrement();
     }
 
         return "DOM-" + txNum.getAndIncrement();
     }
 

-    @Override
-    @Deprecated
-    public Map<Class<? extends DOMDataBrokerExtension>, DOMDataBrokerExtension> getSupportedExtensions() {
-        return extensions;
-    }
-

     @Override
     public ClassToInstanceMap<DOMDataBrokerExtension> getExtensions() {
         return extensions;
     @Override
     public ClassToInstanceMap<DOMDataBrokerExtension> getExtensions() {
         return extensions;

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTree.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTree.java
index 0348e7a2af12fc45e86f19af0c5bcf600348feac..235cc5df306162ef9d9af9aa4b62eafff4b98ad4 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTree.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTree.java
@@ -288,12 +288,6 @@ public class DistributedShardedDOMDataTree implements DOMDataTreeService, DOMDat
         return shardedDOMDataTree.registerListener(listener, subtrees, allowRxMerges, producers);
     }
 
         return shardedDOMDataTree.registerListener(listener, subtrees, allowRxMerges, producers);
     }
 

-    @Override
-    @Deprecated
-    public Map<Class<? extends DOMDataTreeServiceExtension>, DOMDataTreeServiceExtension> getSupportedExtensions() {
-        return ImmutableClassToInstanceMap.of();
-    }
-

     @Override
     public ClassToInstanceMap<DOMDataTreeServiceExtension> getExtensions() {
         return ImmutableClassToInstanceMap.of();
     @Override
     public ClassToInstanceMap<DOMDataTreeServiceExtension> getExtensions() {
         return ImmutableClassToInstanceMap.of();