From 77e5860f42832140d27cff8e08e90b0b2947df31 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 12 Jul 2018 10:13:58 +0200 Subject: [PATCH] Eliminate getSupportedExtensions() blueprint does not like the default method, run a straight-up removal. Change-Id: I2bfbc5eb2587d6cd790cc8153c357f9251ac2485 Signed-off-by: Robert Varga --- .../sal/binding/test/util/MockSchemaService.java | 7 ------- .../controller/cluster/databroker/AbstractDOMBroker.java | 6 ------ .../cluster/sharding/DistributedShardedDOMDataTree.java | 6 ------ 3 files changed, 19 deletions(-) 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 6662e2d224..39a6db28d0 100644 --- 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 java.util.Map; 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; } - @Override - @Deprecated - public Map, DOMSchemaServiceExtension> getSupportedExtensions() { - return ImmutableClassToInstanceMap.of(); - } - @Override public ClassToInstanceMap 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 119ac79c7e..9905893f9f 100644 --- 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, DOMDataBrokerExtension> getSupportedExtensions() { - return extensions; - } - @Override public ClassToInstanceMap 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 0348e7a2af..235cc5df30 100644 --- 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); } - @Override - @Deprecated - public Map, DOMDataTreeServiceExtension> getSupportedExtensions() { - return ImmutableClassToInstanceMap.of(); - } - @Override public ClassToInstanceMap getExtensions() { return ImmutableClassToInstanceMap.of(); -- 2.36.6