[java-identity-provider] branch maint-3.4 updated: Yank spurious warning about old SourceAttribute usage.
Scott Cantor
cantor.2 at osu.edu
Fri Jan 4 14:30:58 EST 2019
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch maint-3.4
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=343864136b4eb9664e1761d9f673cb35f487b41d
The following commit(s) were added to refs/heads/maint-3.4 by this push:
new 3438641 Yank spurious warning about old SourceAttribute usage.
3438641 is described below
commit 343864136b4eb9664e1761d9f673cb35f487b41d
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Jan 4 14:30:56 2019 -0500
Yank spurious warning about old SourceAttribute usage.
---
.../ad/impl/TemplateAttributeDefinition.java | 30 ----------------------
1 file changed, 30 deletions(-)
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/TemplateAttributeDefinition.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/TemplateAttributeDefinition.java
index 0ad9f27..fb063ca 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/TemplateAttributeDefinition.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/TemplateAttributeDefinition.java
@@ -181,8 +181,6 @@ public class TemplateAttributeDefinition extends AbstractAttributeDefinition {
throw new ComponentInitializationException(getLogPrefix() + " no velocity engine was configured");
}
- checkSourceAttributes();
-
if (null == templateText) {
// V2 compatibility - define our own template
final StringBuffer defaultTemplate = new StringBuffer();
@@ -201,34 +199,6 @@ public class TemplateAttributeDefinition extends AbstractAttributeDefinition {
template = Template.fromTemplate(engine, templateText);
}
- /**
- * Check the provided source attributes against the provided dependencies.
- */
- private void checkSourceAttributes() {
- if (sourceAttributes.isEmpty()) {
- return;
- }
-
- final Set<String> dependencyAttributeNames = new HashSet<>(getDependencies().size());
- for (final ResolverPluginDependency dependency: getDependencies()) {
- if (dependency instanceof ResolverAttributeDefinitionDependency) {
- dependencyAttributeNames.add( dependency.getDependencyPluginId());
- } else if (dependency instanceof ResolverDataConnectorDependency) {
- final ResolverDataConnectorDependency dc = (ResolverDataConnectorDependency) dependency;
- if (dc.isAllAttributes()) {
- return;
- }
- dependencyAttributeNames.addAll(dc.getAttributeNames());
- }
- }
-
- for (final String s: sourceAttributes) {
- if (!dependencyAttributeNames.contains(s)) {
- log.warn("{} Source Attribute {} is not provided as a dependency", getLogPrefix(),s);
- }
- }
- }
-
/** {@inheritDoc} */
@Override @Nonnull protected IdPAttribute doAttributeDefinitionResolve(
@Nonnull final AttributeResolutionContext resolutionContext,
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list