fix correct usage (#3404)

base64 is part of JVM , no need to use it from another libraries

Author: strehle

server/src/test/java/org/cloudfoundry/identity/uaa/oauth/jwt/JwtHeaderHelperTest.java

@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.directory.api.util.Base64;
 import org.cloudfoundry.identity.uaa.test.RandomParametersJunitExtension;
 import org.cloudfoundry.identity.uaa.test.RandomParametersJunitExtension.RandomValue;
 import org.junit.jupiter.api.BeforeEach;
@@ -14,6 +13,7 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
+import java.util.Base64;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -194,6 +194,6 @@ private void validateJwtHeaders(JwtHeader header) {
     }
 
     private String asBase64(String jwt) {
-        return new String(Base64.encode(jwt.getBytes()));
+        return new String(Base64.getEncoder().encode(jwt.getBytes()));
     }
 }

uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/RefreshTokenMockMvcTests.java

@@ -15,7 +15,6 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.collect.Lists;
-import org.apache.directory.api.util.Base64;
 import org.apache.http.HttpStatus;
 import org.cloudfoundry.identity.uaa.client.UaaClientDetails;
 import org.cloudfoundry.identity.uaa.constants.OriginKeys;
@@ -46,6 +45,7 @@
 import org.springframework.mock.web.MockHttpServletResponse;
 
 import java.time.Instant;
+import java.util.Base64;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -207,7 +207,7 @@ void refreshTokenGrant_rejectsAccessTokens_PasswordGrantType() throws Exception
         String body = mockMvc.perform(post("/oauth/token")
                         .accept(MediaType.APPLICATION_JSON_VALUE)
                         .header("Host", getZoneHostUrl(zone))
-                        .header("Authorization", "Basic " + new String(Base64.encode((client.getClientId() + ":" + SECRET).getBytes())))
+                        .header("Authorization", "Basic " + new String(Base64.getEncoder().encode((client.getClientId() + ":" + SECRET).getBytes())))
                         .param("grant_type", GRANT_TYPE_PASSWORD)
                         .param("client_id", client.getClientId())
                         .param("client_secret", SECRET)
@@ -238,7 +238,7 @@ void refreshTokenGrant_rejectsIdTokens() throws Exception {
         String body = mockMvc.perform(post("/oauth/token")
                         .accept(MediaType.APPLICATION_JSON_VALUE)
                         .header("Host", getZoneHostUrl(zone))
-                        .header("Authorization", "Basic " + new String(Base64.encode((client.getClientId() + ":" + SECRET).getBytes())))
+                        .header("Authorization", "Basic " + new String(Base64.getEncoder().encode((client.getClientId() + ":" + SECRET).getBytes())))
                         .param("grant_type", GRANT_TYPE_PASSWORD)
                         .param("client_id", client.getClientId())
                         .param("client_secret", SECRET)