[java-support] branch main updated: JSPT-98 Integrate lifecycle checking methods in base classes
Rod Widdowson
rdw at steadingsoftware.com
Sat Jul 16 10:29:30 UTC 2022
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch main
in repository java-support.
View the commit online:
http://git.shibboleth.net/view/?p=java-support.git;a=commit;h=9c5daef1771b110059475c909cb00fdf70292c7a
The following commit(s) were added to refs/heads/main by this push:
new 9c5daef JSPT-98 Integrate lifecycle checking methods in base classes
9c5daef is described below
commit 9c5daef1771b110059475c909cb00fdf70292c7a
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Jul 15 16:15:22 2022 +0100
JSPT-98 Integrate lifecycle checking methods in base classes
https://shibboleth.atlassian.net/browse/JSPT-98
rename methods
throwSetterPreconditionExceptions -> checkSetterPreconditions
throwComponentStateExceptions -> checkComponentActive
---
.../AbstractIdentifiedInitializableComponent.java | 2 +-
.../component/AbstractInitializableComponent.java | 6 ++--
.../utilities/java/support/net/CookieManager.java | 20 +++++------
.../java/support/scripting/EvaluableScript.java | 4 +--
.../java/support/scripting/ScriptedRunnable.java | 4 +--
.../java/support/security/DataSealer.java | 16 ++++-----
.../security/impl/BasicAccessControlService.java | 2 +-
.../security/impl/BasicKeystoreKeyStrategy.java | 14 ++++----
.../impl/DelegatingAccessControlService.java | 2 +-
.../security/impl/IPRangeAccessControl.java | 2 +-
.../support/security/impl/ScriptedKeyStrategy.java | 12 +++----
.../support/service/AbstractReloadableService.java | 6 ++--
.../support/service/ReloadableServiceGaugeSet.java | 2 +-
.../java/support/xml/BasicParserPool.java | 40 +++++++++++-----------
14 files changed, 66 insertions(+), 66 deletions(-)
diff --git a/src/main/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiedInitializableComponent.java b/src/main/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiedInitializableComponent.java
index eb48799..4729743 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiedInitializableComponent.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiedInitializableComponent.java
@@ -82,7 +82,7 @@ public abstract class AbstractIdentifiedInitializableComponent extends AbstractI
* @param componentId ID of the component
*/
protected synchronized void setId(@Nonnull @NotEmpty final String componentId) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
id = Constraint.isNotNull(StringSupport.trimOrNull(componentId), "Component ID can not be null or empty");
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/component/AbstractInitializableComponent.java b/src/main/java/net/shibboleth/utilities/java/support/component/AbstractInitializableComponent.java
index 642f528..eb3470c 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/component/AbstractInitializableComponent.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/component/AbstractInitializableComponent.java
@@ -99,7 +99,7 @@ public abstract class AbstractInitializableComponent implements DestructableComp
/**
* Helper for a setter method to check the standard preconditions.
*/
- protected final void throwSetterPreconditionExceptions() {
+ protected final void checkSetterPreconditions() {
ifDestroyedThrowDestroyedComponentException();
ifInitializedThrowUnmodifiabledComponentException();
}
@@ -108,7 +108,7 @@ public abstract class AbstractInitializableComponent implements DestructableComp
* 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();
}
@@ -132,4 +132,4 @@ public abstract class AbstractInitializableComponent implements DestructableComp
protected void doInitialize() throws ComponentInitializationException {
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/CookieManager.java b/src/main/java/net/shibboleth/utilities/java/support/net/CookieManager.java
index 058fc45..882ffac 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/CookieManager.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/CookieManager.java
@@ -75,7 +75,7 @@ public final class CookieManager extends AbstractInitializableComponent {
* @param path cookie path to use, or null for the default
*/
public void setCookiePath(@Nullable final String path) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
cookiePath = StringSupport.trimOrNull(path);
}
@@ -86,7 +86,7 @@ public final class CookieManager extends AbstractInitializableComponent {
* @param domain the cookie domain to use, or null for the default
*/
public void setCookieDomain(@Nullable final String domain) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
cookieDomain = StringSupport.trimOrNull(domain);
}
@@ -97,7 +97,7 @@ public final class CookieManager extends AbstractInitializableComponent {
* @param request servlet request
*/
public void setHttpServletRequest(@Nonnull final HttpServletRequest request) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
httpRequest = Constraint.isNotNull(request, "HttpServletRequest cannot be null");
}
@@ -108,7 +108,7 @@ public final class CookieManager extends AbstractInitializableComponent {
* @param response servlet response
*/
public void setHttpServletResponse(@Nonnull final HttpServletResponse response) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
httpResponse = Constraint.isNotNull(response, "HttpServletResponse cannot be null");
}
@@ -119,7 +119,7 @@ public final class CookieManager extends AbstractInitializableComponent {
* @param flag flag to set
*/
public void setSecure(final boolean flag) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
secure = flag;
}
@@ -131,7 +131,7 @@ public final class CookieManager extends AbstractInitializableComponent {
* @param flag flag to set
*/
public void setHttpOnly(final boolean flag) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
httpOnly = flag;
}
@@ -142,7 +142,7 @@ public final class CookieManager extends AbstractInitializableComponent {
* @param age max age to set
*/
public void setMaxAge(final int age) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
maxAge = age;
}
@@ -163,7 +163,7 @@ public final class CookieManager extends AbstractInitializableComponent {
* @param value value of cookie
*/
public void addCookie(@Nonnull @NotEmpty final String name, @Nonnull @NotEmpty final String value) {
- throwComponentStateExceptions();
+ checkComponentActive();
final Cookie cookie = new Cookie(name, value);
cookie.setPath(cookiePath != null ? cookiePath : contextPathToCookiePath());
@@ -183,7 +183,7 @@ public final class CookieManager extends AbstractInitializableComponent {
* @param name name of cookie
*/
public void unsetCookie(@Nonnull @NotEmpty final String name) {
- throwComponentStateExceptions();
+ checkComponentActive();
final Cookie cookie = new Cookie(name, null);
cookie.setPath(cookiePath != null ? cookiePath : contextPathToCookiePath());
@@ -224,7 +224,7 @@ public final class CookieManager extends AbstractInitializableComponent {
* @return cookie value
*/
@Nullable public String getCookieValue(@Nonnull @NotEmpty final String name, @Nullable final String defValue) {
- throwComponentStateExceptions();
+ checkComponentActive();
final Cookie[] cookies = httpRequest.getCookies();
if (cookies != null) {
diff --git a/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java b/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java
index 269a454..fd1aa8a 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java
@@ -357,7 +357,7 @@ public final class EvaluableScript extends AbstractInitializableComponent {
* @throws ScriptException thrown if there was a problem evaluating the script
*/
@Nullable public Object eval(@Nonnull final Bindings scriptBindings) throws ScriptException {
- throwComponentStateExceptions();
+ checkComponentActive();
if (compiledScript != null) {
return compiledScript.eval(scriptBindings);
}
@@ -374,7 +374,7 @@ public final class EvaluableScript extends AbstractInitializableComponent {
* @throws ScriptException thrown if there was a problem evaluating the script
*/
@Nullable public Object eval(@Nonnull final ScriptContext scriptContext) throws ScriptException {
- throwComponentStateExceptions();
+ checkComponentActive();
if (compiledScript != null) {
return compiledScript.eval(scriptContext);
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/scripting/ScriptedRunnable.java b/src/main/java/net/shibboleth/utilities/java/support/scripting/ScriptedRunnable.java
index 420c9aa..03a9d6d 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/scripting/ScriptedRunnable.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/scripting/ScriptedRunnable.java
@@ -78,7 +78,7 @@ public class ScriptedRunnable extends AbstractIdentifiableInitializableComponent
* @param object the custom object
*/
public void setCustomObject(@Nullable final Object object) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
customObject = object;
}
@@ -98,7 +98,7 @@ public class ScriptedRunnable extends AbstractIdentifiableInitializableComponent
* @param matcherScript the script to be evaluated
*/
public void setScript(@Nonnull final EvaluableScript matcherScript) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
script = Constraint.isNotNull(matcherScript, "Attribute value matching script cannot be null");
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/DataSealer.java b/src/main/java/net/shibboleth/utilities/java/support/security/DataSealer.java
index e875a1a..3e0e39f 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/DataSealer.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/DataSealer.java
@@ -108,7 +108,7 @@ public class DataSealer extends AbstractInitializableComponent {
* @since 7.4.0
*/
public void setLockedAtStartup(final boolean flag) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
lockedAtStartup = flag;
}
@@ -119,7 +119,7 @@ public class DataSealer extends AbstractInitializableComponent {
* @param strategy key strategy
*/
public void setKeyStrategy(@Nonnull final DataSealerKeyStrategy strategy) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
keyStrategy = Constraint.isNotNull(strategy, "DataSealerKeyStrategy cannot be null");
}
@@ -130,7 +130,7 @@ public class DataSealer extends AbstractInitializableComponent {
* @param r the pseudorandom generator to set
*/
public void setRandom(@Nonnull final SecureRandom r) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
random = Constraint.isNotNull(r, "SecureRandom cannot be null");
}
@@ -142,7 +142,7 @@ public class DataSealer extends AbstractInitializableComponent {
* @param e Byte-to-string encoder.
*/
public void setEncoder(@Nonnull final BinaryEncoder e) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
encoder = Constraint.isNotNull(e, "Encoder cannot be null");
}
@@ -153,7 +153,7 @@ public class DataSealer extends AbstractInitializableComponent {
* @param d String-to-byte decoder.
*/
public void setDecoder(@Nonnull final BinaryDecoder d) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
decoder = Constraint.isNotNull(d, "Decoder cannot be null");
}
@@ -169,7 +169,7 @@ public class DataSealer extends AbstractInitializableComponent {
* @since 8.3.0
*/
public void setNodePrefix(@Nullable @NotEmpty final String prefix) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
nodePrefix = StringSupport.trimOrNull(prefix);
if (nodePrefix != null) {
@@ -238,7 +238,7 @@ public class DataSealer extends AbstractInitializableComponent {
*/
@Nonnull public String unwrap(@Nonnull @NotEmpty final String wrapped, @Nullable final StringBuffer keyUsed)
throws DataSealerException {
- throwComponentStateExceptions();
+ checkComponentActive();
final int magicLen = MAGIC_STRING.length();
@@ -378,7 +378,7 @@ public class DataSealer extends AbstractInitializableComponent {
*/
@Nonnull public String wrap(@Nonnull @NotEmpty final String data, @Nullable final Instant exp)
throws DataSealerException {
- throwComponentStateExceptions();
+ checkComponentActive();
if (data == null || data.length() == 0) {
throw new IllegalArgumentException("Data must be supplied for the wrapping operation");
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/impl/BasicAccessControlService.java b/src/main/java/net/shibboleth/utilities/java/support/security/impl/BasicAccessControlService.java
index 3bd2678..a3b09cb 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/impl/BasicAccessControlService.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/impl/BasicAccessControlService.java
@@ -56,7 +56,7 @@ public class BasicAccessControlService extends AbstractIdentifiableInitializable
* @param map map of named policies
*/
public void setPolicyMap(@Nullable @NonnullElements final Map<String,AccessControl> map) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
if (map != null) {
policyMap = new HashMap<>(map.size());
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/impl/BasicKeystoreKeyStrategy.java b/src/main/java/net/shibboleth/utilities/java/support/security/impl/BasicKeystoreKeyStrategy.java
index aeac40b..34262b8 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/impl/BasicKeystoreKeyStrategy.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/impl/BasicKeystoreKeyStrategy.java
@@ -118,7 +118,7 @@ public class BasicKeystoreKeyStrategy extends AbstractInitializableComponent imp
* @param type the keystore type
*/
public void setKeystoreType(@Nonnull @NotEmpty final String type) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
keystoreType = Constraint.isNotNull(StringSupport.trimOrNull(type), "Keystore type cannot be null or empty");
}
@@ -129,7 +129,7 @@ public class BasicKeystoreKeyStrategy extends AbstractInitializableComponent imp
* @param resource the keystore resource
*/
public void setKeystoreResource(@Nonnull @NotEmpty final Resource resource) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
keystoreResource = Constraint.isNotNull(resource, "Keystore resource cannot be null");
}
@@ -140,7 +140,7 @@ public class BasicKeystoreKeyStrategy extends AbstractInitializableComponent imp
* @param resource the key version resource
*/
public void setKeyVersionResource(@Nonnull @NotEmpty final Resource resource) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
keyVersionResource = Constraint.isNotNull(resource, "Key version resource cannot be null");
}
@@ -174,7 +174,7 @@ public class BasicKeystoreKeyStrategy extends AbstractInitializableComponent imp
* @param alias the encryption key alias base
*/
public void setKeyAlias(@Nonnull @NotEmpty final String alias) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
keyAlias = Constraint.isNotNull(StringSupport.trimOrNull(alias),
"Key alias base cannot be null or empty");
@@ -212,7 +212,7 @@ public class BasicKeystoreKeyStrategy extends AbstractInitializableComponent imp
* @param interval time between key update checks
*/
public void setUpdateInterval(@Nonnull final Duration interval) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
Constraint.isNotNull(interval, "Interval cannot be null");
Constraint.isFalse(interval.isNegative(), "Interval cannot be negative");
@@ -228,7 +228,7 @@ public class BasicKeystoreKeyStrategy extends AbstractInitializableComponent imp
* @param timer timer used to schedule update tasks
*/
public void setUpdateTaskTimer(@Nullable final Timer timer) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
updateTaskTimer = timer;
}
@@ -290,7 +290,7 @@ public class BasicKeystoreKeyStrategy extends AbstractInitializableComponent imp
/** {@inheritDoc} */
@Override
@Nonnull public Pair<String,SecretKey> getDefaultKey() throws KeyException {
- throwComponentStateExceptions();
+ checkComponentActive();
synchronized(this) {
if (defaultKey != null) {
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/impl/DelegatingAccessControlService.java b/src/main/java/net/shibboleth/utilities/java/support/security/impl/DelegatingAccessControlService.java
index 058d113..5d76065 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/impl/DelegatingAccessControlService.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/impl/DelegatingAccessControlService.java
@@ -58,7 +58,7 @@ public class DelegatingAccessControlService extends AbstractIdentifiableInitiali
/** {@inheritDoc} */
@Override
@Nonnull public AccessControl getInstance(@Nonnull final String name) {
- throwComponentStateExceptions();
+ checkComponentActive();
ServiceableComponent<AccessControlService> component = null;
try {
component = service.getServiceableComponent();
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/impl/IPRangeAccessControl.java b/src/main/java/net/shibboleth/utilities/java/support/security/impl/IPRangeAccessControl.java
index 7f09017..0e0491c 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/impl/IPRangeAccessControl.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/impl/IPRangeAccessControl.java
@@ -62,7 +62,7 @@ public class IPRangeAccessControl extends AbstractIdentifiableInitializableCompo
* @param ranges ranges to allow
*/
public void setAllowedRanges(@Nonnull @NonnullElements final Collection<IPRange> ranges) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
Constraint.isNotNull(ranges, "IPRange collection cannot be null");
allowedRanges = List.copyOf(ranges);
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/impl/ScriptedKeyStrategy.java b/src/main/java/net/shibboleth/utilities/java/support/security/impl/ScriptedKeyStrategy.java
index e33c07e..7ce8811 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/impl/ScriptedKeyStrategy.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/impl/ScriptedKeyStrategy.java
@@ -99,7 +99,7 @@ public class ScriptedKeyStrategy extends AbstractInitializableComponent implemen
* @param script script to run
*/
public void setKeyScript(@Nonnull final EvaluableScript script) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
keyScript = Constraint.isNotNull(script, "Script cannot be null");
}
@@ -111,7 +111,7 @@ public class ScriptedKeyStrategy extends AbstractInitializableComponent implemen
* @param object the custom object
*/
public void setCustomObject(@Nullable final Object object) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
customObject = object;
}
@@ -125,7 +125,7 @@ public class ScriptedKeyStrategy extends AbstractInitializableComponent implemen
* @param interval time between key update checks
*/
public void setUpdateInterval(@Nonnull final Duration interval) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
Constraint.isNotNull(interval, "Interval cannot be null");
Constraint.isFalse(interval.isNegative(), "Interval cannot be negative");
@@ -141,7 +141,7 @@ public class ScriptedKeyStrategy extends AbstractInitializableComponent implemen
* @param timer timer used to schedule update tasks
*/
public void setUpdateTaskTimer(@Nullable final Timer timer) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
updateTaskTimer = timer;
}
@@ -154,7 +154,7 @@ public class ScriptedKeyStrategy extends AbstractInitializableComponent implemen
* @param size size of cache
*/
public void setCacheSize(@NonNegative final long size) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
cacheSize = Constraint.isGreaterThanOrEqual(0, size, "Key cache size cannot be negative");
}
@@ -211,7 +211,7 @@ public class ScriptedKeyStrategy extends AbstractInitializableComponent implemen
/** {@inheritDoc} */
@Nonnull public Pair<String,SecretKey> getDefaultKey() throws KeyException {
- throwComponentStateExceptions();
+ checkComponentActive();
synchronized(this) {
if (defaultKey != null) {
diff --git a/src/main/java/net/shibboleth/utilities/java/support/service/AbstractReloadableService.java b/src/main/java/net/shibboleth/utilities/java/support/service/AbstractReloadableService.java
index 75b01e6..ca7d356 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/service/AbstractReloadableService.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/service/AbstractReloadableService.java
@@ -104,7 +104,7 @@ public abstract class AbstractReloadableService<T> extends AbstractIdentifiableI
* @param delay between one reload check and another
*/
public void setReloadCheckDelay(@Nonnull final Duration delay) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
reloadCheckDelay = Constraint.isNotNull(delay, "Delay cannot be null");
}
@@ -126,7 +126,7 @@ public abstract class AbstractReloadableService<T> extends AbstractIdentifiableI
* @param timer timer used to schedule configuration reload tasks
*/
public void setReloadTaskTimer(@Nullable final Timer timer) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
reloadTaskTimer = timer;
}
@@ -161,7 +161,7 @@ public abstract class AbstractReloadableService<T> extends AbstractIdentifiableI
* @param value what to set.
*/
public void setFailFast(final boolean value) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
failFast = value;
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/service/ReloadableServiceGaugeSet.java b/src/main/java/net/shibboleth/utilities/java/support/service/ReloadableServiceGaugeSet.java
index cbdf1a5..57ac0da 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/service/ReloadableServiceGaugeSet.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/service/ReloadableServiceGaugeSet.java
@@ -105,7 +105,7 @@ public class ReloadableServiceGaugeSet<T> extends AbstractInitializableComponent
* @param svc service instance
*/
public void setService(@Nonnull final ReloadableService<T> svc) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
service = Constraint.isNotNull(svc, "ReloadableService cannot be null");
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java b/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java
index c10c2a1..9fa198d 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java
@@ -150,7 +150,7 @@ public class BasicParserPool extends AbstractInitializableComponent implements P
/** {@inheritDoc} */
@Override
@Nonnull public DocumentBuilder getBuilder() throws XMLParserException {
- throwComponentStateExceptions();
+ checkComponentActive();
DocumentBuilder builder = null;
@@ -177,7 +177,7 @@ public class BasicParserPool extends AbstractInitializableComponent implements P
//CheckStyle: ReturnCount OFF
/** {@inheritDoc} */
@Override public void returnBuilder(@Nullable final DocumentBuilder builder) {
- throwComponentStateExceptions();
+ checkComponentActive();
if (builder == null || !(builder instanceof DocumentBuilderProxy)) {
return;
@@ -215,7 +215,7 @@ public class BasicParserPool extends AbstractInitializableComponent implements P
/** {@inheritDoc} */
@Override
@Nonnull public Document newDocument() throws XMLParserException {
- throwComponentStateExceptions();
+ checkComponentActive();
DocumentBuilder builder = null;
final Document document;
@@ -237,7 +237,7 @@ public class BasicParserPool extends AbstractInitializableComponent implements P
/** {@inheritDoc} */
@Override
@Nonnull public Document parse(@Nonnull final InputStream input) throws XMLParserException {
- throwComponentStateExceptions();
+ checkComponentActive();
Constraint.isNotNull(input, "Input stream can not be null");
@@ -260,7 +260,7 @@ public class BasicParserPool extends AbstractInitializableComponent implements P
/** {@inheritDoc} */
@Override
@Nonnull public Document parse(@Nonnull final Reader input) throws XMLParserException {
- throwComponentStateExceptions();
+ checkComponentActive();
Constraint.isNotNull(input, "Input reader can not be null");
@@ -289,7 +289,7 @@ public class BasicParserPool extends AbstractInitializableComponent implements P
* @param name name of attribute
*/
public void setSecurityManagerAttributeName(@Nullable final String name) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
securityManagerAttributeName = StringSupport.trimOrNull(name);
}
@@ -309,7 +309,7 @@ public class BasicParserPool extends AbstractInitializableComponent implements P
* @param newSize max number of builders the pool will hold
*/
public void setMaxPoolSize(final int newSize) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
maxPoolSize = (int) Constraint.isGreaterThan(0, newSize, "New maximum pool size must be greater than 0");
}
@@ -329,7 +329,7 @@ public class BasicParserPool extends AbstractInitializableComponent implements P
* @param newAttributes builder attributes used when creating builders
*/
public void setBuilderAttributes(@Nullable @NullableElements final Map<String, Object> newAttributes) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
if (newAttributes == null) {
builderAttributes = Collections.emptyMap();
@@ -353,7 +353,7 @@ public class BasicParserPool extends AbstractInitializableComponent implements P
* @param isCoalescing whether the builders are coalescing
*/
public void setCoalescing(final boolean isCoalescing) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
coalescing = isCoalescing;
}
@@ -373,7 +373,7 @@ public class BasicParserPool extends AbstractInitializableComponent implements P
* @param expand whether builders expand entity references
*/
public void setExpandEntityReferences(final boolean expand) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
expandEntityReferences = expand;
}
@@ -393,7 +393,7 @@ public class BasicParserPool extends AbstractInitializableComponent implements P
* @param newFeatures the builders' features
*/
public void setBuilderFeatures(@Nullable @NullableElements final Map<String, Boolean> newFeatures) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
if (newFeatures == null) {
builderFeatures = Collections.emptyMap();
@@ -417,7 +417,7 @@ public class BasicParserPool extends AbstractInitializableComponent implements P
* @param ignore The ignoreComments to set.
*/
public void setIgnoreComments(final boolean ignore) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
ignoreComments = ignore;
}
@@ -437,7 +437,7 @@ public class BasicParserPool extends AbstractInitializableComponent implements P
* @param ignore whether the builders ignore element content whitespace
*/
public void setIgnoreElementContentWhitespace(final boolean ignore) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
ignoreElementContentWhitespace = ignore;
}
@@ -457,7 +457,7 @@ public class BasicParserPool extends AbstractInitializableComponent implements P
* @param isNamespaceAware whether the builders are namespace aware
*/
public void setNamespaceAware(final boolean isNamespaceAware) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
namespaceAware = isNamespaceAware;
}
@@ -477,7 +477,7 @@ public class BasicParserPool extends AbstractInitializableComponent implements P
* @param newSchema schema used to validate the XML document during the parsing process
*/
public void setSchema(@Nullable final Schema newSchema) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
schema = newSchema;
if (schema != null) {
@@ -502,7 +502,7 @@ public class BasicParserPool extends AbstractInitializableComponent implements P
* @param resolver the new entity resolver, may be null
*/
public void setEntityResolver(@Nullable final EntityResolver resolver) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
entityResolver = resolver;
}
@@ -521,7 +521,7 @@ public class BasicParserPool extends AbstractInitializableComponent implements P
* @param handler the new error handler
*/
public void setErrorHandler(@Nonnull final ErrorHandler handler) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
errorHandler = Constraint.isNotNull(handler, "ErrorHandler may not be null");
}
@@ -540,7 +540,7 @@ public class BasicParserPool extends AbstractInitializableComponent implements P
* @param isValidating whether the builders are validating
*/
public void setDTDValidating(final boolean isValidating) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
dtdValidating = isValidating;
}
@@ -560,7 +560,7 @@ public class BasicParserPool extends AbstractInitializableComponent implements P
* @param isXIncludeAware whether the builders are XInclude aware
*/
public void setXincludeAware(final boolean isXIncludeAware) {
- throwSetterPreconditionExceptions();
+ checkSetterPreconditions();
xincludeAware = isXIncludeAware;
}
@@ -582,7 +582,7 @@ public class BasicParserPool extends AbstractInitializableComponent implements P
* @throws XMLParserException thrown if their is a configuration error with the builder factory
*/
@Nonnull protected DocumentBuilder createBuilder() throws XMLParserException {
- throwComponentStateExceptions();
+ checkComponentActive();
try {
final DocumentBuilder builder = builderFactory.newDocumentBuilder();
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list