chore(core): remove some deprecated API methods

7 files changed, 12 insertions, 19 deletions

diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/builder/BpkBuilder.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/builder/BpkBuilder.java
index 903aa300..cf26694c 100644
--- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/builder/BpkBuilder.java
+++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/builder/BpkBuilder.java
@@ -24,6 +24,7 @@ import java.security.NoSuchAlgorithmException;
 import java.security.PrivateKey;
 import java.security.PublicKey;
 import java.text.SimpleDateFormat;
+import java.util.Base64;
 import java.util.Date;
 import java.util.Map.Entry;
 
@@ -36,7 +37,6 @@ import javax.crypto.NoSuchPaddingException;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
-import org.springframework.util.Base64Utils;
 
 import at.gv.egiz.eaaf.core.api.data.EaafConstants;
 import at.gv.egiz.eaaf.core.exceptions.EaafBuilderException;
@@ -190,7 +190,7 @@ public class BpkBuilder {
     try {
       final byte[] inputBytes = input.getBytes("ISO-8859-1");
       result = encrypt(inputBytes, publicKey);
-      return new String(Base64Utils.encode(result), "ISO-8859-1").replaceAll("\r\n", "");
+      return new String(Base64.getEncoder().encode(result), "ISO-8859-1").replaceAll("\r\n", "");
       // return new String(Base64Utils.encode(result,
       // "ISO-8859-1")).replaceAll("\r\n", "");
 
@@ -221,7 +221,7 @@ public class BpkBuilder {
     }
     
     try {
-      final byte[] encryptedBytes = Base64Utils.decode(encryptedBpk.getBytes("ISO-8859-1"));
+      final byte[] encryptedBytes = Base64.getDecoder().decode(encryptedBpk.getBytes("ISO-8859-1"));
       final byte[] decryptedBytes = decrypt(encryptedBytes, privateKey);
       decryptedString = new String(decryptedBytes, "ISO-8859-1");
 
@@ -398,7 +398,7 @@ public class BpkBuilder {
       final MessageDigest md = MessageDigest.getInstance("SHA-1");
       final byte[] hash = md.digest(basisbegriff.getBytes("ISO-8859-1"));
       final String hashBase64 =
-          new String(Base64Utils.encode(hash), "ISO-8859-1").replaceAll("\r\n", ""); // Base64Utils.encode(hash);
+          new String(Base64.getEncoder().encode(hash), "ISO-8859-1").replaceAll("\r\n", "");
       return hashBase64;
 
     } catch (final Exception ex) {
diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/EaafKeyStoreFactory.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/EaafKeyStoreFactory.java
index 673a373d..ec275ec5 100644
--- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/EaafKeyStoreFactory.java
+++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/EaafKeyStoreFactory.java
@@ -206,7 +206,7 @@ public class EaafKeyStoreFactory {
 
         } catch (final Exception e) {
           log.info("Can not determine state of alreay loaded HSM Facade: {} because HealthCheck not support", 
-              alreadyLoadedProvider.getVersion());
+              alreadyLoadedProvider.getVersionStr());
           log.debug("Full HSM-Facade health-check exception", e);
           return HsmFacadeStatus.UNKNOWN;
           
diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/data/ExceptionContainer.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/data/ExceptionContainer.java
index e7f952e4..b604edce 100644
--- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/data/ExceptionContainer.java
+++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/data/ExceptionContainer.java
@@ -63,7 +63,7 @@ public class ExceptionContainer implements Serializable {
   /**
    * Error that was thrown.
    */
-  private byte[] internalExceptionThrown = null;
+  private byte[] internalExceptionThrown;
 
   /**
    * pendingReq that throws this error.
@@ -71,7 +71,7 @@ public class ExceptionContainer implements Serializable {
   @JsonTypeInfo(include = JsonTypeInfo.As.PROPERTY, use = JsonTypeInfo.Id.CLASS, property = "@class")
   @JsonSerialize(using = EscapedJsonSerializer.class)
   @JsonDeserialize(using = EscapedJsonDeserializer.class)
-  private IRequest pendingReq = null;
+  private IRequest pendingReq;
 
   /**
    * Create an exception container.
diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/json/EscapedJsonDeserializer.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/json/EscapedJsonDeserializer.java
index 5a081ec5..0bc5b825 100644
--- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/json/EscapedJsonDeserializer.java
+++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/json/EscapedJsonDeserializer.java
@@ -72,7 +72,7 @@ public class EscapedJsonDeserializer extends JsonDeserializer<Object> implements
       String str = p.readValueAs(String.class);
       TreeNode root = ((ObjectMapper) p.getCodec()).readTree(str);
       try {
-        Class clz = Class.forName(((TextNode) root.get("@class")).asText());
+        Class<?> clz = Class.forName(((TextNode) root.get("@class")).asText());
 
         if (this.javaType.getRawClass().isAssignableFrom(clz)) {
           // remove '@class' before deserialization because it's unknown in target class
diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/json/EscapedJsonSerializer.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/json/EscapedJsonSerializer.java
index a79f4d90..3196b7a4 100644
--- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/json/EscapedJsonSerializer.java
+++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/json/EscapedJsonSerializer.java
@@ -39,7 +39,7 @@ public class EscapedJsonSerializer extends StdSerializer<Object> {
     if (value instanceof Collection || value.getClass().isArray()) {
       tempGen.writeStartArray();
       if (value instanceof Collection) {
-        for (Object it : (Collection) value) {
+        for (Object it : (Collection<?>) value) {
           writeTree(gen, it, tempGen);
         }
       } else if (value.getClass().isArray()) {
diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/JoseUtils.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/JoseUtils.java
index f3c8588d..abbee1d9 100644
--- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/JoseUtils.java
+++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/JoseUtils.java
@@ -16,6 +16,7 @@ import java.security.interfaces.RSAPrivateKey;
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.security.spec.X509EncodedKeySpec;
+import java.util.Base64;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -34,7 +35,6 @@ import org.jose4j.jwx.Headers;
 import org.jose4j.jwx.JsonWebStructure;
 import org.jose4j.keys.resolvers.X509VerificationKeyResolver;
 import org.jose4j.lang.JoseException;
-import org.springframework.util.Base64Utils;
 
 import at.gv.egiz.eaaf.core.exception.EaafKeyUsageException;
 import at.gv.egiz.eaaf.core.exceptions.EaafException;
@@ -381,7 +381,7 @@ public class JoseUtils {
         log.info("Can NOT find JOSE certificate in truststore.");
         if (log.isDebugEnabled()) {
           try {
-            log.debug("Cert: {}", Base64Utils.encodeToString(sortedX5cCerts.get(0).getEncoded()));
+            log.debug("Cert: {}", Base64.getEncoder().encodeToString(sortedX5cCerts.get(0).getEncoded()));
 
           } catch (final CertificateEncodingException e) {
             log.warn("Can not create DEBUG output", e);
diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/KeyValueUtils.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/KeyValueUtils.java
index b0a91e74..153876f8 100644
--- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/KeyValueUtils.java
+++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/KeyValueUtils.java
@@ -55,17 +55,10 @@ public class KeyValueUtils {
    * @param properties Java {@link Properties} that should be converted
    * @return
    */
+  @SuppressWarnings("unchecked")
   public static Map<String, String> convertPropertiesToMap(final Properties properties) {
     return new HashMap<String, String>((Map) properties);
 
-    // INFO Java8 solution ;)
-    // return properties.entrySet().stream().collect(
-    // Collectors.toMap(
-    // e -> e.getKey().toString(),
-    // e -> e.getValue().toString()
-    // )
-    // );
-
   }
 
   /**