Merge "Resolve Bug:522"

[controller.git] / opendaylight / md-sal / sal-binding-broker / src / main / java / org / opendaylight / controller / sal / binding / impl / DataBrokerImpl.java

diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/DataBrokerImpl.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/DataBrokerImpl.java
index 16d5a24cb5b7c80364edd8dd5dbe4f8b59e6aa97..48ccbfbc955ff9163487fca3523a184cf9d1c688 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/DataBrokerImpl.java
+++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/DataBrokerImpl.java
@@ -9,19 +9,15 @@ package org.opendaylight.controller.sal.binding.impl;
 \r
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.opendaylight.controller.md.sal.common.impl.service.AbstractDataBroker;
 import org.opendaylight.controller.sal.binding.api.data.DataChangeListener;
 import org.opendaylight.controller.sal.binding.api.data.DataProviderService;
 import org.opendaylight.controller.sal.binding.impl.util.BindingAwareDataReaderRouter;
-import org.opendaylight.controller.sal.common.DataStoreIdentifier;
 import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.binding.DataRoot;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.util.DataObjectReadingUtil;
-import org.opendaylight.yangtools.yang.common.RpcResult;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableMap;
@@ -79,68 +75,7 @@ public class DataBrokerImpl extends AbstractDataBroker<InstanceIdentifier<? exte
     }\r
 \r
     @Override\r
-    @Deprecated\r
-    public <T extends DataRoot> T getData(DataStoreIdentifier store, Class<T> rootType) {\r
-        throw new UnsupportedOperationException("Deprecated");\r
-    }\r
-\r
-    @Override\r
-    @Deprecated\r
-    public <T extends DataRoot> T getData(DataStoreIdentifier store, T filter) {\r
-        throw new UnsupportedOperationException("Deprecated");\r
-    }\r
-\r
-    @Override\r
-    @Deprecated\r
-    public <T extends DataRoot> T getCandidateData(DataStoreIdentifier store, Class<T> rootType) {\r
-        throw new UnsupportedOperationException("Deprecated");\r
-    }\r
-\r
-    @Override\r
-    @Deprecated\r
-    public <T extends DataRoot> T getCandidateData(DataStoreIdentifier store, T filter) {\r
-        throw new UnsupportedOperationException("Deprecated");\r
-    }\r
-\r
-    @Override\r
-    @Deprecated\r
-    public RpcResult<DataRoot> editCandidateData(DataStoreIdentifier store, DataRoot changeSet) {\r
-        throw new UnsupportedOperationException("Deprecated");\r
-    }\r
-\r
-    @Override\r
-    @Deprecated\r
-    public Future<RpcResult<Void>> commit(DataStoreIdentifier store) {\r
-        throw new UnsupportedOperationException("Deprecated");\r
-    }\r
-\r
-    @Override\r
-    @Deprecated\r
-    public DataObject getData(InstanceIdentifier<? extends DataObject> data) {\r
-        throw new UnsupportedOperationException("Deprecated");\r
-    }\r
-\r
-    @Override\r
-    @Deprecated\r
-    public DataObject getConfigurationData(InstanceIdentifier<?> data) {\r
-        throw new UnsupportedOperationException("Deprecated");\r
-    }\r
-\r
-    @Override\r
-    @Deprecated\r
-    public void registerChangeListener(InstanceIdentifier<? extends DataObject> path, DataChangeListener changeListener) {\r
-        throw new UnsupportedOperationException("Deprecated");\r
-    }\r
-\r
-    @Override\r
-    @Deprecated\r
-    public void unregisterChangeListener(InstanceIdentifier<? extends DataObject> path,\r
-            DataChangeListener changeListener) {\r
-        throw new UnsupportedOperationException("Deprecated");\r
-    }\r
-\r
-    @Override\r
-    public void close() throws Exception {\r
+    public void close() {\r
 \r
     }