Merge pull request #4 from umjammer/1.2.4

1.2.4

Author: umjammer

.github/workflows/codeql-analysis.yml

@@ -18,6 +18,10 @@ jobs:
   analyze:
     name: Analyze
     runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
 
     strategy:
       fail-fast: false
@@ -30,11 +34,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -45,7 +49,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Set up JDK 17
       uses: actions/setup-java@v3
@@ -65,7 +69,7 @@ jobs:
     #   make bootstrap
     #   make release
     - name: Build with Maven
-      run: mvn -B package --file pom.xml -Dmaven.test.skip=ture
+      run: mvn -B package --file pom.xml -Dmaven.test.skip=true
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/maven.yml

@@ -9,14 +9,14 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Check w/o SNAPSHOT when "bump version"
         if: ${{ contains(github.event.head_commit.message, 'bump version') }}
         run: grep "<version>" pom.xml | head -1 | grep -v SNAPSHOT
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'temurin'

README.md

@@ -1,12 +1,12 @@
 [![Release](https://jitpack.io/v/umjammer/dotnet4j.svg)](https://jitpack.io/#umjammer/dotnet4j)
-[![Actions Status](https://github.com/umjammer/dotnet4j/workflows/Java%20CI/badge.svg)](https://github.com/umjammer/dotnet4j/actions)
+[![Java CI](https://github.com/umjammer/dotnet4j/actions/workflows/maven.yml/badge.svg)](https://github.com/umjammer/dotnet4j/actions/workflows/maven.yml)
 [![CodeQL](https://github.com/umjammer/dotnet4j/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/umjammer/dotnet4j/actions/workflows/codeql-analysis.yml)
 ![Java](https://img.shields.io/badge/Java-17-b07219)
 [![Parent](https://img.shields.io/badge/Parent-vavi--nio--file--discutils-pink)](https://github.com/umjammer/vavi-nio-file-discutils)
 
 # dotnet4j
 
-<img alt="dotnet-logo" src="https://github.com/umjammer/dotnet4j/assets/493908/d0f33f96-4572-4e8f-895b-4482b48425db" width=80 /><sub><a href="https://dotnet.microsoft.com/">© microsoft</a></sub>
+<img alt="dotnet-logo" src="https://github.com/umjammer/dotnet4j/assets/493908/efdd10f6-f1d6-4325-8783-3032a000dd60" width="160" />
 
 Helper library for .Net to Java migration.
 
@@ -18,7 +18,13 @@ Helper library for .Net to Java migration.
 
 Note: this is a fork of [feyris-tan/dotnetIo4j](https://github.com/feyris-tan/dotnetIo4j)
 
-## Projects that use this library
+## Install
+
+ * [maven](https://jitpack.io/#umjammer/dotnet4j)
+
+## Usage
+
+### user
 
  * [vavi-nio-file-discutils](https://github.com/umjammer/vavi-nio-file-discutils)
  * [vavi-apps-z80](https://github.com/umjammer/vavi-apps-z80)
@@ -33,7 +39,7 @@ Note: this is a fork of [feyris-tan/dotnetIo4j](https://github.com/feyris-tan/do
  * https://www.crystalnet-tech.com/Products/dotNet4Java/Default (not oss)
  * https://github.com/xamarin (obsoleted) -> maui
 
-## Migration Convention
+### Migration Convention
 
 https://github.com/umjammer/dotnet4j/wiki/C%23-to-Java-Migration-Convention
 

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>moe.yo3explorer</groupId>
   <artifactId>dotnet4j</artifactId>
-  <version>1.2.3</version>
+  <version>1.2.4</version>
 
   <packaging>jar</packaging>
 
@@ -80,7 +80,7 @@
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.10.0</version>
+        <version>5.10.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -98,13 +98,13 @@
     <dependency>
       <groupId>org.jetbrains</groupId>
       <artifactId>annotations</artifactId>
-      <version>24.0.1</version>
+      <version>24.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>com.github.umjammer</groupId>
       <artifactId>vavi-commons</artifactId>
-      <version>1.1.9</version>
+      <version>1.1.11</version>
     </dependency>
 
     <dependency>

src/main/java/dotnet4j/io/BinaryReader.java

@@ -66,7 +66,7 @@ public BinaryReader(Stream input, Charset encoding, boolean leaveOpen) {
         // For Encodings that always use 2 bytes per char (or more),
         // special case them here to make read() & Peek() faster.
         this.twoBytesPerChar = encoding.contains(StandardCharsets.UTF_16); // is UnicodeEncoding;
-        // check if BinaryReader is based on MemoryStream, and keep this for it's life
+        // check if BinaryReader is based on MemoryStream, and keep this for its life
         // we cannot use "as" operator, since derived classes are not allowed
         this.isMemoryStream = this.stream instanceof MemoryStream;
         this.leaveOpen = leaveOpen;

src/main/java/dotnet4j/io/BinaryWriter.java

@@ -342,7 +342,7 @@ public void write(String value) throws IOException {
 int totalBytes = 0;
             while (numLeft > 0) {
                 // Figure out how many chars to process this round.
-                int charCount = (numLeft > this.maxChars) ? this.maxChars : numLeft;
+                int charCount = Math.min(numLeft, this.maxChars);
                 int byteLen;
 
                 if (charStart < 0 || charCount < 0 || charStart + charCount > value.length()) {

src/main/java/dotnet4j/io/BufferedStream.java

@@ -16,7 +16,7 @@
  * <p>
  * This class buffers reads & writes in a shared buffer. (If you maintained two
  * buffers separately, one operation would always trash the other buffer
- * anyways, so we might as well use one buffer.) The assumption here is you will
+ * anyway, so we might as well use one buffer.) The assumption here is you will
  * almost always be doing a series of reads or writes, but rarely alternate
  * between the two of them on the same stream. /// Class Invariants: The class
  * has one buffer, shared for reading & writing. It can only be used for one or

src/main/java/dotnet4j/io/FileOptions.java

@@ -32,5 +32,3 @@ public int getValue() {
         this.value = value;
     }
 }
-
-/* */

src/main/java/dotnet4j/io/FileStream.java

@@ -6,16 +6,18 @@
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 
+import vavi.util.Debug;
+
 
 /**
  * Created by FT on 27.11.14.
  */
 public class FileStream extends Stream {
     private FileChannel channel;
-    private FileMode myMode;
-    private FileAccess myAccess;
-    private FileShare myShare;
-    private String myPath;
+    private final FileMode myMode;
+    private final FileAccess myAccess;
+    private final FileShare myShare;
+    private final String myPath;
 
     public FileStream(String path, FileMode mode) {
         this(path, mode, (mode == FileMode.Append ? FileAccess.Write : FileAccess.ReadWrite));
@@ -31,19 +33,11 @@ public FileStream(String path, FileMode mode, FileAccess access, FileShare share
         myAccess = access;
         myShare = share;
 
-        String rafMode = "";
-        switch (access) {
-
-        case Read:
-            rafMode = "r";
-            break;
-        case Write:
-            rafMode = "rw";
-            break;
-        case ReadWrite:
-            rafMode = "rw";
-            break;
-        }
+        String rafMode = switch (access) {
+            case Read -> "r";
+            case Write -> "rw";
+            case ReadWrite -> "rw";
+        };
         try {
             java.io.File f = new java.io.File(path);
             if (mode == FileMode.Create || mode == FileMode.CreateNew || mode == FileMode.OpenOrCreate) {
@@ -167,7 +161,7 @@ public int read(byte[] buffer, int offset, int length) {
                 return 0;
             }
         } catch (IOException e) {
-            e.printStackTrace();
+            Debug.printStackTrace(e);
             throw new dotnet4j.io.IOException(e);
         }
         return m;

src/main/java/dotnet4j/io/MemoryStream.java

@@ -4,6 +4,7 @@
 
 package dotnet4j.io;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.Arrays;
 
@@ -17,6 +18,7 @@
  */
 public class MemoryStream extends Stream implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -7301303954168934077L;
 
     private byte[] buffer;