[java-metadata-aggregator] branch main updated: JSPT-98 Integrate lifecycle checking methods in base classes
Ian Young
ian at iay.org.uk
Thu Aug 25 15:40:22 UTC 2022
This is an automated email from the git hooks/post-receive script.
iay pushed a commit to branch main
in repository java-metadata-aggregator.
View the commit online:
http://git.shibboleth.net/view/?p=java-metadata-aggregator.git;a=commit;h=fc1918c124c09eb5916336c6c41aa06ed1da61db
The following commit(s) were added to refs/heads/main by this push:
new fc1918c JSPT-98 Integrate lifecycle checking methods in base classes
fc1918c is described below
commit fc1918c124c09eb5916336c6c41aa06ed1da61db
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Thu Aug 18 17:41:22 2022 +0100
JSPT-98 Integrate lifecycle checking methods in base classes
https://shibboleth.atlassian.net/browse/JSPT-98
Adopt method names now used in shib-support parent classes.
---
.../dom/AbstractElementValidationStage.java | 4 +--
.../metadata/dom/AbstractElementVisitingStage.java | 4 +--
.../metadata/dom/AbstractXSLProcessingStage.java | 12 ++++----
.../metadata/dom/DOMFilesystemSourceStage.java | 12 ++++----
.../metadata/dom/DOMResourceSourceStage.java | 6 ++--
.../metadata/dom/ElementStrippingStage.java | 4 +--
.../metadata/dom/ElementsStrippingStage.java | 4 +--
.../metadata/dom/EmptyContainerStrippingStage.java | 4 +--
.../metadata/dom/NamespaceStrippingStage.java | 2 +-
.../metadata/dom/NamespacesStrippingStage.java | 4 +--
.../metadata/dom/XMLSchemaValidationStage.java | 4 +--
.../metadata/dom/XMLSignatureSigningStage.java | 36 +++++++++++-----------
.../metadata/dom/XMLSignatureValidationStage.java | 14 ++++-----
.../metadata/dom/XPathFilteringStage.java | 4 +--
.../dom/saml/ContactPersonFilterStage.java | 4 +--
.../dom/saml/EntitiesDescriptorAssemblerStage.java | 6 ++--
.../metadata/dom/saml/EntityFilterStage.java | 6 ++--
.../metadata/dom/saml/EntityRoleFilterStage.java | 8 ++---
.../dom/saml/PullUpCacheDurationStage.java | 4 +--
.../metadata/dom/saml/PullUpValidUntilStage.java | 4 +--
.../metadata/dom/saml/SetCacheDurationStage.java | 2 +-
.../metadata/dom/saml/SetValidUntilStage.java | 2 +-
.../metadata/dom/saml/ValidateValidUntilStage.java | 4 +--
.../saml/mdattr/EntityAttributeAddingStage.java | 8 ++---
.../saml/mdattr/EntityAttributeFilteringStage.java | 6 ++--
.../EntityRegistrationAuthorityFilterStage.java | 8 ++---
.../dom/saml/mdui/IPHintValidationStage.java | 2 +-
.../AbstractItemMetadataSelectionStage.java | 4 +--
.../metadata/pipeline/AbstractStage.java | 4 +--
.../metadata/pipeline/CompositeStage.java | 2 +-
.../metadata/pipeline/ItemIdTransformStage.java | 2 +-
.../metadata/pipeline/ItemMetadataAddingStage.java | 2 +-
.../metadata/pipeline/ItemOrderingStage.java | 2 +-
.../pipeline/MultiOutputSerializationStage.java | 4 +--
.../pipeline/PipelineDemultiplexerStage.java | 8 ++---
.../metadata/pipeline/PipelineMergeStage.java | 8 ++---
.../metadata/pipeline/ScriptletStage.java | 4 +--
.../metadata/pipeline/SerializationStage.java | 6 ++--
.../metadata/pipeline/SimplePipeline.java | 2 +-
.../metadata/pipeline/SplitMergeStage.java | 12 ++++----
.../metadata/pipeline/StaticItemSourceStage.java | 2 +-
.../BaseIdentifiableInitializableComponent.java | 4 +--
.../metadata/validate/BaseValidator.java | 2 +-
.../metadata/validate/ValidatorSequence.java | 2 +-
.../validate/string/BaseStringRegexValidator.java | 2 +-
.../metadata/validate/x509/X509DSADetector.java | 4 +--
.../x509/X509RSAOpenSSLBlacklistValidator.java | 4 +--
47 files changed, 129 insertions(+), 129 deletions(-)
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractElementValidationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractElementValidationStage.java
index c8478cd..ff4c07e 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractElementValidationStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractElementValidationStage.java
@@ -62,7 +62,7 @@ public abstract class AbstractElementValidationStage<T> extends AbstractDOMValid
* @param names collection of element names to visit.
*/
public void setElementNames(@Nonnull final Collection<QName> names) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
Constraint.isNotNull(names, "elementNames may not be null");
elementNames = Set.copyOf(names);
}
@@ -75,7 +75,7 @@ public abstract class AbstractElementValidationStage<T> extends AbstractDOMValid
* @param name {@link QName} for the element to be visited.
*/
public final synchronized void setElementName(@Nonnull final QName name) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
Constraint.isNotNull(name, "elementName may not be null");
elementNames = Set.of(name);
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractElementVisitingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractElementVisitingStage.java
index 3e8967d..992b9e4 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractElementVisitingStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractElementVisitingStage.java
@@ -61,7 +61,7 @@ public abstract class AbstractElementVisitingStage extends AbstractDOMTraversalS
* @param names collection of element names to visit.
*/
public synchronized void setElementNames(@Nonnull @NonnullElements @Unmodifiable final Collection<QName> names) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
Constraint.isNotNull(names, "elementNames may not be null");
elementNames = Set.copyOf(names);
}
@@ -74,7 +74,7 @@ public abstract class AbstractElementVisitingStage extends AbstractDOMTraversalS
* @param name {@link QName} for the element to be visited.
*/
public synchronized void setElementName(@Nonnull final QName name) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
Constraint.isNotNull(name, "elementName may not be null");
elementNames = Set.of(name);
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractXSLProcessingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractXSLProcessingStage.java
index 1cd5132..74f0be8 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractXSLProcessingStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractXSLProcessingStage.java
@@ -122,7 +122,7 @@ public abstract class AbstractXSLProcessingStage extends AbstractStage<Element>
* @param resource resource that provides the XSL document
*/
public synchronized void setXSLResource(@Nonnull final Resource resource) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
xslResource = Constraint.isNotNull(resource, "XSL resource can not be null");
}
@@ -152,7 +152,7 @@ public abstract class AbstractXSLProcessingStage extends AbstractStage<Element>
*/
public synchronized void setTransformAttributes(
@Nonnull @NonnullElements @Unmodifiable final Map<String, Object> attributes) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
transformAttributes = Map.copyOf(attributes);
}
@@ -173,7 +173,7 @@ public abstract class AbstractXSLProcessingStage extends AbstractStage<Element>
*/
public synchronized void setTransformFeatures(
@Nonnull @NonnullElements @Unmodifiable final Map<String, Boolean> features) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
transformFeatures = Map.copyOf(features);
}
@@ -194,7 +194,7 @@ public abstract class AbstractXSLProcessingStage extends AbstractStage<Element>
*/
public synchronized void setTransformParameters(
@Nonnull @NonnullElements @Unmodifiable final Map<String, Object> parameters) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
transformParameters = Map.copyOf(parameters);
}
@@ -213,7 +213,7 @@ public abstract class AbstractXSLProcessingStage extends AbstractStage<Element>
* @param resolver the {@link URIResolver} to use, or <code>null</code>
*/
public synchronized void setURIResolver(@Nullable final URIResolver resolver) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
uriResolver = resolver;
}
@@ -388,4 +388,4 @@ public abstract class AbstractXSLProcessingStage extends AbstractStage<Element>
}
}
-}
\ No newline at end of file
+}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMFilesystemSourceStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMFilesystemSourceStage.java
index d379f50..e2d5ec2 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMFilesystemSourceStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMFilesystemSourceStage.java
@@ -105,7 +105,7 @@ public class DOMFilesystemSourceStage extends AbstractStage<Element> {
* @param pool pool of DOM parsers used to parse the XML file in to a DOM
*/
public synchronized void setParserPool(@Nonnull final ParserPool pool) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
parserPool = Constraint.isNotNull(pool, "Parser pool can not be null");
}
@@ -124,7 +124,7 @@ public class DOMFilesystemSourceStage extends AbstractStage<Element> {
* @param source path to the DOM material provided by this source
*/
public synchronized void setSource(@Nonnull final File source) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
sourceFile = Constraint.isNotNull(source, "XML source file can not be null");
}
@@ -144,7 +144,7 @@ public class DOMFilesystemSourceStage extends AbstractStage<Element> {
* @param filter filter used to determine if a file, in a directory, should be treated as a source file, may be null
*/
public synchronized void setSourceFileFilter(@Nonnull final FileFilter filter) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
sourceFileFilter = Constraint.isNotNull(filter, "File filter can not be null");
}
@@ -163,7 +163,7 @@ public class DOMFilesystemSourceStage extends AbstractStage<Element> {
* @param recurse whether directories will be recursively searched for XML input files
*/
public synchronized void setRecurseDirectories(final boolean recurse) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
recurseDirectories = recurse;
}
@@ -182,7 +182,7 @@ public class DOMFilesystemSourceStage extends AbstractStage<Element> {
* @param isError whether the lack of source files is considered an error
*/
public synchronized void setNoSourceFilesAnError(final boolean isError) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
noSourceFilesAnError = isError;
}
@@ -201,7 +201,7 @@ public class DOMFilesystemSourceStage extends AbstractStage<Element> {
* @param causesFailure whether an error parsing a single file causes the source to fail
*/
public synchronized void setErrorCausesSourceFailure(final boolean causesFailure) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
errorCausesSourceFailure = causesFailure;
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMResourceSourceStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMResourceSourceStage.java
index 0172628..f801c7e 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMResourceSourceStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMResourceSourceStage.java
@@ -87,7 +87,7 @@ public class DOMResourceSourceStage extends AbstractStage<Element> {
* @param resource resource from which the XML document will be fetched
*/
public synchronized void setDOMResource(@Nonnull final Resource resource) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
domResource = Constraint.isNotNull(resource, "DOM resource can not be null");
}
@@ -106,7 +106,7 @@ public class DOMResourceSourceStage extends AbstractStage<Element> {
* @param pool pool of DOM parsers used to parse the XML file in to a DOM
*/
public synchronized void setParserPool(@Nonnull final ParserPool pool) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
parserPool = Constraint.isNotNull(pool, "Parser pool can not be null");
}
@@ -125,7 +125,7 @@ public class DOMResourceSourceStage extends AbstractStage<Element> {
* @param causesFailure whether an error reading and parsing the XML file causes this stage to fail
*/
public synchronized void setErrorCausesSourceFailure(final boolean causesFailure) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
errorCausesSourceFailure = causesFailure;
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/ElementStrippingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/ElementStrippingStage.java
index 3a732cf..a1c2e4d 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/ElementStrippingStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/ElementStrippingStage.java
@@ -66,7 +66,7 @@ public class ElementStrippingStage extends AbstractIteratingStage<Element> {
* @param namespace namespace of the element to strip
*/
public synchronized void setElementNamespace(@Nonnull @NotEmpty final String namespace) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
elementNamespace = Constraint.isNotNull(StringSupport.trimOrNull(namespace),
"target namespace can not be null or empty");
}
@@ -86,7 +86,7 @@ public class ElementStrippingStage extends AbstractIteratingStage<Element> {
* @param name the name of the element to strip
*/
public synchronized void setElementName(@Nonnull @NotEmpty final String name) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
elementName = Constraint.isNotNull(StringSupport.trimOrNull(name),
"target element name can not be null or empty");
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/ElementsStrippingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/ElementsStrippingStage.java
index 027ed70..33df825 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/ElementsStrippingStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/ElementsStrippingStage.java
@@ -163,7 +163,7 @@ public class ElementsStrippingStage extends AbstractDOMTraversalStage<ElementsSt
* @param namespace namespace of the elements to strip
*/
public void setElementNamespace(@Nonnull @NotEmpty final String namespace) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
elementNamespace = Constraint.isNotNull(StringSupport.trimOrNull(namespace),
"target namespace can not be null or empty");
}
@@ -185,7 +185,7 @@ public class ElementsStrippingStage extends AbstractDOMTraversalStage<ElementsSt
*/
public synchronized void setElementNames(
@Nonnull @NonnullElements @Unmodifiable @NotEmpty final Collection<String> names) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
elementNames = Set.copyOf(names);
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/EmptyContainerStrippingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/EmptyContainerStrippingStage.java
index 129d4cf..62d1d0d 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/EmptyContainerStrippingStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/EmptyContainerStrippingStage.java
@@ -64,7 +64,7 @@ public class EmptyContainerStrippingStage extends AbstractIteratingStage<Element
* @param namespace namespace of the element to strip
*/
public synchronized void setElementNamespace(@Nonnull @NotEmpty final String namespace) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
elementNamespace = Constraint.isNotNull(StringSupport.trimOrNull(namespace),
"target namespace can not be null or empty");
}
@@ -84,7 +84,7 @@ public class EmptyContainerStrippingStage extends AbstractIteratingStage<Element
* @param name the name of the element to strip
*/
public synchronized void setElementName(@Nonnull @NotEmpty final String name) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
elementName = Constraint.isNotNull(StringSupport.trimOrNull(name),
"target element name can not be null or empty");
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/NamespaceStrippingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/NamespaceStrippingStage.java
index 1121254..d54256c 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/NamespaceStrippingStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/NamespaceStrippingStage.java
@@ -57,7 +57,7 @@ public class NamespaceStrippingStage extends AbstractNamespacesStrippingStage {
* @param ns namespace URI as a string
*/
public synchronized void setNamespace(@Nonnull @NotEmpty final String ns) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
namespace = Constraint.isNotNull(StringSupport.trimOrNull(ns),
"target namespace can not be null or empty");
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/NamespacesStrippingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/NamespacesStrippingStage.java
index f7667cc..2672fb6 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/NamespacesStrippingStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/NamespacesStrippingStage.java
@@ -75,7 +75,7 @@ public class NamespacesStrippingStage extends AbstractNamespacesStrippingStage {
* @param nss collection of namespaces
*/
public synchronized void setNamespaces(@Nonnull @NonnullElements @Unmodifiable final Collection<String> nss) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
namespaces = Set.copyOf(nss);
}
@@ -94,7 +94,7 @@ public class NamespacesStrippingStage extends AbstractNamespacesStrippingStage {
* @param wl <code>true</code> for whitelisting, <code>false</code> for blacklisting
*/
public synchronized void setWhitelisting(final boolean wl) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
whitelisting = wl;
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSchemaValidationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSchemaValidationStage.java
index f207417..aef8dc0 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSchemaValidationStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSchemaValidationStage.java
@@ -95,7 +95,7 @@ public class XMLSchemaValidationStage extends AbstractIteratingStage<Element> {
*/
public synchronized void setSchemaResources(
@Nullable @NonnullElements @Unmodifiable final List<Resource> resources) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
schemaResources = List.copyOf(resources);
}
@@ -114,7 +114,7 @@ public class XMLSchemaValidationStage extends AbstractIteratingStage<Element> {
* @param isRequired whether Elements are required to be schema valid
*/
public synchronized void setElementRequiredToBeSchemaValid(final boolean isRequired) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
elementRequiredToBeSchemaValid = isRequired;
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java
index 578e5c9..67e4ddb 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java
@@ -170,7 +170,7 @@ public class XMLSignatureSigningStage extends AbstractStage<Element> {
* @param variant SHA algorithm variant used when computing the signature and digest
*/
public synchronized void setShaVariant(@Nonnull final ShaVariant variant) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
shaVariant = Constraint.isNotNull(variant, "SHA variant can not be null");
}
@@ -189,7 +189,7 @@ public class XMLSignatureSigningStage extends AbstractStage<Element> {
* @param key private key used to sign the content
*/
public synchronized void setPrivateKey(@Nonnull final PrivateKey key) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
privKey = Constraint.isNotNull(key, "Private key can not be null");
}
@@ -208,7 +208,7 @@ public class XMLSignatureSigningStage extends AbstractStage<Element> {
* @param key public key associated with private key used to sign the content
*/
public synchronized void setPublicKey(@Nullable final PublicKey key) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
publicKey = key;
}
@@ -231,7 +231,7 @@ public class XMLSignatureSigningStage extends AbstractStage<Element> {
*/
public synchronized void setCertificates(
@Nonnull @NonnullElements @Unmodifiable final List<X509Certificate> certs) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
certificates = List.copyOf(certs);
}
@@ -252,7 +252,7 @@ public class XMLSignatureSigningStage extends AbstractStage<Element> {
*/
public synchronized void setCrls(
@Nonnull @NonnullElements @Unmodifiable final List<X509CRL> revocationLists) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
crls = List.copyOf(revocationLists);
}
@@ -271,7 +271,7 @@ public class XMLSignatureSigningStage extends AbstractStage<Element> {
* @param isExclusive whether exclusive canonicalization will be used
*/
public synchronized void setC14nExclusive(final boolean isExclusive) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
c14nExclusive = isExclusive;
}
@@ -290,7 +290,7 @@ public class XMLSignatureSigningStage extends AbstractStage<Element> {
* @param withComments whether comments are canonicalized
*/
public synchronized void setC14nWithComments(final boolean withComments) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
c14nWithComments = withComments;
}
@@ -311,7 +311,7 @@ public class XMLSignatureSigningStage extends AbstractStage<Element> {
*/
public synchronized void setInclusivePrefixList(
@Nonnull @NonnullElements @Unmodifiable final List<String> prefixList) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
inclusivePrefixList = List.copyOf(prefixList);
}
@@ -332,7 +332,7 @@ public class XMLSignatureSigningStage extends AbstractStage<Element> {
*/
public synchronized void setIdAttributeNames(
@Nonnull @NonnullElements @Unmodifiable final List<QName> names) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
Constraint.isNotNull(names, "names property may not be null");
idAttributeNames = List.copyOf(names);
@@ -355,7 +355,7 @@ public class XMLSignatureSigningStage extends AbstractStage<Element> {
*/
public synchronized void setKeyNames(
@Nonnull @NonnullElements @Unmodifiable final List<String> names) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
keyNames = List.copyOf(names);
}
@@ -374,7 +374,7 @@ public class XMLSignatureSigningStage extends AbstractStage<Element> {
* @param include whether key names are included in the KeyInfo
*/
public synchronized void setIncludeKeyNames(final boolean include) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
includeKeyNames = include;
}
@@ -393,7 +393,7 @@ public class XMLSignatureSigningStage extends AbstractStage<Element> {
* @param included whether key values are included in the KeyInfo
*/
public synchronized void setIncludeKeyValue(final boolean included) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
includeKeyValue = included;
}
@@ -412,7 +412,7 @@ public class XMLSignatureSigningStage extends AbstractStage<Element> {
* @param include whether end-entity certifcate's subject name is included in the KeyInfo
*/
public synchronized void setIncludeX509SubjectName(final boolean include) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
includeX509SubjectName = include;
}
@@ -431,7 +431,7 @@ public class XMLSignatureSigningStage extends AbstractStage<Element> {
* @param include whether X509 certificates are included in the KeyInfo
*/
public synchronized void setIncludeX509Certificates(final boolean include) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
includeX509Certificates = include;
}
@@ -450,7 +450,7 @@ public class XMLSignatureSigningStage extends AbstractStage<Element> {
* @param include whether CRLs are included in the KeyInfo
*/
public synchronized void setIncludeX509Crls(final boolean include) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
includeX509Crls = include;
}
@@ -469,7 +469,7 @@ public class XMLSignatureSigningStage extends AbstractStage<Element> {
* @param include whether the end-entity certificate's issuer and serial number are included in the KeyInfo
*/
public synchronized void setIncludeX509IssuerSerial(final boolean include) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
includeX509IssuerSerial = include;
}
@@ -488,7 +488,7 @@ public class XMLSignatureSigningStage extends AbstractStage<Element> {
* @param debug whether logging of the pre-digest data stream is enabled
*/
public synchronized void setDebugPreDigest(final boolean debug) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
debugPreDigest = debug;
}
@@ -507,7 +507,7 @@ public class XMLSignatureSigningStage extends AbstractStage<Element> {
* @param newValue whether to remove CR characters from generated signatures.
*/
public void setRemovingCRsFromSignature(final boolean newValue) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
removingCRsFromSignature = newValue;
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidationStage.java
index f7a8dea..37946f8 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidationStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidationStage.java
@@ -111,7 +111,7 @@ public class XMLSignatureValidationStage extends AbstractStage<Element> {
* @param required whether the Element is required to be signed
*/
public synchronized void setSignatureRequired(final boolean required) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
signatureRequired = required;
}
@@ -130,7 +130,7 @@ public class XMLSignatureValidationStage extends AbstractStage<Element> {
* @param isRequired whether the signature on a Element element is required to be valid
*/
public synchronized void setValidSignatureRequired(final boolean isRequired) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
validSignatureRequired = isRequired;
}
@@ -150,7 +150,7 @@ public class XMLSignatureValidationStage extends AbstractStage<Element> {
* @param certificate certificate containing the key used to verify the signature
*/
public synchronized void setVerificationCertificate(@Nonnull final Certificate certificate) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
verificationCertificate = Constraint.isNotNull(certificate, "Certificate can not be null");
verificationKey = verificationCertificate.getPublicKey();
}
@@ -170,7 +170,7 @@ public class XMLSignatureValidationStage extends AbstractStage<Element> {
* @param key key used to verify the signature
*/
public synchronized void setVerificationKey(@Nonnull final PublicKey key) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
verificationKey = Constraint.isNotNull(key, "Public key can not be null");
}
@@ -181,7 +181,7 @@ public class XMLSignatureValidationStage extends AbstractStage<Element> {
*/
public synchronized void setBlacklistedDigests(
@Nonnull @NonnullElements @Unmodifiable final Collection<String> identifiers) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
blacklistedDigests = Set.copyOf(identifiers);
}
@@ -201,7 +201,7 @@ public class XMLSignatureValidationStage extends AbstractStage<Element> {
*/
public synchronized void setBlacklistedSignatureMethods(
@Nonnull @NonnullElements @Unmodifiable final Collection<String> identifiers) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
blacklistedSignatureMethods = Set.copyOf(identifiers);
}
@@ -229,7 +229,7 @@ public class XMLSignatureValidationStage extends AbstractStage<Element> {
* @param permit whether empty references are permitted
*/
public synchronized void setPermittingEmptyReferences(final boolean permit) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
permittingEmptyReferences = permit;
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/XPathFilteringStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XPathFilteringStage.java
index 116a6d8..5cef161 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/XPathFilteringStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XPathFilteringStage.java
@@ -85,7 +85,7 @@ public class XPathFilteringStage extends AbstractStage<Element> {
* @param expression XPath expression to execute on each {@link DOMElementItem}
*/
public synchronized void setXPathExpression(@Nonnull @NotEmpty final String expression) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
xpathExpression =
Constraint.isNotNull(StringSupport.trimOrNull(expression), "XPath expression can not be null or empty");
}
@@ -105,7 +105,7 @@ public class XPathFilteringStage extends AbstractStage<Element> {
* @param context {@link NamespaceContext} to use in interpreting the XPath expression
*/
public synchronized void setNamespaceContext(@Nullable final NamespaceContext context) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
if (context == null) {
namespaceContext = new SimpleNamespaceContext();
} else {
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java
index 1900746..eedbe07 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java
@@ -103,7 +103,7 @@ public class ContactPersonFilterStage extends AbstractIteratingStage<Element> {
*/
public synchronized void setDesignatedTypes(
@Nonnull @NonnullElements @Unmodifiable final Collection<String> types) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
final Set<String> checkedTypes = new HashSet<>();
for (final String type : types) {
@@ -133,7 +133,7 @@ public class ContactPersonFilterStage extends AbstractIteratingStage<Element> {
* @param whitelisting true if the designated entities should be considered a whitelist, false otherwise
*/
public synchronized void setWhitelistingTypes(final boolean whitelisting) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
whitelistingTypes = whitelisting;
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage.java
index c74ba4a..fba7c70 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage.java
@@ -88,7 +88,7 @@ public class EntitiesDescriptorAssemblerStage extends AbstractStage<Element> {
* @param isError whether attempting to turn an empty item collection should be treated as processing error
*/
public synchronized void setNoChildrenAProcessingError(final boolean isError) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
noChildrenAProcessingError = isError;
}
@@ -107,7 +107,7 @@ public class EntitiesDescriptorAssemblerStage extends AbstractStage<Element> {
* @param strategy strategy used to order a collection of Items
*/
public synchronized void setItemOrderingStrategy(@Nonnull final ItemOrderingStrategy<Element> strategy) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
itemOrderingStrategy = Constraint.isNotNull(strategy, "Item ordering strategy can not be null");
}
@@ -126,7 +126,7 @@ public class EntitiesDescriptorAssemblerStage extends AbstractStage<Element> {
* @param name Name used for the generated descriptor
*/
public synchronized void setDescriptorName(@Nullable final String name) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
descriptorName = StringSupport.trimOrNull(name);
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntityFilterStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntityFilterStage.java
index d206f92..09ac918 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntityFilterStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntityFilterStage.java
@@ -70,7 +70,7 @@ public class EntityFilterStage extends AbstractFilteringStage<Element> {
*/
public synchronized void setDesignatedEntities(
@Nonnull @NonnullElements @Unmodifiable final Collection<String> ids) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
designatedEntities = Set.copyOf(ids);
}
@@ -89,7 +89,7 @@ public class EntityFilterStage extends AbstractFilteringStage<Element> {
* @param whitelisting true if the designated entities should be considered a whitelist, false otherwise
*/
public synchronized void setWhitelistingEntities(final boolean whitelisting) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
whitelistingEntities = whitelisting;
}
@@ -108,7 +108,7 @@ public class EntityFilterStage extends AbstractFilteringStage<Element> {
* @param remove whether EntitiesDescriptor that do not contain EntityDescriptors should be removed
*/
public synchronized void setRemovingEntitylessEntitiesDescriptor(final boolean remove) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
removingEntitylessEntitiesDescriptor = remove;
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage.java
index c1ac8dd..cbb9029 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage.java
@@ -96,7 +96,7 @@ public class EntityRoleFilterStage extends AbstractFilteringStage<Element> {
* @param roles list of designated entity roles
*/
public synchronized void setDesignatedRoles(@Nonnull @NonnullElements @Unmodifiable final Collection<QName> roles) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
designatedRoles = Set.copyOf(roles);
}
@@ -115,7 +115,7 @@ public class EntityRoleFilterStage extends AbstractFilteringStage<Element> {
* @param whitelisting true if the designated entities should be considered a whitelist, false otherwise
*/
public synchronized void setWhitelistingRoles(final boolean whitelisting) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
whitelistingRoles = whitelisting;
}
@@ -134,7 +134,7 @@ public class EntityRoleFilterStage extends AbstractFilteringStage<Element> {
* @param remove whether EntityDescriptor elements without roles (after filtering) should be removed altogether
*/
public synchronized void setRemoveRolelessEntities(final boolean remove) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
removingRolelessEntities = remove;
}
@@ -153,7 +153,7 @@ public class EntityRoleFilterStage extends AbstractFilteringStage<Element> {
* @param remove whether EntitiesDescriptor that do not contain EntityDescriptors should be removed
*/
public synchronized void setRemovingEntitylessEntitiesDescriptor(final boolean remove) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
removingEntitylessEntitiesDescriptor = remove;
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStage.java
index 550c923..090a6e3 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStage.java
@@ -67,7 +67,7 @@ public class PullUpCacheDurationStage extends AbstractIteratingStage<Element> {
* @param duration the minimum cache duration
*/
public synchronized void setMinimumCacheDuration(final Duration duration) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
if (duration.isNegative()) {
minCacheDuration = Duration.ZERO;
} else {
@@ -91,7 +91,7 @@ public class PullUpCacheDurationStage extends AbstractIteratingStage<Element> {
* @param duration maximum cache duration, must be greater than 0
*/
public synchronized void setMaximumCacheDuration(final Duration duration) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
Constraint.isGreaterThan(0, duration.toMillis(), "Maximum cache duration must be greater than 0");
maxCacheDuration = duration;
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStage.java
index 4ad8bd9..f924c38 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStage.java
@@ -71,7 +71,7 @@ public class PullUpValidUntilStage extends AbstractIteratingStage<Element> {
* @param duration minimum amount of time a descriptor may be valid
*/
public synchronized void setMinimumValidityDuration(@Nonnull final Duration duration) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
if (duration.isNegative()) {
minValidityDuration = Duration.ZERO;
} else {
@@ -95,7 +95,7 @@ public class PullUpValidUntilStage extends AbstractIteratingStage<Element> {
* @param duration maximum amount of time a descriptor may be valid, must be greater than 0
*/
public synchronized void setMaximumValidityDuration(@Nonnull final Duration duration) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
Constraint.isGreaterThan(0, duration.toMillis(), "Maximum validity duration must be greater than 0");
maxValidityDuration = duration;
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStage.java
index 3091ee2..71148ee 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStage.java
@@ -64,7 +64,7 @@ public class SetCacheDurationStage extends AbstractIteratingStage<Element> {
* @param duration cache duration
*/
public synchronized void setCacheDuration(@Nonnull final Duration duration) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
Constraint.isNotNull(duration, "cache duration cannot be null");
Constraint.isFalse(duration.isZero(), "cache duration cannot be zero");
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/SetValidUntilStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/SetValidUntilStage.java
index c4ddad3..d93ca45 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/SetValidUntilStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/SetValidUntilStage.java
@@ -65,7 +65,7 @@ public class SetValidUntilStage extends AbstractIteratingStage<Element> {
* @param duration amount of time the descriptors will be valid
*/
public synchronized void setValidityDuration(@Nonnull final Duration duration) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
Constraint.isNotNull(duration, "validity duration cannot be null");
Constraint.isFalse(duration.isZero(), "validity duration cannot be zero");
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/ValidateValidUntilStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/ValidateValidUntilStage.java
index 34b9a2a..e6809e1 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/ValidateValidUntilStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/ValidateValidUntilStage.java
@@ -64,7 +64,7 @@ public class ValidateValidUntilStage extends AbstractIteratingStage<Element> {
* @param isRequired whether the item is required to have a validUntil attribute
*/
public synchronized void setRequireValidUntil(final boolean isRequired) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
requireValidUntil = isRequired;
}
@@ -86,7 +86,7 @@ public class ValidateValidUntilStage extends AbstractIteratingStage<Element> {
* than or equal to 0
*/
public synchronized void setMaxValidityInterval(@Nonnull final Duration interval) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
Constraint.isNotNull(interval, "max validity interval can not be null");
Constraint.isFalse(interval.isNegative(), "max validity interval can not be negative");
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage.java
index 79c4916..d055309 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage.java
@@ -97,7 +97,7 @@ public class EntityAttributeAddingStage extends AbstractStage<Element> {
* @param name the attributeName to set
*/
public synchronized void setAttributeName(@Nonnull final String name) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
attributeName = Constraint.isNotNull(name, "attributeName must not be null");
}
@@ -117,7 +117,7 @@ public class EntityAttributeAddingStage extends AbstractStage<Element> {
* @param nameFormat the attributeNameFormat to set
*/
public synchronized void setAttributeNameFormat(@Nonnull final String nameFormat) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
attributeNameFormat = Constraint.isNotNull(nameFormat, "attributeNameFormat must not be null");
}
@@ -137,7 +137,7 @@ public class EntityAttributeAddingStage extends AbstractStage<Element> {
* @param value the attributeValue to set
*/
public synchronized void setAttributeValue(@Nonnull final String value) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
attributeValue = Constraint.isNotNull(value, "attributeValue must not be null");
}
@@ -158,7 +158,7 @@ public class EntityAttributeAddingStage extends AbstractStage<Element> {
* @param addFirst <code>true</code> to add as the first child, <code>false</code> as the last
*/
public synchronized void setAddingFirstChild(final boolean addFirst) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
addingFirstChild = addFirst;
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage.java
index 7a6553b..a039885 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage.java
@@ -219,7 +219,7 @@ public class EntityAttributeFilteringStage extends AbstractIteratingStage<Elemen
*/
public synchronized void setRules(
@Nonnull @NonnullElements @Unmodifiable final List<Predicate<EntityAttributeContext>> newRules) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
rules = List.copyOf(Constraint.isNotNull(newRules, "rules property may not be null"));
}
@@ -240,7 +240,7 @@ public class EntityAttributeFilteringStage extends AbstractIteratingStage<Elemen
* <code>false</code> to blacklist
*/
public synchronized void setWhitelisting(final boolean newValue) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
whitelisting = newValue;
}
@@ -260,7 +260,7 @@ public class EntityAttributeFilteringStage extends AbstractIteratingStage<Elemen
* @param newValue whether to remove recorded entity attributes
*/
public synchronized void setRecordingRemovals(final boolean newValue) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
recordingRemovals = newValue;
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStage.java
index a722e75..0075c38 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStage.java
@@ -73,7 +73,7 @@ public class EntityRegistrationAuthorityFilterStage extends AbstractFilteringSta
* @param isRequired whether a descriptor is required to have registration information
*/
public synchronized void setRequiringRegistrationInformation(final boolean isRequired) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
requiringRegistrationInformation = isRequired;
}
@@ -94,7 +94,7 @@ public class EntityRegistrationAuthorityFilterStage extends AbstractFilteringSta
*/
public synchronized void setDesignatedRegistrationAuthorities(
@Nonnull @NonnullElements @Unmodifiable final Collection<String> authorities) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
designatedAuthorities = Set.copyOf(authorities);
}
@@ -114,7 +114,7 @@ public class EntityRegistrationAuthorityFilterStage extends AbstractFilteringSta
* otherwise
*/
public synchronized void setWhitelistingRegistrationAuthorities(final boolean whitelisting) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
whitelistingAuthorities = whitelisting;
}
@@ -133,7 +133,7 @@ public class EntityRegistrationAuthorityFilterStage extends AbstractFilteringSta
* @param remove whether EntitiesDescriptor that do not contain EntityDescriptors should be removed
*/
public synchronized void setRemovingEntitylessEntitiesDescriptor(final boolean remove) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
removingEntitylessEntitiesDescriptor = remove;
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStage.java
index 65fc6e8..3f25ded 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStage.java
@@ -56,7 +56,7 @@ public class IPHintValidationStage extends AbstractDOMTraversalStage<DOMTraversa
* @param check whether to check for network addresses only
*/
public synchronized void setCheckingNetworks(final boolean check) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
this.checkingNetworks = check;
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/AbstractItemMetadataSelectionStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/AbstractItemMetadataSelectionStage.java
index 091c618..c09e402 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/AbstractItemMetadataSelectionStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/AbstractItemMetadataSelectionStage.java
@@ -76,7 +76,7 @@ public abstract class AbstractItemMetadataSelectionStage<T, B> extends AbstractS
*/
public synchronized void setSelectionRequirements(
@Nonnull @NonnullElements @Unmodifiable final Collection<Class<? extends B>> requirements) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
selectionRequirements = Set.copyOf(requirements);
}
@@ -95,7 +95,7 @@ public abstract class AbstractItemMetadataSelectionStage<T, B> extends AbstractS
* @param strategy strategy used to generate {@link Item} identifiers for logging purposes, can not be null
*/
public synchronized void setIdentificationStrategy(@Nonnull final ItemIdentificationStrategy<T> strategy) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
identificationStrategy = Constraint.isNotNull(strategy, "Item identification strategy can not be null");
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/AbstractStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/AbstractStage.java
index fb2c349..9ee7562 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/AbstractStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/AbstractStage.java
@@ -54,7 +54,7 @@ public abstract class AbstractStage<T> extends BaseIdentifiableInitializableComp
* whether the stage will be executed
*/
public synchronized void setCollectionPredicate(@Nonnull final Predicate<Collection<Item<T>>> pred) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
collectionPredicate = Constraint.isNotNull(pred, "collectionPredicate may not be null");
}
@@ -73,7 +73,7 @@ public abstract class AbstractStage<T> extends BaseIdentifiableInitializableComp
@Override
public void execute(@Nonnull @NonnullElements final List<Item<T>> items)
throws StageProcessingException {
- throwComponentStateExceptions();
+ checkComponentActive();
final var start = Instant.now();
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/CompositeStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/CompositeStage.java
index 89b9b68..90e1443 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/CompositeStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/CompositeStage.java
@@ -58,7 +58,7 @@ public class CompositeStage<T> extends AbstractStage<T> {
*/
public synchronized void setComposedStages(
@Nonnull @NonnullElements @Unmodifiable final List<Stage<T>> stages) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
composedStages = List.copyOf(stages);
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ItemIdTransformStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ItemIdTransformStage.java
index 04ab05b..b0dea51 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ItemIdTransformStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ItemIdTransformStage.java
@@ -64,7 +64,7 @@ public class ItemIdTransformStage<T> extends AbstractIteratingStage<T> {
*/
public synchronized void setIdTransformers(
@Nonnull @NonnullElements @Unmodifiable final Collection<Function<String, String>> transformers) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
idTransformers = List.copyOf(transformers);
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataAddingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataAddingStage.java
index 8854afd..1dde75e 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataAddingStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataAddingStage.java
@@ -61,7 +61,7 @@ public class ItemMetadataAddingStage<T> extends AbstractIteratingStage<T> {
*/
public synchronized void setAdditionalItemMetadata(
@Nonnull @NonnullElements @Unmodifiable final Collection<ItemMetadata> metadata) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
Constraint.isNotNull(metadata, "additional metadata collection must not be null");
additionalItemMetadata = List.copyOf(metadata);
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ItemOrderingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ItemOrderingStage.java
index 1563cfc..1580a50 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ItemOrderingStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ItemOrderingStage.java
@@ -58,7 +58,7 @@ public class ItemOrderingStage<T> extends AbstractStage<T> {
* @param strategy strategy used to order a collection of Items
*/
public synchronized void setItemOrderingStrategy(@Nonnull final ItemOrderingStrategy<T> strategy) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
orderingStrategy = Constraint.isNotNull(strategy, "Item ordering strategy can not be null");
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/MultiOutputSerializationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/MultiOutputSerializationStage.java
index e262f47..ccf0549 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/MultiOutputSerializationStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/MultiOutputSerializationStage.java
@@ -116,7 +116,7 @@ public class MultiOutputSerializationStage<T> extends AbstractIteratingStage<T>
* @param strategy output strategy function determining where an item will be written
*/
public synchronized void setOutputStrategy(@Nonnull final OutputStrategy<T> strategy) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
outputStrategy = Constraint.isNotNull(strategy, "Output strategy can not be null");
}
@@ -135,7 +135,7 @@ public class MultiOutputSerializationStage<T> extends AbstractIteratingStage<T>
* @param itemSerializer serializer used to write item to the output file
*/
public synchronized void setSerializer(@Nonnull final ItemSerializer<T> itemSerializer) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
serializer = Constraint.isNotNull(itemSerializer, "Item serializer can not be null");
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java
index 217665d..658ad8d 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java
@@ -94,7 +94,7 @@ public class PipelineDemultiplexerStage<T> extends AbstractStage<T> {
* @param service executor service used to run the selected and non-selected item pipelines
*/
public synchronized void setExecutorService(@Nonnull final ExecutorService service) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
executorService = Constraint.isNotNull(service, "ExecutorService can not be null");
}
@@ -113,7 +113,7 @@ public class PipelineDemultiplexerStage<T> extends AbstractStage<T> {
* @param isWaiting whether this child waits for all the invoked pipelines to complete before proceeding
*/
public synchronized void setWaitingForPipelines(final boolean isWaiting) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
waitingForPipelines = isWaiting;
}
@@ -132,7 +132,7 @@ public class PipelineDemultiplexerStage<T> extends AbstractStage<T> {
* @param factory factory used to create the Item collection that is then given to the pipelines
*/
public synchronized void setCollectionFactory(@Nonnull final Supplier<List<Item<T>>> factory) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
collectionFactory = Constraint.isNotNull(factory, "Collection factory can not be null");
}
@@ -153,7 +153,7 @@ public class PipelineDemultiplexerStage<T> extends AbstractStage<T> {
*/
public synchronized void setPipelineAndSelectionStrategies(
@Nonnull @NonnullElements @Unmodifiable final List<Pair<Pipeline<T>, Predicate<Item<T>>>> passes) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
for (final Pair<Pipeline<T>, Predicate<Item<T>>> pass : passes) {
Constraint.isNotNull(pass.getFirst(), "Pipeline can not be null");
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java
index e144e28..f6c6f51 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java
@@ -85,7 +85,7 @@ public class PipelineMergeStage<T> extends AbstractStage<T> {
* @param service executor service used to run the selected and non-selected item pipelines
*/
public synchronized void setExecutorService(@Nonnull final ExecutorService service) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
executorService = Constraint.isNotNull(service, "ExecutorService can not be null");
}
@@ -106,7 +106,7 @@ public class PipelineMergeStage<T> extends AbstractStage<T> {
*/
public synchronized void setMergedPipelines(
@Nonnull @NonnullElements @Unmodifiable final List<? extends Pipeline<T>> pipelines) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
mergedPipelines = List.copyOf(pipelines);
}
@@ -125,7 +125,7 @@ public class PipelineMergeStage<T> extends AbstractStage<T> {
* @param factory factory used to create the {@link Item} collection produced by this source
*/
public synchronized void setCollectionFactory(@Nonnull final Supplier<List<Item<T>>> factory) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
collectionFactory = Constraint.isNotNull(factory, "Collection factory may not be null");
}
@@ -145,7 +145,7 @@ public class PipelineMergeStage<T> extends AbstractStage<T> {
* null
*/
public synchronized void setCollectionMergeStrategy(@Nonnull final CollectionMergeStrategy strategy) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
mergeStrategy = strategy;
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ScriptletStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ScriptletStage.java
index ad352ed..0ce281e 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ScriptletStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ScriptletStage.java
@@ -81,7 +81,7 @@ public class ScriptletStage<T> extends AbstractStage<T> {
* @param name the variable name
*/
public final synchronized void setVariableName(@Nonnull @NotEmpty final String name) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
variableName = Constraint.isNotNull(StringSupport.trimOrNull(name),
"variable name may not be null or empty");
}
@@ -101,7 +101,7 @@ public class ScriptletStage<T> extends AbstractStage<T> {
* @param stageScript the script executed by this stage
*/
public synchronized void setScript(@Nonnull final EvaluableScript stageScript) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
script = Constraint.isNotNull(stageScript, "Stage script can not be null");
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SerializationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SerializationStage.java
index 880294a..c5f7148 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SerializationStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SerializationStage.java
@@ -83,7 +83,7 @@ public class SerializationStage<T> extends AbstractStage<T> {
* @param file file to which the item will be written
*/
public synchronized void setOutputFile(@Nonnull final File file) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
outputFile = Constraint.isNotNull(file, "Output file can not be null");
}
@@ -102,7 +102,7 @@ public class SerializationStage<T> extends AbstractStage<T> {
* @param isOverwriting whether an existing output file should be overwritten
*/
public synchronized void setOverwritingExistingOutputFile(final boolean isOverwriting) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
overwritingExistingOutputFile = isOverwriting;
}
@@ -121,7 +121,7 @@ public class SerializationStage<T> extends AbstractStage<T> {
* @param itemSerializer serializer used to write item to the output file
*/
public synchronized void setSerializer(@Nonnull final ItemCollectionSerializer<T> itemSerializer) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
serializer = Constraint.isNotNull(itemSerializer, "Item collection serializer can not be null");
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SimplePipeline.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SimplePipeline.java
index 72c0829..317bc62 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SimplePipeline.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SimplePipeline.java
@@ -57,7 +57,7 @@ public class SimplePipeline<T> extends BaseIdentifiableInitializableComponent
*/
public synchronized void setStages(
@Nonnull @NonnullElements @Unmodifiable final List<Stage<T>> stages) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
pipelineStages = List.copyOf(stages);
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java
index 3f8596e..a09263f 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java
@@ -108,7 +108,7 @@ public class SplitMergeStage<T> extends AbstractStage<T> {
* @param service executor service used to run the selected and non-selected item pipelines
*/
public synchronized void setExecutorService(@Nonnull final ExecutorService service) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
executorService = Constraint.isNotNull(service, "ExecutorService can not be null");
}
@@ -127,7 +127,7 @@ public class SplitMergeStage<T> extends AbstractStage<T> {
* @param factory factory used to create the Item collection that is then given to the pipelines
*/
public synchronized void setCollectionFactory(@Nonnull final Supplier<List<Item<T>>> factory) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
collectionFactory = Constraint.isNotNull(factory, "Collection factory can not be null");
}
@@ -146,7 +146,7 @@ public class SplitMergeStage<T> extends AbstractStage<T> {
* @param strategy strategy used to split the given item collection, never null
*/
public synchronized void setSelectionStrategy(@Nonnull final Predicate<Item<T>> strategy) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
selectionStrategy = Constraint.isNotNull(strategy, "Item selection strategy can not be null");
}
@@ -165,7 +165,7 @@ public class SplitMergeStage<T> extends AbstractStage<T> {
* @param pipeline pipeline that receives the selected items
*/
public synchronized void setSelectedItemPipeline(@Nullable final Pipeline<T> pipeline) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
selectedItemPipeline = pipeline;
}
@@ -184,7 +184,7 @@ public class SplitMergeStage<T> extends AbstractStage<T> {
* @param pipeline pipeline that receives the non-selected items
*/
public synchronized void setNonselectedItemPipeline(@Nullable final Pipeline<T> pipeline) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
nonselectedItemPipeline = pipeline;
}
@@ -204,7 +204,7 @@ public class SplitMergeStage<T> extends AbstractStage<T> {
* null
*/
public synchronized void setCollectionMergeStrategy(@Nonnull final CollectionMergeStrategy strategy) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
mergeStrategy = Constraint.isNotNull(strategy, "Collection merge strategy can not be null");
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/StaticItemSourceStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/StaticItemSourceStage.java
index 0b8bb56..cb69b8d 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/StaticItemSourceStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/StaticItemSourceStage.java
@@ -56,7 +56,7 @@ public class StaticItemSourceStage<T> extends AbstractStage<T> {
*/
public synchronized void setSourceItems(
@Nonnull @NonnullElements @Unmodifiable final List<Item<T>> items) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
source = List.copyOf(items);
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/impl/BaseIdentifiableInitializableComponent.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/impl/BaseIdentifiableInitializableComponent.java
index a821abe..1458c34 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/impl/BaseIdentifiableInitializableComponent.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/impl/BaseIdentifiableInitializableComponent.java
@@ -70,7 +70,7 @@ public class BaseIdentifiableInitializableComponent extends AbstractIdentifiable
/**
* Helper for a setter method to check the standard preconditions.
*/
- protected final void throwSetterPreconditionExceptions() {
+ protected final void checkSetterPreconditions() {
ifDestroyedThrowDestroyedComponentException();
ifInitializedThrowUnmodifiabledComponentException();
}
@@ -79,7 +79,7 @@ public class BaseIdentifiableInitializableComponent extends AbstractIdentifiable
* Helper for any method to throw appropriate exceptions if we are either
* not initialized, or have been destroyed.
*/
- protected final void throwComponentStateExceptions() {
+ protected final void checkComponentActive() {
ifDestroyedThrowDestroyedComponentException();
ifNotInitializedThrowUninitializedComponentException();
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/validate/BaseValidator.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/BaseValidator.java
index 87fd19f..8817080 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/validate/BaseValidator.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/validate/BaseValidator.java
@@ -71,7 +71,7 @@ public abstract class BaseValidator extends BaseIdentifiableInitializableCompone
* @since 0.10.0
*/
public void setMessage(@Nonnull final String newMessage) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
message = Constraint.isNotNull(newMessage, "message format string may not be null");
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/validate/ValidatorSequence.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/ValidatorSequence.java
index fbc7aaf..0b00670 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/validate/ValidatorSequence.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/validate/ValidatorSequence.java
@@ -55,7 +55,7 @@ public class ValidatorSequence<V> extends BaseValidator implements Validator<V>
*/
public synchronized void setValidators(
@Nonnull @NonnullElements @Unmodifiable final List<Validator<V>> newValidators) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
validators = List.copyOf(newValidators);
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/validate/string/BaseStringRegexValidator.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/string/BaseStringRegexValidator.java
index 04a1cf7..bd57a05 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/validate/string/BaseStringRegexValidator.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/validate/string/BaseStringRegexValidator.java
@@ -59,7 +59,7 @@ public abstract class BaseStringRegexValidator extends BaseValidator {
* @param r the regular expression to set.
*/
public synchronized void setRegex(@Nonnull final String r) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
regex = r;
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509DSADetector.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509DSADetector.java
index f322da5..ab34bd6 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509DSADetector.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509DSADetector.java
@@ -80,7 +80,7 @@ public class X509DSADetector extends BaseValidator implements Validator<X509Cert
* @param newAction the {@link net.shibboleth.metadata.validate.Validator.Action} to be returned
*/
public synchronized void setAction(@Nonnull final Action newAction) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
action = newAction;
}
@@ -90,7 +90,7 @@ public class X509DSADetector extends BaseValidator implements Validator<X509Cert
* @param newValue whether an {@link net.shibboleth.metadata.ErrorStatus} should be added on failure
*/
public synchronized void setError(final boolean newValue) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
error = newValue;
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator.java
index e742019..2144e18 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator.java
@@ -85,7 +85,7 @@ public class X509RSAOpenSSLBlacklistValidator extends AbstractX509Validator {
* @param resource resource that provides the blacklist
*/
public synchronized void setBlacklistResource(@Nonnull final Resource resource) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
blacklistResource = Constraint.isNotNull(resource, "blacklist resource can not be null");
}
@@ -160,7 +160,7 @@ public class X509RSAOpenSSLBlacklistValidator extends AbstractX509Validator {
@Override
public void doValidate(@Nonnull final X509Certificate cert, @Nonnull final Item<?> item,
@Nonnull final String stageId) throws StageProcessingException {
- throwComponentStateExceptions();
+ checkComponentActive();
final PublicKey key = cert.getPublicKey();
if ("RSA".equals(key.getAlgorithm())) {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list