From e67e519778a0692f3183a059a52e5cb378fce9e0 Mon Sep 17 00:00:00 2001 From: Ed Warnicke Date: Sun, 11 Jan 2015 19:02:35 -0600 Subject: [PATCH] Removed deprecated methods from BindingAwareProvider Also deprecated BindingAwareBroker.registerConsumer(BindingAwareConsumer,BundleContext) in favor of the newly added: BindingAwareBroker.registerConsumer(BindingAwareConsumer) and BindingAwareBroker.registerProvider(BindingAwareProvider,BundleContext) in favor of the newly added: BindingAwareBroker.registerProvider(BindingAwareProvider) Change-Id: Id256c81a7210640b9a493a3f0fc71a9e0379e317 Signed-off-by: Ed Warnicke --- .../SalCompatibilityProvider.java | 20 ------ .../api/AbstractBindingAwareProvider.java | 52 -------------- .../sal/binding/api/BindingAwareBroker.java | 22 +++--- .../sal/binding/api/BindingAwareProvider.java | 71 ------------------- .../sal/binding/api/data/DataRefresher.java | 28 -------- .../binding/api/data/RuntimeDataProvider.java | 27 ------- .../binding/impl/RootBindingAwareBroker.java | 16 ++++- .../dom/BindingIndependentConnector.java | 6 +- .../sal/binding/it/AbstractTestProvider.java | 20 ------ .../test/sal/binding/it/NotificationTest.java | 21 ------ .../sal/binding/util/BindingContextUtils.java | 13 ---- .../netconf/sal/NetconfDeviceSalProvider.java | 14 ---- .../broker/SalRemoteServiceBroker.java | 16 ++++- 13 files changed, 45 insertions(+), 281 deletions(-) delete mode 100644 opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataRefresher.java delete mode 100644 opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/RuntimeDataProvider.java diff --git a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/SalCompatibilityProvider.java b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/SalCompatibilityProvider.java index f8f2b37819..75e63f1309 100644 --- a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/SalCompatibilityProvider.java +++ b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/SalCompatibilityProvider.java @@ -7,11 +7,7 @@ */ package org.opendaylight.controller.sal.compatibility; -import java.util.Collection; -import java.util.Collections; - import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ConsumerContext; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; import org.opendaylight.controller.sal.binding.api.BindingAwareProvider; import org.opendaylight.controller.sal.binding.api.NotificationService; @@ -26,7 +22,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.table.statistics.rev13 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.topology.discovery.rev130819.FlowTopologyDiscoveryService; import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingService; import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.OpendaylightPortStatisticsService; -import org.opendaylight.yangtools.yang.binding.RpcService; import com.google.common.base.Preconditions; @@ -37,21 +32,6 @@ class SalCompatibilityProvider implements BindingAwareProvider { this.activator = Preconditions.checkNotNull(cmpAct); } - @Override - public Collection getFunctionality() { - return Collections.emptyList(); - } - - @Override - public Collection getImplementations() { - return Collections.emptyList(); - } - - @Override - public void onSessionInitialized(final ConsumerContext session) { - // No-op - } - @Override public void onSessionInitiated(final ProviderContext session) { final NotificationService subscribe = session.getSALService(NotificationService.class); diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/AbstractBindingAwareProvider.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/AbstractBindingAwareProvider.java index d32fa36b66..0b9c604c2b 100644 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/AbstractBindingAwareProvider.java +++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/AbstractBindingAwareProvider.java @@ -7,12 +7,7 @@ */ package org.opendaylight.controller.sal.binding.api; -import java.util.Collection; -import java.util.Collections; - -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ConsumerContext; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; -import org.opendaylight.yangtools.yang.binding.RpcService; import org.osgi.framework.BundleContext; @Deprecated @@ -21,52 +16,5 @@ public abstract class AbstractBindingAwareProvider extends AbstractBrokerAwareAc @Override protected final void onBrokerAvailable(BindingAwareBroker broker, BundleContext context) { ProviderContext ctx = broker.registerProvider(this, context); - registerRpcImplementations(ctx); - registerFunctionality(ctx); - } - - private void registerFunctionality(ProviderContext ctx) { - Collection functionality = this.getFunctionality(); - if (functionality == null || functionality.isEmpty()) { - return; - } - for (ProviderFunctionality providerFunctionality : functionality) { - ctx.registerFunctionality(providerFunctionality); - } - - } - - private void registerRpcImplementations(ProviderContext ctx) { - Collection rpcs = this.getImplementations(); - if (rpcs == null || rpcs.isEmpty()) { - return; - } - for (RpcService rpcService : rpcs) { - // ctx.addRpcImplementation(type, implementation); - } - - } - - @Override - public Collection getFunctionality() { - return Collections.emptySet(); - } - - @Override - public Collection getImplementations() { - return Collections.emptySet(); - } - - /** - * Initialization of consumer context. - * - * {@link ProviderContext} is replacement of {@link ConsumerContext} - * so this method is not needed in case of Provider. - * - */ - @Deprecated - @Override - public final void onSessionInitialized(ConsumerContext session) { - // NOOP } } diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareBroker.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareBroker.java index 5e24560853..ab62c803e2 100644 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareBroker.java +++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareBroker.java @@ -8,7 +8,6 @@ package org.opendaylight.controller.sal.binding.api; import org.opendaylight.controller.md.sal.common.api.routing.RoutedRegistration; -import org.opendaylight.controller.sal.binding.api.BindingAwareProvider.ProviderFunctionality; import org.opendaylight.yangtools.concepts.ObjectRegistration; import org.opendaylight.yangtools.yang.binding.BaseIdentity; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; @@ -52,6 +51,12 @@ import org.osgi.framework.BundleContext; * and {@link ProviderContext} */ public interface BindingAwareBroker { + /* + * @deprecated Use registerConsumer(BindingAwareConsumer cons) instead (BundleContext is no longer used) + */ + @Deprecated + ConsumerContext registerConsumer(BindingAwareConsumer consumer, BundleContext ctx); + /** * Registers the {@link BindingAwareConsumer}, which will use the SAL layer. * @@ -73,7 +78,13 @@ public interface BindingAwareBroker { * @throws IllegalStateException * If the consumer is already registered. */ - ConsumerContext registerConsumer(BindingAwareConsumer consumer, BundleContext ctx); + ConsumerContext registerConsumer(BindingAwareConsumer consumer); + + /* + * @deprecated Use registerProvider(BindingAwareProvider prov) instead (BundleContext is no longer used) + */ + @Deprecated + ProviderContext registerProvider(BindingAwareProvider provider, BundleContext ctx); /** * Registers the {@link BindingAwareProvider}, which will use the SAL layer. @@ -103,7 +114,7 @@ public interface BindingAwareBroker { * @throws IllegalStateException * If the consumer is already registered. */ - ProviderContext registerProvider(BindingAwareProvider provider, BundleContext ctx); + ProviderContext registerProvider(BindingAwareProvider provider); /** * {@link BindingAwareConsumer} specific access to the SAL functionality. @@ -149,11 +160,6 @@ public interface BindingAwareBroker { */ public interface ProviderContext extends ConsumerContext, RpcProviderRegistry { - @Deprecated - void registerFunctionality(ProviderFunctionality functionality); - - @Deprecated - void unregisterFunctionality(ProviderFunctionality functionality); } /** diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareProvider.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareProvider.java index cb26cad2f3..35583c0d42 100644 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareProvider.java +++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareProvider.java @@ -7,11 +7,7 @@ */ package org.opendaylight.controller.sal.binding.api; -import java.util.Collection; - -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ConsumerContext; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; -import org.opendaylight.yangtools.yang.binding.RpcService; /** * @@ -107,55 +103,6 @@ import org.opendaylight.yangtools.yang.binding.RpcService; */ public interface BindingAwareProvider { - /** - * @deprecated - * - * This interface was originally intended to solve problems of how to get Implementations - * of functionality from a provider, but that is no longer necessary because the Provider - * Registers RPCs in onSessionInitiated. - * - * Recommend: - * {code - * public Collection getImplementations() { - * return Collections.emptySet(); - * } - * } - */ - @Deprecated - Collection getImplementations(); - - /** - * @deprecated - * - * This interface was originally intended to solve problems of how to get Functionality - * a provider could provide, but that is no longer necessary because the Provider - * Registers RPCs in onSessionInitiated. - * - * Recommend: - * {code - * public Collection getFunctionality() { - * return Collections.emptySet(); - * } - * } - * - */ - @Deprecated - Collection getFunctionality(); - - /** - * Functionality provided by the {@link BindingAwareProvider} - * - *

- * Marker interface used to mark the interfaces describing specific - * functionality which could be exposed by providers to other components. - * - * - * - */ - @Deprecated - public interface ProviderFunctionality { - - } /** * Callback signaling initialization of the consumer session to the SAL. * @@ -168,22 +115,4 @@ public interface BindingAwareProvider { * @param session Unique session between consumer and SAL. */ void onSessionInitiated(ProviderContext session); - - /* - * @deprecated - * - * A provider was at one point considered an extension of a consumer, thus this - * call. It is deprecated and the @see org.opendaylight.controller.sal.binding.api.BindingAwareConsumer#onSessionInitiated - * used, or you should simply use {@link #onSessionInitiated(ProviderContext)} - * - * Recommend: - * {code - * public final void onSessionInitialized(ConsumerContext session) { - * // NOOP - as method is deprecated - * } - * } - */ - @Deprecated - void onSessionInitialized(ConsumerContext session); - } diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataRefresher.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataRefresher.java deleted file mode 100644 index c0c8f4f211..0000000000 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataRefresher.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * 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.controller.sal.binding.api.data; - -import org.opendaylight.controller.sal.binding.api.BindingAwareProvider; - -/** - * Trigger for refreshing of the data exposed by the {@link Provider} - * - * - * @deprecated Unused, not supported. Replaced by org.opendaylight.controller.sal.core.spi.data.DOMStore. - */ -@Deprecated -public interface DataRefresher extends BindingAwareProvider.ProviderFunctionality { - - /** - * Fired when some component explicitly requested the data refresh. - * - * The provider which exposed the {@link DataRefresher} should republish its - * provided data by editing the data in all affected data stores. - */ - void refreshData(); -} \ No newline at end of file diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/RuntimeDataProvider.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/RuntimeDataProvider.java deleted file mode 100644 index 273f20f01d..0000000000 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/RuntimeDataProvider.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * 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.controller.sal.binding.api.data; - -import org.opendaylight.controller.md.sal.common.api.data.DataReader; -import org.opendaylight.controller.sal.binding.api.BindingAwareProvider.ProviderFunctionality; -import org.opendaylight.yangtools.yang.binding.DataObject; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; - -/** - * Utility interface which does type capture for BindingAware DataReader. - * - * - * @deprecated Removed, replaced by org.opendaylight.controller.sal.core.spi.data.DOMStore. - * - */ -@Deprecated -public interface RuntimeDataProvider extends ProviderFunctionality,DataReader, DataObject> { - - - -} diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/RootBindingAwareBroker.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/RootBindingAwareBroker.java index d810149c70..ddfb1cd10c 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/RootBindingAwareBroker.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/RootBindingAwareBroker.java @@ -135,13 +135,25 @@ public class RootBindingAwareBroker implements // } @Override - public ConsumerContext registerConsumer(final BindingAwareConsumer consumer, final BundleContext ctx) { + public ConsumerContext registerConsumer(BindingAwareConsumer consumer, + BundleContext ctx) { + return registerConsumer(consumer); + } + + @Override + public ProviderContext registerProvider(BindingAwareProvider provider, + BundleContext ctx) { + return registerProvider(provider); + } + + @Override + public ConsumerContext registerConsumer(final BindingAwareConsumer consumer) { checkState(supportedConsumerServices != null, "Broker is not initialized."); return BindingContextUtils.createConsumerContextAndInitialize(consumer, supportedConsumerServices); } @Override - public ProviderContext registerProvider(final BindingAwareProvider provider, final BundleContext ctx) { + public ProviderContext registerProvider(final BindingAwareProvider provider) { checkState(supportedProviderServices != null, "Broker is not initialized."); return BindingContextUtils.createProviderContextAndInitialize(provider, supportedProviderServices); } diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/BindingIndependentConnector.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/BindingIndependentConnector.java index d00d8b7fa8..f63ce10165 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/BindingIndependentConnector.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/BindingIndependentConnector.java @@ -12,15 +12,15 @@ import static com.google.common.base.Preconditions.checkState; import java.util.Collection; import java.util.Collections; - import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; + import org.opendaylight.controller.md.sal.binding.impl.AbstractForwardedDataBroker; +import org.opendaylight.controller.md.sal.common.api.data.DataReader; import org.opendaylight.controller.md.sal.common.api.routing.RouteChangePublisher; import org.opendaylight.controller.sal.binding.api.NotificationProviderService; import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; import org.opendaylight.controller.sal.binding.api.data.DataProviderService; -import org.opendaylight.controller.sal.binding.api.data.RuntimeDataProvider; import org.opendaylight.controller.sal.binding.impl.DataBrokerImpl; import org.opendaylight.controller.sal.binding.impl.MountPointManagerImpl.BindingMountPointImpl; import org.opendaylight.controller.sal.binding.impl.RpcProviderRegistryImpl; @@ -41,7 +41,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class BindingIndependentConnector implements // - RuntimeDataProvider, // + DataReader, DataObject>, // Provider, // AutoCloseable { diff --git a/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/AbstractTestProvider.java b/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/AbstractTestProvider.java index da47b174f1..6871a0af61 100644 --- a/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/AbstractTestProvider.java +++ b/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/AbstractTestProvider.java @@ -7,29 +7,9 @@ */ package org.opendaylight.controller.test.sal.binding.it; -import java.util.Collection; -import java.util.Collections; - -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ConsumerContext; import org.opendaylight.controller.sal.binding.api.BindingAwareProvider; -import org.opendaylight.yangtools.yang.binding.RpcService; public abstract class AbstractTestProvider implements BindingAwareProvider { - @Override - public Collection getImplementations() { - return Collections.emptySet(); - } - - @Override - public Collection getFunctionality() { - return Collections.emptySet(); - } - - @Override - public void onSessionInitialized(ConsumerContext session) { - // Noop - - } } diff --git a/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/NotificationTest.java b/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/NotificationTest.java index 9ec5bcf6c2..8f8e475efe 100644 --- a/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/NotificationTest.java +++ b/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/NotificationTest.java @@ -12,7 +12,6 @@ import static org.junit.Assert.assertNotNull; import java.math.BigInteger; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import org.junit.Before; @@ -35,7 +34,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.Swit import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.FlowCookie; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.binding.NotificationListener; -import org.opendaylight.yangtools.yang.binding.RpcService; @Ignore public class NotificationTest extends AbstractTest { @@ -115,25 +113,6 @@ public class NotificationTest extends AbstractTest { listener2Reg = session.getSALService(NotificationProviderService.class).registerNotificationListener( listener2); } - - @Override - public void onSessionInitialized(ConsumerContext session) { - // TODO Auto-generated method stub - - } - - @Override - public Collection getImplementations() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Collection getFunctionality() { - // TODO Auto-generated method stub - return null; - } - }; // registerConsumer method calls onSessionInitialized method above diff --git a/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/BindingContextUtils.java b/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/BindingContextUtils.java index dc22891b47..26aa27eb15 100644 --- a/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/BindingContextUtils.java +++ b/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/BindingContextUtils.java @@ -16,7 +16,6 @@ import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RoutedRpcR import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RpcRegistration; import org.opendaylight.controller.sal.binding.api.BindingAwareConsumer; import org.opendaylight.controller.sal.binding.api.BindingAwareProvider; -import org.opendaylight.controller.sal.binding.api.BindingAwareProvider.ProviderFunctionality; import org.opendaylight.controller.sal.binding.api.BindingAwareService; import org.opendaylight.controller.sal.binding.api.RpcConsumerRegistry; import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; @@ -132,17 +131,5 @@ public class BindingContextUtils { throws IllegalStateException { return getSALService(RpcProviderRegistry.class).addRpcImplementation(type, implementation); } - - @Deprecated - @Override - public void registerFunctionality(ProviderFunctionality functionality) { - // NOOP - } - - @Deprecated - @Override - public void unregisterFunctionality(ProviderFunctionality functionality) { - // NOOP - } } } diff --git a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/sal/NetconfDeviceSalProvider.java b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/sal/NetconfDeviceSalProvider.java index cf9174dd50..171f2f4b0b 100644 --- a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/sal/NetconfDeviceSalProvider.java +++ b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/sal/NetconfDeviceSalProvider.java @@ -23,7 +23,6 @@ import org.opendaylight.controller.sal.core.api.Provider; import org.opendaylight.controller.sal.core.api.RpcProvisionRegistry; import org.opendaylight.controller.sal.core.api.notify.NotificationPublishService; import org.opendaylight.yangtools.concepts.ObjectRegistration; -import org.opendaylight.yangtools.yang.binding.RpcService; import org.opendaylight.yangtools.yang.data.api.CompositeNode; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.slf4j.Logger; @@ -70,16 +69,6 @@ final class NetconfDeviceSalProvider implements AutoCloseable, Provider, Binding return Collections.emptySet(); } - @Override - public Collection getImplementations() { - return Collections.emptySet(); - } - - @Override - public Collection getFunctionality() { - return Collections.emptySet(); - } - @Override public void onSessionInitiated(final BindingAwareBroker.ProviderContext session) { logger.debug("{}: Session with sal established {}", id, session); @@ -88,9 +77,6 @@ final class NetconfDeviceSalProvider implements AutoCloseable, Provider, Binding datastoreAdapter = new NetconfDeviceDatastoreAdapter(id, dataBroker); } - @Override - public void onSessionInitialized(final BindingAwareBroker.ConsumerContext session) {} - public void close() throws Exception { mountInstance.close(); datastoreAdapter.close(); diff --git a/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/sal/restconf/broker/SalRemoteServiceBroker.java b/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/sal/restconf/broker/SalRemoteServiceBroker.java index 74b23201e7..0553b2f0dc 100644 --- a/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/sal/restconf/broker/SalRemoteServiceBroker.java +++ b/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/sal/restconf/broker/SalRemoteServiceBroker.java @@ -51,7 +51,7 @@ public class SalRemoteServiceBroker implements BindingAwareBroker,AutoCloseable .put(RpcConsumerRegistry.class,servicesFactory.getRpcConsumerRegistry() ).build(); } - public ProviderContext registerProvider(BindingAwareProvider provider, BundleContext ctx) { + public ProviderContext registerProvider(BindingAwareProvider provider) { throw new UnsupportedOperationException(); } @Override @@ -59,9 +59,21 @@ public class SalRemoteServiceBroker implements BindingAwareBroker,AutoCloseable //TODO decide if serviceFactory should close clientContext or it has to be closed by consumer } @Override - public ConsumerContext registerConsumer(BindingAwareConsumer consumer, BundleContext ctx) { + public ConsumerContext registerConsumer(BindingAwareConsumer consumer) { checkState(supportedConsumerServices != null, "Broker is not initialized."); return BindingContextUtils.createConsumerContextAndInitialize(consumer, supportedConsumerServices); } + @Override + public ConsumerContext registerConsumer(BindingAwareConsumer consumer, + BundleContext ctx) { + return registerConsumer(consumer); + } + + @Override + public ProviderContext registerProvider(BindingAwareProvider provider, + BundleContext ctx) { + return registerProvider(provider); + } + } -- 2.36.6