Revert "Add reverse() method in Edge and Path classes"

This reverts commit 142c513a58c066cc9fbe4b256320f809034ba365.

Change-Id: Ieeba0e0d6ab47ab49288969a57446da044adcd8c
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 03a07fe560696fb9ba62b9028cf0f1279ab34989..f06bef719c1bd2e1ab160cfd48489f119c48e225 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -89,7 +89,7 @@
     <releaseplugin.version>2.3.2</releaseplugin.version>
     <sal.connection.version>0.1.2-SNAPSHOT</sal.connection.version>
     <sal.networkconfiguration.version>0.0.3-SNAPSHOT</sal.networkconfiguration.version>
-    <sal.version>0.8.1-SNAPSHOT</sal.version>
+    <sal.version>0.7.1-SNAPSHOT</sal.version>
     <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
     <samples.loadbalancer>0.5.2-SNAPSHOT</samples.loadbalancer>
     <sanitytest.version>0.4.2-SNAPSHOT</sanitytest.version>

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index b003ba15e505c58384fd5c2cc1d04d513f2abf36..acea0d9683c00e96b26f2091b482767925693c77 100644 (file)
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -59,7 +59,6 @@
     <module>sal-remoterpc-connector/implementation</module>
     <!--module>clustered-data-store/implementation</module>
         -->
-
   </modules>
 
   <build>

diff --git a/opendaylight/sal/api/pom.xml b/opendaylight/sal/api/pom.xml
index 070029f89169e245db71ec42534c7b77d3a3d66b..d1a47594b0f4cf3ccd21c8e5095a7675b5035601 100644 (file)
--- a/opendaylight/sal/api/pom.xml
+++ b/opendaylight/sal/api/pom.xml
@@ -9,7 +9,7 @@
   </parent>
 
   <artifactId>sal</artifactId>
-  <version>0.8.1-SNAPSHOT</version>
+  <version>0.7.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Edge.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Edge.java
index 0dffee9c474de57797117a218f4aa019e6a33e85..7f398db6f12e8def650afa50be7a0ee888460906 100644 (file)
--- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Edge.java
+++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Edge.java
@@ -85,19 +85,6 @@ public class Edge implements Serializable {
         }
     }
 
-    /**
-     * Create the reversed edge
-     * @return The reversed edge.
-     */
-    public Edge reverse() {
-        Edge re;
-        try {
-            re = new Edge(this.headNodeConnector, this.tailNodeConnector);
-        } catch (ConstructionException e) {
-            re = null;
-        }
-        return re;
-    }
     /**
      * getter of edge
      *

diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Path.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Path.java
index 3a4a192fc9b86c3df90576b393f7c23222974899..bebb62f364901098bc9684c6f65b5240f9a3caf8 100644 (file)
--- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Path.java
+++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Path.java
@@ -18,7 +18,6 @@ package org.opendaylight.controller.sal.core;
 
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
@@ -82,39 +81,6 @@ public class Path implements Serializable {
         this.edges = edges;
     }
 
-    /**
-     * Create the reversed path
-     * @return The reversed path
-     */
-    public Path reverse() {
-        int j = edges.size(); // size always > 0
-        Edge[]  aEdges = new Edge[j];
-        for (Edge e : edges) {
-            j--;
-            aEdges[j] = e.reverse();
-        }
-        Path rp;
-        try {
-         rp = new Path(Arrays.asList(aEdges));
-        } catch (ConstructionException ce) {
-            rp = null;
-        }
-        return rp;
-    }
-
-    /**
-     * Return the list of nodes of this path, the first node is the start node
-     * @return the list of nodes
-     */
-    public List<Node> getNodes() {
-        List<Node> nl = new ArrayList<Node>();
-        nl.add(this.getStartNode());
-        for (Edge e : edges) {
-            nl.add(e.getHeadNodeConnector().getNode());
-        }
-        return nl;
-    }
-
     /**
      * Copy Construct for a path
      *