Minor code quality improvements

filip26 · filip26 · commit 53db39604137 · 2025-08-07T00:10:33.000+02:00
diff --git a/src/main/java/com/apicatalog/cbor/CborComparison.java b/src/main/java/com/apicatalog/cbor/CborComparison.java
@@ -12,6 +12,10 @@
 
 public class CborComparison {
 
+    protected CborComparison() {
+        // protected
+    }
+    
     public static final boolean equals(byte[] value1, byte[] value2) throws CborException {
 
         if (value1 == null || value2 == null) {
diff --git a/src/main/java/com/apicatalog/cborld/context/ObjectExpansion.java b/src/main/java/com/apicatalog/cborld/context/ObjectExpansion.java
@@ -223,15 +223,6 @@ private String processTypeScoped(final ActiveContext typeContext) throws JsonLdE
                     .map(JsonString::getString)
                     .sorted()
                     .collect(Collectors.toList());
-//            entry.save();
-//            final List<String> terms = ValueCursor
-//                                            .toStream(entry.mapKey(key))
-//                                            .filter(ValueCursor::isString)
-//                                            .map(ValueCursor::stringValue)
-//                                            .sorted()
-//                                            .collect(Collectors.toList());
-
-//            entry.restore();
 
             for (final String term : terms) {
 
diff --git a/src/main/java/com/apicatalog/cborld/context/mapping/DecoderContextMapping.java b/src/main/java/com/apicatalog/cborld/context/mapping/DecoderContextMapping.java
@@ -41,13 +41,13 @@ class DecoderContextMapping implements Mapping {
 
     final DataItem decodeValue(final DataItem value, String term) {
 
-        Collection<String> TYPE = Arrays.asList(Keywords.TYPE);
+        var type = Arrays.asList(Keywords.TYPE);
 
         for (final ValueDecoder decoder : valueDecoders) {
             try {
                 final JsonValue decoded = decoder.decode(this, value, term,
                         typeKeyNameMap.isTypeKey(term)
-                                ? TYPE
+                                ? type
                                 : Collections.emptySet());
 
                 if (decoded == null) {
diff --git a/src/main/java/com/apicatalog/cborld/decoder/DecoderBuilder.java b/src/main/java/com/apicatalog/cborld/decoder/DecoderBuilder.java
@@ -1,7 +1,7 @@
 package com.apicatalog.cborld.decoder;
 
 import java.net.URI;
-import java.util.HashMap;
+import java.util.EnumMap;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -58,7 +58,7 @@ public static final DecoderBuilder of(CborLdVersion... versions) {
             throw new IllegalArgumentException();
         }
 
-        final Map<CborLdVersion, DecoderConfigBuilder> decoders = new HashMap<>();
+        final Map<CborLdVersion, DecoderConfigBuilder> decoders = new EnumMap<>(CborLdVersion.class);
         for (CborLdVersion version : versions) {
             enable(decoders, version);
         }
@@ -79,7 +79,7 @@ public static final DecoderBuilder of(DecoderConfig... configs) {
             throw new IllegalArgumentException();
         }
 
-        final Map<CborLdVersion, DecoderConfigBuilder> decoders = new HashMap<>();
+        final Map<CborLdVersion, DecoderConfigBuilder> decoders = new EnumMap<>(CborLdVersion.class);
         for (DecoderConfig config : configs) {
             decoders.put(config.version(), DecoderConfigBuilder.of(config));
         }
diff --git a/src/main/java/com/apicatalog/cborld/decoder/DecoderV1.java b/src/main/java/com/apicatalog/cborld/decoder/DecoderV1.java
@@ -37,13 +37,13 @@ public JsonValue decode(CborLdVersion version, byte[] encoded) throws ContextErr
             }
 
             if (dataItems.size() == 1) {
-                return decode(version, dataItems.iterator().next());
+                return decode(dataItems.iterator().next());
             }
 
             var arrayBuilder = Json.createArrayBuilder();
 
             for (var item : dataItems) {
-                arrayBuilder.add(decode(version, item));
+                arrayBuilder.add(decode(item));
             }
 
             return arrayBuilder.build();
@@ -53,7 +53,7 @@ public JsonValue decode(CborLdVersion version, byte[] encoded) throws ContextErr
         }
     }
 
-    public JsonValue decode(CborLdVersion version, DataItem dataItem) throws ContextError, DecoderException {
+    public JsonValue decode(DataItem dataItem) throws ContextError, DecoderException {
         if (dataItem == null || dataItem.getMajorType() != MajorType.ARRAY) {
             throw new DecoderException(Code.InvalidDocument, "The document is not CBOR-LD v1.0 document. Must start with array of two items, but is " + dataItem + ".");
         }
diff --git a/src/main/java/com/apicatalog/cborld/encoder/DefaultEncoder.java b/src/main/java/com/apicatalog/cborld/encoder/DefaultEncoder.java
@@ -123,16 +123,12 @@ final byte[] compress(final JsonObject document, Collection<String> contextUrls)
                 break;
 
             case V06:
-                baos.write(config.version().bytes()[0]);
-                baos.write(config.dictionary().code());
-                mapBuilder = builder.addMap();
-                break;
-
             case V05:
                 baos.write(config.version().bytes()[0]);
                 baos.write(config.dictionary().code());
                 mapBuilder = builder.addMap();
                 break;
+
             default:
                 throw new EncoderException(Code.Unsupported, "Unsupported CBOR-LD version " + config.version() + ".");
             }
diff --git a/src/main/java/com/apicatalog/cborld/encoder/EncoderContext.java b/src/main/java/com/apicatalog/cborld/encoder/EncoderContext.java
@@ -16,7 +16,7 @@
 
 class EncoderContext {
 
-    public final static Collection<String> get(final JsonObject document) throws EncoderException {
+    public static final Collection<String> get(final JsonObject document) throws EncoderException {
         return get(document, new LinkedHashSet<>());
     }
 
@@ -64,13 +64,12 @@ static final void processContextValue(final JsonValue jsonValue, final Collectio
             }
         }
 
-//        throw new IllegalArgumentException("Non compress-able context detected " + jsonValue + ".");
         throw new EncoderException(
                 Code.NonCompressible,
                 """
-                Non-compressible document. Only JSON-LD documents containing referenced contexts can be compressed. \
-                Referenced contexts serve as a shared dictionary, which is not possible with inline contexts.
-                """);
+                        Non-compressible document. Only JSON-LD documents containing referenced contexts can be compressed. \
+                        Referenced contexts serve as a shared dictionary, which is not possible with inline contexts.
+                        """);
 
     }
 }
diff --git a/src/main/java/com/apicatalog/cborld/encoder/value/DidKeyValueEncoder.java b/src/main/java/com/apicatalog/cborld/encoder/value/DidKeyValueEncoder.java
@@ -17,8 +17,8 @@
 
 public class DidKeyValueEncoder implements ValueEncoder {
 
-    public final static String PREFIX = "did:key:";
-    public final static int CODE = 1025;
+    public static final String PREFIX = "did:key:";
+    public static final int CODE = 1025;
 
     protected static MulticodecDecoder CODECS = MulticodecDecoder.getInstance(Tag.Key);
 
diff --git a/src/main/java/com/apicatalog/cborld/encoder/value/UuidValueEncoder.java b/src/main/java/com/apicatalog/cborld/encoder/value/UuidValueEncoder.java
@@ -16,8 +16,8 @@
 
 public class UuidValueEncoder implements ValueEncoder {
 
-    public final static String PREFIX = "urn:uuid:";
-    public final static int CODE = 3;
+    public static final String PREFIX = "urn:uuid:";
+    public static final int CODE = 3;
 
     @Override
     public DataItem encode(Mapping mapping, JsonValue jsonValue, String term, Collection<String> types) {
diff --git a/src/main/java/com/apicatalog/cborld/registry/DocumentDictionaryBuilder.java b/src/main/java/com/apicatalog/cborld/registry/DocumentDictionaryBuilder.java
@@ -178,5 +178,5 @@ record DocumentDictionaryImpl(
             Dictionary contexts,
             Map<String, Dictionary> types,
             Dictionary uris) implements DocumentDictionary {
-    };
+    }
 }
diff --git a/src/test/java/com/apicatalog/cborld/CborLdTest.java b/src/test/java/com/apicatalog/cborld/CborLdTest.java
@@ -63,7 +63,7 @@ static final Stream<CborLdTestCase> manifest(String name) throws JsonLdError, IO
                     .asJsonObject().getJsonArray("http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#entries")
                     .stream()
                     .map(JsonValue::asJsonObject)
-                    .map(test -> CborLdTestCase.of(test, manifest, CborLdTestRunnerJunit.LOADER));
+                    .map(test -> CborLdTestCase.of(test, CborLdTestRunnerJunit.LOADER));
         }
     }
 }
diff --git a/src/test/java/com/apicatalog/cborld/CborLdTestCase.java b/src/test/java/com/apicatalog/cborld/CborLdTestCase.java
@@ -29,7 +29,7 @@ class CborLdTestCase {
 
     public String config;
 
-    public static CborLdTestCase of(JsonObject test, JsonObject manifest, DocumentLoader loader) {
+    public static CborLdTestCase of(JsonObject test, DocumentLoader loader) {
 
         final CborLdTestCase testCase = new CborLdTestCase();
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package com.apicatalog.cborld.decoder;`
`2`	`2`
`3`	`3`	`import java.net.URI;`
`4`		`-import java.util.HashMap;`
	`4`	`+import java.util.EnumMap;`
`5`	`5`	`import java.util.Map;`
`6`	`6`	`import java.util.function.Function;`
`7`	`7`	`import java.util.stream.Collectors;`
`@@ -58,7 +58,7 @@ public static final DecoderBuilder of(CborLdVersion... versions) {`
`58`	`58`	`throw new IllegalArgumentException();`
`59`	`59`	`}`
`60`	`60`
`61`		`- final Map<CborLdVersion, DecoderConfigBuilder> decoders = new HashMap<>();`
	`61`	`+ final Map<CborLdVersion, DecoderConfigBuilder> decoders = new EnumMap<>(CborLdVersion.class);`
`62`	`62`	`for (CborLdVersion version : versions) {`
`63`	`63`	`enable(decoders, version);`
`64`	`64`	`}`
`@@ -79,7 +79,7 @@ public static final DecoderBuilder of(DecoderConfig... configs) {`
`79`	`79`	`throw new IllegalArgumentException();`
`80`	`80`	`}`
`81`	`81`
`82`		`- final Map<CborLdVersion, DecoderConfigBuilder> decoders = new HashMap<>();`
	`82`	`+ final Map<CborLdVersion, DecoderConfigBuilder> decoders = new EnumMap<>(CborLdVersion.class);`
`83`	`83`	`for (DecoderConfig config : configs) {`
`84`	`84`	`decoders.put(config.version(), DecoderConfigBuilder.of(config));`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,13 +37,13 @@ public JsonValue decode(CborLdVersion version, byte[] encoded) throws ContextErr`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`if (dataItems.size() == 1) {`
`40`		`- return decode(version, dataItems.iterator().next());`
	`40`	`+ return decode(dataItems.iterator().next());`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`var arrayBuilder = Json.createArrayBuilder();`
`44`	`44`
`45`	`45`	`for (var item : dataItems) {`
`46`		`- arrayBuilder.add(decode(version, item));`
	`46`	`+ arrayBuilder.add(decode(item));`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`return arrayBuilder.build();`
`@@ -53,7 +53,7 @@ public JsonValue decode(CborLdVersion version, byte[] encoded) throws ContextErr`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
`56`		`- public JsonValue decode(CborLdVersion version, DataItem dataItem) throws ContextError, DecoderException {`
	`56`	`+ public JsonValue decode(DataItem dataItem) throws ContextError, DecoderException {`
`57`	`57`	`if (dataItem == null \|\| dataItem.getMajorType() != MajorType.ARRAY) {`
`58`	`58`	`throw new DecoderException(Code.InvalidDocument, "The document is not CBOR-LD v1.0 document. Must start with array of two items, but is " + dataItem + ".");`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`class EncoderContext {`
`18`	`18`
`19`		`- public final static Collection<String> get(final JsonObject document) throws EncoderException {`
	`19`	`+ public static final Collection<String> get(final JsonObject document) throws EncoderException {`
`20`	`20`	`return get(document, new LinkedHashSet<>());`
`21`	`21`	`}`
`22`	`22`
`@@ -64,13 +64,12 @@ static final void processContextValue(final JsonValue jsonValue, final Collectio`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`		`-// throw new IllegalArgumentException("Non compress-able context detected " + jsonValue + ".");`
`68`	`67`	`throw new EncoderException(`
`69`	`68`	`Code.NonCompressible,`
`70`	`69`	`"""`
`71`		`- Non-compressible document. Only JSON-LD documents containing referenced contexts can be compressed. \`
`72`		`- Referenced contexts serve as a shared dictionary, which is not possible with inline contexts.`
`73`		`- """);`
	`70`	`+ Non-compressible document. Only JSON-LD documents containing referenced contexts can be compressed. \`
	`71`	`+ Referenced contexts serve as a shared dictionary, which is not possible with inline contexts.`
	`72`	`+ """);`
`74`	`73`
`75`	`74`	`}`
`76`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -178,5 +178,5 @@ record DocumentDictionaryImpl(`
`178`	`178`	`Dictionary contexts,`
`179`	`179`	`Map<String, Dictionary> types,`
`180`	`180`	`Dictionary uris) implements DocumentDictionary {`
`181`		`- };`
	`181`	`+ }`
`182`	`182`	`}`