From 5717e67ca80d62cc2742a02862de0f12ebf1191e Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 11 Jul 2018 15:25:29 +0200 Subject: [PATCH] Switch DOMExtensibleService to require getExtensions() With all implementations switched over to provide getExtensions(), remove getSupportedExtensions(). Change-Id: I16d2a30a28bd565d91cacc32b49ed5cb1a8388bf Signed-off-by: Robert Varga --- .../dom/adapter/test/util/MockSchemaService.java | 8 ++++++++ .../impl/data/BindingDOMDataBrokerAdapter.java | 3 ++- .../spi/loader/BindingDOMAdapterLoaderTest.java | 4 ++++ .../dom/adapter/test/MockSchemaService.java | 8 ++++++++ .../BindingDOMTransactionChainAdapterTest.java | 2 ++ .../mdsal/dom/api/DOMExtensibleService.java | 16 +--------------- .../mdsal/dom/api/DOMSchemaService.java | 8 -------- .../mdsal/dom/broker/AbstractDOMDataBroker.java | 6 ------ .../dom/broker/ShardedDOMDataBrokerAdapter.java | 8 -------- .../mdsal/dom/broker/ShardedDOMDataTree.java | 6 ------ .../ShardedDOMTransactionChainAdapter.java | 6 ------ .../dom/broker/pingpong/PingPongDataBroker.java | 4 ++-- .../schema/ScanningSchemaServiceProvider.java | 8 -------- .../ShardedDOMReadTransactionAdapterTest.java | 7 ------- .../mdsal/dom/spi/ForwardingDOMDataBroker.java | 7 ------- .../dom/spi/ForwardingDOMDataBrokerTest.java | 4 ---- 16 files changed, 27 insertions(+), 78 deletions(-) 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 12ed0d3ed3..4c78c46c04 100644 --- 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 getExtensions() { + return ImmutableClassToInstanceMap.of(); + } + public synchronized void changeSchema(final SchemaContext newContext) { schemaContext = newContext; for (ListenerRegistration 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 b3459d400e..1857c67c4f 100644 --- 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 54229cc148..e9beef1133 100644 --- 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 b6ec477c03..2b65bfa4c3 100644 --- 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 getExtensions() { + return ImmutableClassToInstanceMap.of(); + } + public synchronized void changeSchema(final SchemaContext newContext) { schemaContext = newContext; for (final ListenerRegistration 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 bcd0bcc53b..1f70f10bb1 100644 --- 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 76ca070f54..acc09dc942 100644 --- 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, * 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, 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 getExtensions() { - return ImmutableClassToInstanceMap.copyOf(getSupportedExtensions()); - } + @NonNull ClassToInstanceMap 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 39b103b5f1..8066671d6d 100644 --- 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 registerSchemaContextListener(SchemaContextListener listener); - - @Override - @Deprecated - default Map, 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 f64ff8daf7..1ef0c5ceef 100644 --- 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, DOMDataBrokerExtension> getSupportedExtensions() { - return extensions; - } - @Override public ClassToInstanceMap 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 8320d9007e..4c9b669598 100644 --- 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, DOMDataBrokerExtension> getSupportedExtensions() { - return ImmutableClassToInstanceMap.of(); - } - @Override public ClassToInstanceMap 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 f54f39266f..804beedb6a 100644 --- 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, DOMDataTreeServiceExtension> getSupportedExtensions() { - return ImmutableClassToInstanceMap.of(); - } - @Override public ClassToInstanceMap 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 4a88f463a6..f8296be0f4 100644 --- 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, DOMDataTreeServiceExtension> getSupportedExtensions() { - return delegateTreeService.getSupportedExtensions(); - } - @Override public ClassToInstanceMap 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 6d5ba92f4a..093b3cb69c 100644 --- 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 ListenerRegistration 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 7a9f07df18..7ee3395421 100644 --- 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, 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 bf956e3dea..726f282b79 100644 --- 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, DOMDataTreeServiceExtension> getSupportedExtensions() { - return ImmutableClassToInstanceMap.of(); - } - @Override public ClassToInstanceMap 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 d71b55d8d6..5575cb15ab 100644 --- 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, DOMDataBrokerExtension> getSupportedExtensions() { - return delegate().getSupportedExtensions(); - } - @Override public ClassToInstanceMap 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 e92e8f43ff..b5fc59f864 100644 --- 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(); -- 2.36.6