Merge branch 'release-0.0.10'

Author: charphi

.gitignore

@@ -1,2 +1 @@
-/java-io-xml/target/
-/java-io-base/target/
+target/

java-io-base/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>be.nbb.rd</groupId>
         <artifactId>java-io-parent</artifactId>
-        <version>0.0.9</version>
+        <version>0.0.10</version>
     </parent>
 
     <artifactId>java-io-base</artifactId>

java-io-base/src/main/java/module-info.java

@@ -23,6 +23,7 @@
 
     exports nbbrd.io;
     exports nbbrd.io.function;
+    exports nbbrd.io.sys;
     exports nbbrd.io.text;
     exports nbbrd.io.zip;
 

java-io-base/src/main/java/nbbrd/io/sys/OS.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2019 National Bank of Belgium
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved
+ * by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ *
+ * http://ec.europa.eu/idabc/eupl
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ */
+package nbbrd.io.sys;
+
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+import java.util.Locale;
+
+/**
+ * @author Philippe Charles
+ */
+@lombok.experimental.UtilityClass
+public class OS {
+
+    public static final Name NAME = Name.parse(System.getProperty("os.name"));
+
+    public enum Name {
+        WINDOWS, LINUX, SOLARIS, MACOS, UNKNOWN;
+
+        public static @NonNull Name parse(@Nullable String osName) {
+            if (osName != null) {
+                String str = osName.toLowerCase(Locale.ROOT);
+                if (str.contains("win")) return WINDOWS;
+                if (str.contains("linux")) return LINUX;
+                if (str.contains("solaris") || str.contains("sunos")) return SOLARIS;
+                if (str.contains("mac")) return MACOS;
+            }
+            return UNKNOWN;
+        }
+    }
+}

java-io-base/src/main/java/nbbrd/io/sys/ProcessReader.java

@@ -0,0 +1,88 @@
+/*
+ * Copyright 2018 National Bank of Belgium
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved
+ * by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ *
+ * http://ec.europa.eu/idabc/eupl
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ */
+package nbbrd.io.sys;
+
+import org.checkerframework.checker.nullness.qual.NonNull;
+
+import java.io.*;
+import java.nio.charset.Charset;
+import java.util.stream.Collectors;
+
+/**
+ * @author Philippe Charles
+ */
+@lombok.experimental.UtilityClass
+public class ProcessReader {
+
+    public static @NonNull BufferedReader newReader(@NonNull String... args) throws IOException {
+        return newReader(new ProcessBuilder(args).redirectError(ProcessBuilder.Redirect.INHERIT).start());
+    }
+
+    public static @NonNull BufferedReader newReader(@NonNull Process process) throws IOException {
+        return new BufferedReader(new InputStreamReader(new ProcessInputStream(process), Charset.defaultCharset()));
+    }
+
+    public static @NonNull String readToString(@NonNull String... args) throws IOException {
+        return readToString(new ProcessBuilder(args).redirectError(ProcessBuilder.Redirect.INHERIT).start());
+    }
+
+    public static @NonNull String readToString(@NonNull Process process) throws IOException {
+        try (BufferedReader reader = newReader(process)) {
+            return reader.lines().collect(Collectors.joining(System.lineSeparator()));
+        }
+    }
+
+    private static final class ProcessInputStream extends InputStream {
+
+        @lombok.experimental.Delegate(excludes = Closeable.class)
+        private final InputStream delegate;
+
+        private final Process process;
+
+        public ProcessInputStream(Process process) {
+            this.delegate = process.getInputStream();
+            this.process = process;
+        }
+
+        @Override
+        public void close() throws IOException {
+            try {
+                readUntilEnd();
+                waitForEndOfProcess();
+            } finally {
+                delegate.close();
+            }
+        }
+
+        // we need the process to end, else we'll get an illegal Thread State Exception
+        private void readUntilEnd() throws IOException {
+            while (delegate.read() != -1) {
+            }
+        }
+
+        private void waitForEndOfProcess() throws IOException {
+            try {
+                process.waitFor();
+            } catch (InterruptedException ex) {
+                throw new IOException(ex);
+            }
+            if (process.exitValue() != 0) {
+                throw new IOException("Invalid exit value: " + process.exitValue());
+            }
+        }
+    }
+}