chore(core): only small API changes

3 files changed, 10 insertions, 9 deletions

diff --git a/eaaf_modules/eaaf_module_auth_sl20/src/test/java/at/gv/egiz/eaaf/modules/auth/sl20/utils/JsonSecurityUtilsSoftwareKeyTest.java b/eaaf_modules/eaaf_module_auth_sl20/src/test/java/at/gv/egiz/eaaf/modules/auth/sl20/utils/JsonSecurityUtilsSoftwareKeyTest.java
index d78bdbd7..50f0fef0 100644
--- a/eaaf_modules/eaaf_module_auth_sl20/src/test/java/at/gv/egiz/eaaf/modules/auth/sl20/utils/JsonSecurityUtilsSoftwareKeyTest.java
+++ b/eaaf_modules/eaaf_module_auth_sl20/src/test/java/at/gv/egiz/eaaf/modules/auth/sl20/utils/JsonSecurityUtilsSoftwareKeyTest.java
@@ -2,6 +2,7 @@ package at.gv.egiz.eaaf.modules.auth.sl20.utils;
 
 import java.security.KeyStore;
 import java.security.Provider;
+import java.util.Base64;
 
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.Assert;
@@ -9,7 +10,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.util.Base64Utils;
 
 import at.gv.egiz.eaaf.core.exceptions.EaafException;
 import at.gv.egiz.eaaf.core.impl.credential.KeyStoreConfiguration;
@@ -36,11 +36,12 @@ public class JsonSecurityUtilsSoftwareKeyTest extends AbstractJsonSecurityUtilsT
   
   @Test
   public void invalidSignatureRandomBase64UrlEncoded() {
-    String testValue = Base64Utils.encodeToUrlSafeString(RandomStringUtils.randomAlphanumeric(10).getBytes())
+    String testValue = Base64.getUrlEncoder().encodeToString(RandomStringUtils.randomAlphanumeric(10)
+        .getBytes())
         + "."
-        + Base64Utils.encodeToUrlSafeString(RandomStringUtils.randomAlphanumeric(10).getBytes())
+        + Base64.getUrlEncoder().encodeToString(RandomStringUtils.randomAlphanumeric(10).getBytes())
         + "."
-        + Base64Utils.encodeToUrlSafeString(RandomStringUtils.randomAlphanumeric(10).getBytes());
+        + Base64.getUrlEncoder().encodeToString(RandomStringUtils.randomAlphanumeric(10).getBytes());
     
     try {     
       joseTools.validateSignature(testValue);
diff --git a/eaaf_modules/eaaf_module_moa-sig/src/test/java/console/PdfSigDecoder.java b/eaaf_modules/eaaf_module_moa-sig/src/test/java/console/PdfSigDecoder.java
index b9e9e517..0a85c3c8 100644
--- a/eaaf_modules/eaaf_module_moa-sig/src/test/java/console/PdfSigDecoder.java
+++ b/eaaf_modules/eaaf_module_moa-sig/src/test/java/console/PdfSigDecoder.java
@@ -3,8 +3,8 @@ package console;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
+import java.util.Base64;
 
-import org.springframework.util.Base64Utils;
 import org.springframework.util.StreamUtils;
 
 import iaik.asn1.ASN1;
@@ -28,12 +28,12 @@ public class PdfSigDecoder {
     for (int i = 0; i < test.length() / 2; i++) {
       bytes[i] = (byte) Integer.parseInt(test.substring(i * 2, i * 2 + 2), 16);
     }
-    Base64Utils.encodeToString(bytes);
+    Base64.getEncoder().encodeToString(bytes);
 
     final ASN1 asn1 = new ASN1(bytes);
 
     System.out.println(asn1.toString());
-    System.out.println(Base64Utils.encodeToString(bytes));
+    System.out.println(Base64.getEncoder().encodeToString(bytes));
 
   }
 
diff --git a/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/builder/Pvp2AssertionBuilder.java b/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/builder/Pvp2AssertionBuilder.java
index bbe1d95f..56ea16ae 100644
--- a/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/builder/Pvp2AssertionBuilder.java
+++ b/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/builder/Pvp2AssertionBuilder.java
@@ -22,6 +22,7 @@ package at.gv.egiz.eaaf.modules.pvp2.idp.impl.builder;
 import java.security.MessageDigest;
 import java.time.Instant;
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -59,7 +60,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.Base64Utils;
 
 import at.gv.egiz.eaaf.core.api.data.EaafConstants;
 import at.gv.egiz.eaaf.core.api.data.ILoALevelMapper;
@@ -333,7 +333,7 @@ public class Pvp2AssertionBuilder implements PvpConstants {
       try {
         final MessageDigest md = MessageDigest.getInstance("SHA-1");
         final byte[] hash = md.digest((nameID + random).getBytes("ISO-8859-1"));
-        subjectNameID.setValue(Base64Utils.encodeToString(hash));
+        subjectNameID.setValue(Base64.getEncoder().encodeToString(hash));
         subjectNameID.setNameQualifier(null);
         subjectNameID.setFormat(NameIDType.TRANSIENT);