From c5e85bbfd9de89ca3700a07124ec7997f24f42aa Mon Sep 17 00:00:00 2001
From: Laszlo Papp <laszlo.papp@hubersuhner.com>
Date: Wed, 4 Apr 2018 16:17:52 +0100
Subject: [PATCH] Use apache commons Pair instead of javafx

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

Change-Id: I3379dc87e0515185714b28ca0832a36b76b0772f
---
 .../org/onosproject/segmentrouting/web/PseudowireCodec.java   | 2 +-
 .../onosproject/segmentrouting/web/PseudowireWebResource.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/segmentrouting/web/src/main/java/org/onosproject/segmentrouting/web/PseudowireCodec.java b/apps/segmentrouting/web/src/main/java/org/onosproject/segmentrouting/web/PseudowireCodec.java
index 755cb68768..00d20a776e 100644
--- a/apps/segmentrouting/web/src/main/java/org/onosproject/segmentrouting/web/PseudowireCodec.java
+++ b/apps/segmentrouting/web/src/main/java/org/onosproject/segmentrouting/web/PseudowireCodec.java
@@ -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;
diff --git a/apps/segmentrouting/web/src/main/java/org/onosproject/segmentrouting/web/PseudowireWebResource.java b/apps/segmentrouting/web/src/main/java/org/onosproject/segmentrouting/web/PseudowireWebResource.java
index e20d282b1c..854697bb44 100644
--- a/apps/segmentrouting/web/src/main/java/org/onosproject/segmentrouting/web/PseudowireWebResource.java
+++ b/apps/segmentrouting/web/src/main/java/org/onosproject/segmentrouting/web/PseudowireWebResource.java
@@ -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()));
             }
         }