From 86ac7d158de787214ec4bffae1a5728b44ccc20c Mon Sep 17 00:00:00 2001
From: Luca Prete <luca@onlab.us>
Date: Wed, 2 Dec 2015 23:36:49 -0800
Subject: [PATCH] Moving IntentUtils to intent package

Change-Id: I258c1d988e4bea4b79bdb0c2235e02fe5404ea52
---
 .../java/org/onosproject/sdnip/IntentSynchronizer.java     | 1 +
 .../org/onosproject/sdnip/PeerConnectivityManager.java     | 1 +
 .../test/java/org/onosproject/sdnip/IntentSyncTest.java    | 1 +
 .../org/onosproject/sdnip/TestIntentServiceHelper.java     | 1 +
 .../main/java/org/onosproject/net/intent}/IntentUtils.java | 7 +------
 5 files changed, 5 insertions(+), 6 deletions(-)
 rename {apps/sdnip/src/main/java/org/onosproject/sdnip => core/api/src/main/java/org/onosproject/net/intent}/IntentUtils.java (92%)

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 2eb5d0f3d4..09d4a4368d 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.core.ApplicationId;
 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;
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 fb008aad54..edc2df4d5c 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.DefaultTrafficTreatment;
 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;
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 6dc3ce1023..4736aa1da0 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.IntentService;
 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;
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 7f825e8176..4df7f9de0c 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 @@ package org.onosproject.sdnip;
 
 import org.easymock.IArgumentMatcher;
 import org.onosproject.net.intent.Intent;
+import org.onosproject.net.intent.IntentUtils;
 
 import static org.easymock.EasyMock.reportMatcher;
 
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 863de12af9..f6e33b6ba3 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 @@ public final class IntentUtils {
     private static final Logger log = LoggerFactory.getLogger(IntentUtils.class);
 
     private IntentUtils() {
-
     }
 
     /**