Migrate from tools-api to rpc-api

This migrates users of FutureRpcResults to the non-deprecated
version. Also import serviceutils artifacts from binding-parent.

Change-Id: I52661ad4b116be525234a18022ad4c48c8511a2c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/alivenessmonitor/alivenessmonitor-impl/pom.xml b/alivenessmonitor/alivenessmonitor-impl/pom.xml
index ec393ec73174a114b3bc0e3702c6062432f3e6b5..26853a155ddfe3536d38b06355c879165fe13a05 100644 (file)
--- a/alivenessmonitor/alivenessmonitor-impl/pom.xml
+++ b/alivenessmonitor/alivenessmonitor-impl/pom.xml
@@ -40,13 +40,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.serviceutils</groupId>
-        <artifactId>serviceutils-artifacts</artifactId>
-        <version>0.4.0-SNAPSHOT</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 

diff --git a/commons/binding-parent/pom.xml b/commons/binding-parent/pom.xml
index 8d2b3e30561fca71cd674375773f562742dafeed..0cf7ff34d0734c8076ae64953e3a512e045ccbd8 100644 (file)
--- a/commons/binding-parent/pom.xml
+++ b/commons/binding-parent/pom.xml
@@ -38,6 +38,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.serviceutils</groupId>
+        <artifactId>serviceutils-artifacts</artifactId>
+        <version>0.4.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 

diff --git a/idmanager/idmanager-impl/pom.xml b/idmanager/idmanager-impl/pom.xml
index 8f491168b4702b9aebd86f2b3d2ec6e89a845267..ba2aee3ed32cdbf511dca710d9788e912ddc5aec 100644 (file)
--- a/idmanager/idmanager-impl/pom.xml
+++ b/idmanager/idmanager-impl/pom.xml
@@ -49,8 +49,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependency>
     <dependency>
       <groupId>org.opendaylight.serviceutils</groupId>
-      <artifactId>tools-api</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <artifactId>rpc-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.genius</groupId>

diff --git a/idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/IdManager.java b/idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/IdManager.java
index 739399fdc2abf011bf7a0e90a1055ee3d1884b25..2b42fe6f5c359a3c2b8efdf8f637d71fa8f75964 100644 (file)
--- a/idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/IdManager.java
+++ b/idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/IdManager.java
@@ -56,7 +56,7 @@ import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl;
 import org.opendaylight.genius.infra.TypedReadWriteTransaction;
 import org.opendaylight.genius.infra.TypedWriteTransaction;
 import org.opendaylight.infrautils.jobcoordinator.JobCoordinator;
-import org.opendaylight.serviceutils.tools.mdsal.rpc.FutureRpcResults;
+import org.opendaylight.serviceutils.tools.rpc.FutureRpcResults;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.AllocateIdInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.AllocateIdOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.AllocateIdOutputBuilder;
@@ -281,7 +281,7 @@ public class IdManager implements IdManagerService, IdManagerMonitor {
             releaseIdFromLocalPool(poolName, idUtils.getLocalPoolName(poolName), idKey);
             // TODO return the Future from releaseIdFromLocalPool() instead.. check all callers @CheckReturnValue
             return Futures.immediateFuture((ReleaseIdOutput) null);
-        }).onFailureLogLevel(org.opendaylight.serviceutils.tools.mdsal.rpc.FutureRpcResults.LogLevel.NONE)
+        }).onFailureLogLevel(FutureRpcResults.LogLevel.NONE)
                 .onFailure(e -> {
                     if (e instanceof IdDoesNotExistException) {
                         // Do not log full stack trace in case ID does not exist

diff --git a/interfacemanager/interfacemanager-impl/pom.xml b/interfacemanager/interfacemanager-impl/pom.xml
index ed0ea07f03ae2679e53ec682dc5acef5cbdf4d3f..5ea588033f1e40a9148f6439eba820ba285a2ab2 100644 (file)
--- a/interfacemanager/interfacemanager-impl/pom.xml
+++ b/interfacemanager/interfacemanager-impl/pom.xml
@@ -47,13 +47,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.serviceutils</groupId>
-        <artifactId>serviceutils-artifacts</artifactId>
-        <version>0.4.0-SNAPSHOT</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -99,13 +92,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependency>
     <dependency>
       <groupId>org.opendaylight.serviceutils</groupId>
-      <artifactId>srm-api</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <artifactId>rpc-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.serviceutils</groupId>
-      <artifactId>tools-api</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <artifactId>srm-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>

diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/rpcservice/InterfaceManagerRpcService.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/rpcservice/InterfaceManagerRpcService.java
index b70e2af3d67855bb28c200db9a091d4e4e9949b0..e96058665b64e4a4737b14732d74b9b945e867ff 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/rpcservice/InterfaceManagerRpcService.java
+++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/rpcservice/InterfaceManagerRpcService.java
@@ -7,14 +7,13 @@
  */
 package org.opendaylight.genius.interfacemanager.rpcservice;
 
-import static org.opendaylight.serviceutils.tools.mdsal.rpc.FutureRpcResults.LogLevel.DEBUG;
-import static org.opendaylight.serviceutils.tools.mdsal.rpc.FutureRpcResults.LogLevel.NONE;
-import static org.opendaylight.serviceutils.tools.mdsal.rpc.FutureRpcResults.fromListenableFuture;
+import static org.opendaylight.serviceutils.tools.rpc.FutureRpcResults.LogLevel.DEBUG;
+import static org.opendaylight.serviceutils.tools.rpc.FutureRpcResults.LogLevel.NONE;
+import static org.opendaylight.serviceutils.tools.rpc.FutureRpcResults.fromListenableFuture;
 
 import com.google.common.util.concurrent.ListenableFuture;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-
 import org.opendaylight.genius.interfacemanager.interfaces.InterfaceManagerService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetDpidFromInterfaceInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetDpidFromInterfaceOutput;
@@ -126,7 +125,7 @@ public class InterfaceManagerRpcService implements OdlInterfaceRpcService {
                 }).build();
     }
 
-    private String getDpidFromInterfaceErrorMessage(final String interfaceName, final String dueTo) {
+    private static String getDpidFromInterfaceErrorMessage(final String interfaceName, final String dueTo) {
         return String.format("Retrieval of datapath id for the key {%s} failed due to %s",
                 interfaceName, dueTo);
     }

diff --git a/itm/itm-impl/pom.xml b/itm/itm-impl/pom.xml
index fc3ce4d30149396660826d6efd971702133a4b34..eba86efb8ed372acdefac61854981f4291b5ff9d 100644 (file)
--- a/itm/itm-impl/pom.xml
+++ b/itm/itm-impl/pom.xml
@@ -49,13 +49,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.serviceutils</groupId>
-        <artifactId>serviceutils-artifacts</artifactId>
-        <version>0.4.0-SNAPSHOT</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -72,8 +65,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependency>
     <dependency>
       <groupId>org.opendaylight.serviceutils</groupId>
-      <artifactId>tools-api</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <artifactId>rpc-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.genius</groupId>
@@ -239,7 +231,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.serviceutils</groupId>
       <artifactId>srm-api</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>

diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/rpc/ItmManagerRpcService.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/rpc/ItmManagerRpcService.java
index 3e3e327db2a1b3418284818ecf6cb2bc6267e744..dfff9304338ef7b78fa2e57444aef21dd350d5db 100644 (file)
--- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/rpc/ItmManagerRpcService.java
+++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/rpc/ItmManagerRpcService.java
@@ -8,8 +8,8 @@
 package org.opendaylight.genius.itm.rpc;
 
 import static org.opendaylight.genius.infra.Datastore.CONFIGURATION;
-import static org.opendaylight.serviceutils.tools.mdsal.rpc.FutureRpcResults.LogLevel.ERROR;
-import static org.opendaylight.serviceutils.tools.mdsal.rpc.FutureRpcResults.fromListenableFuture;
+import static org.opendaylight.serviceutils.tools.rpc.FutureRpcResults.LogLevel.ERROR;
+import static org.opendaylight.serviceutils.tools.rpc.FutureRpcResults.fromListenableFuture;
 import static org.opendaylight.yangtools.yang.common.RpcResultBuilder.failed;
 
 import com.google.common.base.Objects;
@@ -65,7 +65,7 @@ import org.opendaylight.genius.mdsalutil.actions.ActionRegLoad;
 import org.opendaylight.genius.mdsalutil.actions.ActionSetFieldTunnelId;
 import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager;
 import org.opendaylight.genius.mdsalutil.matches.MatchTunnelId;
-import org.opendaylight.serviceutils.tools.mdsal.rpc.FutureRpcResults;
+import org.opendaylight.serviceutils.tools.rpc.FutureRpcResults;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
@@ -331,6 +331,7 @@ public class ItmManagerRpcService implements ItmRpcService {
             Futures.addCallback(interfaceManagerService.getTunnelType(inputBuilder.build()),
                     new FutureCallback<org.opendaylight.yang.gen.v1.urn.opendaylight.genius
                             .interfacemanager.rpcs.rev160406.GetTunnelTypeOutput>() {
+                        @Override
                         public void onSuccess(org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs
                                 .rev160406.@NonNull GetTunnelTypeOutput result) {
                             GetTunnelTypeOutputBuilder output = new GetTunnelTypeOutputBuilder()
@@ -339,6 +340,7 @@ public class ItmManagerRpcService implements ItmRpcService {
                                     .withResult(output.build()).build());
                         }
 
+                        @Override
                         public void onFailure(Throwable throwable) {
                             LOG.debug("RPC Call to Get tunnel type failed for interface {}", tunnelName);
                             String errMsg = String.format("RPC to Get tunnel type failed for interface %s",

diff --git a/lockmanager/lockmanager-impl/pom.xml b/lockmanager/lockmanager-impl/pom.xml
index 3a1018cf6d00057d0490626e5518c3b9544f0176..0f98fba1c803e7c5423cd7876751eb753025ce77 100644 (file)
--- a/lockmanager/lockmanager-impl/pom.xml
+++ b/lockmanager/lockmanager-impl/pom.xml
@@ -28,8 +28,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.serviceutils</groupId>
-      <artifactId>tools-api</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <artifactId>rpc-api</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

diff --git a/lockmanager/lockmanager-impl/src/main/java/org/opendaylight/genius/lockmanager/impl/LockManagerServiceImpl.java b/lockmanager/lockmanager-impl/src/main/java/org/opendaylight/genius/lockmanager/impl/LockManagerServiceImpl.java
index f3b26edcc7ccd4c5f4fcbc2e0bbccc9ceeb817f2..0294aac58f36c606a7d1e1636f1177e2221d466b 100644 (file)
--- a/lockmanager/lockmanager-impl/src/main/java/org/opendaylight/genius/lockmanager/impl/LockManagerServiceImpl.java
+++ b/lockmanager/lockmanager-impl/src/main/java/org/opendaylight/genius/lockmanager/impl/LockManagerServiceImpl.java
@@ -28,7 +28,7 @@ import org.opendaylight.controller.md.sal.common.api.data.OptimisticLockFailedEx
 import org.opendaylight.genius.infra.Datastore;
 import org.opendaylight.genius.infra.RetryingManagedNewTransactionRunner;
 import org.opendaylight.genius.utils.JvmGlobalLocks;
-import org.opendaylight.serviceutils.tools.mdsal.rpc.FutureRpcResults;
+import org.opendaylight.serviceutils.tools.rpc.FutureRpcResults;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.lockmanager.rev160413.LockInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.lockmanager.rev160413.LockManagerService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.lockmanager.rev160413.LockOutput;

diff --git a/mdsalutil/mdsalutil-api/pom.xml b/mdsalutil/mdsalutil-api/pom.xml
index d871adc41b00aeec617419a936ae265a9df0f72d..bde65165bf48df527068885384fb7a8a0895d9f5 100644 (file)
--- a/mdsalutil/mdsalutil-api/pom.xml
+++ b/mdsalutil/mdsalutil-api/pom.xml
@@ -76,7 +76,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.serviceutils</groupId>
       <artifactId>tools-api</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

diff --git a/mdsalutil/mdsalutil-impl/pom.xml b/mdsalutil/mdsalutil-impl/pom.xml
index 242fb9a57b7447f09c800354edd6d87ced3e8020..713fcc30f4c80582fee1178183e4a2567b55dd0e 100644 (file)
--- a/mdsalutil/mdsalutil-impl/pom.xml
+++ b/mdsalutil/mdsalutil-impl/pom.xml
@@ -38,7 +38,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.serviceutils</groupId>
       <artifactId>tools-api</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.genius</groupId>