[java-identity-provider] branch master updated: Fix concurrency annotations.
Scott Cantor
cantor.2 at osu.edu
Mon Jun 22 23:50:40 UTC 2020
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=770795146ea43b2dfe2f7ec6cfa93f7a66d89ca7
The following commit(s) were added to refs/heads/master by this push:
new 770795146 Fix concurrency annotations.
770795146 is described below
commit 770795146ea43b2dfe2f7ec6cfa93f7a66d89ca7
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jun 22 19:50:22 2020 -0400
Fix concurrency annotations.
---
.../idp/authn/AbstractUsernamePasswordCredentialValidator.java | 3 +++
.../net/shibboleth/idp/authn/impl/HTPasswdCredentialValidator.java | 4 ++--
.../java/net/shibboleth/idp/authn/impl/JAASCredentialValidator.java | 4 ++--
.../net/shibboleth/idp/authn/impl/KerberosCredentialValidator.java | 4 ++--
.../java/net/shibboleth/idp/authn/impl/LDAPCredentialValidator.java | 4 ++--
5 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractUsernamePasswordCredentialValidator.java b/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractUsernamePasswordCredentialValidator.java
index 262ba0d7d..4e2674fca 100644
--- a/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractUsernamePasswordCredentialValidator.java
+++ b/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractUsernamePasswordCredentialValidator.java
@@ -36,6 +36,7 @@ import net.shibboleth.idp.authn.principal.PasswordPrincipal;
import net.shibboleth.idp.authn.principal.UsernamePrincipal;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.utilities.java.support.annotation.constraint.ThreadSafeAfterInit;
import net.shibboleth.utilities.java.support.collection.Pair;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -52,6 +53,7 @@ import org.slf4j.LoggerFactory;
*
* @since 4.0.0
*/
+ at ThreadSafeAfterInit
public abstract class AbstractUsernamePasswordCredentialValidator extends AbstractCredentialValidator {
/** Default prefix for metrics. */
@@ -220,6 +222,7 @@ public abstract class AbstractUsernamePasswordCredentialValidator extends Abstra
@Nonnull final AuthenticationContext authenticationContext,
@Nullable final WarningHandler warningHandler,
@Nullable final ErrorHandler errorHandler) throws Exception {
+ ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
final UsernamePasswordContext upContext = usernamePasswordContextLookupStrategy.apply(authenticationContext);
if (upContext == null) {
diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/HTPasswdCredentialValidator.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/HTPasswdCredentialValidator.java
index a13aaa6e0..c044fe4bf 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/HTPasswdCredentialValidator.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/HTPasswdCredentialValidator.java
@@ -30,7 +30,6 @@ import java.util.regex.Pattern;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import javax.annotation.concurrent.ThreadSafe;
import javax.security.auth.Subject;
import javax.security.auth.login.LoginException;
@@ -40,6 +39,7 @@ import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.idp.authn.context.UsernamePasswordContext;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+import net.shibboleth.utilities.java.support.annotation.constraint.ThreadSafeAfterInit;
import net.shibboleth.utilities.java.support.codec.StringDigester;
import net.shibboleth.utilities.java.support.codec.StringDigester.OutputFormat;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
@@ -60,7 +60,7 @@ import com.google.common.base.Strings;
*
* @since 4.0.0
*/
- at ThreadSafe
+ at ThreadSafeAfterInit
public class HTPasswdCredentialValidator extends AbstractUsernamePasswordCredentialValidator {
/** Class logger. */
diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/JAASCredentialValidator.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/JAASCredentialValidator.java
index 3ce337eb8..d96633fca 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/JAASCredentialValidator.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/JAASCredentialValidator.java
@@ -26,7 +26,6 @@ import java.util.function.Function;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import javax.annotation.concurrent.ThreadSafe;
import javax.security.auth.Subject;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
@@ -44,6 +43,7 @@ import net.shibboleth.idp.authn.context.RequestedPrincipalContext;
import net.shibboleth.idp.authn.context.UsernamePasswordContext;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.utilities.java.support.annotation.constraint.ThreadSafeAfterInit;
import net.shibboleth.utilities.java.support.collection.Pair;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
*
* @since 4.0.0
*/
- at ThreadSafe
+ at ThreadSafeAfterInit
public class JAASCredentialValidator extends AbstractUsernamePasswordCredentialValidator {
/** Class logger. */
diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/KerberosCredentialValidator.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/KerberosCredentialValidator.java
index 31d1421de..e20b23402 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/KerberosCredentialValidator.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/KerberosCredentialValidator.java
@@ -24,7 +24,6 @@ import java.util.Map;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import javax.annotation.concurrent.ThreadSafe;
import javax.security.auth.Subject;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
@@ -40,6 +39,7 @@ import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.idp.authn.context.UsernamePasswordContext;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.utilities.java.support.annotation.constraint.ThreadSafeAfterInit;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
*
* @since 4.0.0
*/
- at ThreadSafe
+ at ThreadSafeAfterInit
public class KerberosCredentialValidator extends AbstractUsernamePasswordCredentialValidator {
/** Class logger. */
diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/LDAPCredentialValidator.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/LDAPCredentialValidator.java
index b9e19f19f..e44632d74 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/LDAPCredentialValidator.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/LDAPCredentialValidator.java
@@ -19,7 +19,6 @@ package net.shibboleth.idp.authn.impl;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import javax.annotation.concurrent.ThreadSafe;
import javax.security.auth.Subject;
import net.shibboleth.idp.authn.AbstractUsernamePasswordCredentialValidator;
@@ -28,6 +27,7 @@ import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.idp.authn.context.LDAPResponseContext;
import net.shibboleth.idp.authn.context.UsernamePasswordContext;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
+import net.shibboleth.utilities.java.support.annotation.constraint.ThreadSafeAfterInit;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -52,7 +52,7 @@ import org.slf4j.LoggerFactory;
*
* @since 4.0.0
*/
- at ThreadSafe
+ at ThreadSafeAfterInit
public class LDAPCredentialValidator extends AbstractUsernamePasswordCredentialValidator {
/** Class logger. */
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list