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

more pruning

Browse Source
This commit is contained in:
Keith Donald
2009-07-23 14:03:20 +00:00
parent a74422ed65
commit 840ac88b29
11 changed files with 6 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
org.springframework.context/src/main/java/org/springframework/ui/binding/binder/BinderExecutor.java
View File

@@ -48,6 +48,9 @@ public interface BinderExecutor<M> {
BindingResults bind();
// TODO return validation results
/**
* Execute the validate operation.
*/
void validate();
/**

7
org.springframework.context/src/main/java/org/springframework/ui/lifecycle/BindAndValidateLifecycle.java
View File

@@ -1,7 +0,0 @@
package org.springframework.ui.lifecycle;
public interface BindAndValidateLifecycle {
public void execute();
}

5
org.springframework.context/src/main/java/org/springframework/ui/lifecycle/BindAndValidateLifecycleFactory.java
View File

@@ -1,5 +0,0 @@
package org.springframework.ui.lifecycle;
public interface BindAndValidateLifecycleFactory {
BindAndValidateLifecycle getLifecycle(Object model);
}

88
org.springframework.context/src/main/java/org/springframework/ui/lifecycle/BindAndValidateLifecycleImpl.java
View File

@@ -1,88 +0,0 @@
/*
* Copyright 2002-2009 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.ui.lifecycle;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import org.springframework.ui.alert.AlertContext;
import org.springframework.ui.binding.binder.Binder;
import org.springframework.ui.binding.binder.BindingResult;
import org.springframework.ui.binding.binder.BindingResults;
import org.springframework.ui.validation.ValidationFailure;
import org.springframework.ui.validation.Validator;
/**
* Implementation of the model bind and validate lifecycle.
* @author Keith Donald
* @since 3.0
*/
public final class BindAndValidateLifecycleImpl {
private Binder binder;
private Validator validator;
private ValidationDecider validationDecider = ValidationDecider.ALWAYS_VALIDATE;
private final AlertContext alertContext;
/**
* Create a new bind and validate lifecycle.
* @param binder the binder to use for model binding
* @param validator the validator to use for model validation
* @param alertContext a context for adding binding and validation-related alerts
*/
public BindAndValidateLifecycleImpl(Binder binder, Validator validator, AlertContext alertContext) {
this.binder = binder;
this.validator = validator;
this.alertContext = alertContext;
}
/**
* Configures the strategy that determines if validation should execute after binding.
* @param validationDecider the validation decider
*/
public void setValidationDecider(ValidationDecider validationDecider) {
this.validationDecider = validationDecider;
}
/**
* Execute the bind and validate lifecycle.
* Any bind or validation errors are recorded as alerts against the {@link AlertContext}.
* @param sourceValues the source values to bind and validate
*/
public void execute(Map<String, ? extends Object> sourceValues) {
BindingResults bindingResults = binder.bind(sourceValues);
List<ValidationFailure> validationFailures = validate(bindingResults);
for (BindingResult result : bindingResults.failures()) {
alertContext.add(result.getProperty(), result.getAlert());
}
for (ValidationFailure failure : validationFailures) {
alertContext.add(failure.getProperty(), failure.getAlert());
}
}
private List<ValidationFailure> validate(BindingResults bindingResults) {
if (validator != null && validationDecider.shouldValidateAfter(bindingResults)) {
return validator.validate(binder.getModel(), bindingResults.successes().properties());
} else {
return Collections.emptyList();
}
}
}

43
org.springframework.context/src/main/java/org/springframework/ui/lifecycle/ValidationDecider.java
View File

@@ -1,43 +0,0 @@
/*
* Copyright 2002-2009 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.ui.lifecycle;
import org.springframework.ui.binding.binder.BindingResults;
/**
* Decides if validation should run for an execution of the bind and validate lifecycle.
* @author Keith Donald
* @since 3.0
* @see BindAndValidateLifecycleImpl#execute(java.util.Map)
*/
interface ValidationDecider {
/**
* Should validation execute after model binding?
* @param results the results of model binding
* @return yes or no
*/
boolean shouldValidateAfter(BindingResults results);
/**
* Singleton reference to a ValidationDecider that always returns true.
*/
static final ValidationDecider ALWAYS_VALIDATE = new ValidationDecider() {
public boolean shouldValidateAfter(BindingResults results) {
return true;
}
};
}

2
org.springframework.context/src/main/java/org/springframework/ui/validation/constraint/Impact.java → org.springframework.context/src/main/java/org/springframework/ui/validation/Impact.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.ui.validation.constraint;
package org.springframework.ui.validation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;

2
org.springframework.context/src/main/java/org/springframework/ui/validation/constraint/Message.java → org.springframework.context/src/main/java/org/springframework/ui/validation/Message.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.ui.validation.constraint;
package org.springframework.ui.validation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;

2
org.springframework.context/src/main/java/org/springframework/ui/validation/constraint/ValidationConstraint.java → org.springframework.context/src/main/java/org/springframework/ui/validation/ValidationConstraint.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.ui.validation.constraint;
package org.springframework.ui.validation;
public interface ValidationConstraint<T> {
boolean validate(T value);

21
org.springframework.context/src/main/java/org/springframework/ui/validation/ValidationFailure.java
View File

@@ -1,21 +0,0 @@
package org.springframework.ui.validation;
import org.springframework.ui.alert.Alert;
/**
* A single validation failure generated by a Validator.
* @author Keith Donald
* @see Validator#validate(Object, java.util.List)
*/
public interface ValidationFailure {
/**
* The name of the model property associated with this validation result.
*/
String getProperty();
/**
* Gets the alert for this validation failure, appropriate for rendering the failure to the user.
*/
Alert getAlert();
}

34
org.springframework.context/src/main/java/org/springframework/ui/validation/Validator.java
View File

@@ -1,34 +0,0 @@
/*
* Copyright 2002-2009 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.ui.validation;
import java.util.List;
/**
* Validates a model object.
* @author Keith Donald
* @param <M> the type of model object this validator supports
*/
public interface Validator {
/**
* Validate the properties of the model object.
* @param model the model object
* @param properties the properties to validate
* @return a list of validation failures, empty if there were no failures
*/
List<ValidationFailure> validate(Object model, List<String> properties);
}