[java-shib-attribute] branch main updated: Adjust naming of new AttributeSupport methods.
Scott Cantor
cantor.2 at osu.edu
Tue Mar 7 16:22:28 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-attribute.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-attribute.git;a=commit;h=5fb11b08bf8b291327c4c5d4fb81bc5d5b510bd4
The following commit(s) were added to refs/heads/main by this push:
new 5fb11b08b Adjust naming of new AttributeSupport methods.
5fb11b08b is described below
commit 5fb11b08bf8b291327c4c5d4fb81bc5d5b510bd4
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Mar 7 11:22:25 2023 -0500
Adjust naming of new AttributeSupport methods.
---
.../attribute/filter/spring/policyrule/impl/PredicateRuleParser.java | 2 +-
.../idp/attribute/resolver/spring/BaseResolverPluginParser.java | 2 +-
.../resolver/spring/ad/impl/DecryptedAttributeDefinitionParser.java | 2 +-
.../resolver/spring/dc/http/impl/HTTPDataConnectorParser.java | 4 ++--
.../resolver/spring/dc/impl/ComputedIdDataConnectorParser.java | 4 ++--
.../spring/dc/storage/impl/StorageServiceDataConnectorParser.java | 4 ++--
.../idp/attribute/resolver/spring/enc/BaseAttributeEncoderParser.java | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/shib-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/PredicateRuleParser.java b/shib-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/PredicateRuleParser.java
index 5843a1efb..a125a3676 100644
--- a/shib-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/PredicateRuleParser.java
+++ b/shib-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/PredicateRuleParser.java
@@ -47,7 +47,7 @@ public class PredicateRuleParser extends BasePolicyRuleParser {
@Nonnull final BeanDefinitionBuilder builder) {
builder.addPropertyReference("rulePredicate",
- AttributeSupport.getRequiredAttributeValue(element, null, "rulePredicateRef"));
+ AttributeSupport.ensureAttributeValue(element, null, "rulePredicateRef"));
}
}
\ No newline at end of file
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/BaseResolverPluginParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/BaseResolverPluginParser.java
index faef45e3e..5f6b1f35d 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/BaseResolverPluginParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/BaseResolverPluginParser.java
@@ -101,7 +101,7 @@ public abstract class BaseResolverPluginParser extends AbstractCustomBeanDefinit
log.warn("relyingParties/resolutionPhases and variants ignored, using activationConditionRef");
}
builder.addPropertyReference("activationCondition",
- AttributeSupport.getRequiredAttributeValue(config, null, "activationConditionRef"));
+ AttributeSupport.ensureAttributeValue(config, null, "activationConditionRef"));
} else {
final BeanDefinitionBuilder condition = getActivationCondition(config);
if (condition != null) {
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/DecryptedAttributeDefinitionParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/DecryptedAttributeDefinitionParser.java
index cfdd49827..83b10d72f 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/DecryptedAttributeDefinitionParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/DecryptedAttributeDefinitionParser.java
@@ -49,7 +49,7 @@ public class DecryptedAttributeDefinitionParser extends BaseAttributeDefinitionP
super.doParse(config, parserContext, builder);
builder.addPropertyReference("dataSealer",
- AttributeSupport.getRequiredAttributeValue(config, null, "dataSealerRef"));
+ AttributeSupport.ensureAttributeValue(config, null, "dataSealerRef"));
}
}
\ No newline at end of file
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParser.java
index 0dfeadb7f..539587336 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParser.java
@@ -309,14 +309,14 @@ public class HTTPDataConnectorParser extends AbstractDataConnectorParser {
final Element bodyTemplate = bodyTemplates.get(0);
if (urlTemplate.hasAttributeNS(null, "customObjectRef")) {
templateBuilder.addPropertyReference("customObject",
- AttributeSupport.getRequiredAttributeValue(urlTemplate, null, "customObjectRef"));
+ AttributeSupport.ensureAttributeValue(urlTemplate, null, "customObjectRef"));
if (bodyTemplate.hasAttributeNS(null, "customObjectRef")) {
log.warn("{} Ignored <BodyTemplate> customObjectRef in favor of <URLTemplate> customObjectRef",
getLogPrefix());
}
} else if (bodyTemplate.hasAttributeNS(null, "customObjectRef")) {
templateBuilder.addPropertyReference("customObject",
- AttributeSupport.getRequiredAttributeValue(bodyTemplate, null, "customObjectRef"));
+ AttributeSupport.ensureAttributeValue(bodyTemplate, null, "customObjectRef"));
}
templateBuilder.addPropertyValue("uRLTemplateText", urlTemplate.getTextContent());
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ComputedIdDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ComputedIdDataConnectorParser.java
index 46b23c3c1..a3b0a444c 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ComputedIdDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ComputedIdDataConnectorParser.java
@@ -80,12 +80,12 @@ public class ComputedIdDataConnectorParser extends PairwiseIdDataConnectorParser
if (config.hasAttributeNS(null, "exceptionMapRef")) {
builder.addPropertyReference("exceptionMap",
- AttributeSupport.getRequiredAttributeValue(config, null, "exceptionMapRef"));
+ AttributeSupport.ensureAttributeValue(config, null, "exceptionMapRef"));
}
if (config.hasAttributeNS(null, "saltLookupStrategyRef")) {
builder.addPropertyReference("saltLookupStrategy",
- AttributeSupport.getRequiredAttributeValue(config, null, "saltLookupStrategyRef"));
+ AttributeSupport.ensureAttributeValue(config, null, "saltLookupStrategyRef"));
builder.addPropertyReference("httpServletRequestSupplier", SERVLET_SUPPLIER_ID);
}
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/storage/impl/StorageServiceDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/storage/impl/StorageServiceDataConnectorParser.java
index 67f85ceba..9f0524927 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/storage/impl/StorageServiceDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/storage/impl/StorageServiceDataConnectorParser.java
@@ -102,7 +102,7 @@ public class StorageServiceDataConnectorParser extends AbstractDataConnectorPars
}
builder.addPropertyReference("storageService",
- AttributeSupport.getRequiredAttributeValue(config, null, "storageServiceRef"));
+ AttributeSupport.ensureAttributeValue(config, null, "storageServiceRef"));
final String noResultIsError =
AttributeSupport.getAttributeValue(config, new QName("noResultIsError"));
@@ -189,7 +189,7 @@ public class StorageServiceDataConnectorParser extends AbstractDataConnectorPars
if (configElement.hasAttributeNS(null, "customObjectRef")) {
templateBuilder.addPropertyReference("customObject",
- AttributeSupport.getRequiredAttributeValue(configElement, null, "customObjectRef"));
+ AttributeSupport.ensureAttributeValue(configElement, null, "customObjectRef"));
}
templateBuilder.addPropertyValue("contextTemplateText", contextTemplate.getTextContent());
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/BaseAttributeEncoderParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/BaseAttributeEncoderParser.java
index 0bb02dec5..714e0714b 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/BaseAttributeEncoderParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/BaseAttributeEncoderParser.java
@@ -116,7 +116,7 @@ public abstract class BaseAttributeEncoderParser extends AbstractCustomBeanDefin
log.warn("relyingParties ignored, using activationConditionRef");
}
rule.put(AttributeTranscoderRegistry.PROP_CONDITION, new RuntimeBeanReference(
- AttributeSupport.getRequiredAttributeValue(config, null, "activationConditionRef")));
+ AttributeSupport.ensureAttributeValue(config, null, "activationConditionRef")));
} else if (config.hasAttributeNS(null, "relyingParties")) {
rule.put(AttributeTranscoderRegistry.PROP_RELYINGPARTIES, config.getAttributeNS(null, "relyingParties"));
} else {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list