[java-identity-provider] branch master updated: No need to propagate "need" for sourceAttributeID into base class.
Scott Cantor
cantor.2 at osu.edu
Fri Aug 4 16:52:21 EDT 2017
This is an automated email from the git hooks/post-receive script.
scantor 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=f6adeddf844053ca955cbfcd6de7ec6e1cfdf5e3
The following commit(s) were added to refs/heads/master by this push:
new f6adedd No need to propagate "need" for sourceAttributeID into base class.
f6adedd is described below
commit f6adeddf844053ca955cbfcd6de7ec6e1cfdf5e3
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Aug 4 16:52:19 2017 -0400
No need to propagate "need" for sourceAttributeID into base class.
---
.../resolver/spring/ad/BaseAttributeDefinitionParser.java | 12 ------------
.../ad/impl/ContextDerivedAttributeDefinitionParser.java | 5 -----
.../ad/impl/CryptoTransientIdAttributeDefinitionParser.java | 5 -----
.../spring/ad/impl/PrescopedAttributeDefinitionParser.java | 5 -----
...incipalAuthenticationMethodAttributeDefinitionParser.java | 5 -----
.../ad/impl/PrincipalNameAttributeDefinitionParser.java | 5 -----
.../spring/ad/impl/RegexSplitAttributeDefinitionParser.java | 5 -----
.../impl/SAML1NameIdentifierAttributeDefinitionParser.java | 5 -----
.../spring/ad/impl/SAML2NameIDAttributeDefinitionParser.java | 5 -----
.../spring/ad/impl/ScopedAttributeDefinitionParser.java | 5 -----
.../spring/ad/impl/ScriptedAttributeDefinitionParser.java | 5 -----
.../spring/ad/impl/SimpleAttributeDefinitionParser.java | 5 -----
.../ad/impl/SubjectDerivedAttributeDefinitionParser.java | 5 -----
.../spring/ad/impl/TemplateAttributeDefinitionParser.java | 5 -----
.../spring/ad/impl/TransientIdAttributeDefinitionParser.java | 5 -----
.../ad/mapped/impl/MappedAttributeDefinitionParser.java | 5 -----
16 files changed, 87 deletions(-)
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/BaseAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/BaseAttributeDefinitionParser.java
index c3ab279..aecbfe6 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/BaseAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/BaseAttributeDefinitionParser.java
@@ -142,17 +142,5 @@ public abstract class BaseAttributeDefinitionParser extends BaseResolverPluginPa
.append("':");
return builder.toString();
}
-
- /**
- * Ask the specific parser of it needs attributeSourceID.
- * We used to use this to log several misconfiguration possibilities.
- * These days the attribute is irrelevant if you avoid <Dependency>
- * so this is here purely for backwards API compatibility.
- *
- * @return whether the attribute definition for this parser needs attributeSourceID.
- */
- protected boolean needsAttributeSourceID() {
- return false;
- }
}
\ 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 ab7829b..b643cf7 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
@@ -58,11 +58,6 @@ public class ContextDerivedAttributeDefinitionParser extends AbstractWarningAttr
}
}
- /** {@inheritDoc}. No input. */
- @Override protected boolean needsAttributeSourceID() {
- return false;
- }
-
/** {@inheritDoc} */
@Override protected boolean failOnDependencies() {
return true;
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/CryptoTransientIdAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/CryptoTransientIdAttributeDefinitionParser.java
index e5b3f3b..a348705 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/CryptoTransientIdAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/CryptoTransientIdAttributeDefinitionParser.java
@@ -85,9 +85,4 @@ public class CryptoTransientIdAttributeDefinitionParser extends BaseAttributeDef
"via NameID Generation Service configuration");
}
- /** {@inheritDoc}. So source Attribute for this. */
- @Override protected boolean needsAttributeSourceID() {
- return false;
- }
-
}
\ 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 60a1599..6ea152d 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
@@ -61,11 +61,6 @@ public class PrescopedAttributeDefinitionParser extends AbstractWarningAttribute
builder.addPropertyValue("scopeDelimiter", scopeDelimiter);
}
}
-
- /** {@inheritDoc} */
- @Override protected boolean needsAttributeSourceID() {
- return true;
- }
/** {@inheritDoc} */
@Override
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 743fe1a..45dd9cd 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
@@ -40,11 +40,6 @@ public class PrincipalAuthenticationMethodAttributeDefinitionParser extends Abst
@Override protected Class<PrincipalAuthenticationMethodAttributeDefinition> getBeanClass(final Element element) {
return PrincipalAuthenticationMethodAttributeDefinition.class;
}
-
- /** {@inheritDoc}. No input. */
- @Override protected boolean needsAttributeSourceID() {
- return false;
- }
/** {@inheritDoc} */
@Override
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 2351dcc..f49935c 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
@@ -42,11 +42,6 @@ public class PrincipalNameAttributeDefinitionParser extends AbstractWarningAttri
return PrincipalNameAttributeDefinition.class;
}
- /** {@inheritDoc}. No input. */
- @Override protected boolean needsAttributeSourceID() {
- return false;
- }
-
/** {@inheritDoc} */
@Override
@Nonnull protected QName getPreferredName() {
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 1aa770d..4c2f8d3 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
@@ -77,11 +77,6 @@ public class RegexSplitAttributeDefinitionParser extends AbstractWarningAttribut
}
/** {@inheritDoc} */
- @Override protected boolean needsAttributeSourceID() {
- return true;
- }
-
- /** {@inheritDoc} */
@Override
@Nonnull protected QName getPreferredName() {
return TYPE_NAME_RESOLVER;
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 e1c7f2c..70c8c41 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
@@ -68,11 +68,6 @@ public class SAML1NameIdentifierAttributeDefinitionParser extends AbstractWarnin
}
/** {@inheritDoc} */
- @Override protected boolean needsAttributeSourceID() {
- return true;
- }
-
- /** {@inheritDoc} */
@Override
@Nonnull protected QName getPreferredName() {
return TYPE_NAME_RESOLVER;
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 caef140..278c0ae 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
@@ -72,11 +72,6 @@ public class SAML2NameIDAttributeDefinitionParser extends AbstractWarningAttribu
}
/** {@inheritDoc} */
- @Override protected boolean needsAttributeSourceID() {
- return true;
- }
-
- /** {@inheritDoc} */
@Override
@Nonnull protected QName getPreferredName() {
return TYPE_NAME_RESOLVER;
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 e042268..e2f916b 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
@@ -63,11 +63,6 @@ public class ScopedAttributeDefinitionParser extends AbstractWarningAttributeDef
}
/** {@inheritDoc} */
- @Override protected boolean needsAttributeSourceID() {
- return true;
- }
-
- /** {@inheritDoc} */
@Override
@Nonnull protected QName getPreferredName() {
return TYPE_NAME_RESOLVER;
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 545f522..0402201 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
@@ -123,11 +123,6 @@ public class ScriptedAttributeDefinitionParser extends AbstractWarningAttributeD
builder.addPropertyValue("script", scriptBuilder.getBeanDefinition());
}
- /** {@inheritDoc}. No input. */
- @Override protected boolean needsAttributeSourceID() {
- return false;
- }
-
/** {@inheritDoc} */
@Override
@Nonnull protected QName getPreferredName() {
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 237be6c..c26f720 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
@@ -51,11 +51,6 @@ public class SimpleAttributeDefinitionParser extends AbstractWarningAttributeDef
}
/** {@inheritDoc} */
- @Override protected boolean needsAttributeSourceID() {
- return true;
- }
-
- /** {@inheritDoc} */
@Override
@Nonnull protected QName getPreferredName() {
return TYPE_NAME_RESOLVER;
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 2d82e22..36189d7 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
@@ -90,11 +90,6 @@ public class SubjectDerivedAttributeDefinitionParser extends AbstractWarningAttr
builder.addPropertyValue("attributeValuesFunction", contextFunctionBuilder.getBeanDefinition());
}
- /** {@inheritDoc}. No input. */
- @Override protected boolean needsAttributeSourceID() {
- return false;
- }
-
/** {@inheritDoc} */
@Override protected boolean failOnDependencies() {
return true;
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 71e2254..ef30672 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
@@ -110,11 +110,6 @@ public class TemplateAttributeDefinitionParser extends AbstractWarningAttributeD
builder.addPropertyReference("velocityEngine", velocityEngineRef);
}
- /** {@inheritDoc}. No input. */
- @Override protected boolean needsAttributeSourceID() {
- return false;
- }
-
/** {@inheritDoc} */
@Override
@Nonnull protected QName getPreferredName() {
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/TransientIdAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/TransientIdAttributeDefinitionParser.java
index a0a468a..33e1146 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/TransientIdAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/TransientIdAttributeDefinitionParser.java
@@ -90,9 +90,4 @@ public class TransientIdAttributeDefinitionParser extends BaseAttributeDefinitio
"via NameID Generation Service configuration");
}
- /** {@inheritDoc}. No input. */
- @Override protected boolean needsAttributeSourceID() {
- return false;
- }
-
}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/MappedAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/MappedAttributeDefinitionParser.java
index 69e4b17..8b354f8 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/MappedAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/MappedAttributeDefinitionParser.java
@@ -110,9 +110,4 @@ public class MappedAttributeDefinitionParser extends BaseAttributeDefinitionPars
builder.addPropertyValue("valueMaps", valueMaps);
}
- /** {@inheritDoc} */
- @Override protected boolean needsAttributeSourceID() {
- return true;
- }
-
}
\ 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