Move simple BaseTemplate methods 91/97391/1
authorRobert Varga <robert.varga@pantheon.tech>
Sun, 5 Sep 2021 18:36:23 +0000 (20:36 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Sun, 5 Sep 2021 20:07:14 +0000 (22:07 +0200)
Reduce xtend proliferation by moving simplistic methods into
JavaFileTemplate and using them from there. This has also benefit in
that BaseTemplate does not reference yang.model.api directly.

Change-Id: I0f10e8abd5fcf54f9d288bd882ad5e9b62298113
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BaseTemplate.xtend
binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileTemplate.java

index b818549d72771b10e893ea91af965f4c6dbac79a..ec31b7db03cb67c1bfea9d138322942ae7684fcb 100644 (file)
@@ -8,11 +8,9 @@
 package org.opendaylight.mdsal.binding.java.api.generator
 
 import static extension org.opendaylight.mdsal.binding.generator.BindingGeneratorUtil.encodeAngleBrackets
-import static extension org.opendaylight.mdsal.binding.generator.BindingGeneratorUtil.replaceAllIllegalChars
 
 import com.google.common.base.CharMatcher
 import com.google.common.base.Splitter
-import com.google.common.collect.Iterables
 import java.util.Collection
 import java.util.List
 import java.util.Locale
@@ -31,37 +29,16 @@ import org.opendaylight.mdsal.binding.model.api.MethodSignature
 import org.opendaylight.mdsal.binding.model.api.Restrictions
 import org.opendaylight.mdsal.binding.model.api.Type
 import org.opendaylight.mdsal.binding.model.api.TypeMemberComment
-import org.opendaylight.mdsal.binding.model.api.YangSourceDefinition.Single
-import org.opendaylight.mdsal.binding.model.api.YangSourceDefinition.Multiple
 import org.opendaylight.mdsal.binding.model.ri.TypeConstants
 import org.opendaylight.mdsal.binding.spec.naming.BindingMapping
-import org.opendaylight.yangtools.yang.common.QName
-import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode
-import org.opendaylight.yangtools.yang.model.api.ListSchemaNode
-import org.opendaylight.yangtools.yang.model.api.NotificationDefinition
-import org.opendaylight.yangtools.yang.model.api.RpcDefinition
-import org.opendaylight.yangtools.yang.model.api.SchemaNode
-import org.opendaylight.yangtools.yang.model.api.YangStmtMapping
-import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement
-import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement
-import org.opendaylight.yangtools.yang.model.api.stmt.ModuleEffectiveStatement
-import org.opendaylight.yangtools.yang.model.export.DeclaredStatementFormatter
 
 @SuppressModernizer
 abstract class BaseTemplate extends JavaFileTemplate {
     static final char NEW_LINE = '\n'
     static final char SPACE = ' '
-    static val AMP_MATCHER = CharMatcher.is('&')
     static val WS_MATCHER = CharMatcher.anyOf("\n\t")
     static val SPACES_PATTERN = Pattern.compile(" +")
     static val NL_SPLITTER = Splitter.on(NEW_LINE)
-    static val TAIL_COMMENT_PATTERN = Pattern.compile("*/", Pattern.LITERAL);
-    static val YANG_FORMATTER = DeclaredStatementFormatter.builder()
-        .addIgnoredStatement(YangStmtMapping.CONTACT)
-        .addIgnoredStatement(YangStmtMapping.DESCRIPTION)
-        .addIgnoredStatement(YangStmtMapping.REFERENCE)
-        .addIgnoredStatement(YangStmtMapping.ORGANIZATION)
-        .build();
 
     new(GeneratedType type) {
         super(type)
@@ -209,14 +186,6 @@ abstract class BaseTemplate extends JavaFileTemplate {
         '''.toString
     }
 
-    def static encodeJavadocSymbols(String description) {
-        if (description.nullOrEmpty) {
-            return description;
-        }
-
-        return TAIL_COMMENT_PATTERN.matcher(AMP_MATCHER.replaceFrom(description, "&amp;")).replaceAll("&#42;&#47;")
-    }
-
     def protected String formatDataForJavaDoc(GeneratedType type, String additionalComment) {
         val comment = type.comment
         if (comment === null) {
@@ -238,80 +207,6 @@ abstract class BaseTemplate extends JavaFileTemplate {
         '''
     }
 
-    def private static void appendSnippet(StringBuilder sb, GeneratedType type) {
-        val optDef = type.yangSourceDefinition
-        if (optDef.present) {
-            val def = optDef.get
-            sb.append(NEW_LINE)
-
-            if (def instanceof Single) {
-                val node = def.node
-                sb.append("<p>\n")
-                .append("This class represents the following YANG schema fragment defined in module <b>")
-                .append(def.module.argument.localName).append("</b>\n")
-                .append("<pre>\n")
-                appendYangSnippet(sb, def.module, (node as EffectiveStatement<?, ?>).declared)
-                sb.append("</pre>")
-
-                if (node instanceof SchemaNode) {
-                    sb.append("The schema path to identify an instance is\n")
-                    .append("<i>")
-                    .append(formatSchemaPath(def.module.argument.localName, node.path.pathFromRoot))
-                    .append("</i>\n")
-
-                    if (hasBuilderClass(node)) {
-                        val builderName = type.name + "Builder";
-
-                        sb.append("\n<p>To create instances of this class use {@link ").append(builderName)
-                        .append("}.\n")
-                        .append("@see ").append(builderName).append('\n')
-                        if (node instanceof ListSchemaNode) {
-                            val keyDef = node.keyDefinition
-                            if (keyDef !== null && !keyDef.empty) {
-                                sb.append("@see ").append(type.name).append("Key")
-                            }
-                            sb.append('\n');
-                        }
-                    }
-                }
-            } else if (def instanceof Multiple) {
-                sb.append("<pre>\n")
-                for (SchemaNode node : def.nodes) {
-                    appendYangSnippet(sb, def.module, (node as EffectiveStatement<?, ?>).declared)
-                }
-                sb.append("</pre>\n")
-            }
-        }
-    }
-
-    def private static void appendYangSnippet(StringBuilder sb, ModuleEffectiveStatement module,
-            DeclaredStatement<?> stmt) {
-        for (String str : YANG_FORMATTER.toYangTextSnippet(module, stmt)) {
-            sb.append(str.encodeJavadocSymbols.encodeAngleBrackets.replaceAllIllegalChars)
-        }
-    }
-
-    def private static boolean hasBuilderClass(SchemaNode schemaNode) {
-        return schemaNode instanceof ContainerSchemaNode || schemaNode instanceof ListSchemaNode
-                || schemaNode instanceof RpcDefinition || schemaNode instanceof NotificationDefinition;
-    }
-
-    def private static String formatSchemaPath(String moduleName, Iterable<QName> schemaPath) {
-        val sb = new StringBuilder().append(moduleName);
-
-        var currentElement = Iterables.getFirst(schemaPath, null);
-        for (QName pathElement : schemaPath) {
-            sb.append('/')
-            if (!currentElement.namespace.equals(pathElement.namespace)) {
-                currentElement = pathElement
-                sb.append(pathElement)
-            } else {
-                sb.append(pathElement.getLocalName())
-            }
-        }
-        return sb.toString();
-    }
-
     def static formatReference(String reference) '''
         «IF reference !== null»
             <pre>
index 9ea277891fe5db48ad753d936a22b2fe10691df9..669e843a6293ef37a8eb8000076945e823bf15bb 100644 (file)
@@ -10,9 +10,12 @@ package org.opendaylight.mdsal.binding.java.api.generator;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Verify.verify;
 import static java.util.Objects.requireNonNull;
+import static org.opendaylight.mdsal.binding.generator.BindingGeneratorUtil.encodeAngleBrackets;
+import static org.opendaylight.mdsal.binding.generator.BindingGeneratorUtil.replaceAllIllegalChars;
 import static org.opendaylight.mdsal.binding.spec.naming.BindingMapping.AUGMENTABLE_AUGMENTATION_NAME;
 import static org.opendaylight.mdsal.binding.spec.naming.BindingMapping.GETTER_PREFIX;
 
+import com.google.common.base.CharMatcher;
 import com.google.common.collect.ImmutableSortedSet;
 import java.lang.reflect.Method;
 import java.util.AbstractMap;
@@ -43,10 +46,25 @@ import org.opendaylight.mdsal.binding.model.api.MethodSignature;
 import org.opendaylight.mdsal.binding.model.api.ParameterizedType;
 import org.opendaylight.mdsal.binding.model.api.Restrictions;
 import org.opendaylight.mdsal.binding.model.api.Type;
+import org.opendaylight.mdsal.binding.model.api.YangSourceDefinition.Multiple;
+import org.opendaylight.mdsal.binding.model.api.YangSourceDefinition.Single;
 import org.opendaylight.mdsal.binding.model.ri.Types;
 import org.opendaylight.mdsal.binding.spec.naming.BindingMapping;
 import org.opendaylight.yangtools.yang.binding.Augmentable;
 import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.XMLNamespace;
+import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.DocumentedNode;
+import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.NotificationDefinition;
+import org.opendaylight.yangtools.yang.model.api.RpcDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaNode;
+import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
+import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
+import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
+import org.opendaylight.yangtools.yang.model.api.stmt.ModuleEffectiveStatement;
+import org.opendaylight.yangtools.yang.model.export.DeclaredStatementFormatter;
 
 /**
  * Base Java file template. Contains a non-null type and imports which the generated code refers to.
@@ -125,7 +143,16 @@ class JavaFileTemplate {
      */
     static final @NonNull JavaTypeName CODEHELPERS = JavaTypeName.create(CodeHelpers.class);
 
+
     private static final Comparator<MethodSignature> METHOD_COMPARATOR = new AlphabeticallyTypeMemberComparator<>();
+    private static final CharMatcher AMP_MATCHER = CharMatcher.is('&');
+    private static final Pattern TAIL_COMMENT_PATTERN = Pattern.compile("*/", Pattern.LITERAL);
+    private static final DeclaredStatementFormatter YANG_FORMATTER = DeclaredStatementFormatter.builder()
+        .addIgnoredStatement(YangStmtMapping.CONTACT)
+        .addIgnoredStatement(YangStmtMapping.DESCRIPTION)
+        .addIgnoredStatement(YangStmtMapping.REFERENCE)
+        .addIgnoredStatement(YangStmtMapping.ORGANIZATION)
+        .build();
     private static final Type AUGMENTATION_RET_TYPE;
 
     static {
@@ -371,6 +398,88 @@ class JavaFileTemplate {
         return false;
     }
 
+    static void appendSnippet(final StringBuilder sb, final GeneratedType type) {
+        type.getYangSourceDefinition().ifPresent(def -> {
+            sb.append('\n');
+
+            if (def instanceof Single) {
+                final DocumentedNode node = ((Single) def).getNode();
+
+                sb.append("<p>\n")
+                    .append("This class represents the following YANG schema fragment defined in module <b>")
+                    .append(def.getModule().argument().getLocalName()).append("</b>\n")
+                    .append("<pre>\n");
+                appendYangSnippet(sb, def.getModule(), ((EffectiveStatement<?, ?>) node).getDeclared());
+                sb.append("</pre>");
+
+                if (node instanceof SchemaNode) {
+                    final SchemaNode schema = (SchemaNode) node;
+                    sb.append("The schema path to identify an instance is\n");
+                    appendPath(sb.append("<i>"), def.getModule(), schema.getPath().getPathFromRoot());
+                    sb.append("</i>\n");
+
+                    if (hasBuilderClass(schema)) {
+                        final String builderName = type.getName() + "Builder";
+
+                        sb.append("\n<p>To create instances of this class use {@link ").append(builderName)
+                        .append("}.\n")
+                        .append("@see ").append(builderName).append('\n');
+                        if (node instanceof ListSchemaNode) {
+                            final var keyDef = ((ListSchemaNode) node).getKeyDefinition();
+                            if (!keyDef.isEmpty()) {
+                                sb.append("@see ").append(type.getName()).append("Key");
+                            }
+                            sb.append('\n');
+                        }
+                    }
+                }
+            } else if (def instanceof Multiple) {
+                sb.append("<pre>\n");
+                for (SchemaNode node : ((Multiple) def).getNodes()) {
+                    appendYangSnippet(sb, def.getModule(), ((EffectiveStatement<?, ?>) node).getDeclared());
+                }
+                sb.append("</pre>\n");
+            }
+        });
+    }
+
+    static String encodeJavadocSymbols(final String description) {
+        // FIXME: Use String.isBlank()?
+        return description == null || description.isEmpty() ? description
+            : TAIL_COMMENT_PATTERN.matcher(AMP_MATCHER.replaceFrom(description, "&amp;")).replaceAll("&#42;&#47;");
+    }
+
+    private static void appendYangSnippet(final StringBuilder sb, final ModuleEffectiveStatement module,
+        final DeclaredStatement<?> stmt) {
+        for (String str : YANG_FORMATTER.toYangTextSnippet(module, stmt)) {
+            sb.append(replaceAllIllegalChars(encodeAngleBrackets(encodeJavadocSymbols(str))));
+        }
+    }
+
+    private static void appendPath(final StringBuilder sb, final ModuleEffectiveStatement module,
+            final List<QName> path) {
+        if (!path.isEmpty()) {
+            // FIXME: this is module name, while when we switch, we end up using QName.toString() -- which is weird
+            sb.append(module.argument().getLocalName());
+            XMLNamespace currentNamespace = path.get(0).getNamespace();
+
+            for (QName pathElement : path) {
+                final XMLNamespace elementNamespace = pathElement.getNamespace();
+                if (!elementNamespace.equals(currentNamespace)) {
+                    sb.append(pathElement);
+                    currentNamespace = elementNamespace;
+                } else {
+                    sb.append(pathElement.getLocalName());
+                }
+            }
+        }
+    }
+
+    private static boolean hasBuilderClass(final SchemaNode schemaNode) {
+        return schemaNode instanceof ContainerSchemaNode || schemaNode instanceof ListSchemaNode
+                || schemaNode instanceof RpcDefinition || schemaNode instanceof NotificationDefinition;
+    }
+
     private static boolean isSameProperty(final String getterName1, final String getterName2) {
         return propertyNameFromGetter(getterName1).equals(propertyNameFromGetter(getterName2));
     }