mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-17 10:21:52 +02:00
Code Issues Projects Releases Wiki Activity

Use apache commons Pair instead of javafx

Browse Source 
It looks like javafx does not have Pair when using OpenJDK.

Change-Id: I3379dc87e0515185714b28ca0832a36b76b0772f
This commit is contained in:
Laszlo Papp 2018-04-04 16:17:52 +01:00 committed by Charles Chan
parent f433f95e1b
commit c5e85bbfd9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/segmentrouting/web/src/main/java/org/onosproject/segmentrouting/web/PseudowireCodec.java
View File

@ -17,7 +17,7 @@ package org.onosproject.segmentrouting.web;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import javafx.util.Pair;
import org.apache.commons.lang3.tuple.Pair;
import org.onlab.packet.MplsLabel;
import org.onlab.packet.VlanId;
import org.onosproject.codec.CodecContext;

4
apps/segmentrouting/web/src/main/java/org/onosproject/segmentrouting/web/PseudowireWebResource.java
View File

@ -19,7 +19,7 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import javafx.util.Pair;
import org.apache.commons.lang3.tuple.Pair;
import org.onlab.util.ItemNotFoundException;
import org.onosproject.rest.AbstractWebResource;
import org.onosproject.segmentrouting.SegmentRoutingService;
@ -168,7 +168,7 @@ public class PseudowireWebResource extends AbstractWebResource {
L2TunnelHandler.Result res = srService.addPseudowire(pw);
if (!(res == L2TunnelHandler.Result.SUCCESS)) {
log.trace("Could not create pseudowire {} : {}", pw.l2Tunnel().tunnelId(), res.getSpecificError());
failed.add(new Pair<>(pw, res.getSpecificError()));
failed.add(Pair.of(pw, res.getSpecificError()));
}
}