Moving datastore related utils from mdsalutil to new "genius.tools"

There are several requirements coming in where users are asking for a
simple feature with only datastore related utils. Currently all the utils
are parked in mdsalutil which has even openflowplugin related utils, and is embedded
in a heavier genius feature. This patch aims to move of these heavily used utils
to a new module, and add new features to expose the same.

Change-Id: I7d59273851c51b02fe43afcb1525c94ced1c5088
Signed-off-by: Faseela K <faseela.k@ericsson.com>

diff --git a/impl/pom.xml b/impl/pom.xml
index 93aa880bd8a4ad8e2e2e5e3507073afe5c580036..5839b4f6d04edc7f44e6acdbff88d743f0d89b66 100644 (file)
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -33,13 +33,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-api</artifactId>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>tools-api</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.genius</groupId>
-      <artifactId>mdsalutil-api</artifactId>
-      <version>${genius.mdsalutil.version}</version>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-binding-api</artifactId>
     </dependency>
     <dependency>
       <groupId>javax.inject</groupId>

diff --git a/impl/src/main/java/org/opendaylight/genius/srm/impl/ServiceRecoveryListener.java b/impl/src/main/java/org/opendaylight/genius/srm/impl/ServiceRecoveryListener.java
index be7923d065414f2027fa69c0758bd52a288ea468..7c6a6f0b426d5bfd91cf27af547386dd86d0eedf 100644 (file)
--- a/impl/src/main/java/org/opendaylight/genius/srm/impl/ServiceRecoveryListener.java
+++ b/impl/src/main/java/org/opendaylight/genius/srm/impl/ServiceRecoveryListener.java
@@ -14,7 +14,7 @@ import javax.inject.Singleton;
 
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.genius.datastoreutils.listeners.AbstractClusteredSyncDataTreeChangeListener;
+import org.opendaylight.genius.tools.mdsal.listener.AbstractClusteredSyncDataTreeChangeListener;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.ops.rev170711.ServiceOps;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.ops.rev170711.service.ops.Services;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.ops.rev170711.service.ops.services.Operations;

diff --git a/impl/src/main/java/org/opendaylight/genius/srm/impl/SrmRpcProvider.java b/impl/src/main/java/org/opendaylight/genius/srm/impl/SrmRpcProvider.java
index 6036ab3bd5315dbf002e7ed616d159eace19a38b..0663151b40941a269a93ac24c92d4989d2839e90 100644 (file)
--- a/impl/src/main/java/org/opendaylight/genius/srm/impl/SrmRpcProvider.java
+++ b/impl/src/main/java/org/opendaylight/genius/srm/impl/SrmRpcProvider.java
@@ -13,7 +13,7 @@ import java.util.concurrent.Future;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.genius.infra.FutureRpcResults;
+import org.opendaylight.genius.tools.mdsal.rpc.FutureRpcResults;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.rpcs.rev170711.RecoverInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.rpcs.rev170711.RecoverOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.rpcs.rev170711.ReinstallInput;