add Base64 implementation - JAXB v2.3.0 (the latest for JRE 7)

kullfar · kullfar · commit 33e4b878365c · 2021-02-26T11:06:38.000+03:00
diff --git a/scribejava-core/pom.xml b/scribejava-core/pom.xml
@@ -32,6 +32,12 @@
             <version>3.0.0</version>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.0</version> <!-- the latest for the JRE 7 -->
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/base64/Base64.java b/scribejava-core/src/main/java/com/github/scribejava/core/base64/Base64.java
@@ -22,12 +22,15 @@ private static Base64 createInstance() {
         if (Java8Base64.isAvailable()) {
             return new Java8Base64();
         }
-        if (CommonsCodecBase64.isAvailable()) {
-            return new CommonsCodecBase64();
+        if (Jaxb230Base64.isAvailable()) {
+            return new Jaxb230Base64();
         }
         if (JaxbBase64.isAvailable()) {
             return new JaxbBase64();
         }
+        if (CommonsCodecBase64.isAvailable()) {
+            return new CommonsCodecBase64();
+        }
         throw new IllegalStateException(
                 "No Base64 implementation was provided. Java 8 Base64, Apache Commons Codec or JAXB is needed");
     }
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/base64/Jaxb230Base64.java b/scribejava-core/src/main/java/com/github/scribejava/core/base64/Jaxb230Base64.java
@@ -0,0 +1,32 @@
+package com.github.scribejava.core.base64;
+
+import javax.xml.bind.DatatypeConverter;
+
+/**
+ * JAXB v2.3.0 (the latest for JRE 7)
+ */
+public class Jaxb230Base64 extends Base64 {
+
+    @Override
+    protected String internalEncode(byte[] bytes) {
+        return DatatypeConverter.printBase64Binary(bytes);
+    }
+
+    @Override
+    protected String internalEncodeUrlWithoutPadding(byte[] bytes) {
+        String string = DatatypeConverter.printBase64Binary(bytes);
+        while (string.endsWith("=")) {
+            string = string.substring(0, string.length() - 1);
+        }
+        return string.replace('+', '-').replace('/', '_');
+    }
+
+    static boolean isAvailable() {
+        try {
+            Class.forName("javax.xml.bind.DatatypeConverter", false, Jaxb230Base64.class.getClassLoader());
+            return true;
+        } catch (ClassNotFoundException cnfE) {
+            return false;
+        }
+    }
+}
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/base64/Base64Test.java b/scribejava-core/src/test/java/com/github/scribejava/core/base64/Base64Test.java
@@ -11,6 +11,7 @@ public class Base64Test {
     private Base64 java8Base64;
     private Base64 commonsCodecBase64;
     private Base64 jaxbBase64;
+    private Base64 jaxb230Base64;
     private byte[] helloWorldBytes;
     private byte[] helloWorldTwoLinesBytes;
     private byte[] helloWorldTwoLinesAndNewLineBytes;
@@ -57,13 +58,15 @@ public void setUp() throws UnsupportedEncodingException {
         java8Base64 = new Java8Base64();
         commonsCodecBase64 = new CommonsCodecBase64();
         jaxbBase64 = new JaxbBase64();
+        jaxb230Base64 = new Jaxb230Base64();
     }
 
     @Test
     public void allImplementationsAreAvailable() {
         assertTrue(Java8Base64.isAvailable());
         assertTrue(CommonsCodecBase64.isAvailable());
         assertTrue(JaxbBase64.isAvailable());
+        assertTrue(Jaxb230Base64.isAvailable());
     }
 
     @Test
@@ -109,6 +112,13 @@ public void testEncode() {
         assertEquals(helloWorldTwoLinesAndNewLineEncoded, jaxbBase64.internalEncode(helloWorldTwoLinesAndNewLineBytes));
         assertEquals(helloWorldDifferentCharsEncoded, jaxbBase64.internalEncode(helloWorldDifferentCharsBytes));
         assertEquals(str, jaxbBase64.internalEncode(bytes));
+
+        assertEquals(helloWorldEncoded, jaxb230Base64.internalEncode(helloWorldBytes));
+        assertEquals(helloWorldTwoLinesEncoded, jaxb230Base64.internalEncode(helloWorldTwoLinesBytes));
+        assertEquals(helloWorldTwoLinesAndNewLineEncoded,
+                jaxb230Base64.internalEncode(helloWorldTwoLinesAndNewLineBytes));
+        assertEquals(helloWorldDifferentCharsEncoded, jaxb230Base64.internalEncode(helloWorldDifferentCharsBytes));
+        assertEquals(str, jaxb230Base64.internalEncode(bytes));
     }
 
     @Test
@@ -159,5 +169,13 @@ public void testEncodeUrlWithoutPadding() {
         assertEquals(helloWorldDifferentCharsEncoded,
                 jaxbBase64.internalEncodeUrlWithoutPadding(helloWorldDifferentCharsBytes));
         assertEquals(str, jaxbBase64.internalEncodeUrlWithoutPadding(bytes));
+
+        assertEquals(helloWorldEncoded, jaxb230Base64.internalEncodeUrlWithoutPadding(helloWorldBytes));
+        assertEquals(helloWorldTwoLinesEncoded, jaxb230Base64.internalEncodeUrlWithoutPadding(helloWorldTwoLinesBytes));
+        assertEquals(helloWorldTwoLinesAndNewLineEncoded,
+                jaxb230Base64.internalEncodeUrlWithoutPadding(helloWorldTwoLinesAndNewLineBytes));
+        assertEquals(helloWorldDifferentCharsEncoded,
+                jaxb230Base64.internalEncodeUrlWithoutPadding(helloWorldDifferentCharsBytes));
+        assertEquals(str, jaxb230Base64.internalEncodeUrlWithoutPadding(bytes));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,15 @@ private static Base64 createInstance() {`
`22`	`22`	`if (Java8Base64.isAvailable()) {`
`23`	`23`	`return new Java8Base64();`
`24`	`24`	`}`
`25`		`- if (CommonsCodecBase64.isAvailable()) {`
`26`		`- return new CommonsCodecBase64();`
	`25`	`+ if (Jaxb230Base64.isAvailable()) {`
	`26`	`+ return new Jaxb230Base64();`
`27`	`27`	`}`
`28`	`28`	`if (JaxbBase64.isAvailable()) {`
`29`	`29`	`return new JaxbBase64();`
`30`	`30`	`}`
	`31`	`+ if (CommonsCodecBase64.isAvailable()) {`
	`32`	`+ return new CommonsCodecBase64();`
	`33`	`+ }`
`31`	`34`	`throw new IllegalStateException(`
`32`	`35`	`"No Base64 implementation was provided. Java 8 Base64, Apache Commons Codec or JAXB is needed");`
`33`	`36`	`}`