Fix namespace violations in lockmanager-impl

Change-Id: I4a6c2ca693261d4b73ab9df155a9ab9c52fccf4c
Signed-off-by: Vishal Thapar <vishal.thapar@ericsson.com>

diff --git a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestModule.java b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestModule.java
index 55297748eee8ce65d5193da59917c62a735618f2..e7c6d8e84c5fc88757bb7c41a6c57e40b128d2e8 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestModule.java
+++ b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestModule.java
@@ -32,11 +32,11 @@ import org.opendaylight.genius.interfacemanager.listeners.VlanMemberConfigListen
 import org.opendaylight.genius.interfacemanager.rpcservice.InterfaceManagerRpcService;
 import org.opendaylight.genius.interfacemanager.servicebindings.flowbased.listeners.FlowBasedServicesConfigListener;
 import org.opendaylight.genius.interfacemanager.servicebindings.flowbased.listeners.FlowBasedServicesInterfaceStateListener;
+import org.opendaylight.genius.lockmanager.LockListener;
+import org.opendaylight.genius.lockmanager.LockManager;
 import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager;
 import org.opendaylight.genius.mdsalutil.interfaces.testutils.TestIMdsalApiManager;
 import org.opendaylight.infrautils.inject.guice.testutils.AbstractGuiceJsr250Module;
-import org.opendaylight.lockmanager.LockListener;
-import org.opendaylight.lockmanager.LockManager;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.AlivenessMonitorService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.IdManagerService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.OdlInterfaceRpcService;

diff --git a/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/tests/ItmTestModule.java b/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/tests/ItmTestModule.java
index 96df8b8dace6cad42309b740a76496bf244d49e3..b9f3063df5e73ebc5f0d9809821ae5c0f164e6a6 100644 (file)
--- a/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/tests/ItmTestModule.java
+++ b/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/tests/ItmTestModule.java
@@ -30,10 +30,10 @@ import org.opendaylight.genius.itm.listeners.cache.ItmMonitoringListener;
 import org.opendaylight.genius.itm.listeners.cache.StateTunnelListListener;
 import org.opendaylight.genius.itm.monitoring.ItmTunnelEventListener;
 import org.opendaylight.genius.itm.rpc.ItmManagerRpcService;
+import org.opendaylight.genius.lockmanager.LockManager;
 import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager;
 import org.opendaylight.genius.mdsalutil.interfaces.testutils.TestIMdsalApiManager;
 import org.opendaylight.infrautils.inject.guice.testutils.AbstractGuiceJsr250Module;
-import org.opendaylight.lockmanager.LockManager;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.IdManagerService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.config.rev160406.ItmConfig;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.config.rev160406.ItmConfigBuilder;

diff --git a/lockmanager/lockmanager-impl/src/main/java/org/opendaylight/lockmanager/LockListener.java b/lockmanager/lockmanager-impl/src/main/java/org/opendaylight/genius/lockmanager/LockListener.java
similarity index 98%
rename from lockmanager/lockmanager-impl/src/main/java/org/opendaylight/lockmanager/LockListener.java
rename to lockmanager/lockmanager-impl/src/main/java/org/opendaylight/genius/lockmanager/LockListener.java
index f9e493ef9ced5d0f39beb913a6951fc769541dfd..dc103f2078d20a96c0d547c9c833c301b2711589 100644 (file)
--- a/lockmanager/lockmanager-impl/src/main/java/org/opendaylight/lockmanager/LockListener.java
+++ b/lockmanager/lockmanager-impl/src/main/java/org/opendaylight/genius/lockmanager/LockListener.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.lockmanager;
+package org.opendaylight.genius.lockmanager;
 
 import java.util.concurrent.CompletableFuture;
 import javax.annotation.PostConstruct;

diff --git a/lockmanager/lockmanager-impl/src/main/java/org/opendaylight/lockmanager/LockManager.java b/lockmanager/lockmanager-impl/src/main/java/org/opendaylight/genius/lockmanager/LockManager.java
similarity index 99%
rename from lockmanager/lockmanager-impl/src/main/java/org/opendaylight/lockmanager/LockManager.java
rename to lockmanager/lockmanager-impl/src/main/java/org/opendaylight/genius/lockmanager/LockManager.java
index 91308cf5034221b829b1a2201e5f00505d5b775d..988258bc21f8688c7d7a943c49aef99b1ce68fdb 100644 (file)
--- a/lockmanager/lockmanager-impl/src/main/java/org/opendaylight/lockmanager/LockManager.java
+++ b/lockmanager/lockmanager-impl/src/main/java/org/opendaylight/genius/lockmanager/LockManager.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.lockmanager;
+package org.opendaylight.genius.lockmanager;
 
 import com.google.common.base.Optional;
 import com.google.common.util.concurrent.CheckedFuture;

diff --git a/lockmanager/lockmanager-impl/src/main/java/org/opendaylight/lockmanager/LockManagerUtils.java b/lockmanager/lockmanager-impl/src/main/java/org/opendaylight/genius/lockmanager/LockManagerUtils.java
similarity index 97%
rename from lockmanager/lockmanager-impl/src/main/java/org/opendaylight/lockmanager/LockManagerUtils.java
rename to lockmanager/lockmanager-impl/src/main/java/org/opendaylight/genius/lockmanager/LockManagerUtils.java
index 48f6352703d70a322dec7db76bbf9662b8058811..d7d91647b69505dc4d365d4900532a5ef768320b 100644 (file)
--- a/lockmanager/lockmanager-impl/src/main/java/org/opendaylight/lockmanager/LockManagerUtils.java
+++ b/lockmanager/lockmanager-impl/src/main/java/org/opendaylight/genius/lockmanager/LockManagerUtils.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.lockmanager;
+package org.opendaylight.genius.lockmanager;
 
 import java.util.concurrent.TimeUnit;
 

diff --git a/lockmanager/lockmanager-impl/src/test/java/org/opendaylight/lockmanager/tests/LockManagerTest.java b/lockmanager/lockmanager-impl/src/test/java/org/opendaylight/genius/lockmanager/tests/LockManagerTest.java
similarity index 98%
rename from lockmanager/lockmanager-impl/src/test/java/org/opendaylight/lockmanager/tests/LockManagerTest.java
rename to lockmanager/lockmanager-impl/src/test/java/org/opendaylight/genius/lockmanager/tests/LockManagerTest.java
index f97374e15691cf19fce04add0c99cd1c4414fab6..397f70d854a10b4e748cdba8f5a3fbe8de005a99 100644 (file)
--- a/lockmanager/lockmanager-impl/src/test/java/org/opendaylight/lockmanager/tests/LockManagerTest.java
+++ b/lockmanager/lockmanager-impl/src/test/java/org/opendaylight/genius/lockmanager/tests/LockManagerTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.lockmanager.tests;
+package org.opendaylight.genius.lockmanager.tests;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -24,9 +24,9 @@ import org.junit.rules.MethodRule;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.test.AbstractConcurrentDataBrokerTest;
 import org.opendaylight.genius.datastoreutils.testutils.TestableDataTreeChangeListenerModule;
+import org.opendaylight.genius.lockmanager.LockManager;
 import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
 import org.opendaylight.infrautils.testutils.LogRule;
-import org.opendaylight.lockmanager.LockManager;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.lockmanager.rev160413.LockInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.lockmanager.rev160413.LockInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.lockmanager.rev160413.LockManagerService;

diff --git a/lockmanager/lockmanager-impl/src/test/java/org/opendaylight/lockmanager/tests/LockManagerTestModule.java b/lockmanager/lockmanager-impl/src/test/java/org/opendaylight/genius/lockmanager/tests/LockManagerTestModule.java
similarity index 86%
rename from lockmanager/lockmanager-impl/src/test/java/org/opendaylight/lockmanager/tests/LockManagerTestModule.java
rename to lockmanager/lockmanager-impl/src/test/java/org/opendaylight/genius/lockmanager/tests/LockManagerTestModule.java
index 6f0268961467de07a6564478d2da6321684e078b..7123ba4f42540b230a4e97eae1cb377486e9b04a 100644 (file)
--- a/lockmanager/lockmanager-impl/src/test/java/org/opendaylight/lockmanager/tests/LockManagerTestModule.java
+++ b/lockmanager/lockmanager-impl/src/test/java/org/opendaylight/genius/lockmanager/tests/LockManagerTestModule.java
@@ -5,15 +5,15 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.lockmanager.tests;
+package org.opendaylight.genius.lockmanager.tests;
 
 import java.net.UnknownHostException;
 
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.test.DataBrokerTestModule;
+import org.opendaylight.genius.lockmanager.LockListener;
+import org.opendaylight.genius.lockmanager.LockManager;
 import org.opendaylight.infrautils.inject.guice.testutils.AbstractGuiceJsr250Module;
-import org.opendaylight.lockmanager.LockListener;
-import org.opendaylight.lockmanager.LockManager;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.lockmanager.rev160413.LockManagerService;
 
 public class LockManagerTestModule extends AbstractGuiceJsr250Module {

diff --git a/resourcemanager/resourcemanager-impl/src/test/java/org/opendaylight/resourcemanager/tests/ResourceManagerTestModule.java b/resourcemanager/resourcemanager-impl/src/test/java/org/opendaylight/resourcemanager/tests/ResourceManagerTestModule.java
index 8fb9ec033380099a3450b4864c78db100a4f6569..cde786562f0cd6e63e8d1c311182d8226c1b68fc 100644 (file)
--- a/resourcemanager/resourcemanager-impl/src/test/java/org/opendaylight/resourcemanager/tests/ResourceManagerTestModule.java
+++ b/resourcemanager/resourcemanager-impl/src/test/java/org/opendaylight/resourcemanager/tests/ResourceManagerTestModule.java
@@ -10,10 +10,10 @@ package org.opendaylight.resourcemanager.tests;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.test.DataBrokerTestModule;
 import org.opendaylight.genius.idmanager.IdManager;
+import org.opendaylight.genius.lockmanager.LockListener;
+import org.opendaylight.genius.lockmanager.LockManager;
 import org.opendaylight.genius.resourcemanager.ResourceManager;
 import org.opendaylight.infrautils.inject.guice.testutils.AbstractGuiceJsr250Module;
-import org.opendaylight.lockmanager.LockListener;
-import org.opendaylight.lockmanager.LockManager;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.IdManagerService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.lockmanager.rev160413.LockManagerService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.resourcemanager.rev160622.ResourceManagerService;