홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
Committed by Brian O'Connor
893dcea3 1 parent e63e356c

Fixing VPLS app to use a supported Pair abstraction. 

Change-Id: I00732db82dd2780da99bf8ce05e967dde1e2a732
Inline Side-by-side
Showing 2 changed files with 6 additions and 6 deletions
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 package org.onosproject.vpls; 16 package org.onosproject.vpls;
17 17
18 import com.google.common.collect.SetMultimap; 18 import com.google.common.collect.SetMultimap;
19 -import javafx.util.Pair; 19 +import org.apache.commons.lang3.tuple.Pair;
20 import org.onlab.packet.MacAddress; 20 import org.onlab.packet.MacAddress;
21 import org.onlab.packet.VlanId; 21 import org.onlab.packet.VlanId;
22 import org.onosproject.core.ApplicationId; 22 import org.onosproject.core.ApplicationId;
...@@ -83,7 +83,7 @@ public class IntentInstaller { ...@@ -83,7 +83,7 @@ public class IntentInstaller {
83 */ 83 */
84 protected void installIntents(SetMultimap<VlanId, 84 protected void installIntents(SetMultimap<VlanId,
85 Pair<ConnectPoint, 85 Pair<ConnectPoint,
86 - MacAddress>> confHostPresentCPoint) { 86 + MacAddress>> confHostPresentCPoint) {
87 List<Intent> intents = new ArrayList<>(); 87 List<Intent> intents = new ArrayList<>();
88 88
89 confHostPresentCPoint.asMap().keySet() 89 confHostPresentCPoint.asMap().keySet()
......
...@@ -17,7 +17,7 @@ package org.onosproject.vpls; ...@@ -17,7 +17,7 @@ package org.onosproject.vpls;
17 17
18 import com.google.common.collect.HashMultimap; 18 import com.google.common.collect.HashMultimap;
19 import com.google.common.collect.SetMultimap; 19 import com.google.common.collect.SetMultimap;
20 -import javafx.util.Pair; 20 +import org.apache.commons.lang3.tuple.Pair;
21 import org.apache.felix.scr.annotations.Activate; 21 import org.apache.felix.scr.annotations.Activate;
22 import org.apache.felix.scr.annotations.Component; 22 import org.apache.felix.scr.annotations.Component;
23 import org.apache.felix.scr.annotations.Deactivate; 23 import org.apache.felix.scr.annotations.Deactivate;
...@@ -179,13 +179,13 @@ public class Vpls { ...@@ -179,13 +179,13 @@ public class Vpls {
179 if (!connectedHosts.isEmpty()) { 179 if (!connectedHosts.isEmpty()) {
180 connectedHosts.forEach(host -> { 180 connectedHosts.forEach(host -> {
181 if (host.vlan().equals(vlanId)) { 181 if (host.vlan().equals(vlanId)) {
182 - confHostPresentCPoint.put(vlanId, new Pair<>(cp, host.mac())); 182 + confHostPresentCPoint.put(vlanId, Pair.of(cp, host.mac()));
183 } else { 183 } else {
184 - confHostPresentCPoint.put(vlanId, new Pair<>(cp, null)); 184 + confHostPresentCPoint.put(vlanId, Pair.of(cp, null));
185 } 185 }
186 }); 186 });
187 } else { 187 } else {
188 - confHostPresentCPoint.put(vlanId, new Pair<>(cp, null)); 188 + confHostPresentCPoint.put(vlanId, Pair.of(cp, null));
189 } 189 }
190 } 190 }
191 191
......