Removed unused code from md-sal.

Change-Id: Ia64a118ec7c75d0abf5800f7eee98ae708b8e50a
Signed-off-by: Martin Vitez <mvitez@cisco.com>

diff --git a/opendaylight/md-sal/model/pom.xml b/opendaylight/md-sal/model/pom.xml
index d31535cb98b27b7e727088fe3ac076a70d32adef..5092995eb05cb174121f17799008ce248ee58c33 100644 (file)
--- a/opendaylight/md-sal/model/pom.xml
+++ b/opendaylight/md-sal/model/pom.xml
@@ -81,13 +81,13 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>

-                        <version>${yang.codegen.version}</version>
+                        <version>${yangtools.version}</version>

                         <type>jar</type>
                     </dependency>
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>yang-binding</artifactId>
                         <type>jar</type>
                     </dependency>
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>yang-binding</artifactId>

-                        <version>${yang.codegen.version}</version>
+                        <version>${yangtools.version}</version>

                         <type>jar</type>
                     </dependency>
                 </dependencies>
                         <type>jar</type>
                     </dependency>
                 </dependencies>

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index 521ec23859e0656ed15bb6db2e7095bbcafbf89c..2f594148c98290f96e8b2d2288da2d4166bec177 100644 (file)
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -8,7 +8,6 @@
         <relativePath>../commons/opendaylight</relativePath>
     </parent>
 
         <relativePath>../commons/opendaylight</relativePath>
     </parent>
 

-    <groupId>org.opendaylight.controller</groupId>

     <artifactId>sal-parent</artifactId>
     <version>1.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <artifactId>sal-parent</artifactId>
     <version>1.1-SNAPSHOT</version>
     <packaging>pom</packaging>


@@ -102,7 +101,6 @@
     </profiles>
 
     <properties>
     </profiles>
 
     <properties>

-        <yangtools.version>0.6.1</yangtools.version>

         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
         <!-- Java Versions -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
         <!-- Java Versions -->


@@ -115,7 +113,6 @@
 
         <!-- Dependency Versions -->
         <slf4j.version>1.7.2</slf4j.version>
 
         <!-- Dependency Versions -->
         <slf4j.version>1.7.2</slf4j.version>

-       <yang.codegen.version>${yangtools.version}</yang.codegen.version>

         <guava.version>14.0.1</guava.version>
         <osgi.core.version>5.0.0</osgi.core.version>
         <junit.version>4.8.1</junit.version>
         <guava.version>14.0.1</guava.version>
         <osgi.core.version>5.0.0</osgi.core.version>
         <junit.version>4.8.1</junit.version>

diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/YangSchemaUtils.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/YangSchemaUtils.java
index 7f150626c08b3eca26e2d07797aa70cf519a7667..7f6918f2a1e7d7fbf89d8533f4b2719da9d6093c 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/YangSchemaUtils.java
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/YangSchemaUtils.java
@@ -31,7 +31,6 @@ import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.UsesNode;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.UsesNode;

-import org.opendaylight.yangtools.yang.model.api.YangNode;

 
 import static com.google.common.base.Preconditions.*;
 
 
 import static com.google.common.base.Preconditions.*;
 


@@ -127,11 +126,6 @@ public class YangSchemaUtils {
         public NetconfDataRootNode(SchemaContext schema) {
             // TODO Auto-generated constructor stub
         }
         public NetconfDataRootNode(SchemaContext schema) {
             // TODO Auto-generated constructor stub
         }

-
-        public YangNode getParent() {
-            // TODO Auto-generated method stub
-            return null;
-        }

     
         @Override
         public Set<TypeDefinition<?>> getTypeDefinitions() {
     
         @Override
         public Set<TypeDefinition<?>> getTypeDefinitions() {

diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonIncorrectTopLevelTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonIncorrectTopLevelTest.java
index d1e55c73e7db13a8efa65c38bc06a78b8b8ead6d..050a9925ff3f7f767af0c371ef651d2d3e0ba7a5 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonIncorrectTopLevelTest.java
+++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonIncorrectTopLevelTest.java
@@ -33,7 +33,6 @@ import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.UsesNode;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.UsesNode;

-import org.opendaylight.yangtools.yang.model.api.YangNode;

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/opendaylight/md-sal/samples/toaster/pom.xml b/opendaylight/md-sal/samples/toaster/pom.xml
index 8c95545524244024092896e931306e29032f9baa..599fd714b8448452cd7da82d7784247c2f9a48cc 100644 (file)
--- a/opendaylight/md-sal/samples/toaster/pom.xml
+++ b/opendaylight/md-sal/samples/toaster/pom.xml
@@ -45,7 +45,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>

-                        <version>${yang.codegen.version}</version>
+                        <version>${yangtools.version}</version>

                         <type>jar</type>
                     </dependency>
                 </dependencies>
                         <type>jar</type>
                     </dependency>
                 </dependencies>