Bump minimal Java version to 11 (#90)

mtf90 · web-flow · commit 585e02d65f84 · 2025-05-22T14:20:51.000+02:00
* initial refactoring

* update doc

* cleanups

* simplify CF config

* fix errors when building javadoc jars

* remove IOUtil#copy

* further cleanups

* typo
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 [Full changelog](https://github.com/LearnLib/automatalib/compare/automatalib-0.12.1...HEAD)
 
+### Changed
+
+* AutomataLib now requires Java 11 at runtime.
+
+### Removed
+
+* `IOUtil#copy(Reader, Writer)` has been removed. Use `Reader#transferTo(Writer)` instead.
+
 
 ## [0.12.1] - 2025-03-11
 
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ Contributions -- whether it is in the form of new features, better documentation
 
 For simply using AutomataLib you may use the Maven artifacts which are available in the [Maven Central repository][maven-central].
 It is also possible to download a bundled [distribution artifact][maven-central-distr] if you want to use AutomataLib without Maven support.
-Note that AutomataLib requires Java 11 (or newer) to build but still supports Java 8 at runtime.
+Note that AutomataLib requires Java 11 (or newer) to build and run.
 
 #### Building development versions
 
diff --git a/adapters/brics/pom.xml b/adapters/brics/pom.xml
@@ -92,6 +92,18 @@ limitations under the License.
                     </excludes>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <!-- The plugin doesn't like dependencies with missing module names so build with JPMS disabled -->
+                    <legacyMode>true</legacyMode>
+                    <disableSourcepathUsage>true</disableSourcepathUsage>
+                    <sourceFileExcludes>
+                        <sourceFileExclude>**\/module-info.java</sourceFileExclude>
+                    </sourceFileExcludes>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/api/src/main/java/net/automatalib/automaton/vpa/SEVPAGraphView.java b/api/src/main/java/net/automatalib/automaton/vpa/SEVPAGraphView.java
@@ -88,7 +88,7 @@ public L getTarget(SevpaViewEdge<L, I> edge) {
 
     @Override
     public VisualizationHelper<L, SevpaViewEdge<L, I>> getVisualizationHelper() {
-        return new DefaultVisualizationHelper<L, SevpaViewEdge<L, I>>() {
+        return new DefaultVisualizationHelper<>() {
 
             @Override
             protected Collection<L> initialNodes() {
diff --git a/api/src/main/java/net/automatalib/graph/ads/RecursiveADSNode.java b/api/src/main/java/net/automatalib/graph/ads/RecursiveADSNode.java
@@ -132,7 +132,7 @@ default N getTarget(N edge) {
 
     @Override
     default VisualizationHelper<N, N> getVisualizationHelper() {
-        return new VisualizationHelper<N, N>() {
+        return new VisualizationHelper<>() {
 
             @Override
             public boolean getNodeProperties(N node, Map<String, String> properties) {
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -233,17 +233,10 @@ limitations under the License.
                                     <goal>compile</goal>
                                 </goals>
                                 <configuration>
-                                    <release>11</release>
                                     <failOnWarning>true</failOnWarning>
                                     <fork>true</fork>
-                                    <!--
-                                     Setting a different output directly can fail the build when using other annotation
-                                     processors as well. However, with using the same output directory, we pack Java 11
-                                     code in the jars which will fail other analysis tools. Currently, checkerframework
-                                     cannot be run with our other analysis steps...
-                                     -->
-                                    <!--outputDirectory>${project.build.directory}/checkerframework</outputDirectory-->
-                                    <annotationProcessorPaths>
+                                    <outputDirectory>${project.build.directory}/checkerframework</outputDirectory>
+                                    <annotationProcessorPaths combine.children="append">
                                         <path>
                                             <groupId>org.checkerframework</groupId>
                                             <artifactId>checker</artifactId>
@@ -252,6 +245,8 @@ limitations under the License.
                                     </annotationProcessorPaths>
                                     <annotationProcessors>
                                         <annotationProcessor>org.checkerframework.checker.nullness.NullnessChecker</annotationProcessor>
+                                        <!-- by having to explicitly list the CF checkers, we also need to list otherwise automatically picked-up processors -->
+                                        <annotationProcessor>de.learnlib.tooling.processor.edsl.EDSLProcessor</annotationProcessor>
                                     </annotationProcessors>
                                     <compilerArgs>
                                         <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
@@ -284,14 +279,8 @@ limitations under the License.
                                 <configuration>
                                     <failOnWarning>true</failOnWarning>
                                     <fork>true</fork>
-                                    <!--
-                                     Setting a different output directly can fail the build when using other annotation
-                                     processors as well. However, with using the same output directory, we pack Java 11
-                                     code in the jars which will fail other analysis tools. Currently, checkerframework
-                                     cannot be run with our other analysis steps...
-                                     -->
-                                    <!--outputDirectory>${project.build.directory}/checkerframework</outputDirectory-->
-                                    <annotationProcessorPaths>
+                                    <outputDirectory>${project.build.directory}/checkerframework</outputDirectory>
+                                    <annotationProcessorPaths combine.children="append">
                                         <path>
                                             <groupId>org.checkerframework</groupId>
                                             <artifactId>checker</artifactId>
diff --git a/commons/util/src/main/java/net/automatalib/common/util/IOUtil.java b/commons/util/src/main/java/net/automatalib/common/util/IOUtil.java
@@ -301,25 +301,6 @@ private static boolean isBufferedOutputStream(OutputStream os) {
         return os instanceof BufferedOutputStream || os instanceof ByteArrayOutputStream;
     }
 
-    /**
-     * Copies the contents of the given reader into the given writer.
-     *
-     * @param in
-     *         the reader to read data from
-     * @param out
-     *         the writer to write data to
-     *
-     * @throws IOException
-     *         if reading from or writing to the respective reader / writer throws this exception
-     */
-    public static void copy(Reader in, Writer out) throws IOException {
-        final char[] buf = new char[DEFAULT_BUFFER_SIZE];
-        int read;
-        while ((read = in.read(buf)) >= 0) {
-            out.write(buf, 0, read);
-        }
-    }
-
     /**
      * Reads the data from the given reader and returns its contents as a string.
      *
@@ -333,7 +314,7 @@ public static void copy(Reader in, Writer out) throws IOException {
      */
     public static String toString(Reader r) throws IOException {
         final StringWriter w = new StringWriter();
-        copy(r, w);
+        r.transferTo(w);
         return w.toString();
     }
 }
diff --git a/commons/util/src/main/java/net/automatalib/common/util/collection/IteratorUtil.java b/commons/util/src/main/java/net/automatalib/common/util/collection/IteratorUtil.java
@@ -224,7 +224,7 @@ public static <T> Set<T> set(Iterator<T> iterator, int expectedSize) {
      * @return the iterator
      */
     public static <T> Iterator<T> singleton(T element) {
-        return new Iterator<T>() {
+        return new Iterator<>() {
 
             private boolean hasNext = true;
 
diff --git a/commons/util/src/main/java/net/automatalib/common/util/nid/DynamicList.java b/commons/util/src/main/java/net/automatalib/common/util/nid/DynamicList.java
@@ -140,7 +140,7 @@ public void clear() {
 
     @Override
     public Iterator<T> iterator() {
-        return new Iterator<T>() {
+        return new Iterator<>() {
 
             int index;
 
diff --git a/commons/util/src/main/java/net/automatalib/common/util/process/ProcessUtil.java b/commons/util/src/main/java/net/automatalib/common/util/process/ProcessUtil.java
@@ -285,7 +285,7 @@ private static void writeProcessInput(Process process, @Nullable Reader input) t
         if (input != null) {
             try (OutputStream processInput = process.getOutputStream();
                  Writer writer = IOUtil.asBufferedUTF8Writer(processInput)) {
-                IOUtil.copy(input, writer);
+                input.transferTo(writer);
             }
         }
     }
diff --git a/core/src/main/java/net/automatalib/alphabet/impl/AbstractAlphabet.java b/core/src/main/java/net/automatalib/alphabet/impl/AbstractAlphabet.java
@@ -32,7 +32,7 @@ public I get(int index) {
      */
     @Override
     public AbstractAlphabet<I> reversed() {
-        return new AbstractAlphabet<I>() {
+        return new AbstractAlphabet<>() {
 
             @Override
             public boolean containsSymbol(I symbol) {
diff --git a/core/src/main/java/net/automatalib/alphabet/impl/FastAlphabet.java b/core/src/main/java/net/automatalib/alphabet/impl/FastAlphabet.java
@@ -78,7 +78,7 @@ public boolean containsSymbol(I symbol) {
      */
     @Override
     public FastAlphabet<I> reversed() {
-        return new FastAlphabet<I>() {
+        return new FastAlphabet<>() {
 
             @Override
             public boolean containsSymbol(I symbol) {
diff --git a/core/src/main/java/net/automatalib/graph/impl/CompactPMPG.java b/core/src/main/java/net/automatalib/graph/impl/CompactPMPG.java
@@ -16,6 +16,7 @@
 package net.automatalib.graph.impl;
 
 import java.util.Collections;
+import java.util.Objects;
 import java.util.Set;
 
 import net.automatalib.common.util.array.ArrayStorage;
@@ -42,20 +43,12 @@ public CompactPMPG(L defaultLabel) {
 
     @Override
     public void setInitialNode(@Nullable Integer initialNode) {
-        if (initialNode == null) {
-            this.initialNode = -1;
-        } else {
-            this.initialNode = initialNode;
-        }
+        this.initialNode = Objects.requireNonNullElse(initialNode, -1);
     }
 
     @Override
     public void setFinalNode(@Nullable Integer finalNode) {
-        if (finalNode == null) {
-            this.finalNode = -1;
-        } else {
-            this.finalNode = finalNode;
-        }
+        this.finalNode = Objects.requireNonNullElse(finalNode, -1);
     }
 
     @Override
diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -428,6 +428,12 @@ limitations under the License.
                             <finalName>automatalib-${project.version}</finalName>
                             <jarOutputDirectory>${project.build.directory}/bundles</jarOutputDirectory>
                             <includeDependencySources>true</includeDependencySources>
+                            <!-- Aggregating multiple (sometimes even missing) module-info.javas causes problems -->
+                            <legacyMode>true</legacyMode>
+                            <disableSourcepathUsage>true</disableSourcepathUsage>
+                            <sourceFileExcludes>
+                                <sourceFileExclude>**\/module-info.java</sourceFileExclude>
+                            </sourceFileExcludes>
                             <dependencySourceIncludes>
                                 <dependencySourceInclude>net.automatalib:*</dependencySourceInclude>
                             </dependencySourceIncludes>
diff --git a/incremental/src/main/java/net/automatalib/incremental/dfa/dag/AbstractIncrementalDFADAGBuilder.java b/incremental/src/main/java/net/automatalib/incremental/dfa/dag/AbstractIncrementalDFADAGBuilder.java
@@ -478,12 +478,11 @@ State clone(State other, Acceptance acc, int idx, State succ) {
 
     @Override
     public Graph<?, ?> asGraph() {
-        return new UniversalAutomatonGraphView<State, I, State, Acceptance, Void, TransitionSystemView>(new TransitionSystemView(),
-                                                                                                        inputAlphabet) {
+        return new UniversalAutomatonGraphView<>(new TransitionSystemView(), inputAlphabet) {
 
             @Override
             public VisualizationHelper<State, TransitionEdge<I, State>> getVisualizationHelper() {
-                return new AbstractVisualizationHelper<State, I, State, TransitionSystemView>(automaton) {
+                return new AbstractVisualizationHelper<>(automaton) {
 
                     @Override
                     public boolean getNodeProperties(State node, Map<String, String> properties) {
diff --git a/incremental/src/main/java/net/automatalib/incremental/dfa/tree/IncrementalDFATreeBuilder.java b/incremental/src/main/java/net/automatalib/incremental/dfa/tree/IncrementalDFATreeBuilder.java
@@ -195,12 +195,11 @@ public void insert(Word<? extends I> word, boolean acceptance) {
 
     @Override
     public Graph<?, ?> asGraph() {
-        return new UniversalAutomatonGraphView<Node, I, Node, Acceptance, Void, TransitionSystemView>(new TransitionSystemView(),
-                                                                                                      inputAlphabet) {
+        return new UniversalAutomatonGraphView<>(new TransitionSystemView(), inputAlphabet) {
 
             @Override
             public VisualizationHelper<Node, TransitionEdge<I, Node>> getVisualizationHelper() {
-                return new AbstractVisualizationHelper<Node, I, Node, TransitionSystemView>(automaton) {
+                return new AbstractVisualizationHelper<>(automaton) {
 
                     @Override
                     public Acceptance getAcceptance(Node node) {
diff --git a/incremental/src/main/java/net/automatalib/incremental/dfa/tree/IncrementalPCDFATreeBuilder.java b/incremental/src/main/java/net/automatalib/incremental/dfa/tree/IncrementalPCDFATreeBuilder.java
@@ -174,12 +174,11 @@ public void insert(Word<? extends I> word, boolean acceptance) {
 
     @Override
     public Graph<?, ?> asGraph() {
-        return new UniversalAutomatonGraphView<Node, I, Node, Acceptance, Void, TransitionSystemView>(new TransitionSystemView(),
-                                                                                                      inputAlphabet) {
+        return new UniversalAutomatonGraphView<>(new TransitionSystemView(), inputAlphabet) {
 
             @Override
             public VisualizationHelper<Node, TransitionEdge<I, Node>> getVisualizationHelper() {
-                return new AbstractVisualizationHelper<Node, I, Node, TransitionSystemView>(automaton) {
+                return new AbstractVisualizationHelper<>(automaton) {
 
                     @Override
                     public Acceptance getAcceptance(Node node) {
diff --git a/incremental/src/main/java/net/automatalib/incremental/mealy/dag/IncrementalMealyDAGBuilder.java b/incremental/src/main/java/net/automatalib/incremental/mealy/dag/IncrementalMealyDAGBuilder.java
@@ -568,11 +568,11 @@ public Alphabet<I> getInputAlphabet() {
 
     @Override
     public Graph<?, ?> asGraph() {
-        return new MealyGraphView<State<O>, I, Transition<O>, O, AutomatonView>(new AutomatonView(), inputAlphabet) {
+        return new MealyGraphView<>(new AutomatonView(), inputAlphabet) {
 
             @Override
             public VisualizationHelper<State<O>, TransitionEdge<I, Transition<O>>> getVisualizationHelper() {
-                return new net.automatalib.incremental.mealy.VisualizationHelper<State<O>, I, Transition<O>, O>(this.automaton) {
+                return new net.automatalib.incremental.mealy.VisualizationHelper<>(this.automaton) {
 
                     @Override
                     public boolean getNodeProperties(State<O> node, Map<String, String> properties) {
diff --git a/incremental/src/main/java/net/automatalib/incremental/mealy/tree/AbstractAlphabetBasedMealyTreeBuilder.java b/incremental/src/main/java/net/automatalib/incremental/mealy/tree/AbstractAlphabetBasedMealyTreeBuilder.java
@@ -91,8 +91,7 @@ public Alphabet<I> getInputAlphabet() {
 
     @Override
     public Graph<Node<O>, ?> asGraph() {
-        return new MealyGraphView<Node<O>, I, Edge<Node<O>, O>, O, MealyMachineView>(new MealyMachineView(),
-                                                                                     inputAlphabet) {
+        return new MealyGraphView<>(new MealyMachineView(), inputAlphabet) {
             @Override
             public VisualizationHelper<Node<O>, TransitionEdge<I, Edge<Node<O>, O>>> getVisualizationHelper() {
                 return new net.automatalib.incremental.mealy.VisualizationHelper<>(automaton);
diff --git a/incremental/src/main/java/net/automatalib/incremental/mealy/tree/DynamicIncrementalMealyTreeBuilder.java b/incremental/src/main/java/net/automatalib/incremental/mealy/tree/DynamicIncrementalMealyTreeBuilder.java
@@ -128,7 +128,7 @@ public <V> MutableMapping<DynamicNode<I, O>, V> createStaticNodeMapping() {
 
         @Override
         public VisualizationHelper<DynamicNode<I, O>, Entry<I, Edge<DynamicNode<I, O>, O>>> getVisualizationHelper() {
-            return new DefaultVisualizationHelper<DynamicNode<I, O>, Entry<I, Edge<DynamicNode<I, O>, O>>>() {
+            return new DefaultVisualizationHelper<>() {
 
                 private int id;
 
diff --git a/incremental/src/main/java/net/automatalib/incremental/moore/dag/IncrementalMooreDAGBuilder.java b/incremental/src/main/java/net/automatalib/incremental/moore/dag/IncrementalMooreDAGBuilder.java
@@ -589,11 +589,11 @@ public Alphabet<I> getInputAlphabet() {
 
     @Override
     public Graph<?, ?> asGraph() {
-        return new MooreGraphView<State<O>, I, State<O>, O, AutomatonView>(new AutomatonView(), inputAlphabet) {
+        return new MooreGraphView<>(new AutomatonView(), inputAlphabet) {
 
             @Override
             public VisualizationHelper<State<O>, TransitionEdge<I, State<O>>> getVisualizationHelper() {
-                return new MooreVisualizationHelper<State<O>, I, State<O>, O>(automaton) {
+                return new MooreVisualizationHelper<>(automaton) {
 
                     @Override
                     public boolean getNodeProperties(State<O> node, Map<String, String> properties) {
diff --git a/incremental/src/main/java/net/automatalib/incremental/moore/tree/IncrementalMooreTreeBuilder.java b/incremental/src/main/java/net/automatalib/incremental/moore/tree/IncrementalMooreTreeBuilder.java
@@ -207,11 +207,11 @@ public void insert(Word<? extends I> word, Word<? extends O> output) {
 
     @Override
     public Graph<?, ?> asGraph() {
-        return new MooreGraphView<Node<O>, I, Node<O>, O, TransitionSystemView>(new TransitionSystemView(), alphabet) {
+        return new MooreGraphView<>(new TransitionSystemView(), alphabet) {
 
             @Override
             public VisualizationHelper<Node<O>, TransitionEdge<I, Node<O>>> getVisualizationHelper() {
-                return new MooreVisualizationHelper<Node<O>, I, Node<O>, O>(automaton) {
+                return new MooreVisualizationHelper<>(automaton) {
 
                     @Override
                     public boolean getNodeProperties(Node<O> node, Map<String, String> properties) {
diff --git a/incremental/src/test/java/net/automatalib/incremental/dfa/AbstractIncrementalDFABuilderTest.java b/incremental/src/test/java/net/automatalib/incremental/dfa/AbstractIncrementalDFABuilderTest.java
@@ -176,7 +176,7 @@ public void testVisualization() throws IOException {
                 getDOTResource()))) {
 
             GraphDOT.write(incDfa.asGraph(), dotWriter);
-            IOUtil.copy(reader, expectedWriter);
+            reader.transferTo(expectedWriter);
 
             Assert.assertEquals(dotWriter.toString(), expectedWriter.toString());
         }
diff --git a/incremental/src/test/java/net/automatalib/incremental/dfa/AbstractIncrementalPCDFABuilderTest.java b/incremental/src/test/java/net/automatalib/incremental/dfa/AbstractIncrementalPCDFABuilderTest.java
@@ -174,7 +174,7 @@ public void testVisualization() throws IOException {
                 getDOTResource()))) {
 
             GraphDOT.write(incPcDfa.asGraph(), dotWriter);
-            IOUtil.copy(reader, expectedWriter);
+            reader.transferTo(expectedWriter);
 
             Assert.assertEquals(dotWriter.toString(), expectedWriter.toString());
         }
diff --git a/incremental/src/test/java/net/automatalib/incremental/mealy/AbstractIncrementalMealyBuilderTest.java b/incremental/src/test/java/net/automatalib/incremental/mealy/AbstractIncrementalMealyBuilderTest.java
@@ -193,7 +193,7 @@ public void testVisualization() throws IOException {
                 getDOTResource()))) {
 
             GraphDOT.write(incMealy.asGraph(), dotWriter);
-            IOUtil.copy(reader, expectedWriter);
+            reader.transferTo(expectedWriter);
 
             Assert.assertEquals(dotWriter.toString(), expectedWriter.toString());
         }
diff --git a/incremental/src/test/java/net/automatalib/incremental/moore/AbstractIncrementalMooreBuilderTest.java b/incremental/src/test/java/net/automatalib/incremental/moore/AbstractIncrementalMooreBuilderTest.java
@@ -193,7 +193,7 @@ public void testVisualization() throws IOException {
                 getDOTResource()))) {
 
             GraphDOT.write(incMoore.asGraph(), dotWriter);
-            IOUtil.copy(reader, expectedWriter);
+            reader.transferTo(expectedWriter);
 
             Assert.assertEquals(dotWriter.toString(), expectedWriter.toString());
         }
diff --git a/modelchecking/ltsmin/pom.xml b/modelchecking/ltsmin/pom.xml
@@ -101,13 +101,6 @@ limitations under the License.
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>javacc-maven-plugin</artifactId>
-                <configuration>
-                    <!-- We want to share the output directory with other annotation processors. While this config
-                         causes a warning during regular compilation, removing it causes an error when recompiling the
-                         code on a dirty target directory (e.g. done by the javadoc plugin during bundled builds).
-                    -->
-                    <outputDirectory>${project.build.directory}/generated-sources/annotations</outputDirectory>
-                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/modelchecking/ltsmin/src/main/java/net/automatalib/modelchecker/ltsmin/ltl/AbstractLTSminLTL.java b/modelchecking/ltsmin/src/main/java/net/automatalib/modelchecker/ltsmin/ltl/AbstractLTSminLTL.java
@@ -61,7 +61,7 @@ protected AbstractLTSminLTL(boolean keepFiles,
                                 int minimumUnfolds,
                                 double multiplier) {
         super(keepFiles, string2Input);
-        unfolder = new AbstractUnfoldingModelChecker<I, A, String, L>(minimumUnfolds, multiplier) {
+        unfolder = new AbstractUnfoldingModelChecker<>(minimumUnfolds, multiplier) {
 
             @Override
             public @Nullable L findCounterExample(A automaton, Collection<? extends I> inputs, String property) {
diff --git a/modelchecking/m3c/src/test/java/net/automatalib/modelchecker/m3c/solver/AbstractSolverTest.java b/modelchecking/m3c/src/test/java/net/automatalib/modelchecker/m3c/solver/AbstractSolverTest.java
diff --git a/pom.xml b/pom.xml
diff --git a/serialization/dot/src/test/java/net/automatalib/serialization/dot/DOTSerializationTest.java b/serialization/dot/src/test/java/net/automatalib/serialization/dot/DOTSerializationTest.java
diff --git a/util/src/main/java/net/automatalib/util/automaton/ads/BacktrackingSearch.java b/util/src/main/java/net/automatalib/util/automaton/ads/BacktrackingSearch.java
diff --git a/util/src/test/java/net/automatalib/util/automaton/procedural/SPAsTest.java b/util/src/test/java/net/automatalib/util/automaton/procedural/SPAsTest.java
diff --git a/visualization/dot-visualizer/src/test/java/net/automatalib/visualization/dot/DOTDialogTest.java b/visualization/dot-visualizer/src/test/java/net/automatalib/visualization/dot/DOTDialogTest.java
diff --git a/visualization/jung-visualizer/pom.xml b/visualization/jung-visualizer/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ private static void writeProcessInput(Process process, @Nullable Reader input) t`
`285`	`285`	`if (input != null) {`
`286`	`286`	`try (OutputStream processInput = process.getOutputStream();`
`287`	`287`	`Writer writer = IOUtil.asBufferedUTF8Writer(processInput)) {`
`288`		`- IOUtil.copy(input, writer);`
	`288`	`+ input.transferTo(writer);`
`289`	`289`	`}`
`290`	`290`	`}`
`291`	`291`	`}`