Merge branch 'develop'

Author: charphi

.github/workflows/java8-maven.yml

@@ -7,11 +7,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 8, 11 ]
+        java: [ 8, 17 ]
         os: [ ubuntu-latest, macOS-latest, windows-latest ]
         experimental: [ false ]
         include:
-          - java: '>11'
+          - java: '-ea'
             os: ubuntu-latest
             experimental: true
 
@@ -24,18 +24,14 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: true
+          fetch-depth: 0
 
       - name: Setup Java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: 'temurin'
           java-version: ${{ matrix.java }}
-
-      - name: Setup Maven cache
-        uses: actions/cache@v1
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
+          cache: 'maven'
 
       - name: Build and (headless) test with Maven
         uses: GabrielBB/xvfb-action@v1
@@ -47,7 +43,7 @@ jobs:
     if: startsWith(github.repository, 'nbbrd/') && startsWith(github.ref, 'refs/heads/develop')
     strategy:
       matrix:
-        java: [ 11 ]
+        java: [ 17 ]
         os: [ ubuntu-latest ]
 
     name: Snapshot on develop
@@ -58,18 +54,14 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: true
+          fetch-depth: 0
 
       - name: Setup Java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: 'temurin'
           java-version: ${{ matrix.java }}
-
-      - name: Setup Maven cache
-        uses: actions/cache@v1
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
+          cache: 'maven'
 
       - name: Deploy snapshot with Maven if settings defined
         run: test ! -f ci.settings.xml || mvn -B -ntp deploy -DskipTests=true -s ci.settings.xml -P base-deploy,snapshot-deploy,!non-deployable-modules
@@ -84,7 +76,7 @@ jobs:
     if: startsWith(github.repository, 'nbbrd/') && startsWith(github.ref, 'refs/tags/v')
     strategy:
       matrix:
-        java: [ 11 ]
+        java: [ 17 ]
         os: [ ubuntu-latest ]
 
     name: Release on tag
@@ -95,18 +87,14 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: true
+          fetch-depth: 0
 
       - name: Setup Java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: 'temurin'
           java-version: ${{ matrix.java }}
-
-      - name: Setup Maven cache
-        uses: actions/cache@v1
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
+          cache: 'maven'
 
       - name: Deploy with Maven if settings defined
         run: test ! -f ci.settings.xml || mvn -B -ntp deploy -DskipTests=true -s ci.settings.xml -P base-deploy,release-deploy,!non-deployable-modules
@@ -115,6 +103,8 @@ jobs:
           OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
           SIGN_KEY: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
           SIGN_KEY_PASS: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
+          # Fix https://issues.sonatype.org/browse/OSSRH-66257
+          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: Build assets with Maven
         run: mvn -B -ntp install -DskipTests=true -P base-deploy

CHANGELOG.md

@@ -0,0 +1,165 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres
+to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [0.0.16] - 2022-02-01
+
+### Added
+
+- Add Maven BOM
+- Add `DoubleProperty`
+- Add URI parser and formatter
+- Add `TextResource` as reader/writer utilities
+- Add bridge from `Text*` to `File*` utilities
+- Add functional factories to `Text*` and `File*` utilities
+- Add gzip factory to `File*` utilities
+
+## [0.0.15] - 2021-10-01
+
+### Changed
+
+- **Breaking change** : move Jaxb to its own module
+
+## [0.0.14] - 2021-07-08
+
+### Fixed
+
+- Fix closed inputstream on Stax stream flow
+
+## [0.0.13] - 2021-07-07
+
+### Added
+
+- Add property API
+- Add enum and failsafe parser/formatter
+
+### Fixed
+
+- Fix raw use of parameterized class
+
+## [0.0.12] - 2021-03-19
+
+### Changed
+
+- Migration to Maven-Central
+- Maven groupId is now `com.github.nbbrd.java-io-util`
+
+## [0.0.11] - 2021-01-25
+
+### Added
+
+- Add support of error stream in ProcessReader
+- Add URL parser and formatter
+
+## [0.0.10] - 2021-01-18
+
+### Added
+
+- Add system utils
+
+## [0.0.9] - 2021-01-12
+
+### Added
+
+- Add char buffer utils
+
+## [0.0.8] - 2020-10-30
+
+### Added
+
+- Add file parser/formatter
+- Add text parser/formatter
+
+### Fixed
+
+- Fix XML encoding
+
+## [0.0.7] - 2020-08-25
+
+### Added
+
+- Add lenient parsing of Locale
+
+### Fixed
+
+- Fix transitive requirement of nbbrd.io.xml module
+
+## [0.0.6] - 2020-02-26
+
+### Added
+
+- Add char parser/formatter API
+
+## [0.0.5] - 2020-02-17
+
+### Added
+
+- Add IOIterator
+- Add IOUnaryOperator
+- Add Resource#process(URI, IOConsumer<Path)
+
+### Changed
+
+- Big refactoring to split project
+
+### Removed
+
+- Remove Stream utilities
+
+## [0.0.4] - 2019-08-13
+
+### Added
+
+- Add support of JPMS
+
+## [0.0.3] - 2019-05-29
+
+### Added
+
+- Add formatting in XML API
+- Add parsing of class loader resources in XML API
+- Add withers alongside builders in XML API
+- Add composing functions in XML API
+
+### Changed
+
+- Improve reporting of null pointer exceptions in XML API
+- Improve reporting of missing resources in XML API
+
+## [0.0.2] - 2018-11-27
+
+### Changed
+
+- Improve XXE desambiguation
+- Improve XML error reporting
+
+### Fixed
+
+- Fix JDK11 cleanup
+
+## [0.0.1] - 2018-03-01
+
+### Added
+
+- Initial release
+
+[Unreleased]: https://github.com/nbbrd/java-io-util/compare/v0.0.16...HEAD
+[0.0.16]: https://github.com/nbbrd/java-io-util/compare/v0.0.15...v0.0.16
+[0.0.15]: https://github.com/nbbrd/java-io-util/compare/v0.0.14...v0.0.15
+[0.0.14]: https://github.com/nbbrd/java-io-util/compare/v0.0.13...v0.0.14
+[0.0.13]: https://github.com/nbbrd/java-io-util/compare/v0.0.12...v0.0.13
+[0.0.12]: https://github.com/nbbrd/java-io-util/compare/v0.0.11...v0.0.12
+[0.0.11]: https://github.com/nbbrd/java-io-util/compare/v0.0.10...v0.0.11
+[0.0.10]: https://github.com/nbbrd/java-io-util/compare/v0.0.9...v0.0.10
+[0.0.9]: https://github.com/nbbrd/java-io-util/compare/v0.0.8...v0.0.9
+[0.0.8]: https://github.com/nbbrd/java-io-util/compare/v0.0.7...v0.0.8
+[0.0.7]: https://github.com/nbbrd/java-io-util/compare/v0.0.6...v0.0.7
+[0.0.6]: https://github.com/nbbrd/java-io-util/compare/v0.0.5...v0.0.6
+[0.0.5]: https://github.com/nbbrd/java-io-util/compare/v0.0.4...v0.0.5
+[0.0.4]: https://github.com/nbbrd/java-io-util/compare/v0.0.3...v0.0.4
+[0.0.3]: https://github.com/nbbrd/java-io-util/compare/v0.0.2...v0.0.3
+[0.0.2]: https://github.com/nbbrd/java-io-util/compare/v0.0.1...v0.0.2
+[0.0.1]: https://github.com/nbbrd/java-io-util/releases/tag/v0.0.1

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.15</version>
+        <version>0.0.16</version>
     </parent>
 
     <artifactId>java-io-base</artifactId>
@@ -35,8 +35,8 @@
 
         <!-- test libraries -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -50,4 +50,25 @@
             <scope>test</scope>
         </dependency>        
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                        <configuration>
+                            <includes>
+                                <include>_test/**</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

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

@@ -0,0 +1,52 @@
+package internal.io;
+
+import nbbrd.io.FileParser;
+import nbbrd.io.function.IOSupplier;
+import nbbrd.io.function.IOUnaryOperator;
+import org.checkerframework.checker.nullness.qual.NonNull;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Path;
+import java.util.Objects;
+
+@lombok.RequiredArgsConstructor
+public final class DecodingFileFormatter<T> implements FileParser<T> {
+
+    @lombok.NonNull
+    final FileParser<T> parser;
+
+    @lombok.NonNull
+    final IOUnaryOperator<InputStream> decoder;
+
+    @Override
+    public @NonNull T parseFile(@NonNull File source) throws IOException {
+        // force use of default impl
+        return FileParser.super.parseFile(source);
+    }
+
+    @Override
+    public @NonNull T parsePath(@NonNull Path source) throws IOException {
+        // force use of default impl
+        return FileParser.super.parsePath(source);
+    }
+
+    @Override
+    public @NonNull T parseResource(@NonNull Class<?> type, @NonNull String name) throws IOException {
+        // force use of default impl
+        return FileParser.super.parseResource(type, name);
+    }
+
+    @Override
+    public @NonNull T parseStream(IOSupplier<? extends InputStream> source) throws IOException {
+        // force use of default impl
+        return FileParser.super.parseStream(source);
+    }
+
+    @Override
+    public @NonNull T parseStream(@NonNull InputStream resource) throws IOException {
+        Objects.requireNonNull(resource, "resource");
+        return parser.parseStream(decoder.applyWithIO(resource));
+    }
+}