Moved TypeProviderImpl from binding-generator-impl to binding-type-provider.

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

diff --git a/code-generator/binding-generator-impl/pom.xml b/code-generator/binding-generator-impl/pom.xml
index 3a012cb4279b2fd4524b27670091b23f6abcf805..344d41dec122899744641b3e348e5caeb150d10a 100644 (file)
--- a/code-generator/binding-generator-impl/pom.xml
+++ b/code-generator/binding-generator-impl/pom.xml
@@ -26,6 +26,11 @@
             <groupId>org.opendaylight.yangtools</groupId>\r
             <artifactId>binding-generator-spi</artifactId>\r
         </dependency>\r
+        <dependency>\r
+            <groupId>org.opendaylight.yangtools</groupId>\r
+            <artifactId>binding-type-provider</artifactId>\r
+            <version>0.6.0-SNAPSHOT</version>\r
+        </dependency>\r
         <dependency>\r
             <groupId>junit</groupId>\r
             <artifactId>junit</artifactId>\r

diff --git a/code-generator/binding-type-provider/pom.xml b/code-generator/binding-type-provider/pom.xml
new file mode 100644 (file)
index 0000000..40cd8f2
--- /dev/null
+++ b/code-generator/binding-type-provider/pom.xml
@@ -0,0 +1,52 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
+\r
+    <parent>\r
+        <groupId>org.opendaylight.yangtools</groupId>\r
+        <artifactId>binding-generator</artifactId>\r
+        <version>0.6.0-SNAPSHOT</version>\r
+    </parent>\r
+\r
+    <modelVersion>4.0.0</modelVersion>\r
+    <artifactId>binding-type-provider</artifactId>\r
+\r
+    <build>\r
+        <plugins>\r
+            <plugin>\r
+                <artifactId>maven-jar-plugin</artifactId>\r
+            </plugin>\r
+            <plugin>\r
+                <groupId>org.apache.felix</groupId>\r
+                <artifactId>maven-bundle-plugin</artifactId>\r
+                <extensions>true</extensions>\r
+                <configuration>\r
+                    <instructions>\r
+                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>\r
+                    </instructions>\r
+                </configuration>\r
+            </plugin>\r
+        </plugins>\r
+    </build>\r
+\r
+    <dependencies>\r
+        <dependency>\r
+            <groupId>org.opendaylight.yangtools</groupId>\r
+            <artifactId>binding-generator-spi</artifactId>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.opendaylight.yangtools</groupId>\r
+            <artifactId>binding-generator-util</artifactId>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>commons-lang</groupId>\r
+            <artifactId>commons-lang</artifactId>\r
+            <version>2.1</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>junit</groupId>\r
+            <artifactId>junit</artifactId>\r
+            <scope>test</scope>\r
+        </dependency>\r
+    </dependencies>\r
+\r
+</project>\r

diff --git a/code-generator/binding-type-provider/src/main/.gitignore b/code-generator/binding-type-provider/src/main/.gitignore
new file mode 100644 (file)
index 0000000..04b73cb
--- /dev/null
+++ b/code-generator/binding-type-provider/src/main/.gitignore
@@ -0,0 +1 @@
+/xtend-gen

diff --git a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/BaseYangTypes.java b/code-generator/binding-type-provider/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/BaseYangTypes.java
similarity index 100%
rename from code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/BaseYangTypes.java
rename to code-generator/binding-type-provider/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/BaseYangTypes.java

diff --git a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/GroupingDefinitionDependencySort.java b/code-generator/binding-type-provider/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/GroupingDefinitionDependencySort.java
similarity index 100%
rename from code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/GroupingDefinitionDependencySort.java
rename to code-generator/binding-type-provider/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/GroupingDefinitionDependencySort.java

diff --git a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/NodeWrappedType.java b/code-generator/binding-type-provider/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/NodeWrappedType.java
similarity index 100%
rename from code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/NodeWrappedType.java
rename to code-generator/binding-type-provider/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/NodeWrappedType.java

diff --git a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java b/code-generator/binding-type-provider/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java
similarity index 99%
rename from code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java
rename to code-generator/binding-type-provider/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java
index 1f978409c43748cb9a472fa2ec9d63d8e35187c6..858c2e0f09198de27a9ee3cc642541ebdc192c8c 100644 (file)
--- a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java
+++ b/code-generator/binding-type-provider/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java
@@ -769,7 +769,7 @@ public final class TypeProviderImpl implements TypeProvider {
      * 
      * In this case the new generated TO is created for union subtype (recursive
      * call of method
-     * {@link #provideGeneratedTOBuilderForUnionTypeDef(String, TypeDefinition, String)
+     * {@link #provideGeneratedTOBuildersForUnionTypeDef(String, TypeDefinition, String)
      * provideGeneratedTOBuilderForUnionTypeDef} and in parent TO builder
      * <code>parentUnionGenTOBuilder</code> is created property which type is
      * equal to new generated TO.

diff --git a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/UnionDependencySort.java b/code-generator/binding-type-provider/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/UnionDependencySort.java
similarity index 100%
rename from code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/UnionDependencySort.java
rename to code-generator/binding-type-provider/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/UnionDependencySort.java

diff --git a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/package-info.java b/code-generator/binding-type-provider/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/package-info.java
similarity index 100%
rename from code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/package-info.java
rename to code-generator/binding-type-provider/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/package-info.java

diff --git a/code-generator/binding-type-provider/src/test/java/org/opendaylight/yangtools/sal/binding/yang/types/NodeWrappedTypeTest.java b/code-generator/binding-type-provider/src/test/java/org/opendaylight/yangtools/sal/binding/yang/types/NodeWrappedTypeTest.java
new file mode 100644 (file)
index 0000000..d31f2a4
--- /dev/null
+++ b/code-generator/binding-type-provider/src/test/java/org/opendaylight/yangtools/sal/binding/yang/types/NodeWrappedTypeTest.java
@@ -0,0 +1,24 @@
+package org.opendaylight.yangtools.sal.binding.yang.types;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class NodeWrappedTypeTest {
+
+    @Test
+    public void test() {
+        NodeWrappedType nwt1 = new NodeWrappedType("obj1");
+        NodeWrappedType nwt2 = new NodeWrappedType("obj2");
+        NodeWrappedType nwt3 = new NodeWrappedType("obj1");
+        String str = "obj3";
+
+        assertTrue("Node nwt1 should equal to itself.", nwt1.equals(nwt1));
+        assertFalse("It can't be possible to compare nwt with string.", nwt1.equals(str));
+        assertFalse("nwt1 shouldn't equal to nwt2.", nwt1.equals(nwt2));
+        assertTrue("Node nwt1 should equal to nwt3.", nwt1.equals(nwt3));
+
+        assertEquals("toString method is returning incorrect value.", "NodeWrappedType{wrappedType=obj1}",
+                nwt1.toString());
+    }
+}

diff --git a/code-generator/pom.xml b/code-generator/pom.xml
index 81be860b353c219d46e531c27eeefd0eb2c56e38..ebf29b365ff3db90701e2f030202bea89d672e3d 100644 (file)
--- a/code-generator/pom.xml
+++ b/code-generator/pom.xml
@@ -24,6 +24,7 @@
         <module>binding-generator-util</module>
         <module>binding-generator-impl</module>
         <module>binding-java-api-generator</module>
+        <module>binding-type-provider</module>
         <module>maven-sal-api-gen-plugin</module>
     </modules>