Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix attribute for validation hint resolver

Browse Source 
The flow-builder-services attribute for specifying a
ValidationHintResolver was originally added to use (incorrectly)
camelback notation, i.e. validationHintResolver. This change fgiixes
that to the XML convention i.e. validation-hint-resolver.

SWF-1629
This commit is contained in:
Rossen Stoyanchev
2014-03-31 17:36:38 -04:00
parent cce1515a17
commit e108904e37
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-webflow/src/main/java/org/springframework/webflow/config/FlowBuilderServicesBeanDefinitionParser.java
View File

@@ -46,6 +46,7 @@ class FlowBuilderServicesBeanDefinitionParser extends AbstractSingleBeanDefiniti
private static final String EXPRESSION_PARSER_ATTR = "expression-parser";
private static final String VIEW_FACTORY_CREATOR_ATTR = "view-factory-creator";
private static final String VALIDATOR_ATTR = "validator";
private static final String VALIDATION_HINT_RESOLVER_ATTR = "validation-hint-resolver";
// --------------------------- Bean Configuration Properties --------------------- //
private static final String CONVERSION_SERVICE_PROPERTY = "conversionService";
@@ -118,7 +119,7 @@ class FlowBuilderServicesBeanDefinitionParser extends AbstractSingleBeanDefiniti
}
private void parseValidationHintResolver(Element element, ParserContext context, BeanDefinitionBuilder definitionBuilder) {
String resolver = element.getAttribute(VALIDATION_HINT_RESOLVER_PROPERTY);
String resolver = element.getAttribute(VALIDATION_HINT_RESOLVER_ATTR);
if (StringUtils.hasText(resolver)) {
definitionBuilder.addPropertyReference(VALIDATION_HINT_RESOLVER_PROPERTY, resolver);
}

2
spring-webflow/src/main/resources/org/springframework/webflow/config/spring-webflow-config-2.4.xsd
View File

@@ -236,7 +236,7 @@ If not specified, JSR-303 validation will be installed if a JSR-303 provider is
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="validationHintResolver">
<xsd:attribute name="validation-hint-resolver">
<xsd:annotation>
<xsd:documentation source="java:org.springframework.webflow.validation.ValidationHintResolver">
<![CDATA[

2
spring-webflow/src/test/java/org/springframework/webflow/config/flow-builder-services.xml
View File

@@ -15,7 +15,7 @@
view-factory-creator="customViewFactoryCreator"
conversion-service="customConversionService"
validator="customValidator"
validationHintResolver="customValidationHintResolver"
validation-hint-resolver="customValidationHintResolver"
development="true" />
<webflow:flow-builder-services id="flowBuilderServicesConversionServiceCustom"

2
src/reference/views.xml
View File

@@ -526,7 +526,7 @@ private String name;
<programlisting language="xml">
&lt;webflow:flow-registry flow-builder-services="flowBuilderServices" /&gt;
&lt;webflow:flow-builder-services id="flowBuilderServices" validator=".." validationHintResolver=".." /&gt;
&lt;webflow:flow-builder-services id="flowBuilderServices" validator=".." validation-hint-resolver=".." /&gt;
</programlisting>
</para>
</sect3>