[java-shib-attribute] 01/03: JSPT-98 Integrate lifecycle checking methods in base classes
Rod Widdowson
rdw at steadingsoftware.com
Mon Jul 11 16:22:58 UTC 2022
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch dev/JSPT-98
in repository java-shib-attribute.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-attribute.git;a=commit;h=fad9a3bf053d557e7490cde73c7ebed4c4ef31b2
commit fad9a3bf053d557e7490cde73c7ebed4c4ef31b2
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Jul 1 11:55:01 2022 +0100
JSPT-98 Integrate lifecycle checking methods in base classes
https://shibboleth.atlassian.net/browse/JSPT-98
Stop using ComponentSupport and use the appropriate methods instead:
idp-attribute-api idp-attribute-impl
---
.../transcoding/AbstractAttributeTranscoder.java | 19 ++++---
.../attribute/impl/ComputedPairwiseIdStore.java | 21 ++++----
.../idp/attribute/impl/JDBCPairwiseIdStore.java | 59 +++++++++++-----------
.../impl/AttributeRegistryServiceStrategy.java | 3 +-
.../impl/AttributeTranscoderRegistryImpl.java | 15 +++---
5 files changed, 56 insertions(+), 61 deletions(-)
diff --git a/shib-attribute-api/src/main/java/net/shibboleth/idp/attribute/transcoding/AbstractAttributeTranscoder.java b/shib-attribute-api/src/main/java/net/shibboleth/idp/attribute/transcoding/AbstractAttributeTranscoder.java
index 66c725b66..8acb1294f 100644
--- a/shib-attribute-api/src/main/java/net/shibboleth/idp/attribute/transcoding/AbstractAttributeTranscoder.java
+++ b/shib-attribute-api/src/main/java/net/shibboleth/idp/attribute/transcoding/AbstractAttributeTranscoder.java
@@ -22,19 +22,18 @@ import java.util.function.Predicate;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.idp.attribute.AttributeDecodingException;
-import net.shibboleth.idp.attribute.AttributeEncodingException;
-import net.shibboleth.idp.attribute.IdPAttribute;
-import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-
import org.opensaml.profile.context.ProfileRequestContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.base.Predicates;
+import net.shibboleth.idp.attribute.AttributeDecodingException;
+import net.shibboleth.idp.attribute.AttributeEncodingException;
+import net.shibboleth.idp.attribute.IdPAttribute;
+import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
+import net.shibboleth.utilities.java.support.logic.Constraint;
+
/**
* Base class for transcoders.
*
@@ -60,7 +59,7 @@ public abstract class AbstractAttributeTranscoder<T> extends AbstractInitializab
* @param condition condition to set
*/
public void setActivationCondition(@Nonnull final Predicate<ProfileRequestContext> condition) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ throwSetterPreconditionExceptions();
activationCondition = Constraint.isNotNull(condition, "Activation condition cannot be null");
}
@@ -69,7 +68,7 @@ public abstract class AbstractAttributeTranscoder<T> extends AbstractInitializab
@Nullable public T encode(@Nullable final ProfileRequestContext profileRequestContext,
@Nonnull final IdPAttribute attribute, @Nonnull final Class<? extends T> to,
@Nonnull final TranscodingRule rule) throws AttributeEncodingException {
- ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
+ throwComponentStateExceptions();
Constraint.isNotNull(attribute, "Attribute to encode cannot be null");
if (!checkActivation(profileRequestContext, rule)) {
@@ -83,7 +82,7 @@ public abstract class AbstractAttributeTranscoder<T> extends AbstractInitializab
/** {@inheritDoc} */
@Nullable public IdPAttribute decode(@Nullable final ProfileRequestContext profileRequestContext,
@Nonnull final T input, @Nonnull final TranscodingRule rule) throws AttributeDecodingException {
- ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
+ throwComponentStateExceptions();
Constraint.isNotNull(input, "Attribute to decode cannot be null");
if (!checkActivation(profileRequestContext, rule)) {
diff --git a/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/impl/ComputedPairwiseIdStore.java b/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/impl/ComputedPairwiseIdStore.java
index 7368c0451..fab807252 100644
--- a/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/impl/ComputedPairwiseIdStore.java
+++ b/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/impl/ComputedPairwiseIdStore.java
@@ -27,6 +27,9 @@ import java.util.Map;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import net.shibboleth.idp.attribute.PairwiseId;
import net.shibboleth.idp.attribute.PairwiseIdStore;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
@@ -37,13 +40,9 @@ import net.shibboleth.utilities.java.support.codec.DecodingException;
import net.shibboleth.utilities.java.support.codec.EncodingException;
import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* A {@link PairwiseIdStore} that generates a pairwise ID by computing the hash of
* a given attribute value, the entity ID of the recipient, and a provided salt.
@@ -107,7 +106,7 @@ public class ComputedPairwiseIdStore extends AbstractInitializableComponent impl
* @param newValue used when computing the ID
*/
public void setSalt(@Nullable final byte[] newValue) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ throwSetterPreconditionExceptions();
if (newValue != null && newValue.length > 0) {
salt = newValue;
@@ -122,7 +121,7 @@ public class ComputedPairwiseIdStore extends AbstractInitializableComponent impl
* @param newValue used when computing the ID
*/
public void setSalt(@Nullable final String newValue) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ throwSetterPreconditionExceptions();
if (newValue != null && !newValue.isEmpty()) {
salt = newValue.getBytes();
@@ -137,7 +136,7 @@ public class ComputedPairwiseIdStore extends AbstractInitializableComponent impl
* @param newValue used when computing the ID
*/
public void setEncodedSalt(@Nullable final String newValue) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ throwSetterPreconditionExceptions();
if (newValue != null && !newValue.isEmpty()) {
try {
@@ -164,7 +163,7 @@ public class ComputedPairwiseIdStore extends AbstractInitializableComponent impl
* @param alg JCE message digest algorithm
*/
public void setAlgorithm(@Nonnull @NotEmpty final String alg) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ throwSetterPreconditionExceptions();
algorithm = Constraint.isNotNull(StringSupport.trimOrNull(alg), "Digest algorithm cannot be null or empty");
}
@@ -184,7 +183,7 @@ public class ComputedPairwiseIdStore extends AbstractInitializableComponent impl
* @param enc encoding
*/
public void setEncoding(@Nonnull final Encoding enc) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ throwSetterPreconditionExceptions();
encoding = Constraint.isNotNull(enc, "Encoding cannot be null");
}
@@ -200,7 +199,7 @@ public class ComputedPairwiseIdStore extends AbstractInitializableComponent impl
* @param map exceptions to apply
*/
public void setExceptionMap(@Nullable @NotEmpty final Map<String,Map<String,String>> map) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ throwSetterPreconditionExceptions();
if (map == null) {
exceptionMap = Collections.emptyMap();
@@ -240,7 +239,7 @@ public class ComputedPairwiseIdStore extends AbstractInitializableComponent impl
/** {@inheritDoc} */
@Nullable public PairwiseId getBySourceValue(@Nonnull final PairwiseId pid, final boolean allowCreate)
throws IOException {
- ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
+ throwComponentStateExceptions();
Constraint.isNotNull(pid, "Input PairwiseId object cannot be null");
Constraint.isNotEmpty(pid.getRecipientEntityID(), "Recipient entityID cannot be null or empty");
Constraint.isNotEmpty(pid.getPrincipalName(), "Principal name cannot be null or empty");
diff --git a/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/impl/JDBCPairwiseIdStore.java b/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/impl/JDBCPairwiseIdStore.java
index ede199db6..48c7ab69d 100644
--- a/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/impl/JDBCPairwiseIdStore.java
+++ b/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/impl/JDBCPairwiseIdStore.java
@@ -38,6 +38,9 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.sql.DataSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import net.shibboleth.idp.attribute.DurablePairwiseIdStore;
import net.shibboleth.idp.attribute.PairwiseId;
import net.shibboleth.idp.attribute.PairwiseIdStore;
@@ -50,13 +53,9 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* JDBC-based storage management for pairwise IDs.
*
@@ -187,7 +186,7 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
* @param source the data source;
*/
public void setDataSource(@Nonnull final DataSource source) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ throwSetterPreconditionExceptions();
dataSource = Constraint.isNotNull(source, "DataSource cannot be null");
}
@@ -196,7 +195,7 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
* @param what do we want to lock locally?
*/
public void setLocalLocking(final boolean what) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ throwSetterPreconditionExceptions();
if (what) {
readWriteLock = new ReentrantReadWriteLock(true);
} else {
@@ -238,7 +237,7 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
* @param timeout the timeout to set
*/
public void setQueryTimeout(@Nonnull final Duration timeout) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ throwSetterPreconditionExceptions();
Constraint.isNotNull(timeout, "Timeout cannot be null");
Constraint.isFalse(timeout.isNegative(), "Timeout cannot be negative");
@@ -260,7 +259,7 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
* @param retries the number of retries
*/
public void setTransactionRetries(@NonNegative final int retries) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ throwSetterPreconditionExceptions();
transactionRetry = Constraint.isGreaterThanOrEqual(0, retries, "Retries must be greater than or equal to 0");
}
@@ -282,7 +281,7 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
* @param errors retryable messages
*/
public void setRetryableErrors(@Nullable @NonnullElements final Collection<String> errors) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ throwSetterPreconditionExceptions();
retryableErrors = List.copyOf(StringSupport.normalizeStringCollection(errors));
}
@@ -305,7 +304,7 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
* @param flag flag to set
*/
public void setVerifyDatabase(final boolean flag) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ throwSetterPreconditionExceptions();
verifyDatabase = flag;
}
@@ -327,7 +326,7 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
* @param name table name
*/
public void setTableName(@Nonnull @NotEmpty final String name) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ throwSetterPreconditionExceptions();
tableName = Constraint.isNotNull(StringSupport.trimOrNull(name), "Table name cannot be null or empty");
}
@@ -338,7 +337,7 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
* @param name name of issuer column
*/
public void setLocalEntityColumn(@Nonnull @NotEmpty final String name) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ throwSetterPreconditionExceptions();
issuerColumn = Constraint.isNotNull(StringSupport.trimOrNull(name), "Column name cannot be null or empty");
}
@@ -349,7 +348,7 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
* @param name name of recipient column
*/
public void setPeerEntityColumn(@Nonnull @NotEmpty final String name) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ throwSetterPreconditionExceptions();
recipientColumn = Constraint.isNotNull(StringSupport.trimOrNull(name), "Column name cannot be null or empty");
}
@@ -360,7 +359,7 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
* @param name name of principal name column
*/
public void setPrincipalNameColumn(@Nonnull @NotEmpty final String name) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ throwSetterPreconditionExceptions();
principalNameColumn = Constraint.isNotNull(StringSupport.trimOrNull(name),
"Column name cannot be null or empty");
@@ -372,7 +371,7 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
* @param name name of source ID column
*/
public void setSourceIdColumn(@Nonnull @NotEmpty final String name) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ throwSetterPreconditionExceptions();
sourceIdColumn = Constraint.isNotNull(StringSupport.trimOrNull(name), "Column name cannot be null or empty");
}
@@ -383,7 +382,7 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
* @param name name of the persistent ID column
*/
public void setPersistentIdColumn(@Nonnull @NotEmpty final String name) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ throwSetterPreconditionExceptions();
persistentIdColumn = Constraint.isNotNull(StringSupport.trimOrNull(name),
"Column name cannot be null or empty");
@@ -395,7 +394,7 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
* @param name name of peer-provided ID column
*/
public void setPeerProvidedIdColumn(@Nonnull @NotEmpty final String name) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ throwSetterPreconditionExceptions();
peerProvidedIdColumn = Constraint.isNotNull(StringSupport.trimOrNull(name),
"Column name cannot be null or empty");
@@ -407,7 +406,7 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
* @param name name of creation time column
*/
public void setCreateTimeColumn(@Nonnull @NotEmpty final String name) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ throwSetterPreconditionExceptions();
creationTimeColumn = Constraint.isNotNull(StringSupport.trimOrNull(name),
"Column name cannot be null or empty");
@@ -419,7 +418,7 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
* @param name name of deactivation time column
*/
public void setDeactivationTimeColumn(@Nonnull @NotEmpty final String name) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ throwSetterPreconditionExceptions();
deactivationTimeColumn = Constraint.isNotNull(StringSupport.trimOrNull(name),
"Column name cannot be null or empty");
@@ -431,7 +430,7 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
* @param sql statement text, which must contain three parameters (NameQualifier, SPNameQualifier, value)
*/
public void setGetByIssuedSelectSQL(@Nonnull @NotEmpty final String sql) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ throwSetterPreconditionExceptions();
getByIssuedSelectSQL = Constraint.isNotNull(StringSupport.trimOrNull(sql),
"SQL statement cannot be null or empty");
@@ -444,7 +443,7 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
* (NameQualifier, SPNameQualifier, source ID, NameQualifier, SPNameQualifier, source ID)
*/
public void setGetBySourceSelectSQL(@Nonnull @NotEmpty final String sql) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ throwSetterPreconditionExceptions();
getBySourceSelectSQL = Constraint.isNotNull(StringSupport.trimOrNull(sql),
"SQL statement cannot be null or empty");
@@ -457,7 +456,7 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
* (NameQualifier, SPNameQualifier, value, principal, source ID, SPProvidedID, creation time, deactivation time)
*/
public void setInsertSQL(@Nonnull @NotEmpty final String sql) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ throwSetterPreconditionExceptions();
insertSQL = Constraint.isNotNull(StringSupport.trimOrNull(sql), "SQL statement cannot be null or empty");
}
@@ -469,7 +468,7 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
* (deactivation TS, NameQualifier, SPNameQualifier, value)
*/
public void setDeactivateSQL(@Nonnull @NotEmpty final String sql) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ throwSetterPreconditionExceptions();
deactivateSQL = Constraint.isNotNull(StringSupport.trimOrNull(sql), "SQL statement cannot be null or empty");
}
@@ -481,7 +480,7 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
* (SPProvidedID, NameQualifier, SPNameQualifier, value)
*/
public void setAttachSQL(@Nonnull @NotEmpty final String sql) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ throwSetterPreconditionExceptions();
attachSQL = Constraint.isNotNull(StringSupport.trimOrNull(sql), "SQL statement cannot be null or empty");
}
@@ -492,7 +491,7 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
* @param sql statement text, which must contain one parameter (NameQualifier)
*/
public void setDeleteSQL(@Nonnull @NotEmpty final String sql) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ throwSetterPreconditionExceptions();
deleteSQL = Constraint.isNotNull(StringSupport.trimOrNull(sql), "SQL statement cannot be null or empty");
}
@@ -515,7 +514,7 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
* @param store initial value source
*/
public void setInitialValueStore(@Nullable final PairwiseIdStore store) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ throwSetterPreconditionExceptions();
initialValueStore = store;
}
@@ -588,7 +587,7 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
/** {@inheritDoc} */
@Nullable public PairwiseId getBySourceValue(@Nonnull final PairwiseId pid, final boolean allowCreate)
throws IOException {
- ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
+ throwComponentStateExceptions();
Constraint.isNotNull(pid, "Input PairwiseId object cannot be null");
Constraint.isNotEmpty(pid.getIssuerEntityID(), "Issuer entityID cannot be null or empty");
Constraint.isNotEmpty(pid.getRecipientEntityID(), "Recipient entityID cannot be null or empty");
@@ -673,7 +672,7 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
/** {@inheritDoc} */
@Nullable public PairwiseId getByIssuedValue(@Nonnull final PairwiseId pid) throws IOException {
- ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
+ throwComponentStateExceptions();
Constraint.isNotNull(pid, "Input PairwiseId object cannot be null");
Constraint.isNotEmpty(pid.getIssuerEntityID(), "Issuer entityID cannot be null or empty");
Constraint.isNotEmpty(pid.getRecipientEntityID(), "Recipient entityID cannot be null or empty");
@@ -716,7 +715,7 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
/** {@inheritDoc} */
public void deactivate(@Nonnull final PairwiseId pid) throws IOException {
- ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
+ throwComponentStateExceptions();
Constraint.isNotNull(pid, "Input PairwiseId object cannot be null");
Constraint.isNotEmpty(pid.getIssuerEntityID(), "Issuer entityID cannot be null or empty");
Constraint.isNotEmpty(pid.getRecipientEntityID(), "Recipient entityID cannot be null or empty");
@@ -755,7 +754,7 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
/** {@inheritDoc} */
public void attach(@Nonnull final PairwiseId pid) throws IOException {
- ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
+ throwComponentStateExceptions();
Constraint.isNotNull(pid, "Input PairwiseId object cannot be null");
Constraint.isNotEmpty(pid.getIssuerEntityID(), "Issuer entityID cannot be null or empty");
Constraint.isNotEmpty(pid.getRecipientEntityID(), "Recipient entityID cannot be null or empty");
diff --git a/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeRegistryServiceStrategy.java b/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeRegistryServiceStrategy.java
index c7ed10fed..45f9c3c43 100644
--- a/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeRegistryServiceStrategy.java
+++ b/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeRegistryServiceStrategy.java
@@ -37,7 +37,6 @@ import net.shibboleth.idp.attribute.transcoding.TranscodingRule;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.service.ServiceException;
import net.shibboleth.utilities.java.support.service.ServiceableComponent;
@@ -63,7 +62,7 @@ public class AttributeRegistryServiceStrategy extends AbstractIdentifiableInitia
*/
@Autowired
public void setNamingRegistry(@Nullable @NonnullElements final Collection<NamingFunction<?>> namingFunctions) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ throwSetterPreconditionExceptions();
if (namingFunctions != null) {
namingRegistry = List.copyOf(namingFunctions);
diff --git a/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImpl.java b/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImpl.java
index ea4177851..79ce009d0 100644
--- a/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImpl.java
+++ b/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImpl.java
@@ -47,11 +47,10 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElemen
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
/** Service implementation of the {@link AttributeTranscoderRegistry} interface. */
@ThreadSafe
@@ -95,7 +94,7 @@ public class AttributeTranscoderRegistryImpl extends AbstractServiceableComponen
* @param registry collection of naming functions for indexing
*/
public void setNamingRegistry(@Nullable @NonnullElements final Collection<NamingFunction<?>> registry) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ throwSetterPreconditionExceptions();
namingFunctionRegistry.clear();
@@ -122,7 +121,7 @@ public class AttributeTranscoderRegistryImpl extends AbstractServiceableComponen
* @param mappings transcoding rulesets
*/
public void setTranscoderRegistry(@Nonnull @NonnullElements final Collection<TranscodingRule> mappings) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ throwSetterPreconditionExceptions();
Constraint.isNotNull(mappings, "Mappings cannot be null");
transcodingRegistry.clear();
@@ -174,7 +173,7 @@ public class AttributeTranscoderRegistryImpl extends AbstractServiceableComponen
/** {@inheritDoc} */
@Nonnull @NonnullElements @NotLive @Unmodifiable public Map<Locale,String> getDisplayNames(
@Nonnull final IdPAttribute attribute) {
- ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
+ throwComponentStateExceptions();
Constraint.isNotNull(attribute, "IdPAttribute cannot be null");
if (displayNameRegistry.containsKey(attribute.getId())) {
@@ -186,7 +185,7 @@ public class AttributeTranscoderRegistryImpl extends AbstractServiceableComponen
/** {@inheritDoc} */
@Nonnull @NonnullElements @NotLive @Unmodifiable public Map<Locale,String> getDescriptions(
@Nonnull final IdPAttribute attribute) {
- ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
+ throwComponentStateExceptions();
Constraint.isNotNull(attribute, "IdPAttribute cannot be null");
if (descriptionRegistry.containsKey(attribute.getId())) {
@@ -198,7 +197,7 @@ public class AttributeTranscoderRegistryImpl extends AbstractServiceableComponen
/** {@inheritDoc} */
@Nonnull @NonnullElements @Unmodifiable public Collection<TranscodingRule> getTranscodingRules(
@Nonnull final IdPAttribute from, @Nonnull final Class<?> to) {
- ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
+ throwComponentStateExceptions();
Constraint.isNotNull(from, "IdPAttribute cannot be null");
Constraint.isNotNull(to, "Target type cannot be null");
@@ -221,7 +220,7 @@ public class AttributeTranscoderRegistryImpl extends AbstractServiceableComponen
/** {@inheritDoc} */
@Nonnull @NonnullElements @Unmodifiable public <T> Collection<TranscodingRule> getTranscodingRules(
@Nonnull final T from) {
- ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
+ throwComponentStateExceptions();
Constraint.isNotNull(from, "Input object cannot be null");
final Class<?> effectiveType = getEffectiveType(from.getClass());
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list