From: Tony Tkacik Date: Wed, 18 Mar 2015 14:26:04 +0000 (+0100) Subject: Renamed Binding DOM Adapters to share same naming convention. X-Git-Tag: release/lithium~382^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=0e594843543c8180c885fe228c88acc77abe4067 Renamed Binding DOM Adapters to share same naming convention. Renamed Forwarded* classes to BindingDOM*Adapter which better describes what implementations are doing. These are implementation classes and are not part of public API contract outside of sal-binding-broker-impl, so this should not affect any users. Change-Id: I1c3b5f275daa38c82215ca3ba8b8170990e9ac43 Signed-off-by: Tony Tkacik --- diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModule.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModule.java index 2503d3d242..6acf552638 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModule.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModule.java @@ -1,7 +1,7 @@ package org.opendaylight.controller.config.yang.md.sal.binding.impl; import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec; -import org.opendaylight.controller.md.sal.binding.impl.ForwardedBindingDataBroker; +import org.opendaylight.controller.md.sal.binding.impl.BindingDOMDataBrokerAdapter; import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; public class BindingAsyncDataBrokerImplModule extends @@ -29,7 +29,7 @@ public class BindingAsyncDataBrokerImplModule extends public java.lang.AutoCloseable createInstance() { final BindingToNormalizedNodeCodec mappingService = getBindingMappingServiceDependency(); final DOMDataBroker domDataBroker = getDomAsyncBrokerDependency(); - return new ForwardedBindingDataBroker(domDataBroker, mappingService); + return new BindingDOMDataBrokerAdapter(domDataBroker, mappingService); } } diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModule.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModule.java index e786151299..903cb27c92 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModule.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModule.java @@ -10,7 +10,7 @@ package org.opendaylight.controller.config.yang.md.sal.binding.impl; import org.opendaylight.controller.config.api.DependencyResolver; import org.opendaylight.controller.config.api.ModuleIdentifier; import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec; -import org.opendaylight.controller.md.sal.binding.impl.ForwardedNotificationService; +import org.opendaylight.controller.md.sal.binding.impl.BindingDOMNotificationServiceAdapter; import org.opendaylight.controller.md.sal.dom.api.DOMNotificationService; import org.opendaylight.controller.sal.binding.codegen.impl.SingletonHolder; import org.opendaylight.controller.sal.core.api.Broker; @@ -34,7 +34,7 @@ public class BindingNotificationAdapterModule extends AbstractBindingNotificatio final BindingToNormalizedNodeCodec codec = getBindingMappingServiceDependency(); final Broker.ProviderSession session = getDomAsyncBrokerDependency().registerProvider(new DummyDOMProvider()); final DOMNotificationService notifService = session.getService(DOMNotificationService.class); - return new ForwardedNotificationService(codec.getCodecRegistry(), notifService, SingletonHolder.INVOKER_FACTORY); + return new BindingDOMNotificationServiceAdapter(codec.getCodecRegistry(), notifService, SingletonHolder.INVOKER_FACTORY); } } diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModule.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModule.java index bdac710ecb..de4a905931 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModule.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModule.java @@ -10,7 +10,7 @@ package org.opendaylight.controller.config.yang.md.sal.binding.impl; import org.opendaylight.controller.config.api.DependencyResolver; import org.opendaylight.controller.config.api.ModuleIdentifier; import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec; -import org.opendaylight.controller.md.sal.binding.impl.ForwardedNotificationPublishService; +import org.opendaylight.controller.md.sal.binding.impl.BindingDOMNotificationPublishServiceAdapter; import org.opendaylight.controller.md.sal.dom.api.DOMNotificationPublishService; import org.opendaylight.controller.sal.core.api.Broker; @@ -33,7 +33,7 @@ public class BindingNotificationPublishAdapterModule extends AbstractBindingNoti final BindingToNormalizedNodeCodec codec = getBindingMappingServiceDependency(); final Broker.ProviderSession session = getDomAsyncBrokerDependency().registerProvider(new DummyDOMProvider()); final DOMNotificationPublishService publishService = session.getService(DOMNotificationPublishService.class); - return new ForwardedNotificationPublishService(codec.getCodecRegistry(), publishService); + return new BindingDOMNotificationPublishServiceAdapter(codec.getCodecRegistry(), publishService); } } diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMAdapterLoader.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMAdapterLoader.java index 79c974959d..175dbb6c99 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMAdapterLoader.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMAdapterLoader.java @@ -24,9 +24,9 @@ public abstract class BindingDOMAdapterLoader extends AdapterLoader,BindingDOMAdapterBuilder.Factory> FACTORIES = ImmutableMap.,BindingDOMAdapterBuilder.Factory>builder() - .put(NotificationService.class,ForwardedNotificationService.BUILDER_FACTORY) - .put(NotificationPublishService.class,ForwardedNotificationPublishService.BUILDER_FACTORY) - .put(DataBroker.class,ForwardedBindingDataBroker.BUILDER_FACTORY) + .put(NotificationService.class,BindingDOMNotificationServiceAdapter.BUILDER_FACTORY) + .put(NotificationPublishService.class,BindingDOMNotificationPublishServiceAdapter.BUILDER_FACTORY) + .put(DataBroker.class,BindingDOMDataBrokerAdapter.BUILDER_FACTORY) .put(RpcConsumerRegistry.class,BindingDOMRpcServiceAdapter.BUILDER_FACTORY) .build(); diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/ForwardedBindingDataBroker.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMDataBrokerAdapter.java similarity index 77% rename from opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/ForwardedBindingDataBroker.java rename to opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMDataBrokerAdapter.java index bba1747e7c..b17be16615 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/ForwardedBindingDataBroker.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMDataBrokerAdapter.java @@ -32,7 +32,7 @@ import org.opendaylight.controller.sal.core.api.model.SchemaService; * */ -public class ForwardedBindingDataBroker extends AbstractForwardedDataBroker implements DataBroker { +public class BindingDOMDataBrokerAdapter extends AbstractForwardedDataBroker implements DataBroker { static final Factory BUILDER_FACTORY = new BindingDOMAdapterBuilder.Factory() { @@ -44,34 +44,34 @@ public class ForwardedBindingDataBroker extends AbstractForwardedDataBroker impl }; - public ForwardedBindingDataBroker(final DOMDataBroker domDataBroker, final BindingToNormalizedNodeCodec codec) { + public BindingDOMDataBrokerAdapter(final DOMDataBroker domDataBroker, final BindingToNormalizedNodeCodec codec) { super(domDataBroker, codec); } @Deprecated - public ForwardedBindingDataBroker(final DOMDataBroker domDataBroker, final BindingToNormalizedNodeCodec codec, final SchemaService schemaService) { + public BindingDOMDataBrokerAdapter(final DOMDataBroker domDataBroker, final BindingToNormalizedNodeCodec codec, final SchemaService schemaService) { super(domDataBroker, codec,schemaService); } @Override public ReadOnlyTransaction newReadOnlyTransaction() { - return new BindingDataReadTransactionImpl(getDelegate().newReadOnlyTransaction(),getCodec()); + return new BindingDOMReadTransactionAdapter(getDelegate().newReadOnlyTransaction(),getCodec()); } @Override public ReadWriteTransaction newReadWriteTransaction() { - return new BindingDataReadWriteTransactionImpl(getDelegate().newReadWriteTransaction(),getCodec()); + return new BindingDOMReadWriteTransactionAdapter(getDelegate().newReadWriteTransaction(),getCodec()); } @Override public WriteTransaction newWriteOnlyTransaction() { - return new BindingDataWriteTransactionImpl<>(getDelegate().newWriteOnlyTransaction(),getCodec()); + return new BindingDOMWriteTransactionAdapter<>(getDelegate().newWriteOnlyTransaction(),getCodec()); } @Override public BindingTransactionChain createTransactionChain(final TransactionChainListener listener) { - return new BindingTranslatedTransactionChain(getDelegate(), getCodec(), listener); + return new BindingDOMTransactionChainAdapter(getDelegate(), getCodec(), listener); } private static class Builder extends BindingDOMAdapterBuilder { @@ -85,7 +85,7 @@ public class ForwardedBindingDataBroker extends AbstractForwardedDataBroker impl protected DataBroker createInstance(BindingToNormalizedNodeCodec codec, ClassToInstanceMap delegates) { DOMDataBroker domDataBroker = delegates.getInstance(DOMDataBroker.class); - return new ForwardedBindingDataBroker(domDataBroker, codec); + return new BindingDOMDataBrokerAdapter(domDataBroker, codec); } diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/ForwardedNotificationPublishService.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMNotificationPublishServiceAdapter.java similarity index 92% rename from opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/ForwardedNotificationPublishService.java rename to opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMNotificationPublishServiceAdapter.java index 13b53ad22e..0a736ffc79 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/ForwardedNotificationPublishService.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMNotificationPublishServiceAdapter.java @@ -23,7 +23,7 @@ import org.opendaylight.yangtools.yang.binding.Notification; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; -public class ForwardedNotificationPublishService implements NotificationPublishService, AutoCloseable { +public class BindingDOMNotificationPublishServiceAdapter implements NotificationPublishService, AutoCloseable { static final Factory BUILDER_FACTORY = new BindingDOMAdapterBuilder.Factory() { @@ -37,7 +37,7 @@ public class ForwardedNotificationPublishService implements NotificationPublishS private final BindingNormalizedNodeSerializer codecRegistry; private final DOMNotificationPublishService domPublishService; - public ForwardedNotificationPublishService(BindingNormalizedNodeSerializer codecRegistry, DOMNotificationPublishService domPublishService) { + public BindingDOMNotificationPublishServiceAdapter(BindingNormalizedNodeSerializer codecRegistry, DOMNotificationPublishService domPublishService) { this.codecRegistry = codecRegistry; this.domPublishService = domPublishService; } @@ -105,7 +105,7 @@ public class ForwardedNotificationPublishService implements NotificationPublishS ClassToInstanceMap delegates) { BindingNormalizedNodeSerializer codecReg = codec.getCodecRegistry(); DOMNotificationPublishService domPublish = delegates.getInstance(DOMNotificationPublishService.class); - return new ForwardedNotificationPublishService(codecReg, domPublish); + return new BindingDOMNotificationPublishServiceAdapter(codecReg, domPublish); } } diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/ForwardedNotificationService.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMNotificationServiceAdapter.java similarity index 92% rename from opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/ForwardedNotificationService.java rename to opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMNotificationServiceAdapter.java index f0545ca22d..50a0a2815f 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/ForwardedNotificationService.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMNotificationServiceAdapter.java @@ -30,7 +30,7 @@ import org.opendaylight.yangtools.yang.binding.NotificationListener; import org.opendaylight.yangtools.yang.binding.util.BindingReflections; import org.opendaylight.yangtools.yang.model.api.SchemaPath; -public class ForwardedNotificationService implements NotificationService, AutoCloseable { +public class BindingDOMNotificationServiceAdapter implements NotificationService, AutoCloseable { public static final Factory BUILDER_FACTORY = new Factory() { @@ -44,7 +44,7 @@ public class ForwardedNotificationService implements NotificationService, AutoCl private final DOMNotificationService domNotifService; private final NotificationInvokerFactory notificationInvokerFactory; - public ForwardedNotificationService(BindingNormalizedNodeSerializer codec, DOMNotificationService domNotifService, NotificationInvokerFactory notificationInvokerFactory) { + public BindingDOMNotificationServiceAdapter(BindingNormalizedNodeSerializer codec, DOMNotificationService domNotifService, NotificationInvokerFactory notificationInvokerFactory) { this.codec = codec; this.domNotifService = domNotifService; this.notificationInvokerFactory = notificationInvokerFactory; @@ -113,7 +113,7 @@ public class ForwardedNotificationService implements NotificationService, AutoCl ClassToInstanceMap delegates) { DOMNotificationService domNotification = delegates.getInstance(DOMNotificationService.class); NotificationInvokerFactory invokerFactory = SingletonHolder.INVOKER_FACTORY; - return new ForwardedNotificationService(codec.getCodecRegistry(), domNotification, invokerFactory); + return new BindingDOMNotificationServiceAdapter(codec.getCodecRegistry(), domNotification, invokerFactory); } @Override diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDataReadTransactionImpl.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMReadTransactionAdapter.java similarity index 86% rename from opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDataReadTransactionImpl.java rename to opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMReadTransactionAdapter.java index fd0945f1a6..0e8a043ccc 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDataReadTransactionImpl.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMReadTransactionAdapter.java @@ -17,10 +17,10 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import com.google.common.base.Optional; import com.google.common.util.concurrent.CheckedFuture; -class BindingDataReadTransactionImpl extends AbstractForwardedTransaction implements +class BindingDOMReadTransactionAdapter extends AbstractForwardedTransaction implements ReadOnlyTransaction { - protected BindingDataReadTransactionImpl(final DOMDataReadOnlyTransaction delegate, + protected BindingDOMReadTransactionAdapter(final DOMDataReadOnlyTransaction delegate, final BindingToNormalizedNodeCodec codec) { super(delegate, codec); } diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDataReadWriteTransactionImpl.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMReadWriteTransactionAdapter.java similarity index 82% rename from opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDataReadWriteTransactionImpl.java rename to opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMReadWriteTransactionAdapter.java index a1da029c24..e9c4efac53 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDataReadWriteTransactionImpl.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMReadWriteTransactionAdapter.java @@ -17,10 +17,10 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import com.google.common.base.Optional; import com.google.common.util.concurrent.CheckedFuture; -class BindingDataReadWriteTransactionImpl extends - BindingDataWriteTransactionImpl implements ReadWriteTransaction { +class BindingDOMReadWriteTransactionAdapter extends + BindingDOMWriteTransactionAdapter implements ReadWriteTransaction { - protected BindingDataReadWriteTransactionImpl(final DOMDataReadWriteTransaction delegate, + protected BindingDOMReadWriteTransactionAdapter(final DOMDataReadWriteTransaction delegate, final BindingToNormalizedNodeCodec codec) { super(delegate, codec); } diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingTranslatedTransactionChain.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMTransactionChainAdapter.java similarity index 91% rename from opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingTranslatedTransactionChain.java rename to opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMTransactionChainAdapter.java index 36b7a0f5f2..1a0787eb19 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingTranslatedTransactionChain.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMTransactionChainAdapter.java @@ -28,16 +28,16 @@ import org.opendaylight.yangtools.concepts.Delegator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -final class BindingTranslatedTransactionChain implements BindingTransactionChain, Delegator { +final class BindingDOMTransactionChainAdapter implements BindingTransactionChain, Delegator { - private static final Logger LOG = LoggerFactory.getLogger(BindingTranslatedTransactionChain.class); + private static final Logger LOG = LoggerFactory.getLogger(BindingDOMTransactionChainAdapter.class); private final DOMTransactionChain delegate; private final BindingToNormalizedNodeCodec codec; private final DelegateChainListener domListener; private final TransactionChainListener bindingListener; - public BindingTranslatedTransactionChain(final DOMDataBroker chainFactory, + public BindingDOMTransactionChainAdapter(final DOMDataBroker chainFactory, final BindingToNormalizedNodeCodec codec, final TransactionChainListener listener) { Preconditions.checkNotNull(chainFactory, "DOM Transaction chain factory must not be null"); this.domListener = new DelegateChainListener(); @@ -54,14 +54,14 @@ final class BindingTranslatedTransactionChain implements BindingTransactionChain @Override public ReadOnlyTransaction newReadOnlyTransaction() { DOMDataReadOnlyTransaction delegateTx = delegate.newReadOnlyTransaction(); - ReadOnlyTransaction bindingTx = new BindingDataReadTransactionImpl(delegateTx, codec); + ReadOnlyTransaction bindingTx = new BindingDOMReadTransactionAdapter(delegateTx, codec); return bindingTx; } @Override public ReadWriteTransaction newReadWriteTransaction() { DOMDataReadWriteTransaction delegateTx = delegate.newReadWriteTransaction(); - ReadWriteTransaction bindingTx = new BindingDataReadWriteTransactionImpl(delegateTx, codec) { + ReadWriteTransaction bindingTx = new BindingDOMReadWriteTransactionAdapter(delegateTx, codec) { @Override public CheckedFuture submit() { @@ -75,7 +75,7 @@ final class BindingTranslatedTransactionChain implements BindingTransactionChain @Override public WriteTransaction newWriteOnlyTransaction() { final DOMDataWriteTransaction delegateTx = delegate.newWriteOnlyTransaction(); - WriteTransaction bindingTx = new BindingDataWriteTransactionImpl(delegateTx, codec) { + WriteTransaction bindingTx = new BindingDOMWriteTransactionAdapter(delegateTx, codec) { @Override public CheckedFuture submit() { @@ -141,7 +141,7 @@ final class BindingTranslatedTransactionChain implements BindingTransactionChain public void onTransactionChainSuccessful(final TransactionChain chain) { Preconditions.checkState(delegate.equals(chain), "Illegal state - listener for %s was invoked for incorrect chain %s.", delegate, chain); - bindingListener.onTransactionChainSuccessful(BindingTranslatedTransactionChain.this); + bindingListener.onTransactionChainSuccessful(BindingDOMTransactionChainAdapter.this); } } diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDataWriteTransactionImpl.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMWriteTransactionAdapter.java similarity index 95% rename from opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDataWriteTransactionImpl.java rename to opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMWriteTransactionAdapter.java index f261deb99c..02e15a1e51 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDataWriteTransactionImpl.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMWriteTransactionAdapter.java @@ -27,10 +27,10 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgum import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.ListenableFuture; -class BindingDataWriteTransactionImpl extends +class BindingDOMWriteTransactionAdapter extends AbstractWriteTransaction implements WriteTransaction { - protected BindingDataWriteTransactionImpl(final T delegateTx, final BindingToNormalizedNodeCodec codec) { + protected BindingDOMWriteTransactionAdapter(final T delegateTx, final BindingToNormalizedNodeCodec codec) { super(delegateTx, codec); } diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/DataBrokerTestCustomizer.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/DataBrokerTestCustomizer.java index f8f45f25e0..c5138040ec 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/DataBrokerTestCustomizer.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/DataBrokerTestCustomizer.java @@ -15,9 +15,9 @@ import org.opendaylight.controller.md.sal.binding.api.DataBroker; 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.impl.BindingToNormalizedNodeCodec; -import org.opendaylight.controller.md.sal.binding.impl.ForwardedBindingDataBroker; -import org.opendaylight.controller.md.sal.binding.impl.ForwardedNotificationPublishService; -import org.opendaylight.controller.md.sal.binding.impl.ForwardedNotificationService; +import org.opendaylight.controller.md.sal.binding.impl.BindingDOMDataBrokerAdapter; +import org.opendaylight.controller.md.sal.binding.impl.BindingDOMNotificationPublishServiceAdapter; +import org.opendaylight.controller.md.sal.binding.impl.BindingDOMNotificationServiceAdapter; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; import org.opendaylight.controller.md.sal.dom.broker.impl.DOMNotificationRouter; @@ -80,12 +80,12 @@ public class DataBrokerTestCustomizer { } public NotificationService createNotificationService() { - return new ForwardedNotificationService(bindingToNormalized.getCodecRegistry(), domNotificationRouter, + return new BindingDOMNotificationServiceAdapter(bindingToNormalized.getCodecRegistry(), domNotificationRouter, SingletonHolder.INVOKER_FACTORY); } public NotificationPublishService createNotificationPublishService() { - return new ForwardedNotificationPublishService(bindingToNormalized.getCodecRegistry(), domNotificationRouter); + return new BindingDOMNotificationPublishServiceAdapter(bindingToNormalized.getCodecRegistry(), domNotificationRouter); } @@ -94,7 +94,7 @@ public class DataBrokerTestCustomizer { } public DataBroker createDataBroker() { - return new ForwardedBindingDataBroker(getDOMDataBroker(), bindingToNormalized); + return new BindingDOMDataBrokerAdapter(getDOMDataBroker(), bindingToNormalized); } public BindingToNormalizedNodeCodec getBindingToNormalized() { 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 58d6a3de88..262f5afca9 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 @@ -29,7 +29,7 @@ import org.opendaylight.controller.md.sal.binding.impl.BindingDOMMountPointServi import org.opendaylight.controller.md.sal.binding.impl.BindingDOMRpcProviderServiceAdapter; import org.opendaylight.controller.md.sal.binding.impl.BindingDOMRpcServiceAdapter; import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec; -import org.opendaylight.controller.md.sal.binding.impl.ForwardedBindingDataBroker; +import org.opendaylight.controller.md.sal.binding.impl.BindingDOMDataBrokerAdapter; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService; @@ -136,7 +136,7 @@ public class BindingTestContext implements AutoCloseable { public void startNewDataBroker() { checkState(executor != null, "Executor needs to be set"); checkState(newDOMDataBroker != null, "DOM Data Broker must be set"); - dataBroker = new ForwardedBindingDataBroker(newDOMDataBroker, codec); + dataBroker = new BindingDOMDataBrokerAdapter(newDOMDataBroker, codec); } public void startNewDomDataBroker() {