feat(core): starting switch from Spring5/JAVA11 to Spring6/Java17

IMPORTEND: Is not finished because that contains a braking change, like
 javax.servlet.*  --> jakarta.servket.*
as one example and we miss some third-party libs that use the new API.

# Conflicts:
#	eaaf_core_api/checks/spotbugs-exclude.xml
#	eaaf_core_api/pom.xml
#	eaaf_core_utils/checks/spotbugs-exclude.xml
#	pom.xml

1 files changed, 2 insertions, 2 deletions

diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/KeyStoreConfiguration.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/KeyStoreConfiguration.java
index 7e66ca86..6c00fb2e 100644
--- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/KeyStoreConfiguration.java
+++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/KeyStoreConfiguration.java
@@ -199,9 +199,9 @@ public class KeyStoreConfiguration {
      */
     public static KeyStoreType fromString(final String s) {
       try {
-        return KeyStoreType.valueOf(s.toUpperCase());
+        return s != null ? KeyStoreType.valueOf(s.toUpperCase()) : null;
 
-      } catch (IllegalArgumentException | NullPointerException e) {
+      } catch (IllegalArgumentException e) {
         return null;
       }
     }