commit 6deacbde1e408a4824b4f15ad837637de84c6658
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Mon May 22 23:25:05 2017 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Tue May 23 18:15:15 2017 +0000
tree 15c9b3a43c1df9028bfe01c6c4564f2e88a48166
parent 356c37130dc04467d69034e84ff7b0da29b13677

DisjointPath should've been immutable.

Change-Id: I8499bd53acd62425c3aa8b0bce4958d6c0054712

core/api/src/main/java/org/onosproject/net/DefaultDisjointPath.java

diff --git a/core/api/src/main/java/org/onosproject/net/DefaultDisjointPath.java b/core/api/src/main/java/org/onosproject/net/DefaultDisjointPath.java
index b68110d..b133de0 100644
--- a/core/api/src/main/java/org/onosproject/net/DefaultDisjointPath.java
+++ b/core/api/src/main/java/org/onosproject/net/DefaultDisjointPath.java
@@ -30,8 +30,6 @@
     private final DefaultPath path1;
     private final DefaultPath path2;
 
-    boolean usingPath1 = true;
-
     /**
      * Creates a disjoint path pair from two default paths.
      *
@@ -58,21 +56,17 @@
 
     @Override
     public List<Link> links() {
-        if (usingPath1) {
-            return path1.links();
-        } else {
-            return path2.links();
-        }
+        return path1.links();
     }
 
     @Override
     public double cost() {
-        return usingPath1 ? path1.cost() : path2.cost();
+        return path1.cost();
     }
 
     @Override
     public Weight weight() {
-        return usingPath1 ? path1.weight() : path2.weight();
+        return path1.weight();
     }
 
     @Override
@@ -105,12 +99,9 @@
         return false;
     }
 
+    @Deprecated
     @Override
     public boolean useBackup() {
-        if (path2 == null || path2.links() == null) {
-            return false;
-        }
-        usingPath1 = !usingPath1;
-        return true;
+        return false;
     }
 }

core/api/src/main/java/org/onosproject/net/DisjointPath.java

diff --git a/core/api/src/main/java/org/onosproject/net/DisjointPath.java b/core/api/src/main/java/org/onosproject/net/DisjointPath.java
index 39237ea..8367067 100644
--- a/core/api/src/main/java/org/onosproject/net/DisjointPath.java
+++ b/core/api/src/main/java/org/onosproject/net/DisjointPath.java
@@ -30,7 +30,10 @@
      *
      * @return boolean corresponding to whether request to use
      *          backup was successful.
+     *
+     * @deprecated in 1.11.0
      */
+    @Deprecated
     boolean useBackup();
 
     /**

core/api/src/test/java/org/onosproject/net/DefaultDisjointPathTest.java

diff --git a/core/api/src/test/java/org/onosproject/net/DefaultDisjointPathTest.java b/core/api/src/test/java/org/onosproject/net/DefaultDisjointPathTest.java
index 2a287a3..d160809 100644
--- a/core/api/src/test/java/org/onosproject/net/DefaultDisjointPathTest.java
+++ b/core/api/src/test/java/org/onosproject/net/DefaultDisjointPathTest.java
@@ -87,28 +87,6 @@
     }
 
     /**
-     * Tests switching to the backup path.
-     */
-    @Test
-    public void testUseBackup() {
-        disjointPath1.useBackup();
-        assertThat(disjointPath1.primary(), is(path1));
-        assertThat(disjointPath1.backup(), is(path2));
-        assertThat(disjointPath1.links(), is(links2));
-        assertThat(disjointPath1.cost(), is(2.0));
-
-        disjointPath1.useBackup();
-        assertThat(disjointPath1.links(), is(links1));
-        assertThat(disjointPath1.cost(), is(1.0));
-
-        assertThat(disjointPath4.primary(), is(path1));
-        assertThat(disjointPath4.backup(), is((DefaultDisjointPath) null));
-        disjointPath4.useBackup();
-        assertThat(disjointPath4.primary(), is(path1));
-        assertThat(disjointPath4.backup(), is((DefaultDisjointPath) null));
-    }
-
-    /**
      * Tests equals(), hashCode(), and toString() methods.
      */
     @Test