Remove use of SchemaPath

We are not referencing SchemaPath in any shape or form. Remove all
references.

Change-Id: I509ee338ed3e8d038200ca8d36686a5320b13884
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding/mdsal-binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/DocumentedType.java b/binding/mdsal-binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/DocumentedType.java
index 2640000a6426a7404e17e3761997cf0e091d21fc..d3eee27133d465c8e6ae7e7ed23ab4e3b15630a3 100644 (file)
--- a/binding/mdsal-binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/DocumentedType.java
+++ b/binding/mdsal-binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/DocumentedType.java
@@ -7,14 +7,11 @@
  */
 package org.opendaylight.mdsal.binding.model.api;
 
-import org.opendaylight.yangtools.yang.common.QName;
-
 /**
  * Implementing this interface allows an object to hold information which are
  * essential for generating java doc from type definition.
  */
 public interface DocumentedType {
-
     /**
      * Returns a string that contains a human-readable textual description of
      * type definition.
@@ -33,15 +30,6 @@ public interface DocumentedType {
      */
     String getReference();
 
-    /**
-     * Returns a list of QNames which represent schema path in schema tree from
-     * actual concrete type to the root.
-     *
-     * @return a schema path in schema tree from actual concrete schema node
-     *         identifier to the root.
-     */
-    Iterable<QName> getSchemaPath();
-
     /**
      * Returns the name of the module, in which generated type was specified.
      *

diff --git a/binding/mdsal-binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/GeneratedTypeBuilderBase.java b/binding/mdsal-binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/GeneratedTypeBuilderBase.java
index 2fa39c014187e3e72350a2edbad2422c77273490..cc7737c9380b6bca300812eb448e822023c31dcb 100644 (file)
--- a/binding/mdsal-binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/GeneratedTypeBuilderBase.java
+++ b/binding/mdsal-binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/GeneratedTypeBuilderBase.java
@@ -16,7 +16,6 @@ import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject;
 import org.opendaylight.mdsal.binding.model.api.Type;
 import org.opendaylight.mdsal.binding.model.api.TypeComment;
 import org.opendaylight.mdsal.binding.model.api.YangSourceDefinition;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 
 public interface GeneratedTypeBuilderBase<T extends GeneratedTypeBuilderBase<T>> extends Type, AnnotableTypeBuilder {
     /**
@@ -152,13 +151,6 @@ public interface GeneratedTypeBuilderBase<T extends GeneratedTypeBuilderBase<T>>
      */
     void setModuleName(String moduleName);
 
-    /**
-     * Schema path in schema tree from actual concrete type to the root.
-     *
-     * @param schemaPath schema path in schema tree
-     */
-    void setSchemaPath(SchemaPath schemaPath);
-
     /**
      * Set a string that is used to specify a textual cross-reference to an external document, either another module
      * that defines related management information, or a document that provides additional information relevant to this

diff --git a/binding/mdsal-binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractEnumerationBuilder.java b/binding/mdsal-binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractEnumerationBuilder.java
index 04372a8b113daa35f4a944623f06ad63edb0c615..9307657585813518033259d2dd84ac30d5b25280 100644 (file)
--- a/binding/mdsal-binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractEnumerationBuilder.java
+++ b/binding/mdsal-binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractEnumerationBuilder.java
@@ -29,7 +29,6 @@ import org.opendaylight.mdsal.binding.model.api.type.builder.AnnotationTypeBuild
 import org.opendaylight.mdsal.binding.model.api.type.builder.EnumBuilder;
 import org.opendaylight.mdsal.binding.spec.naming.BindingMapping;
 import org.opendaylight.yangtools.util.LazyCollections;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition.EnumPair;
@@ -64,8 +63,6 @@ public abstract class AbstractEnumerationBuilder extends AbstractType implements
 
     public abstract void setModuleName(String moduleName);
 
-    public abstract void setSchemaPath(SchemaPath schemaPath);
-
     public abstract void setYangSourceDefinition(YangSourceDefinition yangSourceDefinition);
 
     abstract AbstractPair createEnumPair(String name, String mappedName, int value, Status status, String description,

diff --git a/binding/mdsal-binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/CodegenEnumerationBuilder.java b/binding/mdsal-binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/CodegenEnumerationBuilder.java
index 595b87eaa885aa53f0c98157be4f4c139519b363..01f78395a32499c66df58ec75d46741ba3fa62e8 100644 (file)
--- a/binding/mdsal-binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/CodegenEnumerationBuilder.java
+++ b/binding/mdsal-binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/CodegenEnumerationBuilder.java
@@ -14,15 +14,12 @@ import org.opendaylight.mdsal.binding.model.api.Enumeration;
 import org.opendaylight.mdsal.binding.model.api.JavaTypeName;
 import org.opendaylight.mdsal.binding.model.api.TypeComment;
 import org.opendaylight.mdsal.binding.model.api.YangSourceDefinition;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
 
 public final class CodegenEnumerationBuilder extends AbstractEnumerationBuilder {
     private String description;
     private String reference;
     private String moduleName;
-    private SchemaPath schemaPath;
     private YangSourceDefinition definition;
 
     public CodegenEnumerationBuilder(final JavaTypeName identifier) {
@@ -39,11 +36,6 @@ public final class CodegenEnumerationBuilder extends AbstractEnumerationBuilder
         this.moduleName = moduleName;
     }
 
-    @Override
-    public void setSchemaPath(final SchemaPath schemaPath) {
-        this.schemaPath = schemaPath;
-    }
-
     @Override
     public void setDescription(final String description) {
         this.description = description;
@@ -51,7 +43,7 @@ public final class CodegenEnumerationBuilder extends AbstractEnumerationBuilder
 
     @Override
     public void setYangSourceDefinition(final YangSourceDefinition yangSourceDefinition) {
-        this.definition = yangSourceDefinition;
+        definition = yangSourceDefinition;
     }
 
     @Override
@@ -98,14 +90,12 @@ public final class CodegenEnumerationBuilder extends AbstractEnumerationBuilder
         private final String description;
         private final String reference;
         private final String moduleName;
-        private final SchemaPath schemaPath;
         private final YangSourceDefinition definition;
 
         EnumerationImpl(final CodegenEnumerationBuilder builder) {
             super(builder);
             description = builder.description;
             moduleName = builder.moduleName;
-            schemaPath = builder.schemaPath;
             reference = builder.reference;
             definition = builder.definition;
         }
@@ -125,11 +115,6 @@ public final class CodegenEnumerationBuilder extends AbstractEnumerationBuilder
             return reference;
         }
 
-        @Override
-        public Iterable<QName> getSchemaPath() {
-            return schemaPath.getPathFromRoot();
-        }
-
         @Override
         public String getModuleName() {
             return moduleName;

diff --git a/binding/mdsal-binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/CodegenGeneratedTOBuilder.java b/binding/mdsal-binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/CodegenGeneratedTOBuilder.java
index 50b5cd25e8e319a8b2aff04cc6aedd693b170e60..e909074c727e67a4a401aefa217ff764cf7125fa 100644 (file)
--- a/binding/mdsal-binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/CodegenGeneratedTOBuilder.java
+++ b/binding/mdsal-binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/CodegenGeneratedTOBuilder.java
@@ -12,8 +12,6 @@ import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject;
 import org.opendaylight.mdsal.binding.model.api.JavaTypeName;
 import org.opendaylight.mdsal.binding.model.api.Restrictions;
 import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedPropertyBuilder;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 
 public class CodegenGeneratedTOBuilder extends AbstractGeneratedTOBuilder {
     private Restrictions restrictions;
@@ -21,7 +19,6 @@ public class CodegenGeneratedTOBuilder extends AbstractGeneratedTOBuilder {
     private String reference;
     private String description;
     private String moduleName;
-    private SchemaPath schemaPath;
 
     public CodegenGeneratedTOBuilder(final JavaTypeName identifier) {
         super(identifier);
@@ -34,7 +31,7 @@ public class CodegenGeneratedTOBuilder extends AbstractGeneratedTOBuilder {
 
     @Override
     public final void setSUID(final GeneratedPropertyBuilder newSuid) {
-        this.suid = newSuid;
+        suid = newSuid;
     }
 
     @Override
@@ -47,11 +44,6 @@ public class CodegenGeneratedTOBuilder extends AbstractGeneratedTOBuilder {
         this.moduleName = moduleName;
     }
 
-    @Override
-    public final void setSchemaPath(final SchemaPath schemaPath) {
-        this.schemaPath = schemaPath;
-    }
-
     @Override
     public final void setReference(final String reference) {
         this.reference = reference;
@@ -68,51 +60,44 @@ public class CodegenGeneratedTOBuilder extends AbstractGeneratedTOBuilder {
         private final String reference;
         private final String description;
         private final String moduleName;
-        private final SchemaPath schemaPath;
 
         GTO(final CodegenGeneratedTOBuilder builder) {
             super(builder);
-            this.restrictions = builder.restrictions;
-            this.reference = builder.reference;
-            this.description = builder.description;
-            this.moduleName = builder.moduleName;
-            this.schemaPath = builder.schemaPath;
+            restrictions = builder.restrictions;
+            reference = builder.reference;
+            description = builder.description;
+            moduleName = builder.moduleName;
 
             if (builder.suid == null) {
-                this.suid = null;
+                suid = null;
             } else {
-                this.suid = builder.suid.toInstance();
+                suid = builder.suid.toInstance();
             }
         }
 
         @Override
         public Restrictions getRestrictions() {
-            return this.restrictions;
+            return restrictions;
         }
 
         @Override
         public GeneratedProperty getSUID() {
-            return this.suid;
+            return suid;
         }
 
         @Override
         public String getDescription() {
-            return this.description;
+            return description;
         }
 
         @Override
         public String getReference() {
-            return this.reference;
-        }
-
-        @Override
-        public Iterable<QName> getSchemaPath() {
-            return this.schemaPath.getPathFromRoot();
+            return reference;
         }
 
         @Override
         public String getModuleName() {
-            return this.moduleName;
+            return moduleName;
         }
     }
 }

diff --git a/binding/mdsal-binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/CodegenGeneratedTypeBuilder.java b/binding/mdsal-binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/CodegenGeneratedTypeBuilder.java
index aac0aa59280e0d836b1311b9f1d4fbcc11ac55b8..8263ac588b17d0e2221b8b0c736a73f5db0d3717 100644 (file)
--- a/binding/mdsal-binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/CodegenGeneratedTypeBuilder.java
+++ b/binding/mdsal-binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/CodegenGeneratedTypeBuilder.java
@@ -10,8 +10,6 @@ package org.opendaylight.mdsal.binding.model.ri.generated.type.builder;
 import org.opendaylight.mdsal.binding.model.api.GeneratedType;
 import org.opendaylight.mdsal.binding.model.api.JavaTypeName;
 import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 
 public final class CodegenGeneratedTypeBuilder extends AbstractGeneratedTypeBuilder<GeneratedTypeBuilder> implements
         GeneratedTypeBuilder {
@@ -19,7 +17,6 @@ public final class CodegenGeneratedTypeBuilder extends AbstractGeneratedTypeBuil
     private String description;
     private String reference;
     private String moduleName;
-    private SchemaPath schemaPath;
 
     public CodegenGeneratedTypeBuilder(final JavaTypeName identifier) {
         super(identifier);
@@ -36,11 +33,6 @@ public final class CodegenGeneratedTypeBuilder extends AbstractGeneratedTypeBuil
         this.moduleName = moduleName;
     }
 
-    @Override
-    public void setSchemaPath(final SchemaPath schemaPath) {
-        this.schemaPath = schemaPath;
-    }
-
     @Override
     public void setReference(final String reference) {
         this.reference = reference;
@@ -57,39 +49,31 @@ public final class CodegenGeneratedTypeBuilder extends AbstractGeneratedTypeBuil
     }
 
     private static final class GeneratedTypeImpl extends AbstractGeneratedType {
-
         private final String description;
         private final String reference;
         private final String moduleName;
-        private final SchemaPath schemaPath;
 
         GeneratedTypeImpl(final CodegenGeneratedTypeBuilder builder) {
             super(builder);
 
-            this.description = builder.description;
-            this.reference = builder.reference;
-            this.moduleName = builder.moduleName;
-            this.schemaPath = builder.schemaPath;
+            description = builder.description;
+            reference = builder.reference;
+            moduleName = builder.moduleName;
         }
 
         @Override
         public String getDescription() {
-            return this.description;
+            return description;
         }
 
         @Override
         public String getReference() {
-            return this.reference;
-        }
-
-        @Override
-        public Iterable<QName> getSchemaPath() {
-            return this.schemaPath.getPathFromRoot();
+            return reference;
         }
 
         @Override
         public String getModuleName() {
-            return this.moduleName;
+            return moduleName;
         }
     }
 }

diff --git a/binding/mdsal-binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/RuntimeEnumerationBuilder.java b/binding/mdsal-binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/RuntimeEnumerationBuilder.java
index c3903f9e89f824880d59b36c78b2649b8837ecef..e46b73175d7df0de8cc69f4b203149fe2a1efe89 100644 (file)
--- a/binding/mdsal-binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/RuntimeEnumerationBuilder.java
+++ b/binding/mdsal-binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/RuntimeEnumerationBuilder.java
@@ -12,8 +12,6 @@ import org.opendaylight.mdsal.binding.model.api.Enumeration;
 import org.opendaylight.mdsal.binding.model.api.JavaTypeName;
 import org.opendaylight.mdsal.binding.model.api.TypeComment;
 import org.opendaylight.mdsal.binding.model.api.YangSourceDefinition;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
 
 public final class RuntimeEnumerationBuilder extends AbstractEnumerationBuilder {
@@ -31,11 +29,6 @@ public final class RuntimeEnumerationBuilder extends AbstractEnumerationBuilder
         // No-op
     }
 
-    @Override
-    public void setSchemaPath(final SchemaPath schemaPath) {
-        // No-op
-    }
-
     @Override
     public void setDescription(final String description) {
         // No-op
@@ -98,11 +91,6 @@ public final class RuntimeEnumerationBuilder extends AbstractEnumerationBuilder
             throw unsupported();
         }
 
-        @Override
-        public Iterable<QName> getSchemaPath() {
-            throw unsupported();
-        }
-
         @Override
         public String getModuleName() {
             throw unsupported();

diff --git a/binding/mdsal-binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/RuntimeGeneratedTOBuilder.java b/binding/mdsal-binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/RuntimeGeneratedTOBuilder.java
index 397cae72abdd0f2f7d90031f7be123ee414d0a1c..9ae2bd8beabdd43e875dd0124963205fcca9e8c1 100644 (file)
--- a/binding/mdsal-binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/RuntimeGeneratedTOBuilder.java
+++ b/binding/mdsal-binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/RuntimeGeneratedTOBuilder.java
@@ -12,8 +12,6 @@ import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject;
 import org.opendaylight.mdsal.binding.model.api.JavaTypeName;
 import org.opendaylight.mdsal.binding.model.api.Restrictions;
 import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedPropertyBuilder;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 
 public class RuntimeGeneratedTOBuilder extends AbstractGeneratedTOBuilder {
     public RuntimeGeneratedTOBuilder(final JavaTypeName identifier) {
@@ -40,11 +38,6 @@ public class RuntimeGeneratedTOBuilder extends AbstractGeneratedTOBuilder {
         // No-op
     }
 
-    @Override
-    public final void setSchemaPath(final SchemaPath schemaPath) {
-        // No-op
-    }
-
     @Override
     public final void setReference(final String reference) {
         // No-op
@@ -80,11 +73,6 @@ public class RuntimeGeneratedTOBuilder extends AbstractGeneratedTOBuilder {
             throw unsupported();
         }
 
-        @Override
-        public final Iterable<QName> getSchemaPath() {
-            throw unsupported();
-        }
-
         @Override
         public final String getModuleName() {
             throw unsupported();

diff --git a/binding/mdsal-binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/RuntimeGeneratedTypeBuilder.java b/binding/mdsal-binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/RuntimeGeneratedTypeBuilder.java
index 6851704ba8cbe3cdf8fdcbf4e0366888e4bf778d..67d3212ed9050094bd1b8f8064245fb5cdc7d788 100644 (file)
--- a/binding/mdsal-binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/RuntimeGeneratedTypeBuilder.java
+++ b/binding/mdsal-binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/RuntimeGeneratedTypeBuilder.java
@@ -10,8 +10,6 @@ package org.opendaylight.mdsal.binding.model.ri.generated.type.builder;
 import org.opendaylight.mdsal.binding.model.api.GeneratedType;
 import org.opendaylight.mdsal.binding.model.api.JavaTypeName;
 import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 
 public final class RuntimeGeneratedTypeBuilder extends AbstractGeneratedTypeBuilder<GeneratedTypeBuilder> implements
         GeneratedTypeBuilder {
@@ -36,11 +34,6 @@ public final class RuntimeGeneratedTypeBuilder extends AbstractGeneratedTypeBuil
         // No-op
     }
 
-    @Override
-    public void setSchemaPath(final SchemaPath schemaPath) {
-        // No-op
-    }
-
     @Override
     public void setReference(final String reference) {
         // No-op
@@ -66,11 +59,6 @@ public final class RuntimeGeneratedTypeBuilder extends AbstractGeneratedTypeBuil
             throw unsupported();
         }
 
-        @Override
-        public Iterable<QName> getSchemaPath() {
-            throw unsupported();
-        }
-
         @Override
         public String getModuleName() {
             throw unsupported();

diff --git a/binding/mdsal-binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/EnumerationBuilderImplTest.java b/binding/mdsal-binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/EnumerationBuilderImplTest.java
index 1d2626350927423e46206a996db4a077505d76d0..fe605b03695f646e96bdd24498403b663db86e31 100644 (file)
--- a/binding/mdsal-binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/EnumerationBuilderImplTest.java
+++ b/binding/mdsal-binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/EnumerationBuilderImplTest.java
@@ -19,7 +19,6 @@ import org.junit.Test;
 import org.opendaylight.mdsal.binding.model.api.Enumeration;
 import org.opendaylight.mdsal.binding.model.api.JavaTypeName;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition;
 import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes;
@@ -48,7 +47,6 @@ public class EnumerationBuilderImplTest {
         enumerationBuilder.setDescription(DESCRIPTION);
         enumerationBuilder.setModuleName(moduleName);
         enumerationBuilder.setReference(reference);
-        enumerationBuilder.setSchemaPath(SchemaPath.create(true, qname));
         enumerationBuilder.addValue(valueName, valueName, value, Status.CURRENT, valueDescription, null);
         enumerationBuilder.addAnnotation(packageName, "TestAnnotation");
         enumerationBuilderSame = new CodegenEnumerationBuilder(JavaTypeName.create(packageName, name));
@@ -96,7 +94,6 @@ public class EnumerationBuilderImplTest {
         assertEquals(moduleName, enumeration.getModuleName());
         assertEquals(packageName + '.' + name, enumeration.getFullyQualifiedName());
         assertEquals(reference, enumeration.getReference());
-        assertEquals(List.of(qname), enumeration.getSchemaPath());
         assertEquals(List.of(), enumeration.getEnclosedTypes());
         assertEquals(List.of(), enumeration.getEnumerations());
         assertEquals(List.of(), enumeration.getMethodDefinitions());

diff --git a/binding/mdsal-binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedTOBuilderImplTest.java b/binding/mdsal-binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedTOBuilderImplTest.java
index 6fe366e8f4932892158bcbacdf1e0e998c6310b4..6b41ab2166e9f3d82fb78611630c91a14c0066af 100644 (file)
--- a/binding/mdsal-binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedTOBuilderImplTest.java
+++ b/binding/mdsal-binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedTOBuilderImplTest.java
@@ -16,7 +16,6 @@ import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject;
 import org.opendaylight.mdsal.binding.model.api.JavaTypeName;
 import org.opendaylight.mdsal.binding.model.api.Restrictions;
 import org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuilder;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 
 public class GeneratedTOBuilderImplTest {
 
@@ -122,7 +121,6 @@ public class GeneratedTOBuilderImplTest {
         genTOBuilder.setDescription("test description");
         genTOBuilder.setModuleName("test-module");
         genTOBuilder.setReference("http://tools.ietf.org/html/rfc6020");
-        genTOBuilder.setSchemaPath(SchemaPath.ROOT);
 
         final GeneratedTransferObject genTO = genTOBuilder.build();
 
@@ -131,7 +129,6 @@ public class GeneratedTOBuilderImplTest {
         assertEquals("test description", genTO.getDescription());
         assertEquals("test-module", genTO.getModuleName());
         assertEquals("http://tools.ietf.org/html/rfc6020", genTO.getReference());
-        assertEquals(SchemaPath.ROOT.getPathFromRoot(), genTO.getSchemaPath());
     }
 
     @Test

diff --git a/binding/mdsal-binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedTypeBuilderTest.java b/binding/mdsal-binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedTypeBuilderTest.java
index 8105e2191d07dfe7170fe0fbcbab3da9bb1789b5..991b01a7b9ba6a9ec8a7e325a59a313092fa84c0 100644 (file)
--- a/binding/mdsal-binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedTypeBuilderTest.java
+++ b/binding/mdsal-binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedTypeBuilderTest.java
@@ -30,8 +30,6 @@ import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder;
 import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder;
 import org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuilder;
 import org.opendaylight.mdsal.binding.model.ri.Types;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 
 public class GeneratedTypeBuilderTest {
 
@@ -286,7 +284,6 @@ public class GeneratedTypeBuilderTest {
         generatedTypeBuilder.setDescription("My description ...");
         generatedTypeBuilder.setModuleName("myModuleName");
         generatedTypeBuilder.setReference("myReference");
-        generatedTypeBuilder.setSchemaPath(SchemaPath.create(true, QName.create("test", "path")));
         assertNotNull(generatedTypeBuilder.addComment(() -> "My comment.."));
 
         assertEquals("CodegenGeneratedTypeBuilder{identifier=my.package.MyName, comment=My comment.., constants=[], "
@@ -297,8 +294,6 @@ public class GeneratedTypeBuilderTest {
         assertEquals("My description ...", instance.getDescription());
         assertEquals("myModuleName", instance.getModuleName());
         assertEquals("myReference", instance.getReference());
-        assertEquals(SchemaPath.create(true, QName.create("test", "path")).getPathFromRoot(),
-            instance.getSchemaPath());
         assertEquals("My comment..", instance.getComment().getJavadoc());
     }
 }