null
if registering an editor for all properties of the given type
* @param propertyEditor editor to register
*/
- void registerCustomEditor(Class requiredType, String propertyPath, PropertyEditor propertyEditor);
+ void registerCustomEditor(Class> requiredType, String propertyPath, PropertyEditor propertyEditor);
/**
* Find a custom property editor for the given type and property.
@@ -74,6 +74,6 @@ public interface PropertyEditorRegistry {
* null
if looking for an editor for all properties of the given type
* @return the registered editor, or null
if none
*/
- PropertyEditor findCustomEditor(Class requiredType, String propertyPath);
+ PropertyEditor findCustomEditor(Class> requiredType, String propertyPath);
}
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/AbstractBindingResult.java b/org.springframework.context/src/main/java/org/springframework/validation/AbstractBindingResult.java
index b28470c2ae227853de10114e7c8e04fb97bd27c3..2b9e4489937b4327877adb88fa88dc6c24d5fa21 100644
--- a/org.springframework.context/src/main/java/org/springframework/validation/AbstractBindingResult.java
+++ b/org.springframework.context/src/main/java/org/springframework/validation/AbstractBindingResult.java
@@ -41,6 +41,7 @@ import org.springframework.util.StringUtils;
* @since 2.0
* @see Errors
*/
+@SuppressWarnings("serial")
public abstract class AbstractBindingResult extends AbstractErrors implements BindingResult, Serializable {
private final String objectName;
@@ -131,7 +132,7 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi
}
public String[] resolveMessageCodes(String errorCode, String field) {
- Class fieldType = getFieldType(field);
+ Class> fieldType = getFieldType(field);
return getMessageCodesResolver().resolveMessageCodes(
errorCode, getObjectName(), fixedField(field), fieldType);
}
@@ -237,7 +238,7 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi
* @see #getActualFieldValue
*/
@Override
- public Class getFieldType(String field) {
+ public Class> getFieldType(String field) {
Object value = getActualFieldValue(fixedField(field));
if (value != null) {
return value.getClass();
@@ -286,10 +287,10 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi
* {@link #getPropertyEditorRegistry() PropertyEditorRegistry}'s
* editor lookup facility, if available.
*/
- public PropertyEditor findEditor(String field, Class valueType) {
+ public PropertyEditor findEditor(String field, Class> valueType) {
PropertyEditorRegistry editorRegistry = getPropertyEditorRegistry();
if (editorRegistry != null) {
- Class valueTypeToUse = valueType;
+ Class> valueTypeToUse = valueType;
if (valueTypeToUse == null) {
valueTypeToUse = getFieldType(field);
}
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/AbstractErrors.java b/org.springframework.context/src/main/java/org/springframework/validation/AbstractErrors.java
index ea2dbe546089581b36225e955113d8edc77962ca..8e8198a6fa9cf95ce10fc5f705ec6d52e0c6470d 100644
--- a/org.springframework.context/src/main/java/org/springframework/validation/AbstractErrors.java
+++ b/org.springframework.context/src/main/java/org/springframework/validation/AbstractErrors.java
@@ -33,6 +33,7 @@ import org.springframework.util.StringUtils;
* @author Juergen Hoeller
* @since 2.5.3
*/
+@SuppressWarnings("serial")
public abstract class AbstractErrors implements Errors, Serializable {
private String nestedPath = "";
@@ -146,8 +147,8 @@ public abstract class AbstractErrors implements Errors, Serializable {
}
public ObjectError getGlobalError() {
- List globalErrors = getGlobalErrors();
- return (!globalErrors.isEmpty() ? (ObjectError) globalErrors.get(0) : null);
+ Listnull
*/
protected PropertyEditor getCustomEditor(String fixedField) {
- Class targetType = getPropertyAccessor().getPropertyType(fixedField);
+ Class> targetType = getPropertyAccessor().getPropertyType(fixedField);
PropertyEditor editor = getPropertyAccessor().findCustomEditor(targetType, fixedField);
if (editor == null) {
editor = BeanUtils.findEditorByConvention(targetType);
@@ -146,8 +147,8 @@ public abstract class AbstractPropertyBindingResult extends AbstractBindingResul
* if applicable.
*/
@Override
- public PropertyEditor findEditor(String field, Class valueType) {
- Class valueTypeForLookup = valueType;
+ public PropertyEditor findEditor(String field, Class> valueType) {
+ Class> valueTypeForLookup = valueType;
if (valueTypeForLookup == null) {
valueTypeForLookup = getFieldType(field);
}
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/BeanPropertyBindingResult.java b/org.springframework.context/src/main/java/org/springframework/validation/BeanPropertyBindingResult.java
index 3437e672b9fa8d125929f0c26c143e8088bfbe37..b974d6ca75216660f46e718d3619f9d11b5c3ec2 100644
--- a/org.springframework.context/src/main/java/org/springframework/validation/BeanPropertyBindingResult.java
+++ b/org.springframework.context/src/main/java/org/springframework/validation/BeanPropertyBindingResult.java
@@ -40,6 +40,7 @@ import org.springframework.util.Assert;
* @see DataBinder#initBeanPropertyAccess()
* @see DirectFieldBindingResult
*/
+@SuppressWarnings("serial")
public class BeanPropertyBindingResult extends AbstractPropertyBindingResult implements Serializable {
private final Object target;
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/BindException.java b/org.springframework.context/src/main/java/org/springframework/validation/BindException.java
index 92b82940ac5570438b55abb6c992c71728630240..8c401edaa1c28d6279bd69faf56f9a89be6b5557 100644
--- a/org.springframework.context/src/main/java/org/springframework/validation/BindException.java
+++ b/org.springframework.context/src/main/java/org/springframework/validation/BindException.java
@@ -40,6 +40,7 @@ import org.springframework.util.Assert;
* @see DataBinder#getBindingResult()
* @see DataBinder#close()
*/
+@SuppressWarnings("serial")
public class BindException extends Exception implements BindingResult {
private final BindingResult bindingResult;
@@ -134,7 +135,7 @@ public class BindException extends Exception implements BindingResult {
return this.bindingResult.getErrorCount();
}
- public List getAllErrors() {
+ public Listnull
if none
*/
- PropertyEditor findEditor(String field, Class valueType);
+ PropertyEditor findEditor(String field, Class> valueType);
/**
* Return the underlying PropertyEditorRegistry.
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/BindingResultUtils.java b/org.springframework.context/src/main/java/org/springframework/validation/BindingResultUtils.java
index a2d446b3c6e4b7dd5d866b6d29e8e5afd5214f5a..7ab8863955bda6c08cbfd1c80f5a88ce6f33c8b2 100644
--- a/org.springframework.context/src/main/java/org/springframework/validation/BindingResultUtils.java
+++ b/org.springframework.context/src/main/java/org/springframework/validation/BindingResultUtils.java
@@ -36,7 +36,7 @@ public abstract class BindingResultUtils {
* @return the BindingResult, or null
if none found
* @throws IllegalStateException if the attribute found is not of type BindingResult
*/
- public static BindingResult getBindingResult(Map model, String name) {
+ public static BindingResult getBindingResult(Map, ?> model, String name) {
Assert.notNull(model, "Model map must not be null");
Assert.notNull(name, "Name must not be null");
Object attr = model.get(BindingResult.MODEL_KEY_PREFIX + name);
@@ -53,7 +53,7 @@ public abstract class BindingResultUtils {
* @return the BindingResult (never null
)
* @throws IllegalStateException if no BindingResult found
*/
- public static BindingResult getRequiredBindingResult(Map model, String name) {
+ public static BindingResult getRequiredBindingResult(Map, ?> model, String name) {
BindingResult bindingResult = getBindingResult(model, name);
if (bindingResult == null) {
throw new IllegalStateException("No BindingResult attribute found for name '" + name +
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/DataBinder.java b/org.springframework.context/src/main/java/org/springframework/validation/DataBinder.java
index 6653905900ac212c3692b71b10df02ac0ca12281..c44833c30b73a37d60ca22fef8688835eabe47c7 100644
--- a/org.springframework.context/src/main/java/org/springframework/validation/DataBinder.java
+++ b/org.springframework.context/src/main/java/org/springframework/validation/DataBinder.java
@@ -509,18 +509,15 @@ public class DataBinder implements PropertyEditorRegistry, TypeConverter {
return this.conversionService;
}
- @SuppressWarnings("unchecked")
- public void registerCustomEditor(Class requiredType, PropertyEditor propertyEditor) {
+ public void registerCustomEditor(Class> requiredType, PropertyEditor propertyEditor) {
getPropertyEditorRegistry().registerCustomEditor(requiredType, propertyEditor);
}
- @SuppressWarnings("unchecked")
- public void registerCustomEditor(Class requiredType, String field, PropertyEditor propertyEditor) {
+ public void registerCustomEditor(Class> requiredType, String field, PropertyEditor propertyEditor) {
getPropertyEditorRegistry().registerCustomEditor(requiredType, field, propertyEditor);
}
- @SuppressWarnings("unchecked")
- public PropertyEditor findCustomEditor(Class requiredType, String propertyPath) {
+ public PropertyEditor findCustomEditor(Class> requiredType, String propertyPath) {
return getPropertyEditorRegistry().findCustomEditor(requiredType, propertyPath);
}
@@ -700,8 +697,7 @@ public class DataBinder implements PropertyEditorRegistry, TypeConverter {
* @throws BindException if there were any errors in the bind operation
* @see BindingResult#getModel()
*/
- @SuppressWarnings("unchecked")
- public Map close() throws BindException {
+ public Map, ?> close() throws BindException {
if (getBindingResult().hasErrors()) {
throw new BindException(getBindingResult());
}
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/DefaultMessageCodesResolver.java b/org.springframework.context/src/main/java/org/springframework/validation/DefaultMessageCodesResolver.java
index 593e992b4caa22f64be703fab2b0c5a9196f07b4..ad282eb1d19c90a6a7122def3f35de43f60827ef 100644
--- a/org.springframework.context/src/main/java/org/springframework/validation/DefaultMessageCodesResolver.java
+++ b/org.springframework.context/src/main/java/org/springframework/validation/DefaultMessageCodesResolver.java
@@ -75,6 +75,7 @@ import org.springframework.util.StringUtils;
* @author Juergen Hoeller
* @since 1.0.1
*/
+@SuppressWarnings("serial")
public class DefaultMessageCodesResolver implements MessageCodesResolver, Serializable {
/**
@@ -119,7 +120,7 @@ public class DefaultMessageCodesResolver implements MessageCodesResolver, Serial
* details on the generated codes.
* @return the list of codes
*/
- public String[] resolveMessageCodes(String errorCode, String objectName, String field, Class fieldType) {
+ public String[] resolveMessageCodes(String errorCode, String objectName, String field, Class> fieldType) {
Listnull
if not determinable
*/
- Class getFieldType(String field);
+ Class> getFieldType(String field);
}
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/FieldError.java b/org.springframework.context/src/main/java/org/springframework/validation/FieldError.java
index 7164f68dc318c4d3a410416927c5115aac667790..e95baf93cfe7488266139bd99f9e4bcfc9479633 100644
--- a/org.springframework.context/src/main/java/org/springframework/validation/FieldError.java
+++ b/org.springframework.context/src/main/java/org/springframework/validation/FieldError.java
@@ -31,6 +31,7 @@ import org.springframework.util.ObjectUtils;
* @since 10.03.2003
* @see DefaultMessageCodesResolver
*/
+@SuppressWarnings("serial")
public class FieldError extends ObjectError {
private final String field;
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/MapBindingResult.java b/org.springframework.context/src/main/java/org/springframework/validation/MapBindingResult.java
index 5d0db273c3612088d0b4045f132ea0e1c61e1e8b..1fc7c5616cb4a02c9cac604cd0f7ab07d5b3e3c6 100644
--- a/org.springframework.context/src/main/java/org/springframework/validation/MapBindingResult.java
+++ b/org.springframework.context/src/main/java/org/springframework/validation/MapBindingResult.java
@@ -33,9 +33,10 @@ import org.springframework.util.Assert;
* @since 2.0
* @see java.util.Map
*/
+@SuppressWarnings("serial")
public class MapBindingResult extends AbstractBindingResult implements Serializable {
- private final Map target;
+ private final Map, ?> target;
/**
@@ -43,14 +44,14 @@ public class MapBindingResult extends AbstractBindingResult implements Serializa
* @param target the target Map to bind onto
* @param objectName the name of the target object
*/
- public MapBindingResult(Map target, String objectName) {
+ public MapBindingResult(Map, ?> target, String objectName) {
super(objectName);
Assert.notNull(target, "Target Map must not be null");
this.target = target;
}
- public final Map getTargetMap() {
+ public final Map, ?> getTargetMap() {
return this.target;
}
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/MessageCodesResolver.java b/org.springframework.context/src/main/java/org/springframework/validation/MessageCodesResolver.java
index cd6b4d7188b10e46ce9b53bd5a3a175de595042b..867359f178da0e920e6346cd632449684194b74e 100644
--- a/org.springframework.context/src/main/java/org/springframework/validation/MessageCodesResolver.java
+++ b/org.springframework.context/src/main/java/org/springframework/validation/MessageCodesResolver.java
@@ -50,6 +50,6 @@ public interface MessageCodesResolver {
* @param fieldType the field type (may be null
if not determinable)
* @return the message codes to use
*/
- String[] resolveMessageCodes(String errorCode, String objectName, String field, Class fieldType);
+ String[] resolveMessageCodes(String errorCode, String objectName, String field, Class> fieldType);
}
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/ObjectError.java b/org.springframework.context/src/main/java/org/springframework/validation/ObjectError.java
index aaa7565b234433484d84042336023dee331f6700..b0398754db403cbcb22425225178669106398013 100644
--- a/org.springframework.context/src/main/java/org/springframework/validation/ObjectError.java
+++ b/org.springframework.context/src/main/java/org/springframework/validation/ObjectError.java
@@ -31,6 +31,7 @@ import org.springframework.util.Assert;
* @see DefaultMessageCodesResolver
* @since 10.03.2003
*/
+@SuppressWarnings("serial")
public class ObjectError extends DefaultMessageSourceResolvable {
private final String objectName;
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java b/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java
index 3252e9b31248a4f9e3fd097bc73a6edd419e8734..de9f3655afa5389f282ca936a76385aa35a7de92 100644
--- a/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java
+++ b/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java
@@ -62,6 +62,7 @@ import org.springframework.util.CollectionUtils;
public class LocalValidatorFactoryBean extends SpringValidatorAdapter
implements ValidatorFactory, ApplicationContextAware, InitializingBean {
+ @SuppressWarnings("rawtypes")
private Class providerClass;
private MessageInterpolator messageInterpolator;
@@ -85,6 +86,7 @@ public class LocalValidatorFactoryBean extends SpringValidatorAdapter
* @see javax.validation.Validation#byProvider(Class)
* @see javax.validation.Validation#byDefaultProvider()
*/
+ @SuppressWarnings("rawtypes")
public void setProviderClass(Class extends ValidationProvider> providerClass) {
this.providerClass = providerClass;
}
@@ -177,6 +179,7 @@ public class LocalValidatorFactoryBean extends SpringValidatorAdapter
@SuppressWarnings("unchecked")
public void afterPropertiesSet() {
+ @SuppressWarnings("rawtypes")
Configuration configuration = (this.providerClass != null ?
Validation.byProvider(this.providerClass).configure() :
Validation.byDefaultProvider().configure());
diff --git a/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/package-info.java b/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/package-info.java
index eb7815bb985b90368acf4b2fa5e65df4a89debdd..f9c8354a4013e1ed41204b2e121746d4df7eff44 100644
--- a/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/package-info.java
+++ b/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/package-info.java
@@ -3,8 +3,9 @@
* (such as Hibernate Validator 4.0) into a Spring ApplicationContext
* and in particular with Spring's data binding and validation APIs.
*
- * The central class is {@link LocalValidatorFactoryBean} which - * defines a shared ValidatorFactory/Validator setup for availability + *
The central class is {@link + * org.springframework.validation.beanvalidation.LocalValidatorFactoryBean} + * which defines a shared ValidatorFactory/Validator setup for availability * to other Spring components. */ package org.springframework.validation.beanvalidation;