From 3cc9cc2152696a25177e965a40d63a5c0ab5f73f Mon Sep 17 00:00:00 2001
From: manuedelf <emmanuelle.delfour@orange.com>
Date: Thu, 27 Aug 2020 10:38:19 +0200
Subject: [PATCH] Remove common module deprecated methods

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I097d664cb06f9505ed94f04e899b0cae738b5fe3
---
 .../common/device/DeviceTransaction.java         | 11 -----------
 .../common/network/NetworkTransactionImpl.java   | 11 -----------
 .../network/NetworkTransactionService.java       |  7 -------
 .../common/network/RequestProcessor.java         | 16 ----------------
 4 files changed, 45 deletions(-)

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 6fb91d21f..574dd6fdd 100644
--- 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 d6995a9d5..11a1898b2 100644
--- 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 edc57d546..4fe79f3cf 100644
--- 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 a129c17c1..54a88c5af 100644
--- 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) {
-- 
2.36.6