From c665669702503ec12193bd14b900d42566becd0a Mon Sep 17 00:00:00 2001
From: Ronny Perinke <23166289+sephiroth-j@users.noreply.github.com>
Date: Wed, 3 May 2023 20:28:24 +0200
Subject: [PATCH] mark `com.sun.xml.messaging.saaj.util.Base64` as deprecated
 and replace it with `java.util.Base64`

closes #202

Signed-off-by: Ronny Perinke <23166289+sephiroth-j@users.noreply.github.com>
---
 .../xml/messaging/saaj/client/p2p/HttpSOAPConnection.java   | 6 +++---
 .../main/java/com/sun/xml/messaging/saaj/util/Base64.java   | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/saaj-ri/src/main/java/com/sun/xml/messaging/saaj/client/p2p/HttpSOAPConnection.java b/saaj-ri/src/main/java/com/sun/xml/messaging/saaj/client/p2p/HttpSOAPConnection.java
index 9d3f06d..1362aa9 100644
--- a/saaj-ri/src/main/java/com/sun/xml/messaging/saaj/client/p2p/HttpSOAPConnection.java
+++ b/saaj-ri/src/main/java/com/sun/xml/messaging/saaj/client/p2p/HttpSOAPConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -18,6 +18,7 @@
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
+import java.util.Base64;
 import java.util.Iterator;
 import java.util.StringTokenizer;
 import java.util.logging.Level;
@@ -32,7 +33,6 @@
 import jakarta.xml.soap.SOAPMessage;
 
 import com.sun.xml.messaging.saaj.SOAPExceptionImpl;
-import com.sun.xml.messaging.saaj.util.Base64;
 import com.sun.xml.messaging.saaj.util.ByteInputStream;
 import com.sun.xml.messaging.saaj.util.LogDomainConstants;
 import com.sun.xml.messaging.saaj.util.ParseUtil;
@@ -553,7 +553,7 @@ private void initAuthUserInfo(HttpURLConnection conn, String userInfo) {
                 concat,
                 nameBytes.length,
                 passwdBytes.length);
-            String auth = "Basic " + new String(Base64.encode(concat));
+            String auth = "Basic " + Base64.getEncoder().encodeToString(concat);
             conn.setRequestProperty("Authorization", auth);
             if (dL > 0)
                 d("Adding auth " + auth);
diff --git a/saaj-ri/src/main/java/com/sun/xml/messaging/saaj/util/Base64.java b/saaj-ri/src/main/java/com/sun/xml/messaging/saaj/util/Base64.java
index c2d9e52..1aa0626 100644
--- a/saaj-ri/src/main/java/com/sun/xml/messaging/saaj/util/Base64.java
+++ b/saaj-ri/src/main/java/com/sun/xml/messaging/saaj/util/Base64.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -22,7 +22,9 @@
  * This class is used by XML Schema binary format validation
  *
  * @author Jeffrey Rodriguez
+ * @deprecated Use {@link java.util.Base64} instead
  */
+@Deprecated(forRemoval = true)
 public final class Base64 {