commit 86ac7d158de787214ec4bffae1a5728b44ccc20c
author Luca Prete <luca@onlab.us> Wed Dec 02 23:36:49 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Thu Dec 03 18:56:40 2015 +0000
tree bfe64fae68e5bcdf49e81e76d19684672a11940e
parent ac099e80efdb75f192e258ab36c4b8930eb1c86c

Moving IntentUtils to intent package

Change-Id: I258c1d988e4bea4b79bdb0c2235e02fe5404ea52

apps/sdnip/src/main/java/org/onosproject/sdnip/IntentSynchronizer.java

diff --git a/apps/sdnip/src/main/java/org/onosproject/sdnip/IntentSynchronizer.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/IntentSynchronizer.java
index 2eb5d0f..09d4a43 100644
--- a/apps/sdnip/src/main/java/org/onosproject/sdnip/IntentSynchronizer.java
+++ b/apps/sdnip/src/main/java/org/onosproject/sdnip/IntentSynchronizer.java
@@ -30,6 +30,7 @@
 import org.onosproject.net.intent.Intent;
 import org.onosproject.net.intent.IntentService;
 import org.onosproject.net.intent.IntentState;
+import org.onosproject.net.intent.IntentUtils;
 import org.onosproject.net.intent.Key;
 import org.onosproject.routing.IntentSynchronizationService;
 import org.slf4j.Logger;

apps/sdnip/src/main/java/org/onosproject/sdnip/PeerConnectivityManager.java

diff --git a/apps/sdnip/src/main/java/org/onosproject/sdnip/PeerConnectivityManager.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/PeerConnectivityManager.java
index fb008aa..edc2df4 100644
--- a/apps/sdnip/src/main/java/org/onosproject/sdnip/PeerConnectivityManager.java
+++ b/apps/sdnip/src/main/java/org/onosproject/sdnip/PeerConnectivityManager.java
@@ -33,6 +33,7 @@
 import org.onosproject.net.flow.TrafficSelector;
 import org.onosproject.net.flow.TrafficTreatment;
 import org.onosproject.net.host.InterfaceIpAddress;
+import org.onosproject.net.intent.IntentUtils;
 import org.onosproject.net.intent.Key;
 import org.onosproject.net.intent.PointToPointIntent;
 import org.onosproject.routing.IntentSynchronizationService;

apps/sdnip/src/test/java/org/onosproject/sdnip/IntentSyncTest.java

diff --git a/apps/sdnip/src/test/java/org/onosproject/sdnip/IntentSyncTest.java b/apps/sdnip/src/test/java/org/onosproject/sdnip/IntentSyncTest.java
index 6dc3ce1..4736aa1 100644
--- a/apps/sdnip/src/test/java/org/onosproject/sdnip/IntentSyncTest.java
+++ b/apps/sdnip/src/test/java/org/onosproject/sdnip/IntentSyncTest.java
@@ -45,6 +45,7 @@
 import org.onosproject.net.intent.IntentState;
 import org.onosproject.net.intent.Key;
 import org.onosproject.net.intent.MultiPointToSinglePointIntent;
+import org.onosproject.net.intent.IntentUtils;
 import org.onosproject.routing.RouteEntry;
 
 import java.util.Collections;

apps/sdnip/src/test/java/org/onosproject/sdnip/TestIntentServiceHelper.java

diff --git a/apps/sdnip/src/test/java/org/onosproject/sdnip/TestIntentServiceHelper.java b/apps/sdnip/src/test/java/org/onosproject/sdnip/TestIntentServiceHelper.java
index 7f825e8..4df7f9d 100644
--- a/apps/sdnip/src/test/java/org/onosproject/sdnip/TestIntentServiceHelper.java
+++ b/apps/sdnip/src/test/java/org/onosproject/sdnip/TestIntentServiceHelper.java
@@ -17,6 +17,7 @@
 
 import org.easymock.IArgumentMatcher;
 import org.onosproject.net.intent.Intent;
+import org.onosproject.net.intent.IntentUtils;
 
 import static org.easymock.EasyMock.reportMatcher;
 

core/api/src/main/java/org/onosproject/net/intent/IntentUtils.java

diff --git a/apps/sdnip/src/main/java/org/onosproject/sdnip/IntentUtils.java b/core/api/src/main/java/org/onosproject/net/intent/IntentUtils.java
similarity index 92%
rename from apps/sdnip/src/main/java/org/onosproject/sdnip/IntentUtils.java
rename to core/api/src/main/java/org/onosproject/net/intent/IntentUtils.java
index 863de12..f6e33b6 100644
--- a/apps/sdnip/src/main/java/org/onosproject/sdnip/IntentUtils.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/IntentUtils.java
@@ -14,12 +14,8 @@
  * limitations under the License.
  */
 
-package org.onosproject.sdnip;
+package org.onosproject.net.intent;
 
-import org.onosproject.net.intent.Intent;
-import org.onosproject.net.intent.MultiPointToSinglePointIntent;
-import org.onosproject.net.intent.PointToPointIntent;
-import org.onosproject.net.intent.SinglePointToMultiPointIntent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,7 +29,6 @@
     private static final Logger log = LoggerFactory.getLogger(IntentUtils.class);
 
     private IntentUtils() {
-
     }
 
     /**