Committed by
Gerrit Code Review
Moving IntentUtils to intent package
Change-Id: I258c1d988e4bea4b79bdb0c2235e02fe5404ea52
Showing
5 changed files
with
5 additions
and
6 deletions
| ... | @@ -30,6 +30,7 @@ import org.onosproject.core.ApplicationId; | ... | @@ -30,6 +30,7 @@ import org.onosproject.core.ApplicationId; |
| 30 | import org.onosproject.net.intent.Intent; | 30 | import org.onosproject.net.intent.Intent; |
| 31 | import org.onosproject.net.intent.IntentService; | 31 | import org.onosproject.net.intent.IntentService; |
| 32 | import org.onosproject.net.intent.IntentState; | 32 | import org.onosproject.net.intent.IntentState; |
| 33 | +import org.onosproject.net.intent.IntentUtils; | ||
| 33 | import org.onosproject.net.intent.Key; | 34 | import org.onosproject.net.intent.Key; |
| 34 | import org.onosproject.routing.IntentSynchronizationService; | 35 | import org.onosproject.routing.IntentSynchronizationService; |
| 35 | import org.slf4j.Logger; | 36 | import org.slf4j.Logger; | ... | ... |
| ... | @@ -33,6 +33,7 @@ import org.onosproject.net.flow.DefaultTrafficTreatment; | ... | @@ -33,6 +33,7 @@ import org.onosproject.net.flow.DefaultTrafficTreatment; |
| 33 | import org.onosproject.net.flow.TrafficSelector; | 33 | import org.onosproject.net.flow.TrafficSelector; |
| 34 | import org.onosproject.net.flow.TrafficTreatment; | 34 | import org.onosproject.net.flow.TrafficTreatment; |
| 35 | import org.onosproject.net.host.InterfaceIpAddress; | 35 | import org.onosproject.net.host.InterfaceIpAddress; |
| 36 | +import org.onosproject.net.intent.IntentUtils; | ||
| 36 | import org.onosproject.net.intent.Key; | 37 | import org.onosproject.net.intent.Key; |
| 37 | import org.onosproject.net.intent.PointToPointIntent; | 38 | import org.onosproject.net.intent.PointToPointIntent; |
| 38 | import org.onosproject.routing.IntentSynchronizationService; | 39 | import org.onosproject.routing.IntentSynchronizationService; | ... | ... |
| ... | @@ -45,6 +45,7 @@ import org.onosproject.net.intent.IntentService; | ... | @@ -45,6 +45,7 @@ import org.onosproject.net.intent.IntentService; |
| 45 | import org.onosproject.net.intent.IntentState; | 45 | import org.onosproject.net.intent.IntentState; |
| 46 | import org.onosproject.net.intent.Key; | 46 | import org.onosproject.net.intent.Key; |
| 47 | import org.onosproject.net.intent.MultiPointToSinglePointIntent; | 47 | import org.onosproject.net.intent.MultiPointToSinglePointIntent; |
| 48 | +import org.onosproject.net.intent.IntentUtils; | ||
| 48 | import org.onosproject.routing.RouteEntry; | 49 | import org.onosproject.routing.RouteEntry; |
| 49 | 50 | ||
| 50 | import java.util.Collections; | 51 | import java.util.Collections; | ... | ... |
| ... | @@ -17,6 +17,7 @@ package org.onosproject.sdnip; | ... | @@ -17,6 +17,7 @@ package org.onosproject.sdnip; |
| 17 | 17 | ||
| 18 | import org.easymock.IArgumentMatcher; | 18 | import org.easymock.IArgumentMatcher; |
| 19 | import org.onosproject.net.intent.Intent; | 19 | import org.onosproject.net.intent.Intent; |
| 20 | +import org.onosproject.net.intent.IntentUtils; | ||
| 20 | 21 | ||
| 21 | import static org.easymock.EasyMock.reportMatcher; | 22 | import static org.easymock.EasyMock.reportMatcher; |
| 22 | 23 | ... | ... |
| ... | @@ -14,12 +14,8 @@ | ... | @@ -14,12 +14,8 @@ |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package org.onosproject.sdnip; | 17 | +package org.onosproject.net.intent; |
| 18 | 18 | ||
| 19 | -import org.onosproject.net.intent.Intent; | ||
| 20 | -import org.onosproject.net.intent.MultiPointToSinglePointIntent; | ||
| 21 | -import org.onosproject.net.intent.PointToPointIntent; | ||
| 22 | -import org.onosproject.net.intent.SinglePointToMultiPointIntent; | ||
| 23 | import org.slf4j.Logger; | 19 | import org.slf4j.Logger; |
| 24 | import org.slf4j.LoggerFactory; | 20 | import org.slf4j.LoggerFactory; |
| 25 | 21 | ||
| ... | @@ -33,7 +29,6 @@ public final class IntentUtils { | ... | @@ -33,7 +29,6 @@ public final class IntentUtils { |
| 33 | private static final Logger log = LoggerFactory.getLogger(IntentUtils.class); | 29 | private static final Logger log = LoggerFactory.getLogger(IntentUtils.class); |
| 34 | 30 | ||
| 35 | private IntentUtils() { | 31 | private IntentUtils() { |
| 36 | - | ||
| 37 | } | 32 | } |
| 38 | 33 | ||
| 39 | /** | 34 | /** | ... | ... |
-
Please register or login to post a comment