Move NodeIdPair from renderer to common

In order to prepare light refactor on renderer, move NodeIdPair class
to common module.
Update import in class using this class.

JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I9d75ed192933a1752ed4ffa2c309147e40127047

diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/NodeIdPair.java b/common/src/main/java/org/opendaylight/transportpce/common/NodeIdPair.java
similarity index 96%
rename from renderer/src/main/java/org/opendaylight/transportpce/renderer/NodeIdPair.java
rename to common/src/main/java/org/opendaylight/transportpce/common/NodeIdPair.java
index 0fb9f44a2e816bd6bb5cf1d9fdb2c925a670d759..4f4ecdc28bb44b36b36f8e16d71ab5774ed2a727 100644 (file)
--- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/NodeIdPair.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/NodeIdPair.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.transportpce.renderer;
+package org.opendaylight.transportpce.common;
 
 public class NodeIdPair {
 

diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/NodeIdPairTest.java b/common/src/test/java/org/opendaylight/transportpce/common/NodeIdPairTest.java
similarity index 97%
rename from renderer/src/test/java/org/opendaylight/transportpce/renderer/NodeIdPairTest.java
rename to common/src/test/java/org/opendaylight/transportpce/common/NodeIdPairTest.java
index 2f40c3de88578f7db07b4392e7cbe4655b0b2623..97c2180999c151ac21fccbdcabb2dcaeb5a29bea 100644 (file)
--- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/NodeIdPairTest.java
+++ b/common/src/test/java/org/opendaylight/transportpce/common/NodeIdPairTest.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.transportpce.renderer;
+package org.opendaylight.transportpce.common;
 
 import java.util.Arrays;
 import java.util.Collection;

diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java
index 310251063320782a4ed839991a608055abcf51aa..84b68ce6b7a765c86cb3176f3b86c711225a37f5 100644 (file)
--- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java
+++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java
@@ -13,6 +13,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
+import org.opendaylight.transportpce.common.NodeIdPair;
 import org.opendaylight.transportpce.common.StringConstants;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev200128.OtnServicePathInput;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev200128.OtnServicePathInputBuilder;

diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/NetworkModelWavelengthServiceImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/NetworkModelWavelengthServiceImpl.java
index eed3477206db653ba39d49bd8239aab09047d4f4..2ca59167fad7d806dac4b1b16d216214ff759429 100644 (file)
--- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/NetworkModelWavelengthServiceImpl.java
+++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/NetworkModelWavelengthServiceImpl.java
@@ -23,6 +23,7 @@ import org.opendaylight.mdsal.binding.api.ReadTransaction;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.transportpce.common.NetworkUtils;
+import org.opendaylight.transportpce.common.NodeIdPair;
 import org.opendaylight.transportpce.common.Timeouts;
 import org.opendaylight.transportpce.common.fixedflex.FixedFlexImpl;
 import org.opendaylight.transportpce.common.fixedflex.GridConstant;