X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=binding%2Fmdsal-binding-java-api-generator%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fbinding%2Fjava%2Fapi%2Fgenerator%2FJavaFileTemplate.java;h=0b3a936f5b8ee863907b977908a0a0e3672b212c;hb=11408d627adca7eb71ac956c3ad01f75b6b91596;hp=528a714cf080cd1fff334fd806fe308e49cdcc16;hpb=65200ab6676fc5a3d7efaa28d0309450f0223980;p=mdsal.git diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileTemplate.java b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileTemplate.java index 528a714cf0..0b3a936f5b 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileTemplate.java +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileTemplate.java @@ -10,9 +10,10 @@ 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.spec.naming.BindingMapping.AUGMENTABLE_AUGMENTATION_NAME; -import static org.opendaylight.mdsal.binding.spec.naming.BindingMapping.GETTER_PREFIX; +import static org.opendaylight.mdsal.binding.generator.BindingGeneratorUtil.encodeAngleBrackets; +import static org.opendaylight.mdsal.binding.generator.BindingGeneratorUtil.replaceAllIllegalChars; +import com.google.common.base.CharMatcher; import com.google.common.collect.ImmutableSortedSet; import java.lang.reflect.Method; import java.util.AbstractMap; @@ -43,10 +44,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.util.Types; +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,13 +141,23 @@ class JavaFileTemplate { */ static final @NonNull JavaTypeName CODEHELPERS = JavaTypeName.create(CodeHelpers.class); + private static final Comparator 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 int GETTER_PREFIX_LENGTH = BindingMapping.GETTER_PREFIX.length(); private static final Type AUGMENTATION_RET_TYPE; static { final Method m; try { - m = Augmentable.class.getDeclaredMethod(AUGMENTABLE_AUGMENTATION_NAME, Class.class); + m = Augmentable.class.getDeclaredMethod(BindingMapping.AUGMENTABLE_AUGMENTATION_NAME, Class.class); } catch (NoSuchMethodException e) { throw new ExceptionInInitializerError(e); } @@ -371,6 +397,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("

\n") + .append("This class represents the following YANG schema fragment defined in module ") + .append(def.getModule().argument().getLocalName()).append("\n") + .append("

\n");
+                appendYangSnippet(sb, def.getModule(), ((EffectiveStatement) node).getDeclared());
+                sb.append("
"); + + if (node instanceof SchemaNode) { + final SchemaNode schema = (SchemaNode) node; +// sb.append("The schema path to identify an instance is\n"); +// appendPath(sb.append(""), def.getModule(), schema.getPath().getPathFromRoot()); +// sb.append("\n"); + + if (hasBuilderClass(schema)) { + final String builderName = type.getName() + BindingMapping.BUILDER_SUFFIX; + + sb.append("\n

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(BindingMapping.KEY_SUFFIX); + } + sb.append('\n'); + } + } + } + } else if (def instanceof Multiple) { + sb.append("

\n");
+                for (SchemaNode node : ((Multiple) def).getNodes()) {
+                    appendYangSnippet(sb, def.getModule(), ((EffectiveStatement) node).getDeclared());
+                }
+                sb.append("
\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, "&")).replaceAll("*/"); + } + + 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 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)); } @@ -401,11 +509,11 @@ class JavaFileTemplate { * @param method method signature from which is the method name and return type obtained * @return generated property instance for the getter method * @throws IllegalArgumentException + *
  • if the {@code method} equals {@code null}
    • + *
  • if the name of the {@code method} equals {@code null}
    • + *
  • if the name of the {@code method} is empty
    • + *
  • if the return type of the {@code method} equals {@code null}
    • + * */ private static BuilderGeneratedProperty propertyFromGetter(final MethodSignature method) { checkArgument(method != null); @@ -419,7 +527,7 @@ class JavaFileTemplate { return null; } - final String fieldName = StringExtensions.toFirstLower(method.getName().substring(GETTER_PREFIX.length())); + final String fieldName = StringExtensions.toFirstLower(method.getName().substring(GETTER_PREFIX_LENGTH)); return new BuilderGeneratedProperty(fieldName, method); } }