[java-shib-metadata] branch main updated: Adjust naming of new AttributeSupport methods.
Scott Cantor
cantor.2 at osu.edu
Tue Mar 7 16:22:14 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-shib-metadata.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-metadata.git;a=commit;h=619b261086a04563d852b0c9f99d1e2ed7a8b910
The following commit(s) were added to refs/heads/main by this push:
new 619b2610 Adjust naming of new AttributeSupport methods.
619b2610 is described below
commit 619b261086a04563d852b0c9f99d1e2ed7a8b910
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Mar 7 11:22:11 2023 -0500
Adjust naming of new AttributeSupport methods.
---
.../metadata/AbstractDynamicHTTPMetadataProviderParser.java | 2 +-
.../spring/metadata/AbstractDynamicMetadataProviderParser.java | 8 ++++----
.../spring/metadata/AbstractMetadataProviderParser.java | 4 ++--
.../spring/metadata/AbstractReloadingMetadataProviderParser.java | 2 +-
.../shibboleth/spring/metadata/HTTPMetadataProviderParser.java | 2 +-
.../shibboleth/spring/metadata/InlineMetadataProviderParser.java | 2 +-
.../spring/metadata/LocalDynamicMetadataProviderParser.java | 2 +-
.../shibboleth/spring/metadata/filter/PredicateFilterParser.java | 2 +-
.../shibboleth/spring/metadata/filter/SchemaValidationParser.java | 2 +-
.../spring/metadata/filter/SignatureValidationParser.java | 8 ++++----
.../spring/security/credential/AbstractCredentialParser.java | 2 +-
.../spring/security/trust/AbstractTrustEngineParser.java | 2 +-
12 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractDynamicHTTPMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractDynamicHTTPMetadataProviderParser.java
index 050ff341..81d78a08 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractDynamicHTTPMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractDynamicHTTPMetadataProviderParser.java
@@ -86,7 +86,7 @@ public abstract class AbstractDynamicHTTPMetadataProviderParser extends Abstract
if (element.hasAttributeNS(null, "httpClientRef")) {
builder.addConstructorArgReference(
- AttributeSupport.getRequiredAttributeValue(element, null, "httpClientRef"));
+ AttributeSupport.ensureAttributeValue(element, null, "httpClientRef"));
if (element.hasAttributeNS(null, "connectionTimeout")
|| element.hasAttributeNS(null, "connectionRequestTimeout")
|| element.hasAttributeNS(null, "socketTimeout")
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractDynamicMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractDynamicMetadataProviderParser.java
index fb5d18a5..e5fb9055 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractDynamicMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractDynamicMetadataProviderParser.java
@@ -70,7 +70,7 @@ public abstract class AbstractDynamicMetadataProviderParser extends AbstractMeta
if (element.hasAttributeNS(null, "indexesRef")) {
builder.addPropertyReference("indexes",
- AttributeSupport.getRequiredAttributeValue(element, null, "indexesRef"));
+ AttributeSupport.ensureAttributeValue(element, null, "indexesRef"));
}
builder.addPropertyReference("parserPool", getParserPoolRef(element));
@@ -136,7 +136,7 @@ public abstract class AbstractDynamicMetadataProviderParser extends AbstractMeta
if (element.hasAttributeNS(null, "persistentCacheManagerRef")) {
builder.addPropertyReference("persistentCacheManager",
- AttributeSupport.getRequiredAttributeValue(element, null, "persistentCacheManagerRef"));
+ AttributeSupport.ensureAttributeValue(element, null, "persistentCacheManagerRef"));
if (element.hasAttributeNS(null, "persistentCacheManagerDirectory")) {
log.warn("{} Element contained both persistentCacheManagerRef and persistentCacheManagerDirectory, "
@@ -157,7 +157,7 @@ public abstract class AbstractDynamicMetadataProviderParser extends AbstractMeta
if (element.hasAttributeNS(null, "persistentCacheKeyGeneratorRef")) {
builder.addPropertyReference("persistentCacheKeyGenerator",
- AttributeSupport.getRequiredAttributeValue(element, null, "persistentCacheKeyGeneratorRef"));
+ AttributeSupport.ensureAttributeValue(element, null, "persistentCacheKeyGeneratorRef"));
}
if (element.hasAttributeNS(null, "initializeFromPersistentCacheInBackground")) {
@@ -172,7 +172,7 @@ public abstract class AbstractDynamicMetadataProviderParser extends AbstractMeta
if (element.hasAttributeNS(null, "initializationFromCachePredicateRef")) {
builder.addPropertyReference("initializationFromCachePredicate",
- AttributeSupport.getRequiredAttributeValue(element, null, "initializationFromCachePredicateRef"));
+ AttributeSupport.ensureAttributeValue(element, null, "initializationFromCachePredicateRef"));
}
}
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractMetadataProviderParser.java
index 5e1dc3fc..35bfeccb 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractMetadataProviderParser.java
@@ -193,7 +193,7 @@ public abstract class AbstractMetadataProviderParser extends AbstractCustomBeanD
if (element.hasAttributeNS(null, "activationConditionRef")) {
builder.addPropertyReference("activationCondition",
- AttributeSupport.getRequiredAttributeValue(element, null, "activationConditionRef"));
+ AttributeSupport.ensureAttributeValue(element, null, "activationConditionRef"));
}
processPredicateOptions(element, parserContext, builder);
@@ -242,7 +242,7 @@ public abstract class AbstractMetadataProviderParser extends AbstractCustomBeanD
if (isPresentNotChaining(element, "criterionPredicateRegistryRef")) {
builder.addPropertyReference("criterionPredicateRegistry",
- AttributeSupport.getRequiredAttributeValue(element, null, "criterionPredicateRegistryRef"));
+ AttributeSupport.ensureAttributeValue(element, null, "criterionPredicateRegistryRef"));
}
}
}
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractReloadingMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractReloadingMetadataProviderParser.java
index 8f031965..c00da251 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractReloadingMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractReloadingMetadataProviderParser.java
@@ -56,7 +56,7 @@ public abstract class AbstractReloadingMetadataProviderParser extends AbstractMe
if (element.hasAttributeNS(null, "indexesRef")) {
builder.addPropertyReference("indexes",
- AttributeSupport.getRequiredAttributeValue(element, null, "indexesRef"));
+ AttributeSupport.ensureAttributeValue(element, null, "indexesRef"));
}
if (element.hasAttributeNS(null, "resolveViaPredicatesOnly")) {
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/HTTPMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/HTTPMetadataProviderParser.java
index d325a322..96414875 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/HTTPMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/HTTPMetadataProviderParser.java
@@ -69,7 +69,7 @@ public abstract class HTTPMetadataProviderParser extends AbstractReloadingMetada
if (element.hasAttributeNS(null, "httpClientRef")) {
builder.addConstructorArgReference(
- AttributeSupport.getRequiredAttributeValue(element, null, "httpClientRef"));
+ AttributeSupport.ensureAttributeValue(element, null, "httpClientRef"));
if (element.hasAttributeNS(null, "connectionTimeout")
|| element.hasAttributeNS(null, "connectionRequestTimeout")
|| element.hasAttributeNS(null, "socketTimeout")
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/InlineMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/InlineMetadataProviderParser.java
index a256b07a..c0be63ac 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/InlineMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/InlineMetadataProviderParser.java
@@ -60,7 +60,7 @@ public class InlineMetadataProviderParser extends AbstractMetadataProviderParser
if (element.hasAttributeNS(null, "indexesRef")) {
builder.addPropertyReference("indexes",
- AttributeSupport.getRequiredAttributeValue(element, null, "indexesRef"));
+ AttributeSupport.ensureAttributeValue(element, null, "indexesRef"));
}
if (element.hasAttributeNS(null, "resolveViaPredicatesOnly")) {
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/LocalDynamicMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/LocalDynamicMetadataProviderParser.java
index 04eaf2af..7b65628e 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/LocalDynamicMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/LocalDynamicMetadataProviderParser.java
@@ -164,7 +164,7 @@ public class LocalDynamicMetadataProviderParser extends AbstractDynamicMetadataP
if (element.hasAttributeNS(null, "sourceDirectoryIntermediateStrategyRef")) {
sourceManagerBuilder.addConstructorArgReference(
- AttributeSupport.getRequiredAttributeValue(element, null,
+ AttributeSupport.ensureAttributeValue(element, null,
"sourceDirectoryIntermediateStrategyRef"));
} else if (isDefaultSourceKeyGenerator) {
final BeanDefinition intermediateDirectoryStrategy =
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/PredicateFilterParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/PredicateFilterParser.java
index 1edfebb4..4df1f197 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/PredicateFilterParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/PredicateFilterParser.java
@@ -101,7 +101,7 @@ public class PredicateFilterParser extends AbstractCustomBeanDefinitionParser {
if (element.hasAttributeNS(null, "conditionRef")) {
log.info("Found conditionRef attribute, ignoring embedded Entity/Group/Tag elements");
builder.addConstructorArgReference(
- AttributeSupport.getRequiredAttributeValue(element, null, "conditionRef"));
+ AttributeSupport.ensureAttributeValue(element, null, "conditionRef"));
} else {
builder.addConstructorArgValue(parseCustomElements(element));
}
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/SchemaValidationParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/SchemaValidationParser.java
index fe4dd036..f817c505 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/SchemaValidationParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/SchemaValidationParser.java
@@ -49,7 +49,7 @@ public class SchemaValidationParser extends AbstractCustomBeanDefinitionParser {
@Nonnull final BeanDefinitionBuilder builder) {
if (element.hasAttributeNS(null, "schemaBuilderRef")) {
builder.addConstructorArgReference(
- AttributeSupport.getRequiredAttributeValue(element, null, "schemaBuilderRef"));
+ AttributeSupport.ensureAttributeValue(element, null, "schemaBuilderRef"));
} else {
builder.addConstructorArgReference("shibboleth.SchemaBuilder");
}
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/SignatureValidationParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/SignatureValidationParser.java
index e0407bb1..0f9ec8bb 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/SignatureValidationParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/SignatureValidationParser.java
@@ -103,7 +103,7 @@ public class SignatureValidationParser extends AbstractCustomBeanDefinitionParse
throw new BeanCreationException("trustEngineRef and embedded public keys are mutually exclusive");
}
builder.addConstructorArgReference(
- AttributeSupport.getRequiredAttributeValue(element, null, "trustEngineRef"));
+ AttributeSupport.ensureAttributeValue(element, null, "trustEngineRef"));
} else if (hasCertFile) {
if (null != publicKeys && !publicKeys.isEmpty()) {
log.error("{}: certificateFile and embedded public keys are mutually exclusive", parserContext
@@ -145,7 +145,7 @@ public class SignatureValidationParser extends AbstractCustomBeanDefinitionParse
if (element.hasAttributeNS(null, "defaultCriteriaRef")) {
builder.addPropertyReference("defaultCriteria",
- AttributeSupport.getRequiredAttributeValue(element, null, "defaultCriteriaRef"));
+ AttributeSupport.ensureAttributeValue(element, null, "defaultCriteriaRef"));
} else {
// TODO refactor, if decide upon new strategy for (or against) well-known bean refs
builder.addPropertyReference("defaultCriteria", "shibboleth.MetadataSignatureValidationStaticCriteria");
@@ -153,12 +153,12 @@ public class SignatureValidationParser extends AbstractCustomBeanDefinitionParse
if (element.hasAttributeNS(null, "signaturePrevalidatorRef")) {
builder.addPropertyReference("signaturePrevalidator",
- AttributeSupport.getRequiredAttributeValue(element, null, "signaturePrevalidatorRef"));
+ AttributeSupport.ensureAttributeValue(element, null, "signaturePrevalidatorRef"));
}
if (element.hasAttributeNS(null, "dynamicTrustedNamesStrategyRef")) {
builder.addPropertyReference("dynamicTrustedNamesStrategy",
- AttributeSupport.getRequiredAttributeValue(element, null, "dynamicTrustedNamesStrategyRef"));
+ AttributeSupport.ensureAttributeValue(element, null, "dynamicTrustedNamesStrategyRef"));
}
}
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractCredentialParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractCredentialParser.java
index 45e7c5a4..c367f51d 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractCredentialParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractCredentialParser.java
@@ -53,7 +53,7 @@ public abstract class AbstractCredentialParser extends AbstractCustomBeanDefinit
@Override
@Nonnull @NotEmpty protected String resolveId(@Nonnull final Element element,
@Nonnull final AbstractBeanDefinition definition, @Nonnull final ParserContext parserContext) {
- return AttributeSupport.getRequiredAttributeValue(element,null, "id");
+ return AttributeSupport.ensureAttributeValue(element,null, "id");
}
/** {@inheritDoc} */
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/AbstractTrustEngineParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/AbstractTrustEngineParser.java
index b036c05c..114c10cf 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/AbstractTrustEngineParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/AbstractTrustEngineParser.java
@@ -37,7 +37,7 @@ public abstract class AbstractTrustEngineParser extends AbstractCustomBeanDefini
@Override
@Nonnull @NotEmpty protected String resolveId(@Nonnull final Element element,
@Nonnull final AbstractBeanDefinition definition, @Nonnull final ParserContext parserContext) {
- return AttributeSupport.getRequiredAttributeValue(element, null, "id");
+ return AttributeSupport.ensureAttributeValue(element, null, "id");
}
@Override protected void doParse(@Nonnull final Element element, @Nonnull final ParserContext parserContext,
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list