feat: restore JDK11 compatibility

Signed-off-by: Andreas Reichel <andreas@manticore-projects.com>

Author: manticore-projects

.github/dependabot.yml

@@ -0,0 +1,9 @@
+version: 2
+updates:
+  - package-ecosystem: "gradle"  # Specify Gradle as the package manager
+    directory: "/"               # Root directory of your project
+    schedule:
+      interval: "weekly"          # Define how often Dependabot should check for updates
+    ignore:
+      - dependency-name: "se.bjurr.gitchangelog.git-changelog-gradle-plugin"
+        versions: ["*"]  # This will ignore all versions for this specific plugin

build.gradle

@@ -19,7 +19,7 @@ plugins {
     id "org.owasp.dependencycheck" version "latest.release"
     id 'org.sonatype.gradle.plugins.scan' version "latest.release"
 
-    id "se.bjurr.gitchangelog.git-changelog-gradle-plugin" version "latest.release"
+    id "se.bjurr.gitchangelog.git-changelog-gradle-plugin" version "2.0.0"
     id "org.hidetake.ssh" version "latest.release"
 }
 
@@ -168,7 +168,7 @@ publishing {
                     }
                     developer {
                         id = 'maca'
-                        name = 'Manoel Campos '
+                        name = 'Manoel Campos'
                         email = ''
                     }
                 }
@@ -206,12 +206,9 @@ java {
     withSourcesJar()
     withJavadocJar()
 
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
 
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
-    }
     modularity.inferModulePath = true
 }
 

src/main/java/com/manticoreprojects/tools/xmldoclet/AnnotationParser.java

@@ -79,15 +79,18 @@ protected AnnotationInstance parse(final Name programElement, final  AnnotationM
      * @param argValue the value for an annotation argument
      */
     private void parseAnnotationArgValue(final Name programElement, final AnnotationArgument arg, final Object argValue) {
-        switch (argValue) {
-            case AnnotationValue annotationValue -> {
-                if (annotationValue.getValue() instanceof List<?> valueList) {
-                    parseAnnotationArgListValue(programElement, arg, valueList);
-                } else arg.getValue().add(annotationValue.getValue().toString());
+        if (argValue instanceof AnnotationValue) {
+            AnnotationValue annotationValue = (AnnotationValue) argValue;
+            if (annotationValue.getValue() instanceof List<?>) {
+                List<?> valueList = (List<?>) annotationValue.getValue();
+                parseAnnotationArgListValue(programElement, arg, valueList);
+            } else {
+                arg.getValue().add(annotationValue.getValue().toString());
             }
-            case null -> {}
-            default -> arg.getValue().add(argValue.toString());
+        } else if (argValue != null) {
+            arg.getValue().add(argValue.toString());
         }
+
     }
 
     /**
@@ -98,18 +101,21 @@ private void parseAnnotationArgValue(final Name programElement, final Annotation
      */
     private void parseAnnotationArgListValue(final Name programElement, final AnnotationArgument arg, final List<?> valueList) {
         for (final Object value : valueList) {
-            if (value instanceof AnnotationMirror annoDesc) {
+            if (value instanceof AnnotationMirror) {
+                AnnotationMirror annoDesc = (AnnotationMirror) value;
                 arg.getAnnotation().add(parse(programElement, annoDesc));
             } else {
                 /*
-                Consider the annotation @Annotation1("A") or @Annotation1({"A", "B"}}).
+                Consider the annotation @Annotation1("A") or @Annotation1({"A", "B"}).
                 The annotation value is an AnnotationValue object with value attribute.
                 This attribute is a List (even if there is a single value).
                 But each value is not the actual value, but another AnnotationValue object with a value attribute.
-                 */
-                arg.getValue().add(((AnnotationValue) value).getValue().toString());
+                */
+                AnnotationValue annotationValue = (AnnotationValue) value;
+                arg.getValue().add(annotationValue.getValue().toString());
             }
         }
+
     }
 
     /**

src/main/java/com/manticoreprojects/tools/xmldoclet/CustomOption.java

@@ -24,8 +24,10 @@ public class CustomOption implements Doclet.Option {
      * If the option expectes a file name as parameter, the description may include the word "file"
      * to indicate that.
      *
-     * <p>If the option has multiple parameters, this attribute should provide
-     * a string representation of all of them, such as: file1 file2</p>
+     * <p>
+     * If the option has multiple parameters, this attribute should provide
+     * a string representation of all of them, such as: file1 file2
+     * </p>
      */
     private final String parameters;
 
@@ -34,6 +36,7 @@ public class CustomOption implements Doclet.Option {
      * The function can check the number of required arguments, try to convert them to the expected type
      * and perform any validation operation required.
      * If the arguments are valid, the Predicate must return true.
+     * 
      * @see #process(String, List)
      */
     private final BiPredicate<String, List<String>> argumentsProcessor;
@@ -46,6 +49,7 @@ public class CustomOption implements Doclet.Option {
 
     /**
      * Creates an Option with a single argument value and a given specification.
+     * 
      * @param argName the name of the single argument to be passed to the option, used in the help message
      */
     public static CustomOption newOneArg(
@@ -58,12 +62,14 @@ public static CustomOption newOneArg(
     /**
      * Creates an Option with no arguments and a given specification
      */
-    public static CustomOption newNoArgs(final String name, final String description, final BiPredicate<String, List<String>> argumentsProcessor) {
+    public static CustomOption newNoArgs(final String name, final String description,
+            final BiPredicate<String, List<String>> argumentsProcessor) {
         return new CustomOption(name, description, "", 0, argumentsProcessor);
     }
 
     /**
      * Creates an Option with a given specification and a default arguments processor.
+     * 
      * @param argName the name of the single argument to be passed to the option, used in the help message
      */
     private CustomOption(final String name, final String description, final String argName, final int argumentCount) {
@@ -106,6 +112,7 @@ public Kind getKind() {
     /**
      * {@inheritDoc}
      * In the case of this class, the list has only one element, the single option name.
+     * 
      * @return a list with a single element containing the name of the option
      * @see #getName()
      */
@@ -115,18 +122,19 @@ public List<String> getNames() {
     }
 
     /**
-     * {@return the name of the option}
      * This class provides a single name for the option.
      * Therefore, no alternative names are supported.
+     *
+     * @return the name of the option
      */
     public String getName() {
         return name;
     }
 
     /**
-     * {@return a String with the name of the single parameter expected by the option (if any)}
-     * The number of parameter for this option class can be 0 or 1, according to {@link #argumentCount}.
-     * That is why this attribute is a single parameter name as a String.
+     * @return a String with the name of the single parameter expected by the option (if any)
+     *         The number of parameter for this option class can be 0 or 1, according to {@link #argumentCount}.
+     *         That is why this attribute is a single parameter name as a String.
      */
     @Override
     public String getParameters() {
@@ -136,6 +144,7 @@ public String getParameters() {
     /**
      * {@inheritDoc}
      * It must check if the given option arguments are valid.
+     * 
      * @param option {@inheritDoc}
      * @param arguments {@inheritDoc} received during the doclet execution
      * @return if the option has the expected number of arguments and they are valid

src/main/java/com/manticoreprojects/tools/xmldoclet/Parser.java

@@ -64,7 +64,7 @@ private String getJavaDoc(final Element element) {
     }
 
     /**
-     * {@return the tags inside a JavaDoc comment}
+     * @return the tags inside a JavaDoc comment
      *
      * @param element the Java element to get its JavaDoc tags
      */
@@ -85,18 +85,27 @@ public Root parseRootDoc() {
             final Package packageNode = getPackage(rootNode, classDoc);
 
             switch (classDoc.getKind()) {
-                case ANNOTATION_TYPE -> packageNode.getAnnotation().add(parseAnnotationTypeDoc(classDoc));
-                case ENUM -> packageNode.getEnum().add(parseEnum(classDoc));
-                case INTERFACE -> packageNode.getInterface().add(parseInterface(classDoc));
-                default -> packageNode.getClazz().add(parseClass(classDoc));
+                case ANNOTATION_TYPE:
+                    packageNode.getAnnotation().add(parseAnnotationTypeDoc(classDoc));
+                    break;
+                case ENUM:
+                    packageNode.getEnum().add(parseEnum(classDoc));
+                    break;
+                case INTERFACE:
+                    packageNode.getInterface().add(parseInterface(classDoc));
+                    break;
+                default:
+                    packageNode.getClazz().add(parseClass(classDoc));
+                    break;
             }
         }
 
+
         return rootNode;
     }
 
     /**
-     * {@return the package node for the given class element}
+     * @return the package node for the given class element
      *
      * @param rootNode
      * @param classElement class to get its package
@@ -546,7 +555,7 @@ protected TagInfo parseTag(final DocTree tagDoc) {
     }
 
     /**
-     * {@return string representation of the element scope}
+     * @return string representation of the element scope
      *
      * @param doc the element to get its scope
      */

src/main/java/com/manticoreprojects/tools/xmldoclet/SupportedOptions.java

@@ -27,20 +27,19 @@ final class SupportedOptions {
 
     public SupportedOptions() {
         this.supportedOptionsSet = Set.of(
-            newArgOption("d", "directory", "Destination directory for output file.\nDefault: ."),
-            newArgOption("docencoding", "encoding", "Encoding of the output file.\nDefault: UTF8"),
-            newNoArgOption("dryrun", "Parse javadoc, but don't write output file.\nDefault: false"),
-            newNoArgOption("rst", "Transform the XML into a Restructured Text file (*.rst).\nDefault: false"),
-            newNoArgOption("md", "Transform the XML into a Markdown file (*.md).\nDefault: false"),
-            newNoArgOption("docbook", "Transform the XML into a DocBook file (*.db.xml).\nDefault: false"),
-            newNoArgOption("adoc", "Transform the XML into an Ascii Doctor file (*.adoc).\nDefault: false"),
-            newOneArgOption("filename", "Name of the output file.\nDefault: javadoc.xml"),
-            newOneArgOption("basePackage", "Name of the base package.\n"),
-            newOneArgOption("doctitle", "Document Title\n"),
-            newOneArgOption("windowtitle", "Window Title\n"),
-            newNoArgOption("noTimestamp", "No Timestamp.\n"),
-            newNoArgOption("withFloatingToc", "Renders a Floating TOC on the right side.\n")
-        );
+                newArgOption("d", "directory", "Destination directory for output file.\nDefault: ."),
+                newArgOption("docencoding", "encoding", "Encoding of the output file.\nDefault: UTF8"),
+                newNoArgOption("dryrun", "Parse javadoc, but don't write output file.\nDefault: false"),
+                newNoArgOption("rst", "Transform the XML into a Restructured Text file (*.rst).\nDefault: false"),
+                newNoArgOption("md", "Transform the XML into a Markdown file (*.md).\nDefault: false"),
+                newNoArgOption("docbook", "Transform the XML into a DocBook file (*.db.xml).\nDefault: false"),
+                newNoArgOption("adoc", "Transform the XML into an Ascii Doctor file (*.adoc).\nDefault: false"),
+                newOneArgOption("filename", "Name of the output file.\nDefault: javadoc.xml"),
+                newOneArgOption("basePackage", "Name of the base package.\n"),
+                newOneArgOption("doctitle", "Document Title\n"),
+                newOneArgOption("windowtitle", "Window Title\n"),
+                newNoArgOption("noTimestamp", "No Timestamp.\n"),
+                newNoArgOption("withFloatingToc", "Renders a Floating TOC on the right side.\n"));
     }
 
     public Set<CustomOption> get() {
@@ -49,6 +48,7 @@ public Set<CustomOption> get() {
 
     /**
      * Creates an option with one argument that has the same name of the option itself.
+     * 
      * @param optionName name of the option and its own single argument
      * @param description option description
      */
@@ -58,6 +58,7 @@ private CustomOption newOneArgOption(final String optionName, final String descr
 
     /**
      * Creates an option with one argument.
+     * 
      * @param optionName name of the option
      * @param argName name of the argument to be passed to the option, used in the help message
      * @param description option description
@@ -67,55 +68,55 @@ private CustomOption newArgOption(final String optionName, final String argName,
     }
 
     private CustomOption newNoArgOption(final String optionName, final String description) {
-        return CustomOption.newNoArgs(optionName, description, this::processNoArgValue);
+        return CustomOption.newNoArgs(optionName, description, (optionName1, argValues) -> processNoArgValue(optionName1));
     }
 
     /**
      * Process and stores name of the option in the {@link #givenCliOptionsMap} to indicate it was sucessfully
      * processed (since it has no arguments and no validation is required).
+     *
      * @param optionName name of the option to store the argument value
-     * @param argValues list of arguments values for the option, which will be empty and ignored,
-     *                  since the option doesn't expect any argument.
      * @return true to indicate the option was successfully processed.
      */
-    private boolean processNoArgValue(final String optionName, final List<String> argValues){
+    private boolean processNoArgValue(final String optionName) {
         givenCliOptionsMap.put(addHyphenPrefix(optionName), null);
         return true;
     }
 
     /**
      * Process and stores the first argument value passed in the command line for a given option
      * when that option is being processed by {@link CustomOption#process(String, List)}.
+     * 
      * @param optionName name of the option to store the argument value
      * @param argValues list of arguments to get the first value to store
      * @return true if there was one argument value in the argument list, false otherwise, indicating no value was stored
      */
-    private boolean processFirstArgValue(final String optionName, final List<String> argValues){
-        if (argValues.isEmpty()){
+    private boolean processFirstArgValue(final String optionName, final List<String> argValues) {
+        if (argValues.isEmpty()) {
             return false;
         }
 
-        givenCliOptionsMap.put(addHyphenPrefix(optionName), argValues.getFirst());
+        givenCliOptionsMap.put(addHyphenPrefix(optionName), argValues.get(0));
         return true;
     }
 
-    public boolean hasOption(final String optionName){
+    public boolean hasOption(final String optionName) {
         return givenCliOptionsMap.containsKey(addHyphenPrefix(optionName));
     }
 
-    public String getOptionValue(final CustomOption option){
+    public String getOptionValue(final CustomOption option) {
         return getOptionValue(option.getName());
     }
 
-    public String getOptionValue(final String optionName){
+    public String getOptionValue(final String optionName) {
         return getOptionValue(optionName, "");
     }
 
-    public String getOptionValue(final CustomOption option, final String defaultValue){
+    public String getOptionValue(final CustomOption option, final String defaultValue) {
         return getOptionValue(option.getName(), defaultValue);
     }
 
-    public String getOptionValue(final String optionName, final String defaultValue){
+    public String getOptionValue(final String optionName, final String defaultValue) {
         return givenCliOptionsMap.getOrDefault(addHyphenPrefix(optionName), defaultValue);
     }