check for java.util.Base64 presence

kullfar · kullfar · commit cd5e3af9ebe8 · 2021-02-15T11:05:33.000+03:00
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
@@ -19,7 +19,11 @@ public static Base64 getInstance() {
     }
 
     private static Base64 createInstance() {
-        return new Java8Base64();
+        if (Java8Base64.isAvailable()) {
+            return new Java8Base64();
+        }
+        throw new IllegalStateException(
+                "No Base64 implementation was provided. Java 8 Base64, Apache commons codec or JAXB is needed");
     }
 
     public static void init(Base64 base64) {
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/base64/Java8Base64.java b/scribejava-core/src/main/java/com/github/scribejava/core/base64/Java8Base64.java
@@ -20,4 +20,12 @@ protected byte[] internalDecodeMime(String string) {
         return JAVA8_BASE64.internalDecodeMime(string);
     }
 
+    static boolean isAvailable() {
+        try {
+            Class.forName("java.util.Base64", false, Java8Base64.class.getClassLoader());
+            return true;
+        } catch (ClassNotFoundException cnfE) {
+            return false;
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,11 @@ public static Base64 getInstance() {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`private static Base64 createInstance() {`
`22`		`- return new Java8Base64();`
	`22`	`+ if (Java8Base64.isAvailable()) {`
	`23`	`+ return new Java8Base64();`
	`24`	`+ }`
	`25`	`+ throw new IllegalStateException(`
	`26`	`+ "No Base64 implementation was provided. Java 8 Base64, Apache commons codec or JAXB is needed");`
`23`	`27`	`}`
`24`	`28`
`25`	`29`	`public static void init(Base64 base64) {`
Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,12 @@ protected byte[] internalDecodeMime(String string) {`
`20`	`20`	`return JAVA8_BASE64.internalDecodeMime(string);`
`21`	`21`	`}`
`22`	`22`
	`23`	`+ static boolean isAvailable() {`
	`24`	`+ try {`
	`25`	`+ Class.forName("java.util.Base64", false, Java8Base64.class.getClassLoader());`
	`26`	`+ return true;`
	`27`	`+ } catch (ClassNotFoundException cnfE) {`
	`28`	`+ return false;`
	`29`	`+ }`
	`30`	`+ }`
`23`	`31`	`}`