commit 3e3ec5f786161086ab0b2680a611f1c73682cda7
author Ray Milkey <ray@onlab.us> Tue Mar 17 17:00:38 2015 -0700
committer Brian O'Connor <bocon@onlab.us> Wed Mar 18 22:17:54 2015 +0000
tree 9920e7f6332d525d3a84b8f9cf631e2b1d5598d5
parent 84ca6e751e87dd776141773f40abe3945a367856

[Cardinal] Add builders for Intents and remove extra constructors.

Starting with PointToPoint intent to see how it looks

Change-Id: I5366a05d657ceaad18c03b95cd71f5d1107200e2

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

diff --git a/apps/sdnip/src/test/java/org/onosproject/sdnip/PeerConnectivityManagerTest.java b/apps/sdnip/src/test/java/org/onosproject/sdnip/PeerConnectivityManagerTest.java
index 7ec843b..f16c8de 100644
--- a/apps/sdnip/src/test/java/org/onosproject/sdnip/PeerConnectivityManagerTest.java
+++ b/apps/sdnip/src/test/java/org/onosproject/sdnip/PeerConnectivityManagerTest.java
@@ -15,7 +15,13 @@
  */
 package org.onosproject.sdnip;
 
-import com.google.common.collect.Sets;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -46,14 +52,13 @@
 import org.onosproject.routing.config.InterfaceAddress;
 import org.onosproject.routing.config.RoutingConfigurationService;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import com.google.common.collect.Sets;
 
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.reset;
+import static org.easymock.EasyMock.verify;
 import static org.onosproject.sdnip.TestIntentServiceHelper.eqExceptId;
 
 /**
@@ -285,9 +290,13 @@
             builder.matchTcpDst(dstTcpPort);
         }
 
-        PointToPointIntent intent = new PointToPointIntent(
-                APPID, builder.build(), noTreatment,
-                srcConnectPoint, dstConnectPoint);
+        PointToPointIntent intent = PointToPointIntent.builder()
+                .appId(APPID)
+                .selector(builder.build())
+                .treatment(noTreatment)
+                .ingressPoint(srcConnectPoint)
+                .egressPoint(dstConnectPoint)
+                .build();
 
         intentList.add(intent);
     }
@@ -457,9 +466,13 @@
                 .matchIPDst(IpPrefix.valueOf(dstPrefix))
                 .build();
 
-        PointToPointIntent intent = new PointToPointIntent(
-                APPID, selector, noTreatment,
-                srcConnectPoint, dstConnectPoint);
+        PointToPointIntent intent = PointToPointIntent.builder()
+                .appId(APPID)
+                .selector(selector)
+                .treatment(noTreatment)
+                .ingressPoint(srcConnectPoint)
+                .egressPoint(dstConnectPoint)
+                .build();
 
         intentList.add(intent);
     }