홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Yuta HIGUCHI
Committed by Yuta HIGUCHI
32e83319 1 parent d4912841

Replace javafx Pair with commons Pair 

Change-Id: I7cd8674f3460f29b4472d21b8cb0665b99694a55
Inline Side-by-side
Showing 2 changed files with 7 additions and 5 deletions
...@@ -16,7 +16,8 @@ ...@@ -16,7 +16,8 @@
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 +
20 +import org.apache.commons.lang3.tuple.Pair;
20 import org.onlab.packet.MacAddress; 21 import org.onlab.packet.MacAddress;
21 import org.onlab.packet.VlanId; 22 import org.onlab.packet.VlanId;
22 import org.onosproject.core.ApplicationId; 23 import org.onosproject.core.ApplicationId;
......
...@@ -17,7 +17,8 @@ package org.onosproject.vpls; ...@@ -17,7 +17,8 @@ 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 +
21 +import org.apache.commons.lang3.tuple.Pair;
21 import org.apache.felix.scr.annotations.Activate; 22 import org.apache.felix.scr.annotations.Activate;
22 import org.apache.felix.scr.annotations.Component; 23 import org.apache.felix.scr.annotations.Component;
23 import org.apache.felix.scr.annotations.Deactivate; 24 import org.apache.felix.scr.annotations.Deactivate;
...@@ -179,13 +180,13 @@ public class Vpls { ...@@ -179,13 +180,13 @@ public class Vpls {
179 if (!connectedHosts.isEmpty()) { 180 if (!connectedHosts.isEmpty()) {
180 connectedHosts.forEach(host -> { 181 connectedHosts.forEach(host -> {
181 if (host.vlan().equals(vlanId)) { 182 if (host.vlan().equals(vlanId)) {
182 - confHostPresentCPoint.put(vlanId, new Pair<>(cp, host.mac())); 183 + confHostPresentCPoint.put(vlanId, Pair.of(cp, host.mac()));
183 } else { 184 } else {
184 - confHostPresentCPoint.put(vlanId, new Pair<>(cp, null)); 185 + confHostPresentCPoint.put(vlanId, Pair.of(cp, null));
185 } 186 }
186 }); 187 });
187 } else { 188 } else {
188 - confHostPresentCPoint.put(vlanId, new Pair<>(cp, null)); 189 + confHostPresentCPoint.put(vlanId, Pair.of(cp, null));
189 } 190 }
190 } 191 }
191 192
......