Merge branch 'develop' into addlib-4.0

Author: mtf90

.github/settings.xml

@@ -6,9 +6,9 @@
 
     <servers>
         <server>
-            <id>ossrh</id>
-            <username>${env.OSSRH_TOKEN_USERNAME}</username>
-            <password>${env.OSSRH_TOKEN_PASSWORD}</password>
+            <id>sonatype</id>
+            <username>${env.SONATYPE_TOKEN_USERNAME}</username>
+            <password>${env.SONATYPE_TOKEN_PASSWORD}</password>
         </server>
     </servers>
 </settings>

.github/workflows/ci.yml

@@ -128,6 +128,6 @@ jobs:
           restore-keys: cache-deploy-
       - name: Run Maven
         env: # make secrets available as environment variables
-          OSSRH_TOKEN_USERNAME: ${{ secrets.OSSRH_TOKEN_USERNAME }}
-          OSSRH_TOKEN_PASSWORD: ${{ secrets.OSSRH_TOKEN_PASSWORD }}
+          SONATYPE_TOKEN_USERNAME: ${{ secrets.SONATYPE_TOKEN_USERNAME }}
+          SONATYPE_TOKEN_PASSWORD: ${{ secrets.SONATYPE_TOKEN_PASSWORD }}
         run: mvn -B -s $GITHUB_WORKSPACE/.github/settings.xml -DskipTests deploy

CHANGELOG.md

@@ -14,10 +14,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Changed
 
 * AutomataLib now requires Java 11 at runtime.
+* `ProcessUtil#invokeProcess` now handles consumers for stdout and stderr separately.
 
 ### Removed
 
 * `IOUtil#copy(Reader, Writer)` has been removed. Use `Reader#transferTo(Writer)` instead.
+* `JVMUtil` has been removed. Use `Runtime.version().feature()` for its previously (only) provided method.
 
 
 ## [0.12.1] - 2025-03-11

commons/util/src/main/java/module-info.java

@@ -50,5 +50,4 @@
     exports net.automatalib.common.util.ref;
     exports net.automatalib.common.util.setting;
     exports net.automatalib.common.util.string;
-    exports net.automatalib.common.util.system;
 }

commons/util/src/main/java/net/automatalib/common/util/process/InputStreamConsumer.java

@@ -18,6 +18,7 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.function.Consumer;
 
 import net.automatalib.common.util.IOUtil;
@@ -30,16 +31,19 @@ interface InputStreamConsumer {
     void consume(InputStream is) throws IOException;
 
     /**
-     * Consumes an input stream by throwing away all of its content.
+     * Consumes an input stream by copying it to a given output stream.
      */
-    class NOPConsumer implements InputStreamConsumer {
+    class CopyConsumer implements InputStreamConsumer {
+
+        private final OutputStream outputStream;
+
+        CopyConsumer(OutputStream outputStream) {
+            this.outputStream = outputStream;
+        }
 
         @Override
         public void consume(InputStream inputStream) throws IOException {
-            final byte[] buf = new byte[IOUtil.DEFAULT_BUFFER_SIZE];
-            while (inputStream.read(buf) >= 0) {
-                // do nothing
-            }
+            inputStream.transferTo(outputStream);
         }
     }
 

commons/util/src/main/java/net/automatalib/common/util/process/ProcessUtil.java

@@ -0,0 +1,108 @@
+/* Copyright (C) 2013-2025 TU Dortmund University
+ * This file is part of AutomataLib <https://automatalib.net>.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package net.automatalib.common.util.process;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.file.Paths;
+import java.util.Objects;
+import java.util.StringJoiner;
+
+import org.testng.Assert;
+import org.testng.SkipException;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+@Test
+public class ProcessUtilTest {
+
+    private final String program;
+    private final String path;
+
+    public ProcessUtilTest() throws URISyntaxException {
+        this.program = "python";
+        this.path = getPathToScript();
+    }
+
+    private static String getPathToScript() throws URISyntaxException {
+        final URL resource = Objects.requireNonNull(ProcessUtilTest.class.getResource("/process.py"));
+        return Paths.get(resource.toURI()).toFile().getAbsolutePath();
+    }
+
+    @BeforeTest
+    public void setUp() {
+        try {
+            if (ProcessUtil.invokeProcess(new String[] {program, "--version"}) != 0) {
+                throw new SkipException("python not supported");
+            }
+        } catch (IOException | InterruptedException e) {
+            throw new SkipException("python not supported");
+        }
+    }
+
+    @Test
+    public void testReturnValue() throws IOException, InterruptedException {
+        Assert.assertEquals(ProcessUtil.invokeProcess(new String[] {program, path, "abc"}), 0);
+        Assert.assertEquals(ProcessUtil.invokeProcess(new String[] {program, path, "abc", "def"}), 1);
+
+        Assert.assertEquals(ProcessUtil.invokeProcess(new String[] {program, path}, new StringReader("abc")), 0);
+        Assert.assertEquals(ProcessUtil.invokeProcess(new String[] {program, path}, new StringReader("abc def")), 1);
+    }
+
+    @Test
+    public void testProcessOutput() throws IOException, InterruptedException {
+        StringJoiner stdOutJoiner = new StringJoiner("\n");
+        StringJoiner stdErrBuilder = new StringJoiner("\n");
+
+        int returnCode =
+                ProcessUtil.invokeProcess(new String[] {program, path, "abc"}, stdOutJoiner::add, stdErrBuilder::add);
+        Assert.assertEquals(returnCode, 0, stdErrBuilder.toString());
+        Assert.assertEquals(stdOutJoiner.toString(), "294");
+        Assert.assertEquals(stdErrBuilder.toString(), "abc");
+
+        stdOutJoiner = new StringJoiner("\n");
+        stdErrBuilder = new StringJoiner("\n");
+        returnCode = ProcessUtil.invokeProcess(new String[] {program, path, "abc", "def"},
+                                               stdOutJoiner::add,
+                                               stdErrBuilder::add);
+        Assert.assertEquals(returnCode, 1, stdErrBuilder.toString());
+        Assert.assertEquals(stdOutJoiner.toString(), "294\n303");
+        Assert.assertEquals(stdErrBuilder.toString(), "abc\ndef");
+
+        stdOutJoiner = new StringJoiner("\n");
+        stdErrBuilder = new StringJoiner("\n");
+        returnCode = ProcessUtil.invokeProcess(new String[] {program, path},
+                                               new StringReader("abc"),
+                                               stdOutJoiner::add,
+                                               stdErrBuilder::add);
+        Assert.assertEquals(returnCode, 0, stdErrBuilder.toString());
+        Assert.assertEquals(stdOutJoiner.toString(), "294");
+        Assert.assertEquals(stdErrBuilder.toString(), "abc");
+
+        stdOutJoiner = new StringJoiner("\n");
+        stdErrBuilder = new StringJoiner("\n");
+        returnCode = ProcessUtil.invokeProcess(new String[] {program, path},
+                                               new StringReader("abc def"),
+                                               stdOutJoiner::add,
+                                               stdErrBuilder::add);
+        Assert.assertEquals(returnCode, 1, stdErrBuilder.toString());
+        Assert.assertEquals(stdOutJoiner.toString(), "294\n303");
+        Assert.assertEquals(stdErrBuilder.toString(), "abc\ndef");
+
+    }
+}

commons/util/src/main/java/net/automatalib/common/util/system/JVMUtil.java

@@ -0,0 +1,21 @@
+#!/bin/python
+import sys
+
+def main():
+    argv = len(sys.argv)
+
+    if argv > 1: # arg mode
+        for arg in sys.argv[1:]:
+            print(sum([ord(c) for c in arg]))
+            print(arg, file=sys.stderr)
+    else: # stdin mode
+        for line in sys.stdin:
+            for arg in line.split():
+                argv += 1
+                print(sum([ord(c) for c in arg]))
+                print(arg, file=sys.stderr)
+
+    sys.exit(argv % 2)
+
+if __name__ == "__main__":
+    main()

commons/util/src/test/java/net/automatalib/common/util/process/ProcessUtilTest.java

@@ -137,19 +137,6 @@ limitations under the License.
                         </systemPropertyVariables>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-enforcer-plugin</artifactId>
-                    <configuration>
-                        <rules>
-                            <enforceBytecodeVersion>
-                                <excludes>
-                                    <exclude>ch.qos.logback:*</exclude>
-                                </excludes>
-                            </enforceBytecodeVersion>
-                        </rules>
-                    </configuration>
-                </plugin>
             </plugins>
         </pluginManagement>
     </build>