diff options
Diffstat (limited to 'eaaf_core_utils')
5 files changed, 24 insertions, 8 deletions
diff --git a/eaaf_core_utils/checks/spotbugs-exclude.xml b/eaaf_core_utils/checks/spotbugs-exclude.xml index 2b258e7c..f3ecd76e 100644 --- a/eaaf_core_utils/checks/spotbugs-exclude.xml +++ b/eaaf_core_utils/checks/spotbugs-exclude.xml @@ -40,4 +40,20 @@ <Bug pattern="EI_EXPOSE_REP2" /> </OR> </Match> + <Match> + <!-- Information are provided by design --> + <OR> + <Class name="at.gv.egiz.eaaf.core.impl.http.EaafSslContextBuilder" /> + <Class name="at.gv.egiz.eaaf.core.impl.http.HttpClientConfiguration" /> + <Class name="at.gv.egiz.eaaf.core.impl.idp.conf.SpConfigurationImpl" /> + <Class name="at.gv.egiz.eaaf.core.impl.idp.process.support.SecureRandomHolder" /> + <Class name="at.gv.egiz.eaaf.core.impl.utils.EaafObjectInputStream" /> + <Class name="at.gv.egiz.eaaf.core.impl.utils.JoseUtils" /> + <Class name="new at.gv.egiz.eaaf.core.impl.utils.NodeIteratorAdapter" /> + </OR> + <OR> + <Bug pattern="EI_EXPOSE_REP" /> + <Bug pattern="EI_EXPOSE_REP2" /> + </OR> + </Match> </FindBugsFilter>
\ No newline at end of file diff --git a/eaaf_core_utils/pom.xml b/eaaf_core_utils/pom.xml index 8949118e..103e8b13 100644 --- a/eaaf_core_utils/pom.xml +++ b/eaaf_core_utils/pom.xml @@ -107,8 +107,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> <scope>provided</scope> </dependency> 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; } } diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/SymmetricKeyConfiguration.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/SymmetricKeyConfiguration.java index 9477789c..96d46381 100644 --- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/SymmetricKeyConfiguration.java +++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/SymmetricKeyConfiguration.java @@ -185,9 +185,9 @@ public class SymmetricKeyConfiguration { */ public static SymmetricKeyType fromString(final String s) { try { - return SymmetricKeyType.valueOf(s.toUpperCase()); + return s != null ? SymmetricKeyType.valueOf(s.toUpperCase()) : null; - } catch (IllegalArgumentException | NullPointerException e) { + } catch (IllegalArgumentException e) { return null; } } diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/http/HttpClientConfiguration.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/http/HttpClientConfiguration.java index 7033a052..c189ff74 100644 --- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/http/HttpClientConfiguration.java +++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/http/HttpClientConfiguration.java @@ -206,9 +206,9 @@ public class HttpClientConfiguration { */ public static ClientAuthMode fromString(final String s) { try { - return ClientAuthMode.valueOf(s.toUpperCase()); + return s != null ? ClientAuthMode.valueOf(s.toUpperCase()) : null; - } catch (IllegalArgumentException | NullPointerException e) { + } catch (IllegalArgumentException e) { return null; } } |