[java-shib-attribute] branch main updated: Fix up QName type constants in classes.
Scott Cantor
cantor.2 at osu.edu
Tue Aug 8 14:26:32 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=36f052eceb1dc8d9afdc8c1b7ffeb438e97c5d76
The following commit(s) were added to refs/heads/main by this push:
new 36f052ece Fix up QName type constants in classes.
36f052ece is described below
commit 36f052eceb1dc8d9afdc8c1b7ffeb438e97c5d76
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Aug 8 10:26:28 2023 -0400
Fix up QName type constants in classes.
---
.../ContextDerivedAttributeDefinitionParser.java | 2 +-
.../ad/impl/DateTimeAttributeDefinitionParser.java | 2 +-
.../impl/DecryptedAttributeDefinitionParser.java | 2 +-
.../impl/PrescopedAttributeDefinitionParser.java | 2 +-
.../PrincipalNameAttributeDefinitionParser.java | 2 +-
.../impl/RegexSplitAttributeDefinitionParser.java | 2 +-
...ML1NameIdentifierAttributeDefinitionParser.java | 2 +-
.../impl/SAML2NameIDAttributeDefinitionParser.java | 2 +-
.../ad/impl/ScopedAttributeDefinitionParser.java | 2 +-
.../ad/impl/ScriptedAttributeDefinitionParser.java | 10 ++--
.../ad/impl/SimpleAttributeDefinitionParser.java | 2 +-
.../SubjectDerivedAttributeDefinitionParser.java | 2 +-
.../ad/impl/TemplateAttributeDefinitionParser.java | 10 ++--
.../impl/MappedAttributeDefinitionParser.java | 6 +-
.../resolver/spring/dc/impl/CacheConfigParser.java | 10 ++--
.../dc/impl/ComputedIdDataConnectorParser.java | 2 +-
.../dc/impl/ContextDerivedDataConnectorParser.java | 2 +-
.../spring/dc/impl/ManagedConnectionParser.java | 16 +++---
.../dc/impl/PairwiseIdDataConnectorParser.java | 2 +-
.../dc/impl/ScriptedDataConnectorParser.java | 10 ++--
.../spring/dc/impl/StaticDataConnectorParser.java | 6 +-
.../dc/impl/StoredIdDataConnectorParser.java | 2 +-
.../spring/dc/impl/SubjectDataConnectorParser.java | 2 +-
.../dc/ldap/impl/LDAPDataConnectorParser.java | 4 +-
.../dc/rdbms/impl/RDBMSDataConnectorParser.java | 2 +-
.../impl/SAML1Base64AttributeEncoderParser.java | 2 +-
.../SAML1ScopedStringAttributeEncoderParser.java | 2 +-
.../impl/SAML1StringAttributeEncoderParser.java | 2 +-
.../impl/SAML1XMLObjectAttributeEncoderParser.java | 2 +-
.../impl/SAML2Base64AttributeEncoderParser.java | 2 +-
.../impl/SAML2DateTimeAttributeEncoderParser.java | 2 +-
.../SAML2ScopedStringAttributeEncoderParser.java | 2 +-
.../impl/SAML2StringAttributeEncoderParser.java | 2 +-
.../impl/SAML2XMLObjectAttributeEncoderParser.java | 2 +-
.../impl/AttributeResolverNamespaceHandler.java | 65 +++++++++++-----------
35 files changed, 96 insertions(+), 93 deletions(-)
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ContextDerivedAttributeDefinitionParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ContextDerivedAttributeDefinitionParser.java
index d53e5ef31..3ac62abc0 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ContextDerivedAttributeDefinitionParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ContextDerivedAttributeDefinitionParser.java
@@ -32,7 +32,7 @@ import net.shibboleth.shared.primitive.StringSupport;
public class ContextDerivedAttributeDefinitionParser extends BaseAttributeDefinitionParser {
/** Schema type name. */
- @Nonnull public static final QName TYPE_NAME_RESOLVER =
+ @Nonnull public static final QName TYPE_NAME =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "ContextDerivedAttribute");
/** {@inheritDoc} */
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/DateTimeAttributeDefinitionParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/DateTimeAttributeDefinitionParser.java
index 00d58ef2a..0a7cbd9d2 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/DateTimeAttributeDefinitionParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/DateTimeAttributeDefinitionParser.java
@@ -33,7 +33,7 @@ import net.shibboleth.shared.spring.util.SpringSupport;
public class DateTimeAttributeDefinitionParser extends BaseAttributeDefinitionParser {
/** Schema type name. */
- @Nonnull public static final QName TYPE_NAME_RESOLVER =
+ @Nonnull public static final QName TYPE_NAME =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "DateTime");
/** {@inheritDoc} */
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 f3f9a0840..6e025b389 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
@@ -31,7 +31,7 @@ import net.shibboleth.shared.xml.AttributeSupport;
public class DecryptedAttributeDefinitionParser extends BaseAttributeDefinitionParser {
/** Schema type name. */
- @Nonnull public static final QName TYPE_NAME_RESOLVER =
+ @Nonnull public static final QName TYPE_NAME =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "Decrypted");
/** {@inheritDoc} */
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrescopedAttributeDefinitionParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrescopedAttributeDefinitionParser.java
index ce9e0cbfb..af47e3d06 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrescopedAttributeDefinitionParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrescopedAttributeDefinitionParser.java
@@ -33,7 +33,7 @@ import net.shibboleth.shared.primitive.StringSupport;
public class PrescopedAttributeDefinitionParser extends BaseAttributeDefinitionParser {
/** Schema type name. */
- @Nonnull public static final QName TYPE_NAME_RESOLVER =
+ @Nonnull public static final QName TYPE_NAME =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "Prescoped");
/** Class logger. */
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrincipalNameAttributeDefinitionParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrincipalNameAttributeDefinitionParser.java
index 2e1c4f5f7..b91537478 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrincipalNameAttributeDefinitionParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrincipalNameAttributeDefinitionParser.java
@@ -28,7 +28,7 @@ import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamesp
public class PrincipalNameAttributeDefinitionParser extends BaseAttributeDefinitionParser {
/** Schema type name. */
- @Nonnull public static final QName TYPE_NAME_RESOLVER =
+ @Nonnull public static final QName TYPE_NAME =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "PrincipalName");
/** {@inheritDoc} */
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/RegexSplitAttributeDefinitionParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/RegexSplitAttributeDefinitionParser.java
index 2eeca6004..b52150236 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/RegexSplitAttributeDefinitionParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/RegexSplitAttributeDefinitionParser.java
@@ -35,7 +35,7 @@ import net.shibboleth.shared.spring.factory.PatternFactoryBean;
public class RegexSplitAttributeDefinitionParser extends BaseAttributeDefinitionParser {
/** Schema type name. */
- @Nonnull public static final QName TYPE_NAME_RESOLVER =
+ @Nonnull public static final QName TYPE_NAME =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "RegexSplit");
/** Logger. */
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SAML1NameIdentifierAttributeDefinitionParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SAML1NameIdentifierAttributeDefinitionParser.java
index 0aa4a3e62..40264c746 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SAML1NameIdentifierAttributeDefinitionParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SAML1NameIdentifierAttributeDefinitionParser.java
@@ -36,7 +36,7 @@ import net.shibboleth.shared.primitive.StringSupport;
public class SAML1NameIdentifierAttributeDefinitionParser extends BaseAttributeDefinitionParser {
/** Schema type name. */
- @Nonnull public static final QName TYPE_NAME_RESOLVER =
+ @Nonnull public static final QName TYPE_NAME =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "SAML1NameIdentifier");
/** Logger. */
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SAML2NameIDAttributeDefinitionParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SAML2NameIDAttributeDefinitionParser.java
index dc297792f..490d3b0f2 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SAML2NameIDAttributeDefinitionParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SAML2NameIDAttributeDefinitionParser.java
@@ -36,7 +36,7 @@ import net.shibboleth.shared.primitive.StringSupport;
public class SAML2NameIDAttributeDefinitionParser extends BaseAttributeDefinitionParser {
/** Schema type name. */
- @Nonnull public static final QName TYPE_NAME_RESOLVER =
+ @Nonnull public static final QName TYPE_NAME =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "SAML2NameID");
/** Logger. */
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScopedAttributeDefinitionParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScopedAttributeDefinitionParser.java
index 7f39a357e..c282bb945 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScopedAttributeDefinitionParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScopedAttributeDefinitionParser.java
@@ -35,7 +35,7 @@ import net.shibboleth.shared.primitive.StringSupport;
public class ScopedAttributeDefinitionParser extends BaseAttributeDefinitionParser {
/** Schema type name. */
- @Nonnull public static final QName TYPE_NAME_RESOLVER =
+ @Nonnull public static final QName TYPE_NAME =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "Scoped");
/** Class logger. */
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScriptedAttributeDefinitionParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScriptedAttributeDefinitionParser.java
index 87bb716bd..17b681811 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScriptedAttributeDefinitionParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScriptedAttributeDefinitionParser.java
@@ -40,15 +40,15 @@ import net.shibboleth.shared.xml.ElementSupport;
public class ScriptedAttributeDefinitionParser extends BaseAttributeDefinitionParser {
/** Schema type name - resolver: . */
- @Nonnull public static final QName TYPE_NAME_RESOLVER =
+ @Nonnull public static final QName TYPE_NAME =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "ScriptedAttribute");
/** Script file element name. */
- @Nonnull public static final QName SCRIPT_FILE_ELEMENT_NAME_RESOLVER =
+ @Nonnull public static final QName SCRIPT_FILE_ELEMENT_NAME =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "ScriptFile");
/** Inline Script element name. */
- @Nonnull public static final QName SCRIPT_ELEMENT_NAME_RESOLVER =
+ @Nonnull public static final QName SCRIPT_ELEMENT_NAME =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "Script");
/** Class logger. */
@@ -77,8 +77,8 @@ public class ScriptedAttributeDefinitionParser extends BaseAttributeDefinitionPa
scriptBuilder.addPropertyValue("engineName", scriptLanguage);
}
- final List<Element> scriptElem = ElementSupport.getChildElements(config, SCRIPT_ELEMENT_NAME_RESOLVER);
- final List<Element> scriptFileElem = ElementSupport.getChildElements(config, SCRIPT_FILE_ELEMENT_NAME_RESOLVER);
+ final List<Element> scriptElem = ElementSupport.getChildElements(config, SCRIPT_ELEMENT_NAME);
+ final List<Element> scriptFileElem = ElementSupport.getChildElements(config, SCRIPT_FILE_ELEMENT_NAME);
if (scriptElem != null && scriptElem.size() > 0) {
if (scriptFileElem != null && scriptFileElem.size() > 0) {
log.warn("{} definition contains both <Script> and <ScriptFile> elements, taking the "
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SimpleAttributeDefinitionParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SimpleAttributeDefinitionParser.java
index 054036642..f451efd8d 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SimpleAttributeDefinitionParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SimpleAttributeDefinitionParser.java
@@ -31,7 +31,7 @@ import net.shibboleth.shared.spring.util.SpringSupport;
public class SimpleAttributeDefinitionParser extends BaseAttributeDefinitionParser {
/** Schema type name. */
- @Nonnull public static final QName TYPE_NAME_RESOLVER =
+ @Nonnull public static final QName TYPE_NAME =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "Simple");
/** {@inheritDoc} */
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SubjectDerivedAttributeDefinitionParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SubjectDerivedAttributeDefinitionParser.java
index 90786acd5..f28f09ef9 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SubjectDerivedAttributeDefinitionParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SubjectDerivedAttributeDefinitionParser.java
@@ -37,7 +37,7 @@ import net.shibboleth.shared.spring.util.SpringSupport;
public class SubjectDerivedAttributeDefinitionParser extends BaseAttributeDefinitionParser {
/** Schema type name. */
- @Nonnull public static final QName TYPE_NAME_RESOLVER =
+ @Nonnull public static final QName TYPE_NAME =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "SubjectDerivedAttribute");
/** Class for sourcing values from Subject(s). */
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/TemplateAttributeDefinitionParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/TemplateAttributeDefinitionParser.java
index 9e60e35da..651e7c57b 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/TemplateAttributeDefinitionParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/TemplateAttributeDefinitionParser.java
@@ -38,11 +38,11 @@ import net.shibboleth.shared.xml.ElementSupport;
public class TemplateAttributeDefinitionParser extends BaseAttributeDefinitionParser {
/** Schema type name. */
- @Nonnull public static final QName TYPE_NAME_RESOLVER =
+ @Nonnull public static final QName TYPE_NAME =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "Template");
- /** SourceValue element name. */
- @Nonnull public static final QName TEMPLATE_ELEMENT_NAME_RESOLVER =
+ /** Template element name. */
+ @Nonnull public static final QName TEMPLATE_ELEMENT_NAME =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "Template");
/** Class logger. */
@@ -59,9 +59,9 @@ public class TemplateAttributeDefinitionParser extends BaseAttributeDefinitionPa
@Nonnull final BeanDefinitionBuilder builder) {
super.doParse(config, parserContext, builder);
- final List<Element> templateElements = ElementSupport.getChildElements(config, TEMPLATE_ELEMENT_NAME_RESOLVER);
+ final List<Element> templateElements = ElementSupport.getChildElements(config, TEMPLATE_ELEMENT_NAME);
if (null == templateElements || templateElements.isEmpty()) {
- log.error( "Missing " + TEMPLATE_ELEMENT_NAME_RESOLVER.getLocalPart() + " Element");
+ log.error( "Missing " + TEMPLATE_ELEMENT_NAME.getLocalPart() + " Element");
} else {
if (templateElements.size() > 1) {
log.warn("{} Too many <Template> elements, taking the first");
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/MappedAttributeDefinitionParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/MappedAttributeDefinitionParser.java
index 06f805c9d..19445eb78 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/MappedAttributeDefinitionParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/MappedAttributeDefinitionParser.java
@@ -40,11 +40,11 @@ import net.shibboleth.shared.xml.ElementSupport;
public class MappedAttributeDefinitionParser extends BaseAttributeDefinitionParser {
/** Schema type name. */
- @Nonnull public static final QName TYPE_NAME_RESOLVER =
+ @Nonnull public static final QName TYPE_NAME =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "Mapped");
/** return Value element name. */
- @Nonnull public static final QName DEFAULT_VALUE_ELEMENT_NAME_RESOLVER =
+ @Nonnull public static final QName DEFAULT_VALUE_ELEMENT_NAME =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "DefaultValue");
/** Class logger. */
@@ -62,7 +62,7 @@ public class MappedAttributeDefinitionParser extends BaseAttributeDefinitionPars
super.doParse(config, parserContext, builder);
final List<Element> defaultValueElements =
- ElementSupport.getChildElements(config, DEFAULT_VALUE_ELEMENT_NAME_RESOLVER);
+ ElementSupport.getChildElements(config, DEFAULT_VALUE_ELEMENT_NAME);
String defaultValue = null;
String passThru = null;
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/CacheConfigParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/CacheConfigParser.java
index 78b2bb259..05802cb63 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/CacheConfigParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/CacheConfigParser.java
@@ -44,11 +44,11 @@ import net.shibboleth.shared.xml.ElementSupport;
public class CacheConfigParser {
/** ResultCache name. */
- @Nonnull public static final QName RESULT_CACHE_RESOLVER =
+ @Nonnull public static final QName RESULT_CACHE =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "ResultCache");
/** ResultCacheBean name. */
- @Nonnull public static final QName RESULT_CACHE_BEAN_RESOLVER =
+ @Nonnull public static final QName RESULT_CACHE_BEAN =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "ResultCacheBean");
/** Documented maximumCachedElements maximum (500). Unfortunately it has to be here since
@@ -85,7 +85,7 @@ public class CacheConfigParser {
*/
@Nullable public BeanDefinition createCache() {
- final List<Element> cacheElements = ElementSupport.getChildElements(configElement, RESULT_CACHE_RESOLVER);
+ final List<Element> cacheElements = ElementSupport.getChildElements(configElement, RESULT_CACHE);
if (cacheElements.isEmpty()) {
return null;
}
@@ -193,7 +193,7 @@ public class CacheConfigParser {
*/
@Nullable public static String getBeanResultCacheID(@Nonnull final Element config) {
- final List<Element> beanResultCache = ElementSupport.getChildElements(config, RESULT_CACHE_BEAN_RESOLVER);
+ final List<Element> beanResultCache = ElementSupport.getChildElements(config, RESULT_CACHE_BEAN);
if (beanResultCache.isEmpty()) {
return null;
@@ -204,7 +204,7 @@ public class CacheConfigParser {
warn("Only one <ResultCacheBean> should be specified; the first one has been consulted");
}
- final List<Element> resultCacheElements = ElementSupport.getChildElements(config, RESULT_CACHE_RESOLVER);
+ final List<Element> resultCacheElements = ElementSupport.getChildElements(config, RESULT_CACHE);
if (resultCacheElements.size() > 0) {
LoggerFactory.getLogger(ManagedConnectionParser.class).
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 d98a4ed2f..79e467c75 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
@@ -35,7 +35,7 @@ import net.shibboleth.shared.xml.AttributeSupport;
public class ComputedIdDataConnectorParser extends PairwiseIdDataConnectorParser {
/** Schema type - resolver. */
- @Nonnull public static final QName TYPE_NAME_RESOLVER = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
+ @Nonnull public static final QName TYPE_NAME = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
"ComputedId");
/** ID of system bean used to access servlet request. */
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ContextDerivedDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ContextDerivedDataConnectorParser.java
index ed84330ff..f5a430ad6 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ContextDerivedDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ContextDerivedDataConnectorParser.java
@@ -35,7 +35,7 @@ import net.shibboleth.shared.xml.AttributeSupport;
public class ContextDerivedDataConnectorParser extends AbstractDataConnectorParser {
/** Schema type name. */
- @Nonnull public static final QName TYPE_NAME_RESOLVER =
+ @Nonnull public static final QName TYPE_NAME =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "ContextDerived");
/** {@inheritDoc} */
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ManagedConnectionParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ManagedConnectionParser.java
index 54b01b5a0..c6fdd725d 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ManagedConnectionParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ManagedConnectionParser.java
@@ -42,15 +42,15 @@ import net.shibboleth.shared.xml.ElementSupport;
public class ManagedConnectionParser {
/** resolver:ContainerManagedConnection.*/
- @Nonnull public static final QName CONTAINER_MANAGED_CONNECTION_RESOLVER =
+ @Nonnull public static final QName CONTAINER_MANAGED_CONNECTION =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "ContainerManagedConnection");
/** resolver:BeanManagedConnection.*/
- @Nonnull public static final QName BEAN_MANAGED_CONNECTION_RESOLVER =
+ @Nonnull public static final QName BEAN_MANAGED_CONNECTION =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "BeanManagedConnection");
/** resolver:SimpleManagedConnection.*/
- @Nonnull public static final QName SIMPLE_MANAGED_CONNECTION_RESOLVER =
+ @Nonnull public static final QName SIMPLE_MANAGED_CONNECTION =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "SimpleManagedConnection");
/** Logger. */
@@ -77,10 +77,10 @@ public class ManagedConnectionParser {
*/
@Nullable public BeanDefinition createDataSource() {
final List<Element> containerManagedElements =
- ElementSupport.getChildElements(configElement, CONTAINER_MANAGED_CONNECTION_RESOLVER);
+ ElementSupport.getChildElements(configElement, CONTAINER_MANAGED_CONNECTION);
final List<Element> simpleManagedElements =
- ElementSupport.getChildElements(configElement, SIMPLE_MANAGED_CONNECTION_RESOLVER);
+ ElementSupport.getChildElements(configElement, SIMPLE_MANAGED_CONNECTION);
if ((simpleManagedElements.size() + containerManagedElements.size() ) > 1) {
LOG.warn("Only one <SimpleManagedConnection> or <ContainerManagedConnection> is allowed per DataConnector");
@@ -195,7 +195,7 @@ public class ManagedConnectionParser {
@Nullable public static String getBeanDataSourceID(@Nonnull final Element config) {
final List<Element> beanManagedElements = ElementSupport.getChildElements(config,
- BEAN_MANAGED_CONNECTION_RESOLVER);
+ BEAN_MANAGED_CONNECTION);
if (beanManagedElements.isEmpty()) {
return null;
@@ -206,8 +206,8 @@ public class ManagedConnectionParser {
}
final List<Element> managedElements = new ArrayList<>(ElementSupport.getChildElements(config,
- CONTAINER_MANAGED_CONNECTION_RESOLVER));
- managedElements.addAll(ElementSupport.getChildElements(config, SIMPLE_MANAGED_CONNECTION_RESOLVER));
+ CONTAINER_MANAGED_CONNECTION));
+ managedElements.addAll(ElementSupport.getChildElements(config, SIMPLE_MANAGED_CONNECTION));
if (managedElements.size() > 0) {
LOG.warn("<BeanManagedConnection> is incompatible with <ContainerManagedConnection>"
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/PairwiseIdDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/PairwiseIdDataConnectorParser.java
index 3027c691e..c3dbaebee 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/PairwiseIdDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/PairwiseIdDataConnectorParser.java
@@ -40,7 +40,7 @@ import net.shibboleth.shared.xml.ElementSupport;
public class PairwiseIdDataConnectorParser extends AbstractDataConnectorParser {
/** Schema type - resolver. */
- @Nonnull public static final QName TYPE_NAME_RESOLVER = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
+ @Nonnull public static final QName TYPE_NAME = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
"PairwiseId");
/** Class logger. */
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ScriptedDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ScriptedDataConnectorParser.java
index 792e53d42..f06ffeffb 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ScriptedDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ScriptedDataConnectorParser.java
@@ -38,15 +38,15 @@ import net.shibboleth.shared.xml.ElementSupport;
public class ScriptedDataConnectorParser extends AbstractDataConnectorParser {
/** Schema type - resolver. */
- @Nonnull public static final QName TYPE_NAME_RESOLVER =
+ @Nonnull public static final QName TYPE_NAME =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "ScriptedDataConnector");
/** Script file element name. */
- @Nonnull public static final QName SCRIPT_FILE_ELEMENT_NAME_RESOLVER =
+ @Nonnull public static final QName SCRIPT_FILE_ELEMENT_NAME =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "ScriptFile");
/** Inline Script element name. */
- @Nonnull public static final QName SCRIPT_ELEMENT_NAME_RESOLVER =
+ @Nonnull public static final QName SCRIPT_ELEMENT_NAME =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "Script");
/** Class logger. */
@@ -74,8 +74,8 @@ public class ScriptedDataConnectorParser extends AbstractDataConnectorParser {
scriptBuilder.addPropertyValue("engineName", scriptLanguage);
}
- final List<Element> scriptElem = ElementSupport.getChildElements(config, SCRIPT_ELEMENT_NAME_RESOLVER);
- final List<Element> scriptFileElem = ElementSupport.getChildElements(config, SCRIPT_FILE_ELEMENT_NAME_RESOLVER);
+ final List<Element> scriptElem = ElementSupport.getChildElements(config, SCRIPT_ELEMENT_NAME);
+ final List<Element> scriptFileElem = ElementSupport.getChildElements(config, SCRIPT_FILE_ELEMENT_NAME);
if (scriptElem != null && scriptElem.size() > 0) {
if (scriptElem.size() > 1) {
log.warn("{} Data connector {}: definition contains more than one "
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StaticDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StaticDataConnectorParser.java
index f92bba661..08bd0302a 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StaticDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StaticDataConnectorParser.java
@@ -40,11 +40,11 @@ import net.shibboleth.shared.xml.ElementSupport;
public class StaticDataConnectorParser extends AbstractDataConnectorParser {
/** Schema type - resolver. */
- @Nonnull public static final QName TYPE_NAME_RESOLVER =
+ @Nonnull public static final QName TYPE_NAME =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "Static");
/** Local name of attribute. */
- @Nonnull public static final QName ATTRIBUTE_ELEMENT_NAME_RESOLVER =
+ @Nonnull public static final QName ATTRIBUTE_ELEMENT_NAME =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "Attribute");
/** Class logger. */
@@ -61,7 +61,7 @@ public class StaticDataConnectorParser extends AbstractDataConnectorParser {
@Nonnull final BeanDefinitionBuilder builder) {
super.doParse(config, parserContext, builder);
- final List<Element> children = ElementSupport.getChildElements(config, ATTRIBUTE_ELEMENT_NAME_RESOLVER);
+ final List<Element> children = ElementSupport.getChildElements(config, ATTRIBUTE_ELEMENT_NAME);
final List<BeanDefinition> attributes = new ManagedList<>(children.size());
final String attrListRef = StringSupport.trimOrNull(config.getAttributeNS(null, "attributeListRef"));
if (null != attrListRef) {
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StoredIdDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StoredIdDataConnectorParser.java
index ab7e16ccc..50a525249 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StoredIdDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StoredIdDataConnectorParser.java
@@ -36,7 +36,7 @@ import net.shibboleth.shared.spring.util.SpringSupport;
public class StoredIdDataConnectorParser extends ComputedIdDataConnectorParser {
/** Schema type - resolver. */
- @Nonnull public static final QName TYPE_NAME_RESOLVER =
+ @Nonnull public static final QName TYPE_NAME =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "StoredId");
/** Class logger. */
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/SubjectDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/SubjectDataConnectorParser.java
index a614c668c..159c709ea 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/SubjectDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/SubjectDataConnectorParser.java
@@ -39,7 +39,7 @@ import net.shibboleth.shared.xml.AttributeSupport;
public class SubjectDataConnectorParser extends AbstractDataConnectorParser {
/** Schema type name. */
- @Nonnull public static final QName TYPE_NAME_RESOLVER =
+ @Nonnull public static final QName TYPE_NAME =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "Subject");
/** Class logger. */
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
index 2b6cfc366..ddefdaa58 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
@@ -80,8 +80,8 @@ import net.shibboleth.shared.xml.XMLConstants;
public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
/** Schema type - resolver. */
- @Nonnull public static final QName
- TYPE_NAME_RESOLVER = new QName(AttributeResolverNamespaceHandler.NAMESPACE, "LDAPDirectory");
+ @Nonnull public static final QName TYPE_NAME =
+ new QName(AttributeResolverNamespaceHandler.NAMESPACE, "LDAPDirectory");
/** Class logger. */
@Nonnull private final Logger log = LoggerFactory.getLogger(LDAPDataConnectorParser.class);
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java
index 7646cd088..d8f7589b9 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java
@@ -47,7 +47,7 @@ import net.shibboleth.shared.xml.ElementSupport;
public class RDBMSDataConnectorParser extends AbstractDataConnectorParser {
/** Schema type name. */
- @Nonnull public static final QName TYPE_NAME_RESOLVER =
+ @Nonnull public static final QName TYPE_NAME =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "RelationalDatabase");
/** Class logger. */
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1Base64AttributeEncoderParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1Base64AttributeEncoderParser.java
index 802269055..fa37824a5 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1Base64AttributeEncoderParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1Base64AttributeEncoderParser.java
@@ -30,7 +30,7 @@ import net.shibboleth.idp.saml.attribute.transcoding.impl.SAML1ByteAttributeTran
public class SAML1Base64AttributeEncoderParser extends BaseSAML1AttributeEncoderParser {
/** Schema type name. */
- @Nonnull public static final QName TYPE_NAME_RESOLVER = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
+ @Nonnull public static final QName TYPE_NAME = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
"SAML1Base64");
/** {@inheritDoc} */
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1ScopedStringAttributeEncoderParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1ScopedStringAttributeEncoderParser.java
index 630b137d5..96edd1520 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1ScopedStringAttributeEncoderParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1ScopedStringAttributeEncoderParser.java
@@ -35,7 +35,7 @@ import net.shibboleth.shared.primitive.StringSupport;
public class SAML1ScopedStringAttributeEncoderParser extends BaseSAML1AttributeEncoderParser {
/** Schema type name. */
- @Nonnull public static final QName TYPE_NAME_RESOLVER = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
+ @Nonnull public static final QName TYPE_NAME = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
"SAML1ScopedString");
/** {@inheritDoc} */
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1StringAttributeEncoderParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1StringAttributeEncoderParser.java
index 3610955e8..73fbfc81b 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1StringAttributeEncoderParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1StringAttributeEncoderParser.java
@@ -30,7 +30,7 @@ import net.shibboleth.idp.saml.attribute.transcoding.impl.SAML1StringAttributeTr
public class SAML1StringAttributeEncoderParser extends BaseSAML1AttributeEncoderParser {
/** Schema type name.. */
- @Nonnull public static final QName TYPE_NAME_RESOLVER = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
+ @Nonnull public static final QName TYPE_NAME = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
"SAML1String");
/** {@inheritDoc} */
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1XMLObjectAttributeEncoderParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1XMLObjectAttributeEncoderParser.java
index 8aa2a266b..722e7d49f 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1XMLObjectAttributeEncoderParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1XMLObjectAttributeEncoderParser.java
@@ -28,7 +28,7 @@ import net.shibboleth.idp.saml.attribute.transcoding.impl.SAML1XMLObjectAttribut
public class SAML1XMLObjectAttributeEncoderParser extends BaseSAML1AttributeEncoderParser {
/** Schema type name.. */
- @Nonnull public static final QName TYPE_NAME_RESOLVER =
+ @Nonnull public static final QName TYPE_NAME =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "SAML1XMLObject");
/** {@inheritDoc} */
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2Base64AttributeEncoderParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2Base64AttributeEncoderParser.java
index 2cbcc17aa..a59126d19 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2Base64AttributeEncoderParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2Base64AttributeEncoderParser.java
@@ -30,7 +30,7 @@ import net.shibboleth.idp.saml.attribute.transcoding.impl.SAML2ByteAttributeTran
public class SAML2Base64AttributeEncoderParser extends BaseSAML2AttributeEncoderParser {
/** Schema type name.. */
- @Nonnull public static final QName TYPE_NAME_RESOLVER = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
+ @Nonnull public static final QName TYPE_NAME = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
"SAML2Base64");
/** {@inheritDoc} */
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2DateTimeAttributeEncoderParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2DateTimeAttributeEncoderParser.java
index c75808028..2373cb52e 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2DateTimeAttributeEncoderParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2DateTimeAttributeEncoderParser.java
@@ -30,7 +30,7 @@ import net.shibboleth.idp.saml.attribute.transcoding.impl.SAML2DateTimeAttribute
public class SAML2DateTimeAttributeEncoderParser extends BaseSAML2AttributeEncoderParser {
/** Schema type name.. */
- @Nonnull public static final QName TYPE_NAME_RESOLVER = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
+ @Nonnull public static final QName TYPE_NAME = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
"SAML2DateTime");
/** {@inheritDoc} */
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2ScopedStringAttributeEncoderParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2ScopedStringAttributeEncoderParser.java
index 4bc13e78b..9220d995a 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2ScopedStringAttributeEncoderParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2ScopedStringAttributeEncoderParser.java
@@ -35,7 +35,7 @@ import net.shibboleth.shared.primitive.StringSupport;
public class SAML2ScopedStringAttributeEncoderParser extends BaseSAML2AttributeEncoderParser {
/** Schema type name.. */
- @Nonnull public static final QName TYPE_NAME_RESOLVER = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
+ @Nonnull public static final QName TYPE_NAME = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
"SAML2ScopedString");
/** {@inheritDoc} */
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2StringAttributeEncoderParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2StringAttributeEncoderParser.java
index 35d3097d2..053095b8d 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2StringAttributeEncoderParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2StringAttributeEncoderParser.java
@@ -30,7 +30,7 @@ import net.shibboleth.idp.saml.attribute.transcoding.impl.SAML2StringAttributeTr
public class SAML2StringAttributeEncoderParser extends BaseSAML2AttributeEncoderParser {
/** Schema type name.. */
- @Nonnull public static final QName TYPE_NAME_RESOLVER = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
+ @Nonnull public static final QName TYPE_NAME = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
"SAML2String");
/** {@inheritDoc} */
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2XMLObjectAttributeEncoderParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2XMLObjectAttributeEncoderParser.java
index 7f81d8b11..3d74df20b 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2XMLObjectAttributeEncoderParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2XMLObjectAttributeEncoderParser.java
@@ -28,7 +28,7 @@ import net.shibboleth.idp.saml.attribute.transcoding.impl.SAML2XMLObjectAttribut
public class SAML2XMLObjectAttributeEncoderParser extends BaseSAML2AttributeEncoderParser {
/** Schema type name.. */
- @Nonnull public static final QName TYPE_NAME_RESOLVER = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
+ @Nonnull public static final QName TYPE_NAME = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
"SAML2XMLObject");
/** {@inheritDoc} */
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverNamespaceHandler.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverNamespaceHandler.java
index 7bc799a85..f235fdf07 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverNamespaceHandler.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverNamespaceHandler.java
@@ -36,6 +36,7 @@ import net.shibboleth.idp.attribute.resolver.spring.ad.mapped.impl.SourceValuePa
import net.shibboleth.idp.attribute.resolver.spring.ad.mapped.impl.ValueMapParser;
import net.shibboleth.idp.attribute.resolver.spring.dc.http.impl.HTTPDataConnectorParser;
import net.shibboleth.idp.attribute.resolver.spring.dc.impl.ComputedIdDataConnectorParser;
+import net.shibboleth.idp.attribute.resolver.spring.dc.impl.EntityAttributesDataConnectorParser;
import net.shibboleth.idp.attribute.resolver.spring.dc.impl.PairwiseIdDataConnectorParser;
import net.shibboleth.idp.attribute.resolver.spring.dc.impl.ScriptedDataConnectorParser;
import net.shibboleth.idp.attribute.resolver.spring.dc.impl.StaticDataConnectorParser;
@@ -73,79 +74,81 @@ public class AttributeResolverNamespaceHandler extends BaseSpringNamespaceHandle
registerBeanDefinitionParser(InputAttributeDefinitionParser.ELEMENT_NAME, new InputAttributeDefinitionParser());
// Attribute Resolvers
- registerBeanDefinitionParser(PrescopedAttributeDefinitionParser.TYPE_NAME_RESOLVER,
+ registerBeanDefinitionParser(PrescopedAttributeDefinitionParser.TYPE_NAME,
new PrescopedAttributeDefinitionParser());
- registerBeanDefinitionParser(PrincipalNameAttributeDefinitionParser.TYPE_NAME_RESOLVER,
+ registerBeanDefinitionParser(PrincipalNameAttributeDefinitionParser.TYPE_NAME,
new PrincipalNameAttributeDefinitionParser());
- registerBeanDefinitionParser(RegexSplitAttributeDefinitionParser.TYPE_NAME_RESOLVER,
+ registerBeanDefinitionParser(RegexSplitAttributeDefinitionParser.TYPE_NAME,
new RegexSplitAttributeDefinitionParser());
- registerBeanDefinitionParser(SubjectDerivedAttributeDefinitionParser.TYPE_NAME_RESOLVER,
+ registerBeanDefinitionParser(SubjectDerivedAttributeDefinitionParser.TYPE_NAME,
new SubjectDerivedAttributeDefinitionParser());
- registerBeanDefinitionParser(ContextDerivedAttributeDefinitionParser.TYPE_NAME_RESOLVER,
+ registerBeanDefinitionParser(ContextDerivedAttributeDefinitionParser.TYPE_NAME,
new ContextDerivedAttributeDefinitionParser());
- registerBeanDefinitionParser(SAML1NameIdentifierAttributeDefinitionParser.TYPE_NAME_RESOLVER,
+ registerBeanDefinitionParser(SAML1NameIdentifierAttributeDefinitionParser.TYPE_NAME,
new SAML1NameIdentifierAttributeDefinitionParser());
- registerBeanDefinitionParser(SAML2NameIDAttributeDefinitionParser.TYPE_NAME_RESOLVER,
+ registerBeanDefinitionParser(SAML2NameIDAttributeDefinitionParser.TYPE_NAME,
new SAML2NameIDAttributeDefinitionParser());
- registerBeanDefinitionParser(ScopedAttributeDefinitionParser.TYPE_NAME_RESOLVER,
+ registerBeanDefinitionParser(ScopedAttributeDefinitionParser.TYPE_NAME,
new ScopedAttributeDefinitionParser());
- registerBeanDefinitionParser(ScriptedAttributeDefinitionParser.TYPE_NAME_RESOLVER,
+ registerBeanDefinitionParser(ScriptedAttributeDefinitionParser.TYPE_NAME,
new ScriptedAttributeDefinitionParser());
- registerBeanDefinitionParser(SimpleAttributeDefinitionParser.TYPE_NAME_RESOLVER,
+ registerBeanDefinitionParser(SimpleAttributeDefinitionParser.TYPE_NAME,
new SimpleAttributeDefinitionParser());
- registerBeanDefinitionParser(DecryptedAttributeDefinitionParser.TYPE_NAME_RESOLVER,
+ registerBeanDefinitionParser(DecryptedAttributeDefinitionParser.TYPE_NAME,
new DecryptedAttributeDefinitionParser());
- registerBeanDefinitionParser(TemplateAttributeDefinitionParser.TYPE_NAME_RESOLVER,
+ registerBeanDefinitionParser(TemplateAttributeDefinitionParser.TYPE_NAME,
new TemplateAttributeDefinitionParser());
registerBeanDefinitionParser(SourceValueParser.TYPE_NAME_RESOLVER, new SourceValueParser());
registerBeanDefinitionParser(ValueMapParser.TYPE_NAME_RESOLVER, new ValueMapParser());
- registerBeanDefinitionParser(MappedAttributeDefinitionParser.TYPE_NAME_RESOLVER,
+ registerBeanDefinitionParser(MappedAttributeDefinitionParser.TYPE_NAME,
new MappedAttributeDefinitionParser());
- registerBeanDefinitionParser(DateTimeAttributeDefinitionParser.TYPE_NAME_RESOLVER,
+ registerBeanDefinitionParser(DateTimeAttributeDefinitionParser.TYPE_NAME,
new DateTimeAttributeDefinitionParser());
// Data Connectors
- registerBeanDefinitionParser(ComputedIdDataConnectorParser.TYPE_NAME_RESOLVER,
+ registerBeanDefinitionParser(ComputedIdDataConnectorParser.TYPE_NAME,
new ComputedIdDataConnectorParser());
- registerBeanDefinitionParser(RDBMSDataConnectorParser.TYPE_NAME_RESOLVER, new RDBMSDataConnectorParser());
- registerBeanDefinitionParser(LDAPDataConnectorParser.TYPE_NAME_RESOLVER, new LDAPDataConnectorParser());
- registerBeanDefinitionParser(PairwiseIdDataConnectorParser.TYPE_NAME_RESOLVER,
+ registerBeanDefinitionParser(RDBMSDataConnectorParser.TYPE_NAME, new RDBMSDataConnectorParser());
+ registerBeanDefinitionParser(LDAPDataConnectorParser.TYPE_NAME, new LDAPDataConnectorParser());
+ registerBeanDefinitionParser(PairwiseIdDataConnectorParser.TYPE_NAME,
new PairwiseIdDataConnectorParser());
registerBeanDefinitionParser(HTTPDataConnectorParser.TYPE_NAME, new HTTPDataConnectorParser());
- registerBeanDefinitionParser(ScriptedDataConnectorParser.TYPE_NAME_RESOLVER, new ScriptedDataConnectorParser());
- registerBeanDefinitionParser(StaticDataConnectorParser.TYPE_NAME_RESOLVER, new StaticDataConnectorParser());
- registerBeanDefinitionParser(StoredIdDataConnectorParser.TYPE_NAME_RESOLVER, new StoredIdDataConnectorParser());
- registerBeanDefinitionParser(SubjectDataConnectorParser.TYPE_NAME_RESOLVER, new SubjectDataConnectorParser());
+ registerBeanDefinitionParser(ScriptedDataConnectorParser.TYPE_NAME, new ScriptedDataConnectorParser());
+ registerBeanDefinitionParser(StaticDataConnectorParser.TYPE_NAME, new StaticDataConnectorParser());
+ registerBeanDefinitionParser(StoredIdDataConnectorParser.TYPE_NAME, new StoredIdDataConnectorParser());
+ registerBeanDefinitionParser(SubjectDataConnectorParser.TYPE_NAME, new SubjectDataConnectorParser());
registerBeanDefinitionParser(StorageServiceDataConnectorParser.TYPE_NAME,
new StorageServiceDataConnectorParser());
+ //registerBeanDefinitionParser(EntityAttributesDataConnectorParser.TYPE_NAME,
+ //new EntityAttributesDataConnectorParser());
// Encoders
- registerBeanDefinitionParser(SAML1StringAttributeEncoderParser.TYPE_NAME_RESOLVER,
+ registerBeanDefinitionParser(SAML1StringAttributeEncoderParser.TYPE_NAME,
new SAML1StringAttributeEncoderParser());
- registerBeanDefinitionParser(SAML1Base64AttributeEncoderParser.TYPE_NAME_RESOLVER,
+ registerBeanDefinitionParser(SAML1Base64AttributeEncoderParser.TYPE_NAME,
new SAML1Base64AttributeEncoderParser());
- registerBeanDefinitionParser(SAML1ScopedStringAttributeEncoderParser.TYPE_NAME_RESOLVER,
+ registerBeanDefinitionParser(SAML1ScopedStringAttributeEncoderParser.TYPE_NAME,
new SAML1ScopedStringAttributeEncoderParser());
- registerBeanDefinitionParser(SAML1XMLObjectAttributeEncoderParser.TYPE_NAME_RESOLVER,
+ registerBeanDefinitionParser(SAML1XMLObjectAttributeEncoderParser.TYPE_NAME,
new SAML1XMLObjectAttributeEncoderParser());
- registerBeanDefinitionParser(SAML2Base64AttributeEncoderParser.TYPE_NAME_RESOLVER,
+ registerBeanDefinitionParser(SAML2Base64AttributeEncoderParser.TYPE_NAME,
new SAML2Base64AttributeEncoderParser());
- registerBeanDefinitionParser(SAML2ScopedStringAttributeEncoderParser.TYPE_NAME_RESOLVER,
+ registerBeanDefinitionParser(SAML2ScopedStringAttributeEncoderParser.TYPE_NAME,
new SAML2ScopedStringAttributeEncoderParser());
- registerBeanDefinitionParser(SAML2StringAttributeEncoderParser.TYPE_NAME_RESOLVER,
+ registerBeanDefinitionParser(SAML2StringAttributeEncoderParser.TYPE_NAME,
new SAML2StringAttributeEncoderParser());
- registerBeanDefinitionParser(SAML2DateTimeAttributeEncoderParser.TYPE_NAME_RESOLVER,
+ registerBeanDefinitionParser(SAML2DateTimeAttributeEncoderParser.TYPE_NAME,
new SAML2DateTimeAttributeEncoderParser());
- registerBeanDefinitionParser(SAML2XMLObjectAttributeEncoderParser.TYPE_NAME_RESOLVER,
+ registerBeanDefinitionParser(SAML2XMLObjectAttributeEncoderParser.TYPE_NAME,
new SAML2XMLObjectAttributeEncoderParser());
}
// Checkstyle: MethodLength ON
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list