X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=binding%2Fmdsal-binding-dom-adapter%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fbinding%2Fdom%2Fadapter%2Fosgi%2FOSGiDataBroker.java;h=dd5e420375e65383008907b07465bae1131f7f0c;hb=refs%2Fchanges%2F16%2F107916%2F8;hp=d018d7c4054087bebca70eb98641de557b0941ff;hpb=b0712bca8e467f463a91ae4a6e664cc51e66809a;p=mdsal.git

diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/osgi/OSGiDataBroker.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/osgi/OSGiDataBroker.java
index d018d7c405..dd5e420375 100644
--- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/osgi/OSGiDataBroker.java
+++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/osgi/OSGiDataBroker.java
@@ -7,16 +7,14 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter.osgi;
 
-import com.google.common.annotations.Beta;
 import java.util.Map;
-import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.DataTreeChangeListener;
 import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
 import org.opendaylight.mdsal.binding.api.ReadTransaction;
 import org.opendaylight.mdsal.binding.api.ReadWriteTransaction;
 import org.opendaylight.mdsal.binding.api.TransactionChain;
-import org.opendaylight.mdsal.binding.api.TransactionChainListener;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.yangtools.concepts.Registration;
 import org.opendaylight.yangtools.yang.binding.DataObject;
@@ -24,54 +22,57 @@ import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
 
-@Beta
+@NonNullByDefault
 @Component(factory = OSGiDataBroker.FACTORY_NAME)
 public final class OSGiDataBroker extends AbstractAdaptedService<DataBroker> implements DataBroker {
     // OSGi DS Component Factory name
     static final String FACTORY_NAME = "org.opendaylight.mdsal.binding.dom.adapter.osgi.OSGiDataBroker";
 
-    public OSGiDataBroker() {
-        super(DataBroker.class);
+    @Activate
+    public OSGiDataBroker(final Map<String, ?> properties) {
+        super(DataBroker.class, properties);
+    }
+
+    @Deactivate
+    void deactivate(final int reason) {
+        stop(reason);
     }
 
     @Override
     public ReadTransaction newReadOnlyTransaction() {
-        return delegate().newReadOnlyTransaction();
+        return delegate.newReadOnlyTransaction();
     }
 
     @Override
     public ReadWriteTransaction newReadWriteTransaction() {
-        return delegate().newReadWriteTransaction();
+        return delegate.newReadWriteTransaction();
     }
 
     @Override
     public WriteTransaction newWriteOnlyTransaction() {
-        return delegate().newWriteOnlyTransaction();
+        return delegate.newWriteOnlyTransaction();
     }
 
     @Override
-    public <T extends DataObject> Registration registerDataTreeChangeListener(final DataTreeIdentifier<T> treeId,
-            final DataTreeChangeListener<T> listener) {
-        return delegate().registerDataTreeChangeListener(treeId, listener);
+    public TransactionChain createTransactionChain() {
+        return delegate.createTransactionChain();
     }
 
     @Override
-    public TransactionChain createTransactionChain(@NonNull final TransactionChainListener listener) {
-        return delegate().createTransactionChain(listener);
+    public TransactionChain createMergingTransactionChain() {
+        return delegate.createMergingTransactionChain();
     }
 
     @Override
-    public TransactionChain createMergingTransactionChain(final TransactionChainListener listener) {
-        return delegate().createMergingTransactionChain(listener);
-    }
-
-    @Activate
-    void activate(final Map<String, ?> properties) {
-        start(properties);
+    public <T extends DataObject> Registration registerTreeChangeListener(final DataTreeIdentifier<T> treeId,
+            final DataTreeChangeListener<T> listener) {
+        return delegate.registerTreeChangeListener(treeId, listener);
     }
 
-    @Deactivate
-    void deactivate(final int reason) {
-        stop(reason);
+    @Override
+    @Deprecated(since = "13.0.0", forRemoval = true)
+    public <T extends DataObject> Registration registerLegacyTreeChangeListener(final DataTreeIdentifier<T> treeId,
+            final DataTreeChangeListener<T> listener) {
+        return delegate.registerLegacyTreeChangeListener(treeId, listener);
     }
 }