[java-shib-metadata] branch main updated: Null checking, more low hanging fruit
Rod Widdowson
rdw at steadingsoftware.com
Tue Jan 31 11:39:22 UTC 2023
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch main
in repository java-shib-metadata.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-metadata.git;a=commit;h=418c77a80e383429e2dc64012b8186fe70f20c80
The following commit(s) were added to refs/heads/main by this push:
new 418c77a8 Null checking, more low hanging fruit
418c77a8 is described below
commit 418c77a80e383429e2dc64012b8186fe70f20c80
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Jan 31 10:27:34 2023 +0000
Null checking, more low hanging fruit
---
.../java/net/shibboleth/idp/saml/metadata/ACSUIInfo.java | 12 +++++++-----
.../shibboleth/idp/saml/metadata/OrganizationUIInfo.java | 15 +++++++++------
.../shibboleth/idp/saml/security/KeyAuthoritySupport.java | 1 -
.../metadata/impl/ByReferenceMetadataFilterBridge.java | 12 +++++++-----
.../java/net/shibboleth/spring/ScriptTypeBeanParser.java | 11 +++--------
.../metadata/AbstractDynamicMetadataProviderParser.java | 12 ++++++------
.../spring/metadata/AbstractMetadataProviderParser.java | 2 +-
.../metadata/ByReferenceFilterBeanPostProcessor.java | 10 +++++-----
.../spring/metadata/HTTPMetadataProviderParser.java | 2 +-
.../metadata/HTTPMetadataProvidersParserSupport.java | 2 +-
.../metadata/LocalDynamicMetadataProviderParser.java | 2 +-
.../metadata/ResourceBackedMetadataProviderParser.java | 2 +-
.../spring/metadata/filter/AlgorithmFilterParser.java | 2 +-
.../metadata/filter/EntityAttributesFilterParser.java | 2 +-
.../spring/metadata/filter/PredicateFilterParser.java | 2 +-
.../filter/SignatureValidationCriteriaSetFactoryBean.java | 2 +-
.../spring/metadata/filter/SignatureValidationParser.java | 2 +-
.../credential/AbstractBasicCredentialParser.java | 10 +++++-----
.../security/credential/AbstractX509CredentialParser.java | 14 +++++++-------
19 files changed, 59 insertions(+), 58 deletions(-)
diff --git a/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/ACSUIInfo.java b/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/ACSUIInfo.java
index aa662ec1..beda3312 100644
--- a/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/ACSUIInfo.java
+++ b/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/ACSUIInfo.java
@@ -27,10 +27,10 @@ import javax.annotation.Nonnull;
import org.opensaml.saml.saml2.metadata.AttributeConsumingService;
import org.opensaml.saml.saml2.metadata.LocalizedName;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import net.shibboleth.shared.annotation.constraint.Unmodifiable;
import net.shibboleth.shared.collection.CollectionSupport;
+import net.shibboleth.shared.primitive.LoggerFactory;
/**
* Class to contain a processed form of the {@link AttributeConsumingService} suitable for display purposes. */
@@ -72,19 +72,21 @@ public class ACSUIInfo {
serviceNames = acs.getNames().
stream().
filter(nullLanguageString).
- collect(Collectors.toUnmodifiableMap(
+ collect(CollectionSupport.nonnullCollector(Collectors.toUnmodifiableMap(
serviceName -> Locale.forLanguageTag(serviceName.getXMLLang()),
serviceName -> serviceName.getValue(),
- CollectionSupport.warningMergeFunction("ServiceName", false)));
+ CollectionSupport.warningMergeFunction("ServiceName", false)))).
+ get();
serviceDescriptions = acs.
getDescriptions().
stream().
filter(nullLanguageString).
- collect(Collectors.toUnmodifiableMap(
+ collect(CollectionSupport.nonnullCollector(Collectors.toUnmodifiableMap(
description -> Locale.forLanguageTag(description.getXMLLang()),
description -> description.getValue(),
- CollectionSupport.warningMergeFunction("ServiceDescription", false)));
+ CollectionSupport.warningMergeFunction("ServiceDescription", false)))).
+ get();
}
/**
diff --git a/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/OrganizationUIInfo.java b/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/OrganizationUIInfo.java
index ea159cde..b660a8cd 100644
--- a/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/OrganizationUIInfo.java
+++ b/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/OrganizationUIInfo.java
@@ -92,28 +92,31 @@ public class OrganizationUIInfo {
getOrganizationNames().
stream().
filter(nullLanguageString).
- collect(Collectors.toUnmodifiableMap(
+ collect(CollectionSupport.nonnullCollector(Collectors.toUnmodifiableMap(
serviceName -> Locale.forLanguageTag(serviceName.getXMLLang()),
serviceName -> serviceName.getValue(),
- CollectionSupport.warningMergeFunction("OrganizationUIInfo OrganizationName", false)));
+ CollectionSupport.warningMergeFunction("OrganizationUIInfo OrganizationName", false)))).
+ get();
displayNames = organization.
getDisplayNames().
stream().
filter(nullLanguageString).
- collect(Collectors.toUnmodifiableMap(
+ collect(CollectionSupport.nonnullCollector(Collectors.toUnmodifiableMap(
description -> Locale.forLanguageTag(description.getXMLLang()),
description -> description.getValue(),
- CollectionSupport.warningMergeFunction("OrganizationUIInfo DisplayNames", false)));
+ CollectionSupport.warningMergeFunction("OrganizationUIInfo DisplayNames", false)))).
+ get();
urls = organization.
getURLs().
stream().
filter(nullLanguageURL).
- collect(Collectors.toUnmodifiableMap(
+ collect(CollectionSupport.nonnullCollector(Collectors.toUnmodifiableMap(
url -> Locale.forLanguageTag(url.getXMLLang()),
dn -> dn.getURI(),
- CollectionSupport.warningMergeFunction("OrganizationUIInfo URL", false)));
+ CollectionSupport.warningMergeFunction("OrganizationUIInfo URL", false)))).
+ get();
}
/**
diff --git a/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/security/KeyAuthoritySupport.java b/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/security/KeyAuthoritySupport.java
index c77841d3..2e4b880b 100644
--- a/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/security/KeyAuthoritySupport.java
+++ b/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/security/KeyAuthoritySupport.java
@@ -36,7 +36,6 @@ import org.opensaml.xmlsec.signature.KeyInfo;
import net.shibboleth.idp.saml.xmlobject.KeyAuthority;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
-import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.logic.Constraint;
diff --git a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ByReferenceMetadataFilterBridge.java b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ByReferenceMetadataFilterBridge.java
index 3e27953a..ca844f7f 100644
--- a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ByReferenceMetadataFilterBridge.java
+++ b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ByReferenceMetadataFilterBridge.java
@@ -17,7 +17,7 @@
package net.shibboleth.idp.saml.metadata.impl;
-import java.util.List;
+import java.util.Collection;
import java.util.Map;
import javax.annotation.Nonnull;
@@ -33,6 +33,7 @@ import org.slf4j.Logger;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
+import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.primitive.LoggerFactory;
/**
@@ -70,12 +71,13 @@ public class ByReferenceMetadataFilterBridge implements MetadataFilter {
chain = filterChain;
} else if (applicationContext != null) {
try {
- final Map<String,ByReferenceMetadataFilter> beans =
+ @Nonnull final Map<String,ByReferenceMetadataFilter> beans =
applicationContext.getBeansOfType(ByReferenceMetadataFilter.class);
log.debug("Bridging to {} ByReference filters in Spring context", beans.size());
- filterChain = new MetadataFilterChain();
- filterChain.setFilters(List.copyOf(beans.values()));
- chain = filterChain;
+ filterChain = chain = new MetadataFilterChain();
+ final Collection<ByReferenceMetadataFilter> vals = beans.values();
+ assert vals != null;
+ chain.setFilters(CollectionSupport.copyToList(vals));
} catch (final BeansException e) {
throw new FilterException(e);
}
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/ScriptTypeBeanParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/ScriptTypeBeanParser.java
index 13468390..a4819118 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/ScriptTypeBeanParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/ScriptTypeBeanParser.java
@@ -20,14 +20,12 @@ package net.shibboleth.spring;
import javax.annotation.Nonnull;
-import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.shared.xml.ElementSupport;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.w3c.dom.Element;
+import net.shibboleth.shared.primitive.StringSupport;
+import net.shibboleth.shared.xml.ElementSupport;
+
/**
* Parser for elements derived from ScriptType in the various namespaces.
*
@@ -36,9 +34,6 @@ import org.w3c.dom.Element;
*/
public final class ScriptTypeBeanParser {
- /** Logger. */
- @Nonnull private static final Logger LOG = LoggerFactory.getLogger(ScriptTypeBeanParser.class);
-
/** Private c'tor. */
private ScriptTypeBeanParser() {
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractDynamicMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractDynamicMetadataProviderParser.java
index dd62e1d2..fb5d18a5 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractDynamicMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractDynamicMetadataProviderParser.java
@@ -17,21 +17,21 @@
package net.shibboleth.spring.metadata;
-import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.shared.spring.util.SpringSupport;
-import net.shibboleth.shared.xml.AttributeSupport;
-
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.opensaml.core.xml.persist.FilesystemLoadSaveManager;
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.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.primitive.LoggerFactory;
+import net.shibboleth.shared.primitive.StringSupport;
+import net.shibboleth.shared.spring.util.SpringSupport;
+import net.shibboleth.shared.xml.AttributeSupport;
+
/**
* Parser for {@link org.opensaml.saml.metadata.resolver.impl.AbstractDynamicMetadataResolver}.
*/
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractMetadataProviderParser.java
index a918d9b8..5e1dc3fc 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractMetadataProviderParser.java
@@ -25,7 +25,6 @@ import javax.xml.namespace.QName;
import org.opensaml.saml.metadata.resolver.MetadataResolver;
import org.opensaml.saml.metadata.resolver.filter.MetadataFilterChain;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
import org.springframework.beans.factory.xml.ParserContext;
@@ -34,6 +33,7 @@ import org.w3c.dom.Node;
import net.shibboleth.idp.saml.metadata.impl.MetadataProviderContainer;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.primitive.LoggerFactory;
import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.spring.custom.AbstractCustomBeanDefinitionParser;
import net.shibboleth.shared.spring.util.SpringSupport;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/ByReferenceFilterBeanPostProcessor.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/ByReferenceFilterBeanPostProcessor.java
index 14d4cf14..1e6c15f0 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/ByReferenceFilterBeanPostProcessor.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/ByReferenceFilterBeanPostProcessor.java
@@ -17,8 +17,7 @@
package net.shibboleth.spring.metadata;
-import java.util.Arrays;
-
+import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.opensaml.saml.metadata.resolver.ChainingMetadataResolver;
@@ -32,6 +31,7 @@ import org.springframework.context.ApplicationContextAware;
import org.springframework.core.Ordered;
import net.shibboleth.idp.saml.metadata.impl.ByReferenceMetadataFilterBridge;
+import net.shibboleth.shared.collection.CollectionSupport;
/**
* A {@link BeanPostProcessor} for {@link MetadataResolver} beans that ensures a {@link ByReferenceMetadataFilterBridge}
@@ -72,7 +72,7 @@ public class ByReferenceFilterBeanPostProcessor implements BeanPostProcessor, Ap
}
/** {@inheritDoc} */
- @Override public Object postProcessBeforeInitialization(final Object bean, final String beanName) {
+ @Override public Object postProcessBeforeInitialization(final @Nonnull Object bean, final @Nonnull String beanName) {
// Do not attach to beans which just include other ones.
if (!enabled || !(bean instanceof MetadataResolver) || bean instanceof ChainingMetadataResolver) {
@@ -101,7 +101,7 @@ public class ByReferenceFilterBeanPostProcessor implements BeanPostProcessor, Ap
((MetadataFilterChain) filter).getFilters().add(filterToAttach);
} else {
final MetadataFilterChain chain = new MetadataFilterChain();
- chain.setFilters(Arrays.asList(filter, filterToAttach));
+ chain.setFilters(CollectionSupport.listOf(filter, filterToAttach));
resolver.setMetadataFilter(chain);
}
}
@@ -110,7 +110,7 @@ public class ByReferenceFilterBeanPostProcessor implements BeanPostProcessor, Ap
}
/** {@inheritDoc} */
- @Override public Object postProcessAfterInitialization(final Object bean, final String beanName) {
+ @Override public Object postProcessAfterInitialization(final @Nonnull Object bean, final @Nonnull String beanName) {
return bean;
}
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/HTTPMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/HTTPMetadataProviderParser.java
index da4b7cae..d325a322 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/HTTPMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/HTTPMetadataProviderParser.java
@@ -21,12 +21,12 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
+import net.shibboleth.shared.primitive.LoggerFactory;
import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.xml.AttributeSupport;
import net.shibboleth.shared.xml.ElementSupport;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/HTTPMetadataProvidersParserSupport.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/HTTPMetadataProvidersParserSupport.java
index 95ea4d2a..48ccdce0 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/HTTPMetadataProvidersParserSupport.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/HTTPMetadataProvidersParserSupport.java
@@ -24,7 +24,6 @@ import javax.xml.namespace.QName;
import org.opensaml.security.httpclient.HttpClientSecurityParameters;
import org.opensaml.spring.tls.TLSSocketFactoryFactoryBean;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
@@ -32,6 +31,7 @@ import org.w3c.dom.Element;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.logic.Constraint;
+import net.shibboleth.shared.primitive.LoggerFactory;
import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.shared.xml.ElementSupport;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/LocalDynamicMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/LocalDynamicMetadataProviderParser.java
index d9c41e59..04eaf2af 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/LocalDynamicMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/LocalDynamicMetadataProviderParser.java
@@ -27,7 +27,6 @@ import org.opensaml.saml.metadata.resolver.MetadataResolver;
import org.opensaml.saml.metadata.resolver.impl.DefaultLocalDynamicSourceKeyGenerator;
import org.opensaml.saml.metadata.resolver.impl.LocalDynamicMetadataResolver;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
import org.springframework.beans.factory.parsing.Location;
@@ -36,6 +35,7 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
+import net.shibboleth.shared.primitive.LoggerFactory;
import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.xml.AttributeSupport;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/ResourceBackedMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/ResourceBackedMetadataProviderParser.java
index 05fe8772..dd8d3df5 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/ResourceBackedMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/ResourceBackedMetadataProviderParser.java
@@ -23,7 +23,6 @@ import javax.xml.namespace.QName;
import org.opensaml.saml.metadata.resolver.impl.AbstractBatchMetadataResolver;
import org.opensaml.saml.metadata.resolver.impl.ResourceBackedMetadataResolver;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
import org.springframework.beans.factory.parsing.Location;
@@ -32,6 +31,7 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
+import net.shibboleth.shared.primitive.LoggerFactory;
import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.spring.resource.ResourceHelper;
import net.shibboleth.shared.xml.AttributeSupport;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/AlgorithmFilterParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/AlgorithmFilterParser.java
index 6d53f3c2..80e0f62b 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/AlgorithmFilterParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/AlgorithmFilterParser.java
@@ -33,7 +33,6 @@ import org.opensaml.saml.ext.saml2alg.SigningMethod;
import org.opensaml.saml.metadata.resolver.filter.impl.AlgorithmFilter;
import org.opensaml.saml.saml2.metadata.EncryptionMethod;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -44,6 +43,7 @@ import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
import net.shibboleth.shared.logic.ScriptedPredicate;
+import net.shibboleth.shared.primitive.LoggerFactory;
import net.shibboleth.shared.spring.custom.AbstractCustomBeanDefinitionParser;
import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.spring.ScriptTypeBeanParser;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/EntityAttributesFilterParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/EntityAttributesFilterParser.java
index 73c01a0e..55e506ac 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/EntityAttributesFilterParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/EntityAttributesFilterParser.java
@@ -31,7 +31,6 @@ import org.opensaml.saml.common.profile.logic.EntityIdPredicate;
import org.opensaml.saml.metadata.resolver.filter.impl.EntityAttributesFilter;
import org.opensaml.saml.saml2.core.Attribute;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -42,6 +41,7 @@ import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
import net.shibboleth.shared.logic.ScriptedPredicate;
+import net.shibboleth.shared.primitive.LoggerFactory;
import net.shibboleth.shared.spring.custom.AbstractCustomBeanDefinitionParser;
import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.spring.ScriptTypeBeanParser;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/PredicateFilterParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/PredicateFilterParser.java
index a1663d91..1edfebb4 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/PredicateFilterParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/PredicateFilterParser.java
@@ -30,7 +30,6 @@ import org.opensaml.saml.common.profile.logic.EntityGroupNamePredicate;
import org.opensaml.saml.common.profile.logic.EntityIdPredicate;
import org.opensaml.saml.metadata.resolver.filter.impl.PredicateFilter;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -41,6 +40,7 @@ import org.w3c.dom.Element;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.logic.PredicateSupport;
import net.shibboleth.shared.logic.ScriptedPredicate;
+import net.shibboleth.shared.primitive.LoggerFactory;
import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.spring.custom.AbstractCustomBeanDefinitionParser;
import net.shibboleth.shared.spring.util.SpringSupport;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/SignatureValidationCriteriaSetFactoryBean.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/SignatureValidationCriteriaSetFactoryBean.java
index 923d6c2b..9e1a7a2a 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/SignatureValidationCriteriaSetFactoryBean.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/SignatureValidationCriteriaSetFactoryBean.java
@@ -32,9 +32,9 @@ import org.opensaml.xmlsec.criterion.SignatureValidationConfigurationCriterion;
import org.opensaml.xmlsec.impl.BasicSignatureValidationParametersResolver;
import org.opensaml.xmlsec.signature.support.SignatureValidationParametersCriterion;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.FactoryBean;
+import net.shibboleth.shared.primitive.LoggerFactory;
import net.shibboleth.shared.resolver.CriteriaSet;
import net.shibboleth.shared.resolver.Criterion;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/SignatureValidationParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/SignatureValidationParser.java
index b3dc77c3..e0407bb1 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/SignatureValidationParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/SignatureValidationParser.java
@@ -36,7 +36,6 @@ import org.opensaml.xmlsec.keyinfo.impl.provider.InlineX509DataProvider;
import org.opensaml.xmlsec.keyinfo.impl.provider.RSAKeyValueProvider;
import org.opensaml.xmlsec.signature.support.impl.ExplicitKeySignatureTrustEngine;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -45,6 +44,7 @@ import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.primitive.LoggerFactory;
import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.spring.custom.AbstractCustomBeanDefinitionParser;
import net.shibboleth.shared.spring.util.SpringSupport;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractBasicCredentialParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractBasicCredentialParser.java
index 6ed33e9a..59b26c68 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractBasicCredentialParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractBasicCredentialParser.java
@@ -23,17 +23,17 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.xml.namespace.QName;
-import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.shared.xml.ElementSupport;
-import net.shibboleth.spring.security.SecurityNamespaceHandler;
-
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
+import net.shibboleth.shared.primitive.LoggerFactory;
+import net.shibboleth.shared.primitive.StringSupport;
+import net.shibboleth.shared.xml.ElementSupport;
+import net.shibboleth.spring.security.SecurityNamespaceHandler;
+
/**
* Specific parser for all BasicCredentials.
*
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractX509CredentialParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractX509CredentialParser.java
index 33525fed..be2f7473 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractX509CredentialParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractX509CredentialParser.java
@@ -23,19 +23,19 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.xml.namespace.QName;
-import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.shared.spring.util.SpringSupport;
-import net.shibboleth.shared.xml.AttributeSupport;
-import net.shibboleth.shared.xml.ElementSupport;
-import net.shibboleth.spring.security.SecurityNamespaceHandler;
-
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.ManagedList;
import org.w3c.dom.Element;
+import net.shibboleth.shared.primitive.LoggerFactory;
+import net.shibboleth.shared.primitive.StringSupport;
+import net.shibboleth.shared.spring.util.SpringSupport;
+import net.shibboleth.shared.xml.AttributeSupport;
+import net.shibboleth.shared.xml.ElementSupport;
+import net.shibboleth.spring.security.SecurityNamespaceHandler;
+
/**
* Specific parser for all X509Credentials.
*
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list