Merge pull request #179 from filip26/fix/issue-176

Fix compression output to stdout

Author: filip26

.github/workflows/java-build.yml

@@ -24,10 +24,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 24
+    - name: Set up JDK 25
       uses: actions/setup-java@v1
       with:
-        java-version: 24
+        java-version: 25
     - name: Build with Maven
       env:
         GITHUB_ACTOR: ${{ github.actor }}

.github/workflows/native-build.yml

@@ -32,7 +32,7 @@ jobs:
         uses: graalvm/setup-graalvm@v1
         with:
           version: 'latest'
-          java-version: '24'
+          java-version: 25
           components: 'native-image'
           github-token: ${{ secrets.GITHUB_TOKEN }}
 

README.md

@@ -151,12 +151,6 @@ All PR's welcome!
 * [Copper Multibase](https://github.com/filip26/copper-multibase)
 * [Copper Multicodec](https://github.com/filip26/copper-multicodec)
 
-## Sponsors
-
-<a href="https://github.com/thadguidry">
-  <img src="https://avatars.githubusercontent.com/u/986438?v=4" width="40" />
-</a> 
-
 ## Commercial Support
 
 Commercial support and consulting are available.  

pom.xml

@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.apicatalog</groupId>
     <artifactId>ld-cli</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
     <packaging>jar</packaging>
 
     <name>A Command Line Processor for Linked Data Processing</name>
@@ -21,8 +21,8 @@
     <url>https://github.com/filip26/ld-cli</url>
 
     <properties>
-        <maven.compiler.target>24</maven.compiler.target>
-        <maven.compiler.source>24</maven.compiler.source>
+        <maven.compiler.target>25</maven.compiler.target>
+        <maven.compiler.source>25</maven.compiler.source>
         <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

snapcraft.yaml

@@ -1,6 +1,6 @@
 name: ld-cli
 title: Linked Data CLI
-version: 1.0.1
+version: 1.0.2
 license: Apache-2.0
 summary: Command-line tool for JSON-LD, RDF, RDFC, JCS, CBOR-LD, semantic processing
 description: |
@@ -26,14 +26,14 @@ grade: stable
 parts:
   graalvm:
     plugin: nil
-    source: https://download.oracle.com/graalvm/24/latest/graalvm-jdk-24_linux-x64_bin.tar.gz
+    source: https://download.oracle.com/graalvm/25/latest/graalvm-jdk-25_linux-x64_bin.tar.gz
     build-packages:
       - wget
       - tar 
     override-build: |
       echo "=== Entering GraalVM override-build ==="
       mkdir -p $SNAPCRAFT_STAGE/opt
-      wget -qO- https://download.oracle.com/graalvm/24/latest/graalvm-jdk-24_linux-x64_bin.tar.gz | tar xz -C $SNAPCRAFT_STAGE/opt
+      wget -qO- https://download.oracle.com/graalvm/25/latest/graalvm-jdk-25_linux-x64_bin.tar.gz | tar xz -C $SNAPCRAFT_STAGE/opt
       GRAALVM_DIR=$(find $SNAPCRAFT_STAGE/opt -maxdepth 1 -type d -name "graalvm-*")
       
       if [ -z "$GRAALVM_DIR" ]; then
@@ -59,7 +59,7 @@ parts:
       export PATH=$JAVA_HOME/bin:$PATH
       echo "JAVA_HOME is set to: $JAVA_HOME"  # For debugging purposes
       echo "PATH is set to: $PATH"  # For debugging purposes
-      mvn clean package -Pnative
+      mvn package -Pnative
       mkdir -p $SNAPCRAFT_PART_INSTALL/bin
       cp target/ld-cli $SNAPCRAFT_PART_INSTALL/bin/
 

src/main/java/com/apicatalog/cli/App.java

@@ -35,8 +35,8 @@
         MultibaseCmd.class,
         MulticodecCmd.class,
 }, mixinStandardHelpOptions = false, descriptionHeading = "%n", parameterListHeading = "%nParameters:%n", optionListHeading = "%nOptions:%n", commandListHeading = "%nCommands:%n", version = {
-        "ld-cli            1.0.1  https://github.com/filip26/ld-cli",
-        "titanium-json-ld  1.6.0   https://github.com/filip26/titanium-json-ld",
+        "ld-cli            1.0.2  https://github.com/filip26/ld-cli",
+        "titanium-json-ld  1.7.0   https://github.com/filip26/titanium-json-ld",
         "titanium-rdfc     2.0.0   https://github.com/filip26/titanium-rdf-canon",
         "titanium-jcs      1.0.0   https://github.com/filip26/titanium-jcs",
         "iridium-cbor-ld   0.7.3   https://github.com/filip26/iridium-cbor-ld",

src/main/java/com/apicatalog/cli/command/CompressCmd.java

@@ -1,8 +1,8 @@
 package com.apicatalog.cli.command;
 
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.net.URI;
+import java.nio.charset.StandardCharsets;
 import java.util.concurrent.Callable;
 
 import com.apicatalog.base.Base16;
@@ -41,7 +41,7 @@ public final class CompressCmd implements Callable<Integer> {
     @Option(names = { "-d", "--dictionary" }, description = "Custom dictionary location (JSON).", paramLabel = "<uri|file>")
     URI dictionary = null;
 
-    @Option(names = { "-x", "--hex" }, description = "Output result as hexadecimal-encoded.")
+    @Option(names = { "-x", "--hex" }, description = "Output result as hexadecimal-encoded. Automatically enabled for stdout.")
     boolean hex = false;
 
     @Mixin
@@ -85,22 +85,21 @@ public Integer call() throws Exception {
                 .encode(json.asJsonObject());
 
         if (output == null) {
-            spec.commandLine().getOut().print(encode(encoded, hex));
+            spec.commandLine().getOut().print(Base16.encode(encoded, Base16.ALPHABET_LOWER));
             spec.commandLine().getOut().flush();
 
         } else {
             try (var os = new FileOutputStream(output)) {
-                os.write(encode(encoded, hex));
+                if (hex) {
+                    os.write(Base16.encode(encoded, Base16.ALPHABET_LOWER).getBytes(StandardCharsets.UTF_8));
+                } else {
+                    os.write(encoded);
+                }
+
                 os.flush();
             }
         }
 
         return spec.exitCodeOnSuccess();
     }
-
-    static byte[] encode(byte[] encoded, boolean hex) throws IOException {
-        return hex
-                ? Base16.encode(encoded, Base16.ALPHABET_LOWER).getBytes()
-                : encoded;
-    }
 }