From 80fcd5e9757822d5a4c0749fb206e796b4b00d59 Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Tue, 30 May 2017 19:07:28 -0400 Subject: [PATCH] Bug 8568: Remove DataProviderService from RootBindingAwareBroker Change-Id: Ib5e4f70ef72819103544cd6388558dc4a05b55d2 Signed-off-by: Tom Pantelis --- .../binding/impl/RootBindingAwareBroker.java | 26 +++------- .../binding/test/AbstractDataServiceTest.java | 5 -- .../binding/test/util/BindingTestContext.java | 17 +----- .../binding/impl/BindingBrokerImplModule.java | 1 - .../AbstractBindingSalConsumerInstance.java | 52 ++----------------- .../AbstractBindingSalProviderInstance.java | 20 +++---- 6 files changed, 20 insertions(+), 101 deletions(-) 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 640bc658f6..5465a95327 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 @@ -24,8 +24,6 @@ import org.opendaylight.controller.sal.binding.api.NotificationProviderService; import org.opendaylight.controller.sal.binding.api.NotificationService; import org.opendaylight.controller.sal.binding.api.RpcConsumerRegistry; import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; -import org.opendaylight.controller.sal.binding.api.data.DataBrokerService; -import org.opendaylight.controller.sal.binding.api.data.DataProviderService; import org.opendaylight.controller.sal.binding.api.mount.MountProviderService; import org.opendaylight.controller.sal.binding.api.mount.MountService; import org.opendaylight.controller.sal.binding.api.rpc.RpcContextIdentifier; @@ -53,9 +51,6 @@ public class RootBindingAwareBroker implements Mutable, Identifiable, Bi private NotificationPublishService notificationPublishService; - @SuppressWarnings("deprecation") - private DataProviderService legacyDataBroker; - private DataBroker dataBroker; private MountProviderService legacyMount; @@ -83,10 +78,6 @@ public class RootBindingAwareBroker implements Mutable, Identifiable, Bi return controllerRoot; } - public DataProviderService getDataBroker() { - return this.legacyDataBroker; - } - public NotificationProviderService getNotificationBroker() { return this.notificationBroker; } @@ -94,6 +85,7 @@ public class RootBindingAwareBroker implements Mutable, Identifiable, Bi public NotificationPublishService getNotificationPublishService() { return this.notificationPublishService; } + public RpcProviderRegistry getRpcProviderRegistry() { return this.rpcBroker; } @@ -130,21 +122,16 @@ public class RootBindingAwareBroker implements Mutable, Identifiable, Bi this.notificationPublishService = notificationPublishService; } - public void setLegacyDataBroker(final DataProviderService dataBroker) { - this.legacyDataBroker = dataBroker; - } - public void start() { checkState(controllerRoot == null, "Binding Aware Broker was already started."); LOG.info("Starting Binding Aware Broker: {}", identifier); - controllerRoot = new RootSalInstance(getRpcProviderRegistry(), getNotificationBroker(), getDataBroker()); + controllerRoot = new RootSalInstance(getRpcProviderRegistry(), getNotificationBroker()); final ImmutableClassToInstanceMap.Builder consBuilder = ImmutableClassToInstanceMap .builder(); consBuilder.put(NotificationService.class, getRoot()); - consBuilder.put(DataBrokerService.class, getRoot()); consBuilder.put(RpcConsumerRegistry.class, getRoot()); if (dataBroker != null) { consBuilder.put(DataBroker.class, dataBroker); @@ -156,8 +143,7 @@ public class RootBindingAwareBroker implements Mutable, Identifiable, Bi final ImmutableClassToInstanceMap.Builder provBuilder = ImmutableClassToInstanceMap .builder(); provBuilder.putAll(supportedConsumerServices).put(NotificationProviderService.class, getRoot()) - .put(DataProviderService.class, getRoot()).put(RpcProviderRegistry.class, getRoot()) - .put(MountProviderService.class, legacyMount); + .put(RpcProviderRegistry.class, getRoot()) .put(MountProviderService.class, legacyMount); if (notificationPublishService != null) { provBuilder.put(NotificationPublishService.class, notificationPublishService); } @@ -216,11 +202,11 @@ public class RootBindingAwareBroker implements Mutable, Identifiable, Bi } public class RootSalInstance extends - AbstractBindingSalProviderInstance { + AbstractBindingSalProviderInstance { public RootSalInstance(final RpcProviderRegistry rpcRegistry, - final NotificationProviderService notificationBroker, final DataProviderService dataBroker) { - super(rpcRegistry, notificationBroker, dataBroker); + final NotificationProviderService notificationBroker) { + super(rpcRegistry, notificationBroker); } } diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/AbstractDataServiceTest.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/AbstractDataServiceTest.java index d79bff12ba..aa80e117ab 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/AbstractDataServiceTest.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/AbstractDataServiceTest.java @@ -10,14 +10,11 @@ package org.opendaylight.controller.sal.binding.test; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import org.junit.Before; -import org.opendaylight.controller.sal.binding.api.data.DataProviderService; import org.opendaylight.controller.sal.binding.test.util.BindingBrokerTestFactory; import org.opendaylight.controller.sal.binding.test.util.BindingTestContext; public abstract class AbstractDataServiceTest { - protected DataProviderService baDataService; - protected BindingTestContext testContext; @Before @@ -28,8 +25,6 @@ public abstract class AbstractDataServiceTest { factory.setStartWithParsedSchema(getStartWithSchema()); testContext = factory.getTestContext(); testContext.start(); - - baDataService = testContext.getBindingDataBroker(); } protected boolean getStartWithSchema() { diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java index 5bd1316504..9da772a18c 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java @@ -8,6 +8,7 @@ package org.opendaylight.controller.sal.binding.test.util; import static com.google.common.base.Preconditions.checkState; + import com.google.common.annotations.Beta; import com.google.common.collect.ClassToInstanceMap; import com.google.common.collect.ImmutableMap; @@ -15,13 +16,13 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.MutableClassToInstanceMap; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; +import javassist.ClassPool; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.MountPointService; import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService; import org.opendaylight.controller.md.sal.binding.api.NotificationService; import org.opendaylight.controller.md.sal.binding.compat.HeliumNotificationProviderServiceAdapter; import org.opendaylight.controller.md.sal.binding.compat.HeliumRpcProviderRegistry; -import org.opendaylight.controller.md.sal.binding.compat.HydrogenDataBrokerAdapter; import org.opendaylight.controller.md.sal.binding.compat.HydrogenMountProvisionServiceAdapter; import org.opendaylight.controller.md.sal.binding.impl.BindingDOMDataBrokerAdapter; import org.opendaylight.controller.md.sal.binding.impl.BindingDOMMountPointServiceAdapter; @@ -59,7 +60,6 @@ import org.opendaylight.yangtools.binding.data.codec.impl.BindingNormalizedNodeC import org.opendaylight.yangtools.yang.binding.YangModuleInfo; import org.opendaylight.yangtools.yang.binding.util.BindingReflections; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import javassist.ClassPool; @Beta public class BindingTestContext implements AutoCloseable { @@ -153,7 +153,6 @@ public class BindingTestContext implements AutoCloseable { public void startBindingBroker() { checkState(this.executor != null, "Executor needs to be set"); - checkState(this.baData != null, "Binding Data Broker must be started"); checkState(this.baNotifyImpl != null, "Notification Service must be started"); this.baConsumerRpc = new BindingDOMRpcServiceAdapter(getDomRpcInvoker(), this.codec); @@ -165,7 +164,6 @@ public class BindingTestContext implements AutoCloseable { this.baBrokerImpl.setMountService(mountService); this.baBrokerImpl.setLegacyMountManager(new HydrogenMountProvisionServiceAdapter(mountService)); this.baBrokerImpl.setRpcBroker(new HeliumRpcProviderRegistry(this.baConsumerRpc, this.baProviderRpc)); - this.baBrokerImpl.setLegacyDataBroker(this.baData); this.baBrokerImpl.setNotificationBroker(this.baNotifyImpl); this.baBrokerImpl.start(); } @@ -201,7 +199,6 @@ public class BindingTestContext implements AutoCloseable { startDomMountPoint(); startBindingToDomMappingService(); startNewDataBroker(); - startNewBindingDataBroker(); startBindingNotificationBroker(); startBindingBroker(); @@ -211,11 +208,6 @@ public class BindingTestContext implements AutoCloseable { } } - public void startNewBindingDataBroker() { - final HydrogenDataBrokerAdapter forwarded = new HydrogenDataBrokerAdapter(this.dataBroker); - this.baData = forwarded; - } - private void startDomMountPoint() { this.biMountImpl = new DOMMountPointServiceImpl(); } @@ -249,11 +241,6 @@ public class BindingTestContext implements AutoCloseable { updateYangSchema(moduleInfos); } - @Deprecated - public DataProviderService getBindingDataBroker() { - return this.baData; - } - public RpcProviderRegistry getBindingRpcRegistry() { return this.baBrokerImpl.getRoot(); } diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModule.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModule.java index 71bd0017cf..fe2e499357 100644 --- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModule.java +++ b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModule.java @@ -69,7 +69,6 @@ public final class BindingBrokerImplModule extends final MountProviderService legacyMount = createLegacyMountPointService(mount); - broker.setLegacyDataBroker(getDataBrokerDependency()); broker.setNotificationBroker(getNotificationServiceDependency()); if (getNotificationPublishServiceDependency() != null) { broker.setNotificationPublishService(getNotificationPublishServiceDependency()); diff --git a/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/AbstractBindingSalConsumerInstance.java b/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/AbstractBindingSalConsumerInstance.java index 53abd39cde..861f9f0629 100644 --- a/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/AbstractBindingSalConsumerInstance.java +++ b/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/AbstractBindingSalConsumerInstance.java @@ -7,29 +7,19 @@ */ package org.opendaylight.controller.md.sal.binding.util; +import com.google.common.base.Preconditions; import org.opendaylight.controller.sal.binding.api.NotificationListener; import org.opendaylight.controller.sal.binding.api.NotificationService; import org.opendaylight.controller.sal.binding.api.RpcConsumerRegistry; -import org.opendaylight.controller.sal.binding.api.data.DataBrokerService; -import org.opendaylight.controller.sal.binding.api.data.DataChangeListener; -import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction; import org.opendaylight.yangtools.concepts.ListenerRegistration; -import org.opendaylight.yangtools.yang.binding.DataObject; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.Notification; import org.opendaylight.yangtools.yang.binding.RpcService; -import com.google.common.base.Preconditions; - -public abstract class AbstractBindingSalConsumerInstance // - implements // - RpcConsumerRegistry, // - NotificationService, // - DataBrokerService { +public abstract class AbstractBindingSalConsumerInstance + implements RpcConsumerRegistry, NotificationService { private final R rpcRegistry; private final N notificationBroker; - private final D dataBroker; protected final R getRpcRegistry() { return rpcRegistry; @@ -39,10 +29,6 @@ public abstract class AbstractBindingSalConsumerInstance path) { - return getDataBrokerChecked().readConfigurationData(path); - } - - @Override - public DataObject readOperationalData(InstanceIdentifier path) { - return getDataBrokerChecked().readOperationalData(path); - } - - @Override - @Deprecated - public ListenerRegistration registerDataChangeListener( - InstanceIdentifier path, DataChangeListener listener) { - return getDataBrokerChecked().registerDataChangeListener(path, listener); - } } diff --git a/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/AbstractBindingSalProviderInstance.java b/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/AbstractBindingSalProviderInstance.java index bba32011fc..8fb31d1ac8 100644 --- a/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/AbstractBindingSalProviderInstance.java +++ b/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/AbstractBindingSalProviderInstance.java @@ -13,23 +13,19 @@ 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.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.rpc.RpcContextIdentifier; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.Notification; import org.opendaylight.yangtools.yang.binding.RpcService; -public abstract class AbstractBindingSalProviderInstance // - extends AbstractBindingSalConsumerInstance // - implements // - DataProviderService, // - RpcProviderRegistry, // - NotificationProviderService { +public abstract class AbstractBindingSalProviderInstance + extends AbstractBindingSalConsumerInstance + implements RpcProviderRegistry, NotificationProviderService { - public AbstractBindingSalProviderInstance(final R rpcRegistry, final N notificationBroker, - final D dataBroker) { - super(rpcRegistry, notificationBroker, dataBroker); + public AbstractBindingSalProviderInstance(final R rpcRegistry, final N notificationBroker) { + super(rpcRegistry, notificationBroker); } @Override @@ -39,8 +35,8 @@ public abstract class AbstractBindingSalProviderInstance RoutedRpcRegistration addRoutedRpcImplementation(final Class type, final T implementation) - throws IllegalStateException { + public RoutedRpcRegistration addRoutedRpcImplementation(final Class type, + final T implementation) throws IllegalStateException { return getRpcRegistryChecked().addRoutedRpcImplementation(type, implementation); } -- 2.36.6