commit fc0529e76a9be5623aad640e7201aa2d2f7ac485
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Sun Jul 10 00:28:08 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Mon Jul 11 16:53:41 2016 +0000
tree 6bbe4f37d54c1e80ebb72822ccbc797ec339a209
parent 32e83319cb03177b611a1906680b703db27fea29

Replace javafx Pair with commons Pair

Change-Id: I2a81faf4877889729ac81c75ed6039f33c6222fc

apps/newoptical/src/test/java/org/onosproject/newoptical/OpticalPathProvisionerTest.java

diff --git a/apps/newoptical/src/test/java/org/onosproject/newoptical/OpticalPathProvisionerTest.java b/apps/newoptical/src/test/java/org/onosproject/newoptical/OpticalPathProvisionerTest.java
index b7d26e3..669124d 100644
--- a/apps/newoptical/src/test/java/org/onosproject/newoptical/OpticalPathProvisionerTest.java
+++ b/apps/newoptical/src/test/java/org/onosproject/newoptical/OpticalPathProvisionerTest.java
@@ -16,7 +16,7 @@
 
 package org.onosproject.newoptical;
 
-import javafx.util.Pair;
+import org.apache.commons.lang3.tuple.Pair;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -502,7 +502,7 @@
                 return Collections.emptySet();
             }
 
-            edges.add(new Pair<>((DeviceId) src, (DeviceId) dst));
+            edges.add(Pair.of((DeviceId) src, (DeviceId) dst));
 
             Set<Path> paths = new HashSet<>();
             List<Link> links = Stream.of(LINK1, LINK2, LINK3, LINK4, LINK5, LINK6)
@@ -636,7 +636,7 @@
 
                 @Override
                 public ConsistentMap<K, V> build() {
-                    return new TestConsistentMap<K, V>();
+                    return new TestConsistentMap<>();
                 }
             };
 
@@ -651,7 +651,7 @@
                     return new DistributedSetAdapter<E>() {
                         @Override
                         public DistributedSet<E> asDistributedSet() {
-                            return new TestDistributedSet<E>();
+                            return new TestDistributedSet<>();
                         }
                     };
                 }