From 777e4ef9442e290b82a070154b2a41508bd24a2b Mon Sep 17 00:00:00 2001
From: Josh Cummings <josh.cummings@gmail.com>
Date: Wed, 2 Feb 2022 13:27:39 -0700
Subject: [PATCH] Remove DatatypeConverter Usage

Issue gh-626
---
 .../ldap/support/LdapEncoder.java             | 25 ++-----------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/core/src/main/java/org/springframework/ldap/support/LdapEncoder.java b/core/src/main/java/org/springframework/ldap/support/LdapEncoder.java
index 92bdb4e0..8c0a4af5 100644
--- a/core/src/main/java/org/springframework/ldap/support/LdapEncoder.java
+++ b/core/src/main/java/org/springframework/ldap/support/LdapEncoder.java
@@ -20,9 +20,6 @@ import java.util.Base64;
 
 import org.springframework.ldap.BadLdapGrammarException;
 import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-
-import jakarta.xml.bind.DatatypeConverter;
 
 /**
  * Helper class to encode and decode ldap names and values.
@@ -300,28 +297,10 @@ public final class LdapEncoder {
     }
 
     private static String encode(byte[] decoded) {
-        if (ClassUtils.isPresent("java.util.Base64", null)) {
-            return java.util.Base64.getEncoder().encodeToString(decoded);
-        } else {
-            return Base64Converter.encode(decoded);
-        }
+        return Base64.getEncoder().encodeToString(decoded);
     }
 
     private static byte[] decode(String encoded) {
-        if (ClassUtils.isPresent("java.util.Base64", null)) {
-            return java.util.Base64.getDecoder().decode(encoded);
-        } else {
-            return Base64Converter.decode(encoded);
-        }
-    }
-
-    private static class Base64Converter {
-        static byte[] decode(String string) {
-            return DatatypeConverter.parseBase64Binary(string);
-        }
-
-        static String encode(byte[] bytes) {
-            return DatatypeConverter.printBase64Binary(bytes);
-        }
+        return Base64.getDecoder().decode(encoded);
     }
 }