BUG-597: removed dependency on GeneratedTOBuilderImpl from BindingGeneratorUtil to...

Change-Id: I6dfbf217982e1128ab22db70af261ade250642c3
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 5308884c8704116d01571dc73072711935cd2d6b..4cae65a4e539af0b5586fbd34d597bdafb196d00 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
@@ -297,7 +297,7 @@ public class BindingGeneratorImpl implements BindingGenerator {
             // serialVersionUID
             if (genTOBuilder !== null) {
                 val GeneratedPropertyBuilder prop = new GeneratedPropertyBuilderImpl("serialVersionUID");
-                prop.setValue(Long.toString(computeDefaultSUID(genTOBuilder as GeneratedTOBuilderImpl)));
+                prop.setValue(Long.toString(computeDefaultSUID(genTOBuilder)));
                 genTOBuilder.setSUID(prop);
             }
 

diff --git a/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/BindingGeneratorUtil.java b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/BindingGeneratorUtil.java
index f9501e0b973cf4c868c68655bdf322b727b84102..fc83572915cf8e53b2ad1d73f9cf46e3ab07a7ff 100644 (file)
--- a/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/BindingGeneratorUtil.java
+++ b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/BindingGeneratorUtil.java
@@ -29,6 +29,7 @@ import org.opendaylight.yangtools.sal.binding.model.api.AccessModifier;
 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.type.builder.GeneratedPropertyBuilder;
+import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedTypeBuilderBase;
 import org.opendaylight.yangtools.sal.binding.model.api.type.builder.MethodSignatureBuilder;
 import org.opendaylight.yangtools.sal.binding.model.api.type.builder.TypeMemberBuilder;
 import org.opendaylight.yangtools.yang.binding.BindingMapping;
@@ -391,7 +392,7 @@ public final class BindingGeneratorUtil {
         gto.setSUID(prop);
     }
 
-    public static long computeDefaultSUID(final GeneratedTOBuilderImpl to) {
+    public static long computeDefaultSUID(final GeneratedTypeBuilderBase<?> to) {
         try {
             ByteArrayOutputStream bout = new ByteArrayOutputStream();
             DataOutputStream dout = new DataOutputStream(bout);

diff --git a/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedTypeBuilderBase.java b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedTypeBuilderBase.java
index bc5f69b9eaf2f98ae318131eb8466ae9d5dd2ad2..22dce2cd84e89c0690cc46017ede3c83f1f71ab2 100644 (file)
--- a/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedTypeBuilderBase.java
+++ b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedTypeBuilderBase.java
@@ -7,6 +7,7 @@
  */
 package org.opendaylight.yangtools.sal.binding.model.api.type.builder;
 
+import java.util.List;
 import org.opendaylight.yangtools.sal.binding.model.api.Constant;
 import org.opendaylight.yangtools.sal.binding.model.api.Type;
 
@@ -22,7 +23,7 @@ public interface GeneratedTypeBuilderBase<T extends GeneratedTypeBuilderBase<T>>
      * enclosing type will simply overwrite the older definition. <br>
      * If the name of enclosing type is <code>null</code> the method SHOULD
      * throw {@link IllegalArgumentException}
-     * 
+     *
      * @param name
      *            Name of Enclosing Type
      * @return <code>new</code> Instance of Generated Type Builder.
@@ -32,7 +33,7 @@ public interface GeneratedTypeBuilderBase<T extends GeneratedTypeBuilderBase<T>>
     /**
      * Adds new Enclosing Transfer Object <code>genTOBuilder</code> into
      * definition of Generated Type
-     * 
+     *
      * <br>
      * There is no need of specifying of Package Name because enclosing Type is
      * already defined inside Generated Type with specific package name. <br>
@@ -42,7 +43,7 @@ public interface GeneratedTypeBuilderBase<T extends GeneratedTypeBuilderBase<T>>
      * If the parameter <code>genTOBuilder</code> of enclosing type is
      * <code>null</code> the method SHOULD throw
      * {@link IllegalArgumentException}
-     * 
+     *
      * @param genTOBuilder
      *            Name of Enclosing Type
      */
@@ -52,7 +53,7 @@ public interface GeneratedTypeBuilderBase<T extends GeneratedTypeBuilderBase<T>>
      * Adds String definition of comment into Method Signature definition. <br>
      * The comment String MUST NOT contain anny comment specific chars (i.e.
      * "/**" or "//") just plain String text description.
-     * 
+     *
      * @param comment
      *            Comment String.
      */
@@ -64,7 +65,7 @@ public interface GeneratedTypeBuilderBase<T extends GeneratedTypeBuilderBase<T>>
      * Neither the package name or annotation name can contain <code>null</code>
      * references. In case that any of parameters contains <code>null</code> the
      * method SHOULD thrown {@link IllegalArgumentException}
-     * 
+     *
      * @param packageName
      *            Package Name of Annotation Type
      * @param name
@@ -73,18 +74,22 @@ public interface GeneratedTypeBuilderBase<T extends GeneratedTypeBuilderBase<T>>
      */
     AnnotationTypeBuilder addAnnotation(final String packageName, final String name);
 
+    boolean isAbstract();
+
     /**
      * Sets the <code>abstract</code> flag to define Generated Type as
      * <i>abstract</i> type.
-     * 
+     *
      * @param isAbstract
      *            abstract flag
      */
     T setAbstract(boolean isAbstract);
 
+    List<Type> getImplementsTypes();
+
     /**
      * Add Type to implements.
-     * 
+     *
      * @param genType
      *            Type to implement
      * @return <code>true</code> if the addition of type is successful.
@@ -97,7 +102,7 @@ public interface GeneratedTypeBuilderBase<T extends GeneratedTypeBuilderBase<T>>
      * value. The name SHOULD be defined with capital letters. Neither of method
      * parameters can be <code>null</code> and the method SHOULD throw
      * {@link IllegalArgumentException} if the contract is broken.
-     * 
+     *
      * @param type
      *            Constant Type
      * @param name
@@ -116,13 +121,15 @@ public interface GeneratedTypeBuilderBase<T extends GeneratedTypeBuilderBase<T>>
      * Name of Enumeration cannot be <code>null</code>, if it is
      * <code>null</code> the method SHOULD throw
      * {@link IllegalArgumentException}
-     * 
+     *
      * @param name
      *            Enumeration Name
      * @return <code>new</code> instance of Enumeration Builder.
      */
     EnumBuilder addEnumeration(final String name);
 
+    List<MethodSignatureBuilder> getMethodDefinitions();
+
     /**
      * Add new Method Signature definition for Generated Type Builder and
      * returns Method Signature Builder for specifying all Method parameters. <br>
@@ -132,7 +139,7 @@ public interface GeneratedTypeBuilderBase<T extends GeneratedTypeBuilderBase<T>>
      * {@link MethodSignatureBuilder#setAbstract(boolean)},
      * {TypeMemberBuilder#setFinal(boolean)} and
      * {TypeMemberBuilder#setAccessModifier(boolean)}
-     * 
+     *
      * @param name
      *            Name of Method
      * @return <code>new</code> instance of Method Signature Builder.
@@ -142,18 +149,20 @@ public interface GeneratedTypeBuilderBase<T extends GeneratedTypeBuilderBase<T>>
     /**
      * Checks if GeneratedTypeBuilder contains method with name
      * <code>methodName</code>
-     * 
+     *
      * @param methodName
      *            is method name
      */
     boolean containsMethod(final String methodName);
 
+    List<GeneratedPropertyBuilder> getProperties();
+
     /**
      * Add new Generated Property definition for Generated Transfer Object
      * Builder and returns Generated Property Builder for specifying Property. <br>
      * Name of Property cannot be <code>null</code>, if it is <code>null</code>
      * the method SHOULD throw {@link IllegalArgumentException}
-     * 
+     *
      * @param name
      *            Name of Property
      * @return <code>new</code> instance of Generated Property Builder.
@@ -163,7 +172,7 @@ public interface GeneratedTypeBuilderBase<T extends GeneratedTypeBuilderBase<T>>
     /**
      * Check whether GeneratedTOBuilder contains property with name
      * <code>name</code>
-     * 
+     *
      * @param name
      *            of property which existance is checked
      * @return true if property <code>name</code> exists in list of properties.