Remove common module deprecated methods

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I097d664cb06f9505ed94f04e899b0cae738b5fe3

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransaction.java b/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransaction.java
index 6fb91d21f4e7e3dec55bfd404c03c2119740d43e..574dd6fddeeec6a1f556bf7e8b4aa1cd4f3dc92a 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransaction.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransaction.java
@@ -62,21 +62,10 @@ public class DeviceTransaction {
         rwTx.put(store, path, data);
     }
 
-    @Deprecated
-    public <T extends DataObject> void put(LogicalDatastoreType store, InstanceIdentifier<T> path, T data,
-            boolean createMissingParents) {
-        rwTx.put(store, path, data, createMissingParents);
-    }
-
     public <T extends DataObject> void merge(LogicalDatastoreType store, InstanceIdentifier<T> path, T data) {
         rwTx.merge(store, path, data);
     }
 
-    @Deprecated
-    public <T extends DataObject> void merge(LogicalDatastoreType store, InstanceIdentifier<T> path, T data,
-            boolean createMissingParents) {
-        rwTx.merge(store, path, data, createMissingParents);
-    }
 
     public void delete(LogicalDatastoreType store, InstanceIdentifier<?> path) {
         rwTx.delete(store, path);

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/network/NetworkTransactionImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/network/NetworkTransactionImpl.java
index d6995a9d54ca3e9d9b9c7c9b14897ce2ffaec0e5..11a1898b2dba4ef9c4c7b583020ce742f5ce5d5f 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/network/NetworkTransactionImpl.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/network/NetworkTransactionImpl.java
@@ -37,12 +37,7 @@ public class NetworkTransactionImpl implements NetworkTransactionService {
         requestProcessor.delete(store, path);
     }
 
-    @Deprecated
-    public <T extends DataObject> void put(LogicalDatastoreType store,
-        InstanceIdentifier<T> path, T data, boolean createMissingParents) {
 
-        requestProcessor.put(store, path, data, createMissingParents);
-    }
 
     @Override
     public <T extends DataObject> void put(LogicalDatastoreType store,
@@ -65,11 +60,5 @@ public class NetworkTransactionImpl implements NetworkTransactionService {
         requestProcessor.merge(store, path, data);
     }
 
-    @Deprecated
-    public <T extends DataObject> void merge(LogicalDatastoreType store,
-        InstanceIdentifier<T> path, T data, boolean createMissingParents) {
-
-        requestProcessor.merge(store, path, data, createMissingParents);
-    }
 
 }

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/network/NetworkTransactionService.java b/common/src/main/java/org/opendaylight/transportpce/common/network/NetworkTransactionService.java
index edc57d5461b22a60dce2dc70eab7c34021a193d0..4fe79f3cf40511e84200685e90247e59b71ecbd1 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/network/NetworkTransactionService.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/network/NetworkTransactionService.java
@@ -26,17 +26,10 @@ public interface NetworkTransactionService {
 
     void delete(LogicalDatastoreType store, InstanceIdentifier<?> path);
 
-    <T extends DataObject> void put(LogicalDatastoreType store, InstanceIdentifier<T> path, T data,
-                                    boolean createMissingParents);
-
-
     <T extends DataObject> void put(LogicalDatastoreType store, InstanceIdentifier<T> path,T data);
 
     <T extends DataObject> void merge(LogicalDatastoreType store, InstanceIdentifier<T> path, T data);
 
-    <T extends DataObject> void merge(LogicalDatastoreType store, InstanceIdentifier<T> path, T data,
-                                      boolean createMissingParents);
-
     FluentFuture<? extends @NonNull CommitInfo> commit();
 
     void close();

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/network/RequestProcessor.java b/common/src/main/java/org/opendaylight/transportpce/common/network/RequestProcessor.java
index a129c17c1249c00a8f918eaed0ab0aab558a4ce6..54a88c5afed759ca94c8cb1e593973ab71bdda52 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/network/RequestProcessor.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/network/RequestProcessor.java
@@ -61,14 +61,6 @@ public class RequestProcessor {
         rwTx.delete(store, path);
     }
 
-    @Deprecated
-    public <T extends DataObject> void put(LogicalDatastoreType store,
-        InstanceIdentifier<T> path, T data, boolean createMissingParents) {
-
-        acquireLock();
-        LOG.debug("Number of put requests waiting in queue :{}", lock.getQueueLength());
-        rwTx.put(store, path, data, createMissingParents);
-    }
 
     public <T extends DataObject> void put(LogicalDatastoreType store,
         InstanceIdentifier<T> path, T data) {
@@ -78,14 +70,6 @@ public class RequestProcessor {
         rwTx.put(store, path, data);
     }
 
-    @Deprecated
-    public <T extends DataObject> void merge(LogicalDatastoreType store,
-        InstanceIdentifier<T> path, T data, boolean createMissingParents) {
-
-        acquireLock();
-        LOG.debug("Number of merge requests waiting in queue :{}", lock.getQueueLength());
-        rwTx.merge(store, path, data, createMissingParents);
-    }
 
     public <T extends DataObject> void merge(LogicalDatastoreType store,
         InstanceIdentifier<T> path, T data) {