Remove deprecated unfiltered connect point methods from multipoint to single point intents
Change-Id: I220a024568852d1f3168bac3f5cf47d0b3fd9d86
diff --git a/core/api/src/main/java/org/onosproject/net/intent/MultiPointToSinglePointIntent.java b/core/api/src/main/java/org/onosproject/net/intent/MultiPointToSinglePointIntent.java
index 6d68798..8745ecb 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/MultiPointToSinglePointIntent.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/MultiPointToSinglePointIntent.java
@@ -176,42 +176,6 @@
}
/**
- * Sets the ingress point of the single point to multi point intent
- * that will be built.
- *
- * @param ingressPoints ingress connect points
- * @return this builder
- */
- @Deprecated
- public Builder ingressPoints(Set<ConnectPoint> ingressPoints) {
- if (this.ingressPoints != null) {
- log.warn("Ingress points are already set, " +
- "this will override original ingress points.");
- }
- this.ingressPoints = ingressPoints.stream()
- .map(FilteredConnectPoint::new)
- .collect(Collectors.toSet());
- return this;
- }
-
- /**
- * Sets the egress point of the multi point to single point intent
- * that will be built.
- *
- * @param egressPoint egress connect point
- * @return this builder
- */
- @Deprecated
- public Builder egressPoint(ConnectPoint egressPoint) {
- if (this.egressPoint != null) {
- log.warn("Egress point is already set, " +
- "this will override original egress point.");
- }
- this.egressPoint = new FilteredConnectPoint(egressPoint);
- return this;
- }
-
- /**
* Sets the filtered ingress point of the single point to multi point intent
* that will be built.
*
diff --git a/core/api/src/test/java/org/onosproject/net/intent/MultiPointToSinglePointIntentTest.java b/core/api/src/test/java/org/onosproject/net/intent/MultiPointToSinglePointIntentTest.java
index 5603238..d4e3750 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/MultiPointToSinglePointIntentTest.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/MultiPointToSinglePointIntentTest.java
@@ -91,8 +91,8 @@
.appId(APPID)
.selector(MATCH)
.treatment(NOP)
- .ingressPoints(PS1)
- .egressPoint(P2)
+ .filteredIngressPoints(FPS1)
+ .filteredEgressPoint(FP2)
.build();
}
@@ -102,8 +102,8 @@
.appId(APPID)
.selector(MATCH)
.treatment(NOP)
- .ingressPoints(PS2)
- .egressPoint(P1)
+ .filteredIngressPoints(FPS2)
+ .filteredEgressPoint(FP1)
.build();
}
@@ -112,8 +112,8 @@
.appId(APPID)
.selector(VLANMATCH1)
.treatment(NOP)
- .ingressPoints(PS1)
- .egressPoint(P2)
+ .filteredIngressPoints(FPS1)
+ .filteredEgressPoint(FP2)
.build();
}
@@ -122,8 +122,8 @@
.appId(APPID)
.selector(MATCH)
.treatment(NOP)
- .ingressPoints(PS1)
- .egressPoint(P2)
+ .filteredIngressPoints(FPS1)
+ .filteredEgressPoint(FP2)
.resourceGroup(RESOURCE_GROUP)
.build();
}