[java-opensaml] branch main updated: IDP-2083 - Treat NonnullElements as the default for collections
Scott Cantor
cantor.2 at osu.edu
Mon Jun 5 14:35:55 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-opensaml.
View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=64968de8dfbcfb7fa76401e2296edf7b25ab4271
The following commit(s) were added to refs/heads/main by this push:
new 64968de8d IDP-2083 - Treat NonnullElements as the default for collections
64968de8d is described below
commit 64968de8dfbcfb7fa76401e2296edf7b25ab4271
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jun 5 10:35:52 2023 -0400
IDP-2083 - Treat NonnullElements as the default for collections
https://shibboleth.atlassian.net/browse/IDP-2083
Review opensaml-spring.
---
.../java/org/opensaml/spring/credential/package-info.java | 4 +++-
.../org/opensaml/spring/tls/TLSSocketFactoryFactoryBean.java | 2 +-
.../src/main/java/org/opensaml/spring/tls/package-info.java | 4 +++-
.../opensaml/spring/trust/StaticExplicitKeyFactoryBean.java | 3 +--
.../org/opensaml/spring/trust/StaticPKIXFactoryBean.java | 12 ++++++------
.../main/java/org/opensaml/spring/trust/package-info.java | 4 +++-
6 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/opensaml-spring/src/main/java/org/opensaml/spring/credential/package-info.java b/opensaml-spring/src/main/java/org/opensaml/spring/credential/package-info.java
index b599cb5e9..acf216f37 100644
--- a/opensaml-spring/src/main/java/org/opensaml/spring/credential/package-info.java
+++ b/opensaml-spring/src/main/java/org/opensaml/spring/credential/package-info.java
@@ -18,5 +18,7 @@
/**
* Factory beans for various credential classes.
*/
+ at NonnullElements
+package org.opensaml.spring.credential;
-package org.opensaml.spring.credential;
\ No newline at end of file
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
diff --git a/opensaml-spring/src/main/java/org/opensaml/spring/tls/TLSSocketFactoryFactoryBean.java b/opensaml-spring/src/main/java/org/opensaml/spring/tls/TLSSocketFactoryFactoryBean.java
index c1bb51c6d..e780f6234 100644
--- a/opensaml-spring/src/main/java/org/opensaml/spring/tls/TLSSocketFactoryFactoryBean.java
+++ b/opensaml-spring/src/main/java/org/opensaml/spring/tls/TLSSocketFactoryFactoryBean.java
@@ -50,7 +50,7 @@ public class TLSSocketFactoryFactoryBean extends AbstractFactoryBean<LayeredConn
* @deprecated use setHttpClientSecurityParameters instead
* @param engine the trust engine instance to use, or null
*/
- @Deprecated
+ @Deprecated(since="5.0.0", forRemoval=true)
public void setTLSTrustEngine(@Nullable final TrustEngine<? super X509Credential> engine) {
tlsTrustEngine = engine;
}
diff --git a/opensaml-spring/src/main/java/org/opensaml/spring/tls/package-info.java b/opensaml-spring/src/main/java/org/opensaml/spring/tls/package-info.java
index 81404861f..249cd4755 100644
--- a/opensaml-spring/src/main/java/org/opensaml/spring/tls/package-info.java
+++ b/opensaml-spring/src/main/java/org/opensaml/spring/tls/package-info.java
@@ -18,5 +18,7 @@
/**
* Spring support for TLS configuration.
*/
+ at NonnullElements
+package org.opensaml.spring.tls;
-package org.opensaml.spring.tls;
\ No newline at end of file
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
diff --git a/opensaml-spring/src/main/java/org/opensaml/spring/trust/StaticExplicitKeyFactoryBean.java b/opensaml-spring/src/main/java/org/opensaml/spring/trust/StaticExplicitKeyFactoryBean.java
index c620c0061..c6c4e941e 100644
--- a/opensaml-spring/src/main/java/org/opensaml/spring/trust/StaticExplicitKeyFactoryBean.java
+++ b/opensaml-spring/src/main/java/org/opensaml/spring/trust/StaticExplicitKeyFactoryBean.java
@@ -42,7 +42,6 @@ import org.slf4j.Logger;
import org.springframework.beans.FatalBeanException;
import org.springframework.core.io.Resource;
-import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.primitive.LoggerFactory;
import net.shibboleth.shared.spring.factory.AbstractComponentAwareFactoryBean;
@@ -92,7 +91,7 @@ public class StaticExplicitKeyFactoryBean extends AbstractComponentAwareFactoryB
*
* @return the certificates null
*/
- @Nonnull @NonnullElements protected List<Credential> getCredentials() {
+ @Nonnull protected List<Credential> getCredentials() {
final List<Credential> credentials = new ArrayList<>(keyResources.size() + certificateResources.size());
diff --git a/opensaml-spring/src/main/java/org/opensaml/spring/trust/StaticPKIXFactoryBean.java b/opensaml-spring/src/main/java/org/opensaml/spring/trust/StaticPKIXFactoryBean.java
index fa12d6f0c..961a526a5 100644
--- a/opensaml-spring/src/main/java/org/opensaml/spring/trust/StaticPKIXFactoryBean.java
+++ b/opensaml-spring/src/main/java/org/opensaml/spring/trust/StaticPKIXFactoryBean.java
@@ -79,11 +79,11 @@ public class StaticPKIXFactoryBean extends AbstractComponentAwareFactoryBean<PKI
private boolean checkNames;
/** Custom instance of {@link PKIXTrustEvaluator} to use. */
- private PKIXTrustEvaluator trustEvaluator;
+ @Nullable private PKIXTrustEvaluator trustEvaluator;
/** Custom instance of {@link X509CredentialNameEvaluator} to use.
* A non-null value overrides {@link #checkNames}. */
- private X509CredentialNameEvaluator credentialNameEvaluator;
+ @Nullable private X509CredentialNameEvaluator credentialNameEvaluator;
/** Constructor. */
public StaticPKIXFactoryBean() {
@@ -162,7 +162,7 @@ public class StaticPKIXFactoryBean extends AbstractComponentAwareFactoryBean<PKI
/**
* Set the custom instance of {@link PKIXTrustEvaluator} to use.
*
- * @param evaluator The trustEvaluator to set.
+ * @param evaluator {@link PKIXTrustEvaluator} to set
*/
public void setTrustEvaluator(@Nullable final PKIXTrustEvaluator evaluator) {
trustEvaluator = evaluator;
@@ -175,7 +175,7 @@ public class StaticPKIXFactoryBean extends AbstractComponentAwareFactoryBean<PKI
* A non-null value overrides {@link #setCheckNames(boolean)}.
* </p>
*
- * @param evaluator The credentialNameEvaluator to set.
+ * @param evaluator {@link X509CredentialNameEvaluator} to set
*/
public void setCredentialNameEvaluator(@Nullable final X509CredentialNameEvaluator evaluator) {
credentialNameEvaluator = evaluator;
@@ -186,7 +186,7 @@ public class StaticPKIXFactoryBean extends AbstractComponentAwareFactoryBean<PKI
*
* @return the certificates
*/
- @Nonnull @NonnullElements protected List<X509Certificate> getCertificates() {
+ @Nonnull protected List<X509Certificate> getCertificates() {
if (certificateResources == null) {
return CollectionSupport.emptyList();
}
@@ -210,7 +210,7 @@ public class StaticPKIXFactoryBean extends AbstractComponentAwareFactoryBean<PKI
*
* @return the crls
*/
- @Nonnull @NonnullElements protected List<X509CRL> getCRLs() {
+ @Nonnull protected List<X509CRL> getCRLs() {
if (crlResources == null) {
return CollectionSupport.emptyList();
}
diff --git a/opensaml-spring/src/main/java/org/opensaml/spring/trust/package-info.java b/opensaml-spring/src/main/java/org/opensaml/spring/trust/package-info.java
index 5bf1420a2..66ee91c18 100644
--- a/opensaml-spring/src/main/java/org/opensaml/spring/trust/package-info.java
+++ b/opensaml-spring/src/main/java/org/opensaml/spring/trust/package-info.java
@@ -18,5 +18,7 @@
/**
* Factory beans for trust engines.
*/
+ at NonnullElements
+package org.opensaml.spring.trust;
-package org.opensaml.spring.trust;
\ No newline at end of file
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list