Merge branch 'develop'

Author: charphi

.github/workflows/check-links.yml

@@ -34,7 +34,7 @@ jobs:
 
       - name: Check links
         id: lychee
-        uses: lycheeverse/lychee-action@v1.10.0
+        uses: lycheeverse/lychee-action@v2.3.0
         with:
           fail: true
           args: --max-concurrency 1 --cache --no-progress --exclude-all-private './**/*.md'

.github/workflows/heylogs.yml

@@ -2,29 +2,25 @@ name: Heylogs
 
 on: [ push ]
 
+env:
+  MAVEN_ARGS: "-B -ntp"
+
 jobs:
   badge-job:
     if: startsWith(github.repository, 'nbbrd/') && startsWith(github.ref, 'refs/heads/develop')
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout source code
-        uses: actions/checkout@v4
-        
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: 21
-          cache: 'maven'
-          
+      - name: Checkout and Setup Maven
+        uses: s4u/[email protected]
+
       - name: Scan changelog
-        run: mvn -B -ntp -U com.github.nbbrd.heylogs:heylogs-maven-plugin::scan -Dheylogs.output.file=scan.json -Dheylogs.format.id=json
-        
+        run: mvn -U com.github.nbbrd.heylogs:heylogs-maven-plugin::scan -Dheylogs.output.file=scan.json -Dheylogs.format.id=json
+
       - name: Create badges endpoint json
         run: |
           mkdir heylogs
           jq '{schemaVersion: 1, label: "unreleased changes", message: "#\(.[0].summary.unreleasedChanges)", color: "E05735", logoColor: "white", namedLogo: "keepachangelog"}' scan.json > heylogs/unreleased-changes.json
-          
+
       - name: Deploy badges endpoint json
         uses: peaceiris/actions-gh-pages@v4
         with:

.github/workflows/java-ea-maven.yml

@@ -6,32 +6,42 @@ on:
       - develop
   workflow_dispatch:
 
+env:
+  MAVEN_ARGS: "-B -ntp"
+
 jobs:
   build-and-test-job:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 21 ]
-        os: [ ubuntu-latest, macos-latest ]
+        java: [ 23 ]
+        os:
+          - ubuntu-latest     # Linux x64
+          - ubuntu-24.04-arm  # Linux arm64
+          - macos-latest      # macOS arm64
 
     name: JDK${{ matrix.java }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
 
     steps:
-      - name: Checkout source code
-        uses: actions/checkout@v4
-        with:
-          submodules: true
-          fetch-depth: 0
-
-      - name: Setup Java
-        uses: actions/setup-java@v4
+      - name: Checkout and Setup Maven
+        uses: s4u/[email protected]
         with:
-          distribution: 'temurin'
+          checkout-submodules: true
+          checkout-fetch-depth: 0
           java-version: ${{ matrix.java }}
-          cache: 'maven'
 
-      - name: Build and (headless) test with Maven
-        uses: smithki/[email protected]
+      - name: Pre-download dependencies with Maven
+        uses: nick-fields/retry@v3
         with:
-          run: mvn -U -B -ntp verify
+          command: mvn -U dependency:go-offline
+          max_attempts: 3
+          timeout_minutes: 5
+
+      - name: Build and (headless) test with Maven (Linux)
+        if: ${{ runner.os == 'Linux' }}
+        run: xvfb-run mvn verify
+
+      - name: Build and (headless) test with Maven (Windows and macOS)
+        if: ${{ runner.os != 'Linux' }}
+        run: mvn verify

.github/workflows/java8-maven.yml

@@ -2,6 +2,9 @@ name: Java8+ with Maven
 
 on: [ push, pull_request ]
 
+env:
+  MAVEN_ARGS: "-B -ntp"
+
 jobs:
   build-and-test-job:
     if: github.event_name == 'pull_request' || startsWith(github.ref, 'refs/heads/develop') || startsWith(github.ref, 'refs/tags/v')
@@ -24,21 +27,24 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
+          distribution: 'zulu'
           java-version: ${{ matrix.java }}
           cache: 'maven'
 
       - name: Pre-download dependencies with Maven
         uses: nick-fields/retry@v3
         with:
-          command: mvn -U -B -ntp dependency:go-offline
+          command: mvn -U dependency:go-offline
           max_attempts: 3
           timeout_minutes: 5
 
-      - name: Build and (headless) test with Maven
-        uses: smithki/[email protected]
-        with:
-          run: mvn -U -B -ntp verify
+      - name: Build and (headless) test with Maven (Linux)
+        if: ${{ runner.os == 'Linux' }}
+        run: xvfb-run mvn -U verify
+
+      - name: Build and (headless) test with Maven (Windows and macOS)
+        if: ${{ runner.os != 'Linux' }}
+        run: mvn -U verify
 
   auto-merge-job:
     needs: build-and-test-job
@@ -82,20 +88,20 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
+          distribution: 'zulu'
           java-version: ${{ matrix.java }}
           cache: 'maven'
 
       - name: Deploy snapshot with Maven if settings defined
-        run: test ! -f ci.settings.xml || mvn -B -ntp deploy -DskipTests -s ci.settings.xml -P base-deploy,snapshot-deploy,!non-deployable-modules
+        run: test ! -f ci.settings.xml || mvn deploy -DskipTests -s ci.settings.xml -P base-deploy,snapshot-deploy,!non-deployable-modules
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
           SIGN_KEY: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
           SIGN_KEY_PASS: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
 
       - name: Dryrun release assets with Maven
-        run: mvn -B -ntp install -DskipTests -P full-release -Djreleaser.output.directory=$PWD/out/jreleaser -Djreleaser.dry.run
+        run: mvn install -DskipTests -P full-release -Djreleaser.output.directory=$PWD/out/jreleaser -Djreleaser.dry.run
         env:
           JRELEASER_GITHUB_TOKEN: ${{ secrets.JRELEASER_GITHUB_TOKEN }}
           JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.MAVEN_GPG_PUBLIC_KEY }}
@@ -132,12 +138,12 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
+          distribution: 'zulu'
           java-version: ${{ matrix.java }}
           cache: 'maven'
 
       - name: Deploy with Maven if settings defined
-        run: test ! -f ci.settings.xml || mvn -B -ntp deploy -DskipTests -s ci.settings.xml -P base-deploy,release-deploy,!non-deployable-modules
+        run: test ! -f ci.settings.xml || mvn deploy -DskipTests -s ci.settings.xml -P base-deploy,release-deploy,!non-deployable-modules
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
@@ -147,7 +153,7 @@ jobs:
           MAVEN_OPTS: "--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED"
 
       - name: Release assets with Maven
-        run: mvn -B -ntp install -DskipTests -P full-release -Djreleaser.output.directory=$PWD/out/jreleaser
+        run: mvn install -DskipTests -P full-release -Djreleaser.output.directory=$PWD/out/jreleaser
         env:
           JRELEASER_GITHUB_TOKEN: ${{ secrets.JRELEASER_GITHUB_TOKEN }}
           JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.MAVEN_GPG_PUBLIC_KEY }}

CHANGELOG.md

@@ -7,6 +7,18 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [0.0.33] - 2025-03-06
+
+### Added
+
+- Add static factory shortcuts to Picocsv parser/formatter
+- Add path shortcuts to CScriptWrapper and PowerShellWrapper
+- Add process shortcut to TextParser
+
+### Changed
+
+- Modernize use of NIO API
+
 ## [0.0.32] - 2024-09-25
 
 ### Fixed
@@ -280,7 +292,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 - Initial release
 
-[Unreleased]: https://github.com/nbbrd/java-io-util/compare/v0.0.32...HEAD
+[Unreleased]: https://github.com/nbbrd/java-io-util/compare/v0.0.33...HEAD
+[0.0.33]: https://github.com/nbbrd/java-io-util/compare/v0.0.32...v0.0.33
 [0.0.32]: https://github.com/nbbrd/java-io-util/compare/v0.0.31...v0.0.32
 [0.0.31]: https://github.com/nbbrd/java-io-util/compare/v0.0.30...v0.0.31
 [0.0.30]: https://github.com/nbbrd/java-io-util/compare/v0.0.29...v0.0.30

java-io-base/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.nbbrd.java-io-util</groupId>
         <artifactId>java-io-parent</artifactId>
-        <version>0.0.32</version>
+        <version>0.0.33</version>
     </parent>
 
     <artifactId>java-io-base</artifactId>

java-io-base/src/main/java/internal/io/InternalResource.java

@@ -1,9 +1,8 @@
 package internal.io;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import nbbrd.io.function.IOSupplier;
+
+import java.io.*;
 
 @lombok.experimental.UtilityClass
 public class InternalResource {
@@ -23,4 +22,19 @@ public static void transferTo(InputStream input, OutputStream output) throws IOE
             output.write(buffer, 0, read);
         }
     }
+
+    public static InputStream openInputStream(IOSupplier<? extends InputStream> source) throws IOException {
+        return checkResource(source.getWithIO(), "Missing InputStream");
+    }
+
+    public static OutputStream openOutputStream(IOSupplier<? extends OutputStream> source) throws IOException {
+        return checkResource(source.getWithIO(), "Missing OutputStream");
+    }
+
+    public static <T extends Closeable> T checkResource(T resource, String message) throws IOException {
+        if (resource == null) {
+            throw new IOException(message);
+        }
+        return resource;
+    }
 }

java-io-base/src/main/java/internal/io/LockingFileFormatter.java

@@ -6,13 +6,13 @@
 import nbbrd.io.function.IOSupplier;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.channels.Channels;
 import java.nio.channels.FileChannel;
 import java.nio.channels.FileLock;
 import java.nio.channels.OverlappingFileLockException;
+import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
 
@@ -25,12 +25,10 @@ public final class LockingFileFormatter<T> implements FileFormatter<T> {
 
     @Override
     public void formatFile(@NonNull T value, @NonNull File target) throws IOException {
-        try (FileOutputStream stream = new FileOutputStream(checkTarget(target))) {
-            try (FileLock ignore = stream.getChannel().lock()) {
-                delegate.formatStream(value, stream);
-            } catch (OverlappingFileLockException ex) {
-                throw WrappedIOException.wrap(ex);
-            }
+        try {
+            formatPath(value, target.toPath());
+        } catch (InvalidPathException ex) {
+            throw WrappedIOException.wrap(ex);
         }
     }
 

java-io-base/src/main/java/internal/io/LockingFileParser.java

@@ -6,13 +6,13 @@
 import nbbrd.io.function.IOSupplier;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.channels.Channels;
 import java.nio.channels.FileChannel;
 import java.nio.channels.FileLock;
 import java.nio.channels.OverlappingFileLockException;
+import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
 
@@ -25,12 +25,10 @@ public final class LockingFileParser<T> implements FileParser<T> {
 
     @Override
     public @NonNull T parseFile(@NonNull File source) throws IOException {
-        try (FileInputStream stream = new FileInputStream(checkSource(source))) {
-            try (FileLock ignore = stream.getChannel().lock(0, Long.MAX_VALUE, true)) {
-                return delegate.parseStream(stream);
-            } catch (OverlappingFileLockException ex) {
-                throw WrappedIOException.wrap(ex);
-            }
+        try {
+            return parsePath(source.toPath());
+        } catch (InvalidPathException ex) {
+            throw WrappedIOException.wrap(ex);
         }
     }