BUG-579: removed dependency on GeneratedTOBuilderImpl from Types to break a package...

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

diff --git a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/BindingGeneratorImpl.xtend b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/BindingGeneratorImpl.xtend
index ba8259e9b30627c064d1e041312963e4acafb427..5308884c8704116d01571dc73072711935cd2d6b 100644 (file)
--- a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/BindingGeneratorImpl.xtend
+++ b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/BindingGeneratorImpl.xtend
@@ -80,6 +80,7 @@ import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedTy
 
 import com.google.common.collect.Sets
 import java.util.TreeSet
+import org.opendaylight.yangtools.yang.binding.BaseIdentity
 
 public class BindingGeneratorImpl implements BindingGenerator {
 
@@ -604,7 +605,9 @@ public class BindingGeneratorImpl implements BindingGenerator {
         val newType = new GeneratedTOBuilderImpl(packageName, genTypeName);
         val baseIdentity = identity.baseIdentity;
         if (baseIdentity === null) {
-            newType.setExtendsType(Types.baseIdentityTO);
+            val GeneratedTOBuilderImpl gto = new GeneratedTOBuilderImpl(BaseIdentity.package.name,
+                BaseIdentity.simpleName);
+            newType.setExtendsType(gto.toInstance);
         } else {
             val baseIdentityParentModule = SchemaContextUtil.findParentModule(context, baseIdentity);
             val returnTypePkgName = moduleNamespaceToPackageName(baseIdentityParentModule);

diff --git a/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/Types.java b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/Types.java
index b658d2f2fa51f5bda45ee330484def38754f59a6..a6a5ef5a41b699899a42c2a7d1cb615fcc65c5c6 100644 (file)
--- a/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/Types.java
+++ b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/Types.java
@@ -11,17 +11,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Future;
-
-import org.opendaylight.yangtools.binding.generator.util.generated.type.builder.GeneratedTOBuilderImpl;
 import org.opendaylight.yangtools.sal.binding.model.api.ConcreteType;
-import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject;
 import org.opendaylight.yangtools.sal.binding.model.api.ParameterizedType;
 import org.opendaylight.yangtools.sal.binding.model.api.Restrictions;
 import org.opendaylight.yangtools.sal.binding.model.api.Type;
 import org.opendaylight.yangtools.sal.binding.model.api.WildcardType;
 import org.opendaylight.yangtools.yang.binding.Augmentable;
 import org.opendaylight.yangtools.yang.binding.Augmentation;
-import org.opendaylight.yangtools.yang.binding.BaseIdentity;
 
 public final class Types {
     private static final Type SET_TYPE = typeForClass(Set.class);
@@ -120,19 +116,6 @@ public final class Types {
         return parameterizedTypeFor(LIST_TYPE, valueType);
     }
 
-    /**
-     * Creates generated transfer object for
-     * {@link org.opendaylight.yangtools.yang.binding.BaseIdentity BaseIdentity}
-     *
-     * @return generated transfer object which is used as extension when YANG
-     *         <code>identity</code> is mapped to generated TO
-     */
-    public static GeneratedTransferObject getBaseIdentityTO() {
-        Class<BaseIdentity> cls = BaseIdentity.class;
-        GeneratedTOBuilderImpl gto = new GeneratedTOBuilderImpl(cls.getPackage().getName(), cls.getSimpleName());
-        return gto.toInstance();
-    }
-
     /**
      * Creates instance of type
      * {@link org.opendaylight.yangtools.sal.binding.model.api.ParameterizedType