[java-identity-provider] 14/51: IDP-1121 Remove the AbstractWarningAttributeDefinitionParser
Rod Widdowson
rdw at steadingsoftware.com
Wed Feb 6 08:42:45 EST 2019
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=cb093bf5b11329dfbc0e2fef5d5e5dc192f9bd18
commit cb093bf5b11329dfbc0e2fef5d5e5dc192f9bd18
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Nov 28 16:42:33 2018 +0000
IDP-1121 Remove the AbstractWarningAttributeDefinitionParser
https://issues.shibboleth.net/jira/browse/IDP-1121
---
.../AbstractWarningAttributeDefinitionParser.java | 58 ----------------------
.../ContextDerivedAttributeDefinitionParser.java | 10 +---
.../impl/PrescopedAttributeDefinitionParser.java | 17 +++----
...henticationMethodAttributeDefinitionParser.java | 16 +++---
.../PrincipalNameAttributeDefinitionParser.java | 10 +---
.../impl/RegexSplitAttributeDefinitionParser.java | 10 +---
...ML1NameIdentifierAttributeDefinitionParser.java | 10 +---
.../impl/SAML2NameIDAttributeDefinitionParser.java | 9 +---
.../ad/impl/ScopedAttributeDefinitionParser.java | 10 +---
.../ad/impl/ScriptedAttributeDefinitionParser.java | 21 +++-----
.../ad/impl/SimpleAttributeDefinitionParser.java | 10 +---
.../SubjectDerivedAttributeDefinitionParser.java | 22 +++-----
.../ad/impl/TemplateAttributeDefinitionParser.java | 24 ++++-----
13 files changed, 51 insertions(+), 176 deletions(-)
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/AbstractWarningAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/AbstractWarningAttributeDefinitionParser.java
deleted file mode 100644
index 8601ec6..0000000
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/AbstractWarningAttributeDefinitionParser.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.attribute.resolver.spring.ad.impl;
-
-import javax.annotation.Nonnull;
-import javax.xml.namespace.QName;
-
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import net.shibboleth.idp.attribute.resolver.spring.ad.BaseAttributeDefinitionParser;
-import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
-import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
-
-/**
- * A special case version of {@link net.shibboleth.idp.attribute.resolver.spring.dc.AbstractDataConnectorParser}
- * which warns if the legacy name is used.
- */
-public abstract class AbstractWarningAttributeDefinitionParser extends BaseAttributeDefinitionParser {
-
- /** {@inheritDoc} */
- @Override protected void doParse(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
- @Nonnull final BeanDefinitionBuilder builder) {
- super.doParse(config, parserContext, builder);
-
- final QName suppliedQname = DOMTypeSupport.getXSIType(config);
- if (!AttributeResolverNamespaceHandler.NAMESPACE.equals(suppliedQname.getNamespaceURI())) {
- DeprecationSupport.warnOnce(ObjectType.XSITYPE, suppliedQname.toString(),
- parserContext.getReaderContext().getResource().getDescription(), getPreferredName().toString());
- }
- }
-
- /**
- * Helper function to assist rewrite from old to new QName.
- *
- * @return the "new" type
- */
- @Nonnull protected abstract QName getPreferredName();
-
-}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ContextDerivedAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ContextDerivedAttributeDefinitionParser.java
index 8b7aaad..0f78e49 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ContextDerivedAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ContextDerivedAttributeDefinitionParser.java
@@ -26,11 +26,12 @@ import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
import net.shibboleth.idp.attribute.resolver.ad.impl.ContextDerivedAttributeDefinition;
+import net.shibboleth.idp.attribute.resolver.spring.ad.BaseAttributeDefinitionParser;
import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
/** Spring Bean Definition Parser for attribute definitions derived from the Principal. */
-public class ContextDerivedAttributeDefinitionParser extends AbstractWarningAttributeDefinitionParser {
+public class ContextDerivedAttributeDefinitionParser extends BaseAttributeDefinitionParser {
/** Schema type name. */
@Nonnull public static final QName TYPE_NAME_RESOLVER =
@@ -58,11 +59,4 @@ public class ContextDerivedAttributeDefinitionParser extends AbstractWarningAttr
@Override protected boolean failOnDependencies() {
return true;
}
-
- /** {@inheritDoc} */
- @Override
- @Nonnull protected QName getPreferredName() {
- return TYPE_NAME_RESOLVER;
- }
-
}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrescopedAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrescopedAttributeDefinitionParser.java
index 961e1ad..ca56c9b 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrescopedAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrescopedAttributeDefinitionParser.java
@@ -21,18 +21,19 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.xml.namespace.QName;
-import net.shibboleth.idp.attribute.resolver.ad.impl.PrescopedAttributeDefinition;
-import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
+import net.shibboleth.idp.attribute.resolver.ad.impl.PrescopedAttributeDefinition;
+import net.shibboleth.idp.attribute.resolver.spring.ad.BaseAttributeDefinitionParser;
+import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
+
/** Spring bean definition parser for prescoped attributes. */
-public class PrescopedAttributeDefinitionParser extends AbstractWarningAttributeDefinitionParser {
+public class PrescopedAttributeDefinitionParser extends BaseAttributeDefinitionParser {
/** Schema type name. */
@Nonnull public static final QName TYPE_NAME_RESOLVER =
@@ -58,10 +59,4 @@ public class PrescopedAttributeDefinitionParser extends AbstractWarningAttribute
}
}
- /** {@inheritDoc} */
- @Override
- @Nonnull protected QName getPreferredName() {
- return TYPE_NAME_RESOLVER;
- }
-
}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrincipalAuthenticationMethodAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrincipalAuthenticationMethodAttributeDefinitionParser.java
index aca3189..82997fa 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrincipalAuthenticationMethodAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrincipalAuthenticationMethodAttributeDefinitionParser.java
@@ -20,17 +20,18 @@ package net.shibboleth.idp.attribute.resolver.spring.ad.impl;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.w3c.dom.Element;
+
import net.shibboleth.idp.attribute.resolver.ad.impl.PrincipalAuthenticationMethodAttributeDefinition;
+import net.shibboleth.idp.attribute.resolver.spring.ad.BaseAttributeDefinitionParser;
import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
/** Spring Bean Definition Parser for PrincipalAuthenticationMethod. */
-public class PrincipalAuthenticationMethodAttributeDefinitionParser extends AbstractWarningAttributeDefinitionParser {
+public class PrincipalAuthenticationMethodAttributeDefinitionParser extends BaseAttributeDefinitionParser {
/** Schema type name. */
@Nonnull public static final QName TYPE_NAME_RESOLVER =
@@ -41,11 +42,6 @@ public class PrincipalAuthenticationMethodAttributeDefinitionParser extends Abst
return PrincipalAuthenticationMethodAttributeDefinition.class;
}
- /** {@inheritDoc} */
- @Override @Nonnull protected QName getPreferredName() {
- return TYPE_NAME_RESOLVER;
- }
-
@Override protected void doParse(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
@Nonnull final BeanDefinitionBuilder builder) {
DeprecationSupport.warnOnce(ObjectType.ELEMENT, "PrincipalAuthenticationMethod",
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrincipalNameAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrincipalNameAttributeDefinitionParser.java
index 7ac7f91..cf25066 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrincipalNameAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrincipalNameAttributeDefinitionParser.java
@@ -24,10 +24,11 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Element;
import net.shibboleth.idp.attribute.resolver.ad.impl.PrincipalNameAttributeDefinition;
+import net.shibboleth.idp.attribute.resolver.spring.ad.BaseAttributeDefinitionParser;
import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
/** Spring Bean Definition Parser for PrincipalName attribute definitions. */
-public class PrincipalNameAttributeDefinitionParser extends AbstractWarningAttributeDefinitionParser {
+public class PrincipalNameAttributeDefinitionParser extends BaseAttributeDefinitionParser {
/** Schema type name. */
@Nonnull public static final QName TYPE_NAME_RESOLVER =
@@ -37,11 +38,4 @@ public class PrincipalNameAttributeDefinitionParser extends AbstractWarningAttri
@Override protected Class<PrincipalNameAttributeDefinition> getBeanClass(@Nullable final Element element) {
return PrincipalNameAttributeDefinition.class;
}
-
- /** {@inheritDoc} */
- @Override
- @Nonnull protected QName getPreferredName() {
- return TYPE_NAME_RESOLVER;
- }
-
}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/RegexSplitAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/RegexSplitAttributeDefinitionParser.java
index dce71fe..ab52397 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/RegexSplitAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/RegexSplitAttributeDefinitionParser.java
@@ -29,12 +29,13 @@ import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
import net.shibboleth.idp.attribute.resolver.ad.impl.RegexSplitAttributeDefinition;
+import net.shibboleth.idp.attribute.resolver.spring.ad.BaseAttributeDefinitionParser;
import net.shibboleth.idp.attribute.resolver.spring.ad.PatternFactoryBean;
import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
/** Spring Bean Definition Parser for Regexp split attribute definitions. */
-public class RegexSplitAttributeDefinitionParser extends AbstractWarningAttributeDefinitionParser {
+public class RegexSplitAttributeDefinitionParser extends BaseAttributeDefinitionParser {
/** Schema type name. */
@Nonnull public static final QName TYPE_NAME_RESOLVER =
@@ -71,11 +72,4 @@ public class RegexSplitAttributeDefinitionParser extends AbstractWarningAttribut
builder.addPropertyValue("regularExpression", pattern.getBeanDefinition());
}
-
- /** {@inheritDoc} */
- @Override
- @Nonnull protected QName getPreferredName() {
- return TYPE_NAME_RESOLVER;
- }
-
}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SAML1NameIdentifierAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SAML1NameIdentifierAttributeDefinitionParser.java
index d5a6d52..5270f33 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SAML1NameIdentifierAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SAML1NameIdentifierAttributeDefinitionParser.java
@@ -27,12 +27,13 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
+import net.shibboleth.idp.attribute.resolver.spring.ad.BaseAttributeDefinitionParser;
import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
import net.shibboleth.idp.saml.attribute.resolver.impl.SAML1NameIdentifierAttributeDefinition;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
/** Spring bean definition parser for SAML 1 NameIdentifier attribute definitions. */
-public class SAML1NameIdentifierAttributeDefinitionParser extends AbstractWarningAttributeDefinitionParser {
+public class SAML1NameIdentifierAttributeDefinitionParser extends BaseAttributeDefinitionParser {
/** Schema type name. */
@Nonnull public static final QName TYPE_NAME_RESOLVER =
@@ -62,11 +63,4 @@ public class SAML1NameIdentifierAttributeDefinitionParser extends AbstractWarnin
log.debug("{} nameIdQualifier '{}'", getLogPrefix(), nameIdQualifier);
}
}
-
- /** {@inheritDoc} */
- @Override
- @Nonnull protected QName getPreferredName() {
- return TYPE_NAME_RESOLVER;
- }
-
}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SAML2NameIDAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SAML2NameIDAttributeDefinitionParser.java
index c4dd437..694a018 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SAML2NameIDAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SAML2NameIDAttributeDefinitionParser.java
@@ -27,12 +27,13 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
+import net.shibboleth.idp.attribute.resolver.spring.ad.BaseAttributeDefinitionParser;
import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
import net.shibboleth.idp.saml.attribute.resolver.impl.SAML2NameIDAttributeDefinition;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
/** Spring bean definition parser for SAML 2 NameID attribute definitions. */
-public class SAML2NameIDAttributeDefinitionParser extends AbstractWarningAttributeDefinitionParser {
+public class SAML2NameIDAttributeDefinitionParser extends BaseAttributeDefinitionParser {
/** Schema type name. */
@Nonnull public static final QName TYPE_NAME_RESOLVER =
@@ -67,10 +68,4 @@ public class SAML2NameIDAttributeDefinitionParser extends AbstractWarningAttribu
nameIdSPQualifier);
}
- /** {@inheritDoc} */
- @Override
- @Nonnull protected QName getPreferredName() {
- return TYPE_NAME_RESOLVER;
- }
-
}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScopedAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScopedAttributeDefinitionParser.java
index 8fba350..17cab35 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScopedAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScopedAttributeDefinitionParser.java
@@ -28,13 +28,14 @@ import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
import net.shibboleth.idp.attribute.resolver.ad.impl.ScopedAttributeDefinition;
+import net.shibboleth.idp.attribute.resolver.spring.ad.BaseAttributeDefinitionParser;
import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
/**
* Spring Bean Definition Parser for scoped attribute definitions.
*/
-public class ScopedAttributeDefinitionParser extends AbstractWarningAttributeDefinitionParser {
+public class ScopedAttributeDefinitionParser extends BaseAttributeDefinitionParser {
/** Schema type name. */
@Nonnull public static final QName TYPE_NAME_RESOLVER =
@@ -57,11 +58,4 @@ public class ScopedAttributeDefinitionParser extends AbstractWarningAttributeDef
log.debug("{} Setting scope to '{}'.", getLogPrefix(), scope);
builder.addPropertyValue("scope", scope);
}
-
- /** {@inheritDoc} */
- @Override
- @Nonnull protected QName getPreferredName() {
- return TYPE_NAME_RESOLVER;
- }
-
}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScriptedAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScriptedAttributeDefinitionParser.java
index 7222d6b..013f31a 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScriptedAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScriptedAttributeDefinitionParser.java
@@ -23,12 +23,6 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.xml.namespace.QName;
-import net.shibboleth.ext.spring.factory.EvaluableScriptFactoryBean;
-import net.shibboleth.idp.attribute.resolver.ad.impl.ScriptedAttributeDefinition;
-import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.BeanCreationException;
@@ -36,10 +30,17 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
+import net.shibboleth.ext.spring.factory.EvaluableScriptFactoryBean;
+import net.shibboleth.idp.attribute.resolver.ad.impl.ScriptedAttributeDefinition;
+import net.shibboleth.idp.attribute.resolver.spring.ad.BaseAttributeDefinitionParser;
+import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.utilities.java.support.xml.ElementSupport;
+
/**
* Spring bean definition parser for scripted attribute configuration elements.
*/
-public class ScriptedAttributeDefinitionParser extends AbstractWarningAttributeDefinitionParser {
+public class ScriptedAttributeDefinitionParser extends BaseAttributeDefinitionParser {
/** Schema type name. */
/** Schema type name - resolver: . */
@@ -110,10 +111,4 @@ public class ScriptedAttributeDefinitionParser extends AbstractWarningAttributeD
builder.addPropertyValue("script", scriptBuilder.getBeanDefinition());
}
- /** {@inheritDoc} */
- @Override
- @Nonnull protected QName getPreferredName() {
- return TYPE_NAME_RESOLVER;
- }
-
}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SimpleAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SimpleAttributeDefinitionParser.java
index ff2e3dd..725fdef 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SimpleAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SimpleAttributeDefinitionParser.java
@@ -26,10 +26,11 @@ import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
import net.shibboleth.idp.attribute.resolver.ad.impl.SimpleAttributeDefinition;
+import net.shibboleth.idp.attribute.resolver.spring.ad.BaseAttributeDefinitionParser;
import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
/** Bean definition parser for a {@link SimpleAttributeDefinition}. */
-public class SimpleAttributeDefinitionParser extends AbstractWarningAttributeDefinitionParser {
+public class SimpleAttributeDefinitionParser extends BaseAttributeDefinitionParser {
/** Schema type name. */
@Nonnull public static final QName TYPE_NAME_RESOLVER =
@@ -45,11 +46,4 @@ public class SimpleAttributeDefinitionParser extends AbstractWarningAttributeDef
@Nonnull final BeanDefinitionBuilder builder) {
super.doParse(config, parserContext, builder);
}
-
- /** {@inheritDoc} */
- @Override
- @Nonnull protected QName getPreferredName() {
- return TYPE_NAME_RESOLVER;
- }
-
}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SubjectDerivedAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SubjectDerivedAttributeDefinitionParser.java
index 074954f..9288add 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SubjectDerivedAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SubjectDerivedAttributeDefinitionParser.java
@@ -20,12 +20,6 @@ package net.shibboleth.idp.attribute.resolver.spring.ad.impl;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
-import net.shibboleth.idp.attribute.resolver.ad.impl.ContextDerivedAttributeDefinition;
-import net.shibboleth.idp.attribute.resolver.ad.impl.IdPAttributePrincipalValuesFunction;
-import net.shibboleth.idp.attribute.resolver.ad.impl.SubjectDerivedAttributeValuesFunction;
-import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.BeanCreationException;
@@ -33,8 +27,15 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
+import net.shibboleth.idp.attribute.resolver.ad.impl.ContextDerivedAttributeDefinition;
+import net.shibboleth.idp.attribute.resolver.ad.impl.IdPAttributePrincipalValuesFunction;
+import net.shibboleth.idp.attribute.resolver.ad.impl.SubjectDerivedAttributeValuesFunction;
+import net.shibboleth.idp.attribute.resolver.spring.ad.BaseAttributeDefinitionParser;
+import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
+
/** Spring Bean Definition Parser for attribute definitions derived from the Principal. */
-public class SubjectDerivedAttributeDefinitionParser extends AbstractWarningAttributeDefinitionParser {
+public class SubjectDerivedAttributeDefinitionParser extends BaseAttributeDefinitionParser {
/** Schema type name. */
@Nonnull public static final QName TYPE_NAME_RESOLVER =
@@ -90,11 +91,4 @@ public class SubjectDerivedAttributeDefinitionParser extends AbstractWarningAttr
@Override protected boolean failOnDependencies() {
return true;
}
-
- /** {@inheritDoc} */
- @Override
- @Nonnull protected QName getPreferredName() {
- return TYPE_NAME_RESOLVER;
- }
-
}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/TemplateAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/TemplateAttributeDefinitionParser.java
index 490e40a..7f9bc89 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/TemplateAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/TemplateAttributeDefinitionParser.java
@@ -23,13 +23,6 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.xml.namespace.QName;
-import net.shibboleth.idp.attribute.resolver.ad.impl.TemplateAttributeDefinition;
-import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -37,10 +30,18 @@ import org.springframework.beans.factory.support.ManagedList;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
+import net.shibboleth.idp.attribute.resolver.ad.impl.TemplateAttributeDefinition;
+import net.shibboleth.idp.attribute.resolver.spring.ad.BaseAttributeDefinitionParser;
+import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.utilities.java.support.xml.ElementSupport;
+
/**
* Spring bean definition parser for templated attribute definition elements.
*/
-public class TemplateAttributeDefinitionParser extends AbstractWarningAttributeDefinitionParser {
+public class TemplateAttributeDefinitionParser extends BaseAttributeDefinitionParser {
/** Schema type name. */
@Nonnull public static final QName TYPE_NAME_RESOLVER =
@@ -104,11 +105,4 @@ public class TemplateAttributeDefinitionParser extends AbstractWarningAttributeD
log.debug("{} Velocity engine reference '{}'.", getLogPrefix(), velocityEngineRef);
builder.addPropertyReference("velocityEngine", velocityEngineRef);
}
-
- /** {@inheritDoc} */
- @Override
- @Nonnull protected QName getPreferredName() {
- return TYPE_NAME_RESOLVER;
- }
-
}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list