[FIXED] stabilization

thevpc · Nov 30, 2024 · 28031b3 · 28031b3
1 parent e33c352
commit 28031b3
Show file tree

Hide file tree

Showing 38 changed files with 858 additions and 719 deletions.
diff --git a/core/nuts-api/src/main/java/net/thevpc/nuts/io/NInputSource.java b/core/nuts-api/src/main/java/net/thevpc/nuts/io/NInputSource.java
@@ -71,6 +71,12 @@ static NInputSource ofMultiRead(NInputSource source) {
     static NInputSource of(InputStream inputStream, NContentMetadata metadata) {
         return inputStream == null ? null : NIORPI.of().ofInputSource(inputStream, metadata);
     }
+    static NInputSource of(Reader reader, NContentMetadata metadata) {
+        return reader == null ? null : NIORPI.of().ofInputSource(reader, metadata);
+    }
+    static NInputSource of(Reader reader) {
+        return reader == null ? null : NIORPI.of().ofInputSource(reader);
+    }
 
 
     static NInputSource of(byte[] bytes, NContentMetadata metadata) {

diff --git a/core/nuts-api/src/main/java/net/thevpc/nuts/io/NOutputTarget.java b/core/nuts-api/src/main/java/net/thevpc/nuts/io/NOutputTarget.java
@@ -29,6 +29,7 @@
 import net.thevpc.nuts.reserved.rpi.NIORPI;
 
 import java.io.OutputStream;
+import java.io.Writer;
 
 /**
  * I/O output stream base
@@ -45,6 +46,13 @@ static NOutputTarget of(OutputStream outputStream) {
     static NOutputTarget of(OutputStream outputStream, NContentMetadata metadata) {
         return NIORPI.of().ofOutputTarget(outputStream, metadata);
     }
+    static NOutputTarget of(Writer writer) {
+        return NIORPI.of().ofOutputTarget(writer);
+    }
+
+    static NOutputTarget of(Writer writer, NContentMetadata metadata) {
+        return NIORPI.of().ofOutputTarget(writer, metadata);
+    }
 
     OutputStream getOutputStream();
 

diff --git a/core/nuts-api/src/main/java/net/thevpc/nuts/reserved/rpi/NIORPI.java b/core/nuts-api/src/main/java/net/thevpc/nuts/reserved/rpi/NIORPI.java
@@ -9,6 +9,7 @@
 
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.Reader;
 import java.io.Writer;
 import java.util.List;
 
@@ -60,6 +61,10 @@ static NIORPI of() {
 
     NInputSource ofInputSource(InputStream inputStream, NContentMetadata metadata);
 
+    NInputSource ofInputSource(Reader inputStream);
+
+    NInputSource ofInputSource(Reader inputStream, NContentMetadata metadata);
+
     NInputSource ofInputSource(byte[] inputStream);
 
     NInputSource ofInputSource(byte[] inputStream, NContentMetadata metadata);
@@ -68,6 +73,10 @@ static NIORPI of() {
 
     NOutputTarget ofOutputTarget(OutputStream outputStream, NContentMetadata metadata);
 
+    NOutputTarget ofOutputTarget(Writer writer, NContentMetadata metadata);
+
+    NOutputTarget ofOutputTarget(Writer writer);
+
     NOutputStreamBuilder ofOutputStreamBuilder(OutputStream base);
 
     NNonBlockingInputStream ofNonBlockingInputStream(InputStream base);
@@ -128,7 +137,6 @@ static NIORPI of() {
     void enableRichTerm();
 
 
-
     List<NExecutionEntry> parseExecutionEntries(NPath file);
 
 

diff --git a/core/nuts-app/dependency-reduced-pom.xml b/core/nuts-app/dependency-reduced-pom.xml
@@ -310,12 +310,12 @@
     </snapshotRepository>
   </distributionManagement>
   <properties>
+    <nuts.categories>/Settings/PackageManager/Nuts</nuts.categories>
+    <github.global.server>github</github.global.server>
     <nuts.api>true</nuts.api>
     <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <nuts.categories>/Settings/PackageManager/Nuts</nuts.categories>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.target>1.8</maven.compiler.target>
     <nuts.genericName>Package Manager</nuts.genericName>
-    <github.global.server>github</github.global.server>
   </properties>
 </project>