(jena) branch main updated: Migrating Base64 operations from Apache Commons Codec to JDK Util package

[andy]

This is an automated email from the ASF dual-hosted git repository.

andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git


The following commit(s) were added to refs/heads/main by this push:
     new 69ca0370bd Migrating Base64 operations from Apache Commons Codec to 
JDK Util package
69ca0370bd is described below

commit 69ca0370bd42a277a7105bf8777f3ac2e399d5a1
Author: Paul Gallagher <132362215+telicentp...@users.noreply.github.com>
AuthorDate: Fri Apr 12 18:59:01 2024 +0100

    Migrating Base64 operations from Apache Commons Codec to JDK Util package
---
 .../main/java/org/apache/jena/datatypes/xsd/XSDbase64Binary.java   | 5 +++--
 .../java/org/apache/jena/reasoner/rulesys/builtins/MakeSkolem.java | 4 ++--
 .../src/test/java/org/apache/jena/http/AuthBearerTestLib.java      | 7 +++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git 
a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDbase64Binary.java 
b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDbase64Binary.java
index 5e580ff143..3b2b8c506d 100644
--- a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDbase64Binary.java
+++ b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDbase64Binary.java
@@ -18,9 +18,10 @@
 
 package org.apache.jena.datatypes.xsd;
 
-import org.apache.commons.codec.binary.Base64;
 import org.apache.jena.datatypes.DatatypeFormatException ;
 
+import java.util.Base64;
+
 /**
  * Implement base64binary type. Most of the work is done in the superclass.
  * This only needs to implement the unparsing.
@@ -38,7 +39,7 @@ public class XSDbase64Binary extends XSDbinary {
     @Override
     public String unparse(Object value) {
         if (value instanceof byte[]) {
-            return Base64.encodeBase64String((byte[])value);
+            return Base64.getEncoder().encodeToString((byte[])value);
         } else {
             throw new DatatypeFormatException("base64 asked to encode an 
unwrapped byte array");
         }
diff --git 
a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/MakeSkolem.java
 
b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/MakeSkolem.java
index 69bd08d3b6..1a38b8d29d 100644
--- 
a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/MakeSkolem.java
+++ 
b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/MakeSkolem.java
@@ -20,8 +20,8 @@ package org.apache.jena.reasoner.rulesys.builtins;
 
 import java.security.MessageDigest ;
 import java.security.NoSuchAlgorithmException ;
+import java.util.Base64;
 
-import org.apache.commons.codec.binary.Base64;
 import org.apache.jena.graph.Node ;
 import org.apache.jena.graph.NodeFactory ;
 import org.apache.jena.reasoner.rulesys.RuleContext ;
@@ -75,7 +75,7 @@ public class MakeSkolem extends BaseBuiltin {
             MessageDigest digester = MessageDigest.getInstance("MD5");
             digester.reset();
             byte[] digest = digester.digest(key.toString().getBytes());
-            String label = Base64.encodeBase64String(digest);
+            String label = Base64.getEncoder().encodeToString(digest);
             Node skolem = NodeFactory.createBlankNode(label);
             return context.getEnv().bind(args[0], skolem); 
         } catch (NoSuchAlgorithmException e) {
diff --git 
a/jena-integration-tests/src/test/java/org/apache/jena/http/AuthBearerTestLib.java
 
b/jena-integration-tests/src/test/java/org/apache/jena/http/AuthBearerTestLib.java
index b87fea8f43..afc62193ef 100644
--- 
a/jena-integration-tests/src/test/java/org/apache/jena/http/AuthBearerTestLib.java
+++ 
b/jena-integration-tests/src/test/java/org/apache/jena/http/AuthBearerTestLib.java
@@ -19,10 +19,9 @@
 package org.apache.jena.http;
 
 import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 import java.util.Objects;
 
-import org.apache.commons.codec.binary.Base64;
-
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -49,7 +48,7 @@ public class AuthBearerTestLib {
                 log.warn("Bad token: '"+token+"'");
                 return null;
             }
-            byte[] jsonBytes = Base64.decodeBase64(parts[1]);
+            byte[] jsonBytes = Base64.getDecoder().decode(parts[1]);
             String jsonStr = new String(jsonBytes, StandardCharsets.UTF_8);
             JsonObject obj = new Gson().fromJson(jsonStr, JsonObject.class);
             JsonElement field = obj.get("sub");
@@ -81,7 +80,7 @@ public class AuthBearerTestLib {
     private static String enc64(String x) {
         byte[] bytes = x.getBytes(StandardCharsets.UTF_8);
         // URL encoding, no padding, no chunking line breaks.
-        String s = 
org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString(bytes);
+        String s = Base64.getEncoder().encodeToString(bytes);
         return s;
     }