Author: rdw
Date: Mon Aug 4 12:20:55 2014
New Revision: 6394
URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6394&view=rev
Log:
IDP-354 Fix a String to List<String> conversion. Add a TODO about inline defaults
Modified:
trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SchemaValidationParser.java
trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParser.java
Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SchemaValidationParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SchemaValidationParser.java?rev=6394&r1=6393&r2=6394&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SchemaValidationParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SchemaValidationParser.java Mon Aug 4 12:20:55 2014
@@ -56,6 +56,7 @@
@Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
List<Element> schemaNameElements = ElementSupport.getChildElements(element, EXTENSION_SCHEMA_NAME);
+ // TODO(rdw) move default to bean (if possible).
builder.addConstructorArgReference("shibboleth.SchemaBuilder");
if (null != schemaNameElements && !schemaNameElements.isEmpty()) {
Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParser.java?rev=6394&r1=6393&r2=6394&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParser.java Mon Aug 4 12:20:55 2014
@@ -85,7 +85,7 @@
throw new BeanCreationException("trustEngineRef and embedded public keys are mutually exlusive");
}
builder.addConstructorArgReference(StringSupport.trimOrNull(element.getAttributeNS(null,
- "trustEngineRef")));
+ "trustEngineRef")));
} else if (hasCertFile) {
if (null != publicKeys && !publicKeys.isEmpty()) {
log.error("{}: certificateFile and embedded public keys are mutually exlusive", parserContext
@@ -174,7 +174,9 @@
private BeanDefinition buildCertificateCredential(String attribute) {
final BeanDefinitionBuilder credentialBuilder =
BeanDefinitionBuilder.genericBeanDefinition(X509ResourceCredentialFactoryBean.class);
- credentialBuilder.addPropertyValue("certificates", attribute);
+ final List<String> certs = new ManagedList<>(1);
+ certs.add(attribute);
+ credentialBuilder.addPropertyValue("certificates", certs);
return credentialBuilder.getBeanDefinition();
}