diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/AbstractPropertyAccessor.java b/org.springframework.beans/src/main/java/org/springframework/beans/AbstractPropertyAccessor.java index fd2ecfeae2..4094232795 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/AbstractPropertyAccessor.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/AbstractPropertyAccessor.java @@ -111,6 +111,7 @@ public abstract class AbstractPropertyAccessor extends PropertyEditorRegistrySup // Redefined with public visibility. + @Override public Class getPropertyType(String propertyPath) { return null; } diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java b/org.springframework.beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java index 863335a849..8af75c662a 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java @@ -74,6 +74,7 @@ public class BeanMetadataAttribute implements BeanMetadataElement { } + @Override public boolean equals(Object other) { if (this == other) { return true; @@ -87,10 +88,12 @@ public class BeanMetadataAttribute implements BeanMetadataElement { ObjectUtils.nullSafeEquals(this.source, otherMa.source)); } + @Override public int hashCode() { return this.name.hashCode() * 29 + ObjectUtils.nullSafeHashCode(this.value); } + @Override public String toString() { return "metadata attribute '" + this.name + "'"; } diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/BeanMetadataAttributeAccessor.java b/org.springframework.beans/src/main/java/org/springframework/beans/BeanMetadataAttributeAccessor.java index f6f95d6523..39c28b5747 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/BeanMetadataAttributeAccessor.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/BeanMetadataAttributeAccessor.java @@ -62,15 +62,18 @@ public class BeanMetadataAttributeAccessor extends AttributeAccessorSupport impl return (BeanMetadataAttribute) super.getAttribute(name); } + @Override public void setAttribute(String name, Object value) { super.setAttribute(name, new BeanMetadataAttribute(name, value)); } + @Override public Object getAttribute(String name) { BeanMetadataAttribute attribute = (BeanMetadataAttribute) super.getAttribute(name); return (attribute != null ? attribute.getValue() : null); } + @Override public Object removeAttribute(String name) { BeanMetadataAttribute attribute = (BeanMetadataAttribute) super.removeAttribute(name); return (attribute != null ? attribute.getValue() : null); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java b/org.springframework.beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java index 6c956eba5d..c596c8ed15 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java @@ -282,6 +282,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra return nestedBw.getCachedIntrospectionResults().getPropertyDescriptor(getFinalPath(nestedBw, propertyName)); } + @Override public Class getPropertyType(String propertyName) throws BeansException { try { PropertyDescriptor pd = getPropertyDescriptorInternal(propertyName); @@ -527,6 +528,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra // Implementation of PropertyAccessor interface //--------------------------------------------------------------------- + @Override public Object getPropertyValue(String propertyName) throws BeansException { BeanWrapperImpl nestedBw = getBeanWrapperForPropertyPath(propertyName); PropertyTokenHolder tokens = getPropertyNameTokens(getFinalPath(nestedBw, propertyName)); @@ -620,6 +622,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra } } + @Override public void setPropertyValue(String propertyName, Object value) throws BeansException { BeanWrapperImpl nestedBw = null; try { @@ -633,6 +636,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra nestedBw.setPropertyValue(tokens, new PropertyValue(propertyName, value)); } + @Override public void setPropertyValue(PropertyValue pv) throws BeansException { PropertyTokenHolder tokens = (PropertyTokenHolder) pv.resolvedTokens; if (tokens == null) { @@ -864,6 +868,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra } + @Override public String toString() { StringBuffer sb = new StringBuffer(getClass().getName()); if (this.object != null) { diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/BeansException.java b/org.springframework.beans/src/main/java/org/springframework/beans/BeansException.java index 18789ba015..a2c0834d36 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/BeansException.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/BeansException.java @@ -50,6 +50,7 @@ public abstract class BeansException extends NestedRuntimeException { } + @Override public boolean equals(Object other) { if (this == other) { return true; @@ -62,6 +63,7 @@ public abstract class BeansException extends NestedRuntimeException { ObjectUtils.nullSafeEquals(getCause(), otherBe.getCause())); } + @Override public int hashCode() { return getMessage().hashCode(); } diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java b/org.springframework.beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java index 44d5fcbb43..80ec5a5e7f 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java @@ -77,6 +77,7 @@ public class DirectFieldAccessor extends AbstractPropertyAccessor { return this.fieldMap.containsKey(propertyName); } + @Override public Class getPropertyType(String propertyName) throws BeansException { Field field = (Field) this.fieldMap.get(propertyName); if (field != null) { @@ -85,6 +86,7 @@ public class DirectFieldAccessor extends AbstractPropertyAccessor { return null; } + @Override public Object getPropertyValue(String propertyName) throws BeansException { Field field = (Field) this.fieldMap.get(propertyName); if (field == null) { @@ -100,6 +102,7 @@ public class DirectFieldAccessor extends AbstractPropertyAccessor { } } + @Override public void setPropertyValue(String propertyName, Object newValue) throws BeansException { Field field = (Field) this.fieldMap.get(propertyName); if (field == null) { diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java b/org.springframework.beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java index 06a6f93f2d..f0c42bcf7b 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java @@ -70,18 +70,22 @@ class GenericTypeAwarePropertyDescriptor extends PropertyDescriptor { } + @Override public Method getReadMethod() { return this.readMethod; } + @Override public Method getWriteMethod() { return this.writeMethod; } + @Override public Class getPropertyEditorClass() { return this.propertyEditorClass; } + @Override public synchronized Class getPropertyType() { if (this.propertyType == null) { if (this.readMethod != null) { diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/MutablePropertyValues.java b/org.springframework.beans/src/main/java/org/springframework/beans/MutablePropertyValues.java index 76f36d9d13..8396a72a84 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/MutablePropertyValues.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/MutablePropertyValues.java @@ -325,6 +325,7 @@ public class MutablePropertyValues implements PropertyValues, Serializable { } + @Override public boolean equals(Object other) { if (this == other) { return true; @@ -336,10 +337,12 @@ public class MutablePropertyValues implements PropertyValues, Serializable { return this.propertyValueList.equals(that.propertyValueList); } + @Override public int hashCode() { return this.propertyValueList.hashCode(); } + @Override public String toString() { PropertyValue[] pvs = getPropertyValues(); StringBuffer sb = new StringBuffer("PropertyValues: length=" + pvs.length + "; "); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java b/org.springframework.beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java index d95465ed25..0dff5620ec 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java @@ -80,6 +80,7 @@ public class PropertyBatchUpdateException extends BeansException { } + @Override public String getMessage() { StringBuffer sb = new StringBuffer("Failed properties: "); for (int i = 0; i < this.propertyAccessExceptions.length; i++) { @@ -91,6 +92,7 @@ public class PropertyBatchUpdateException extends BeansException { return sb.toString(); } + @Override public String toString() { StringBuffer sb = new StringBuffer(); sb.append(getClass().getName()).append("; nested PropertyAccessExceptions ("); @@ -102,6 +104,7 @@ public class PropertyBatchUpdateException extends BeansException { return sb.toString(); } + @Override public void printStackTrace(PrintStream ps) { synchronized (ps) { ps.println(getClass().getName() + "; nested PropertyAccessException details (" + @@ -113,6 +116,7 @@ public class PropertyBatchUpdateException extends BeansException { } } + @Override public void printStackTrace(PrintWriter pw) { synchronized (pw) { pw.println(getClass().getName() + "; nested PropertyAccessException details (" + @@ -124,6 +128,7 @@ public class PropertyBatchUpdateException extends BeansException { } } + @Override public boolean contains(Class exType) { if (exType == null) { return false; diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/PropertyValue.java b/org.springframework.beans/src/main/java/org/springframework/beans/PropertyValue.java index f421171039..0cf12c389b 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/PropertyValue.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/PropertyValue.java @@ -160,6 +160,7 @@ public class PropertyValue extends BeanMetadataAttributeAccessor implements Seri } + @Override public boolean equals(Object other) { if (this == other) { return true; @@ -173,10 +174,12 @@ public class PropertyValue extends BeanMetadataAttributeAccessor implements Seri ObjectUtils.nullSafeEquals(this.source, otherPv.source)); } + @Override public int hashCode() { return this.name.hashCode() * 29 + ObjectUtils.nullSafeHashCode(this.value); } + @Override public String toString() { return "bean property '" + this.name + "'"; } diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/PropertyValuesEditor.java b/org.springframework.beans/src/main/java/org/springframework/beans/PropertyValuesEditor.java index 63b79b8cb7..7d19837b48 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/PropertyValuesEditor.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/PropertyValuesEditor.java @@ -38,6 +38,7 @@ public class PropertyValuesEditor extends PropertyEditorSupport { private final PropertiesEditor propertiesEditor = new PropertiesEditor(); + @Override public void setAsText(String text) throws IllegalArgumentException { this.propertiesEditor.setAsText(text); Properties props = (Properties) this.propertiesEditor.getValue(); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanCreationException.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanCreationException.java index b94c597c09..b08692e472 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanCreationException.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanCreationException.java @@ -146,6 +146,7 @@ public class BeanCreationException extends FatalBeanException { } + @Override public String toString() { StringBuffer sb = new StringBuffer(super.toString()); if (this.relatedCauses != null) { @@ -158,6 +159,7 @@ public class BeanCreationException extends FatalBeanException { return sb.toString(); } + @Override public void printStackTrace(PrintStream ps) { synchronized (ps) { super.printStackTrace(ps); @@ -171,6 +173,7 @@ public class BeanCreationException extends FatalBeanException { } } + @Override public void printStackTrace(PrintWriter pw) { synchronized (pw) { super.printStackTrace(pw); @@ -184,6 +187,7 @@ public class BeanCreationException extends FatalBeanException { } } + @Override public boolean contains(Class exClass) { if (super.contains(exClass)) { return true; diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/access/el/SimpleSpringBeanELResolver.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/access/el/SimpleSpringBeanELResolver.java index 91e6de00d4..631f08c56e 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/access/el/SimpleSpringBeanELResolver.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/access/el/SimpleSpringBeanELResolver.java @@ -42,6 +42,7 @@ public class SimpleSpringBeanELResolver extends SpringBeanELResolver { this.beanFactory = beanFactory; } + @Override protected BeanFactory getBeanFactory(ELContext elContext) { return this.beanFactory; } diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/access/el/SpringBeanELResolver.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/access/el/SpringBeanELResolver.java index 1f69ea7610..73a86c078c 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/access/el/SpringBeanELResolver.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/access/el/SpringBeanELResolver.java @@ -43,6 +43,7 @@ public abstract class SpringBeanELResolver extends ELResolver { protected final Log logger = LogFactory.getLog(getClass()); + @Override public Object getValue(ELContext elContext, Object base, Object property) throws ELException { if (base == null) { String beanName = property.toString(); @@ -58,6 +59,7 @@ public abstract class SpringBeanELResolver extends ELResolver { return null; } + @Override public Class getType(ELContext elContext, Object base, Object property) throws ELException { if (base == null) { String beanName = property.toString(); @@ -70,6 +72,7 @@ public abstract class SpringBeanELResolver extends ELResolver { return null; } + @Override public void setValue(ELContext elContext, Object base, Object property, Object value) throws ELException { if (base == null) { String beanName = property.toString(); @@ -81,6 +84,7 @@ public abstract class SpringBeanELResolver extends ELResolver { } } + @Override public boolean isReadOnly(ELContext elContext, Object base, Object property) throws ELException { if (base == null) { String beanName = property.toString(); @@ -92,10 +96,12 @@ public abstract class SpringBeanELResolver extends ELResolver { return false; } + @Override public Iterator getFeatureDescriptors(ELContext elContext, Object base) { return null; } + @Override public Class getCommonPropertyType(ELContext elContext, Object base) { return Object.class; } diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java index 39ccb77617..4d71b43b40 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java @@ -181,6 +181,7 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean } } + @Override public Constructor[] determineCandidateConstructors(Class beanClass, String beanName) throws BeansException { // Quick check on the concurrent map first, with minimal locking. Constructor[] candidateConstructors = this.candidateConstructorsCache.get(beanClass); @@ -234,6 +235,7 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean return (candidateConstructors.length > 0 ? candidateConstructors : null); } + @Override public boolean postProcessAfterInstantiation(Object bean, String beanName) throws BeansException { InjectionMetadata metadata = findAutowiringMetadata(bean.getClass()); try { @@ -245,6 +247,7 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean return true; } + @Override public PropertyValues postProcessPropertyValues( PropertyValues pvs, PropertyDescriptor[] pds, Object bean, String beanName) throws BeansException { diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java index a264a6b120..1d8aa16e17 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java @@ -297,11 +297,13 @@ public class InitDestroyAnnotationBeanPostProcessor this.method.invoke(target, (Object[]) null); } + @Override public boolean equals(Object other) { return (this == other || (other instanceof LifecycleElement && this.method.getName().equals(((LifecycleElement) other).method.getName()))); } + @Override public int hashCode() { return this.method.getName().hashCode(); } diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java index 2a4e264d78..f26bc1ff65 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java @@ -222,6 +222,7 @@ public class InjectionMetadata { return null; } + @Override public boolean equals(Object other) { if (this == other) { return true; @@ -241,10 +242,12 @@ public class InjectionMetadata { } } + @Override public int hashCode() { return this.member.getClass().hashCode() * 29 + this.member.getName().hashCode(); } + @Override public String toString() { return getClass().getSimpleName() + " for " + this.member; } diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.java index 7c18de5975..cc6c84c8b2 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.java @@ -106,6 +106,7 @@ public class RequiredAnnotationBeanPostProcessor extends InstantiationAwareBeanP } + @Override public PropertyValues postProcessPropertyValues( PropertyValues pvs, PropertyDescriptor[] pds, Object bean, String beanName) throws BeansException { diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java index f6816c75d7..0176a91425 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java @@ -145,11 +145,13 @@ public class BeanDefinitionHolder implements BeanMetadataElement { * @see #getLongDescription() * @see #getShortDescription() */ + @Override public String toString() { return getLongDescription(); } + @Override public boolean equals(Object other) { if (this == other) { return true; @@ -163,6 +165,7 @@ public class BeanDefinitionHolder implements BeanMetadataElement { ObjectUtils.nullSafeEquals(this.aliases, otherHolder.aliases); } + @Override public int hashCode() { int hashCode = this.beanDefinition.hashCode(); hashCode = 29 * hashCode + this.beanName.hashCode(); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java index 8a129485dc..94c3cc627d 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java @@ -312,6 +312,7 @@ public class ConstructorArgumentValues { } + @Override public boolean equals(Object other) { if (this == other) { return true; @@ -344,6 +345,7 @@ public class ConstructorArgumentValues { return true; } + @Override public int hashCode() { int hashCode = 7; for (Iterator it = this.genericArgumentValues.iterator(); it.hasNext();) { diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/ListFactoryBean.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/ListFactoryBean.java index 1fc998c98d..88a7297209 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/ListFactoryBean.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/ListFactoryBean.java @@ -65,10 +65,12 @@ public class ListFactoryBean extends AbstractFactoryBean { } + @Override public Class getObjectType() { return List.class; } + @Override protected Object createInstance() { if (this.sourceList == null) { throw new IllegalArgumentException("'sourceList' is required"); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/MapFactoryBean.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/MapFactoryBean.java index 4390c4b76f..8a6ece50a6 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/MapFactoryBean.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/MapFactoryBean.java @@ -65,10 +65,12 @@ public class MapFactoryBean extends AbstractFactoryBean { } + @Override public Class getObjectType() { return Map.class; } + @Override protected Object createInstance() { if (this.sourceMap == null) { throw new IllegalArgumentException("'sourceMap' is required"); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java index efa24eacf8..0f54f6407a 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java @@ -118,6 +118,7 @@ public class MethodInvokingFactoryBean extends ArgumentConvertingMethodInvoker this.beanClassLoader = classLoader; } + @Override protected Class resolveClassName(String className) throws ClassNotFoundException { return ClassUtils.forName(className, this.beanClassLoader); } @@ -133,6 +134,7 @@ public class MethodInvokingFactoryBean extends ArgumentConvertingMethodInvoker * if possible. * @see ConfigurableBeanFactory#getTypeConverter() */ + @Override protected TypeConverter getDefaultTypeConverter() { if (this.beanFactory != null) { return this.beanFactory.getTypeConverter(); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.java index 30626606af..f3301b5ef5 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.java @@ -110,16 +110,19 @@ public class ObjectFactoryCreatingFactoryBean extends AbstractFactoryBean { this.targetBeanName = targetBeanName; } + @Override public void afterPropertiesSet() throws Exception { Assert.hasText(this.targetBeanName, "Property 'targetBeanName' is required"); super.afterPropertiesSet(); } + @Override public Class getObjectType() { return ObjectFactory.class; } + @Override protected Object createInstance() { return new ObjectFactory() { public Object getObject() throws BeansException { diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java index b910b07fe0..f025a941c1 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java @@ -86,6 +86,7 @@ public class PreferencesPlaceholderConfigurer extends PropertyPlaceholderConfigu * in the user preferences, then in the system preferences, then in * the passed-in properties. */ + @Override protected String resolvePlaceholder(String placeholder, Properties props) { String path = null; String key = placeholder; diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/PropertyOverrideConfigurer.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/PropertyOverrideConfigurer.java index e735c601e6..33129b5ad4 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/PropertyOverrideConfigurer.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/PropertyOverrideConfigurer.java @@ -93,6 +93,7 @@ public class PropertyOverrideConfigurer extends PropertyResourceConfigurer { } + @Override protected void processProperties(ConfigurableListableBeanFactory beanFactory, Properties props) throws BeansException { diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurer.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurer.java index db04b76ab6..b2ae0b2eb7 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurer.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurer.java @@ -249,6 +249,7 @@ public class PropertyPlaceholderConfigurer extends PropertyResourceConfigurer } + @Override protected void processProperties(ConfigurableListableBeanFactory beanFactoryToProcess, Properties props) throws BeansException { diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java index ebaea25aec..3df4a47c27 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java @@ -61,6 +61,7 @@ public class RuntimeBeanNameReference implements BeanReference { } + @Override public boolean equals(Object other) { if (this == other) { return true; @@ -72,10 +73,12 @@ public class RuntimeBeanNameReference implements BeanReference { return this.beanName.equals(that.beanName); } + @Override public int hashCode() { return this.beanName.hashCode(); } + @Override public String toString() { return '<' + getBeanName() + '>'; } diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java index 3418666efc..822d98c43c 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java @@ -86,6 +86,7 @@ public class RuntimeBeanReference implements BeanReference { } + @Override public boolean equals(Object other) { if (this == other) { return true; @@ -97,12 +98,14 @@ public class RuntimeBeanReference implements BeanReference { return (this.beanName.equals(that.beanName) && this.toParent == that.toParent); } + @Override public int hashCode() { int result = this.beanName.hashCode(); result = 29 * result + (this.toParent ? 1 : 0); return result; } + @Override public String toString() { return '<' + getBeanName() + '>'; } diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/SetFactoryBean.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/SetFactoryBean.java index 454241b5fe..fa64384281 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/SetFactoryBean.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/SetFactoryBean.java @@ -65,10 +65,12 @@ public class SetFactoryBean extends AbstractFactoryBean { } + @Override public Class getObjectType() { return Set.class; } + @Override protected Object createInstance() { if (this.sourceSet == null) { throw new IllegalArgumentException("'sourceSet' is required"); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/TypedStringValue.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/TypedStringValue.java index 358909a73f..0e60d9f9d3 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/TypedStringValue.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/config/TypedStringValue.java @@ -170,6 +170,7 @@ public class TypedStringValue implements BeanMetadataElement { } + @Override public boolean equals(Object other) { if (this == other) { return true; @@ -182,10 +183,12 @@ public class TypedStringValue implements BeanMetadataElement { ObjectUtils.nullSafeEquals(this.targetType, otherValue.targetType)); } + @Override public int hashCode() { return ObjectUtils.nullSafeHashCode(this.value) * 29 + ObjectUtils.nullSafeHashCode(this.targetType); } + @Override public String toString() { return "TypedStringValue: value [" + this.value + "], target type [" + this.targetType + "]"; } diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/AbstractComponentDefinition.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/AbstractComponentDefinition.java index 945085d4cb..24a03a757f 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/AbstractComponentDefinition.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/AbstractComponentDefinition.java @@ -63,6 +63,7 @@ public abstract class AbstractComponentDefinition implements ComponentDefinition /** * Delegates to {@link #getDescription}. */ + @Override public String toString() { return getDescription(); } diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/BeanComponentDefinition.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/BeanComponentDefinition.java index 148a2c8e78..38e3b2f36e 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/BeanComponentDefinition.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/BeanComponentDefinition.java @@ -119,6 +119,7 @@ public class BeanComponentDefinition extends BeanDefinitionHolder implements Com * This implementation returns this ComponentDefinition's description. * @see #getDescription() */ + @Override public String toString() { return getDescription(); } @@ -127,6 +128,7 @@ public class BeanComponentDefinition extends BeanDefinitionHolder implements Com * This implementations expects the other object to be of type BeanComponentDefinition * as well, in addition to the superclass's equality requirements. */ + @Override public boolean equals(Object other) { return (this == other || (other instanceof BeanComponentDefinition && super.equals(other))); } diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/BeanEntry.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/BeanEntry.java index 4bb1f36a4b..df3d0af75a 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/BeanEntry.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/BeanEntry.java @@ -36,6 +36,7 @@ public class BeanEntry implements ParseState.Entry { } + @Override public String toString() { return "Bean '" + this.beanDefinitionName + "'"; } diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/ConstructorArgumentEntry.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/ConstructorArgumentEntry.java index 9f54568df1..86540ef078 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/ConstructorArgumentEntry.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/ConstructorArgumentEntry.java @@ -52,6 +52,7 @@ public class ConstructorArgumentEntry implements ParseState.Entry { } + @Override public String toString() { return "Constructor-arg" + (this.index >= 0 ? " #" + this.index : ""); } diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/ParseState.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/ParseState.java index 9f476b67fe..96a18a9719 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/ParseState.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/ParseState.java @@ -93,6 +93,7 @@ public final class ParseState { /** * Returns a tree-style representation of the current ParseState. */ + @Override public String toString() { StringBuffer sb = new StringBuffer(); for (int x = 0; x < this.state.size(); x++) { diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/Problem.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/Problem.java index 2ffef106f7..6fc9f2d664 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/Problem.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/Problem.java @@ -114,6 +114,7 @@ public class Problem { } + @Override public String toString() { StringBuffer sb = new StringBuffer(); sb.append("Configuration problem: "); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/PropertyEntry.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/PropertyEntry.java index 403c4fa2fa..c1737e456c 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/PropertyEntry.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/PropertyEntry.java @@ -43,6 +43,7 @@ public class PropertyEntry implements ParseState.Entry { } + @Override public String toString() { return "Property '" + this.name + "'"; } diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/QualifierEntry.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/QualifierEntry.java index de7f41be0e..2c80092fb1 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/QualifierEntry.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/QualifierEntry.java @@ -36,6 +36,7 @@ public class QualifierEntry implements ParseState.Entry { this.typeName = typeName; } + @Override public String toString() { return "Qualifier '" + this.typeName + "'"; } diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/serviceloader/AbstractServiceLoaderBasedFactoryBean.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/serviceloader/AbstractServiceLoaderBasedFactoryBean.java index 6be2b2f3a6..27e72ce9e0 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/serviceloader/AbstractServiceLoaderBasedFactoryBean.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/serviceloader/AbstractServiceLoaderBasedFactoryBean.java @@ -53,6 +53,7 @@ public abstract class AbstractServiceLoaderBasedFactoryBean extends AbstractFact return this.serviceType; } + @Override public void setBeanClassLoader(ClassLoader beanClassLoader) { this.beanClassLoader = beanClassLoader; } @@ -62,6 +63,7 @@ public abstract class AbstractServiceLoaderBasedFactoryBean extends AbstractFact * Delegates to {@link #getObjectToExpose(java.util.ServiceLoader)}. * @return the object to expose */ + @Override protected Object createInstance() { Assert.notNull(getServiceType(), "Property 'serviceType' is required"); return getObjectToExpose(ServiceLoader.load(getServiceType(), this.beanClassLoader)); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceFactoryBean.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceFactoryBean.java index 33bee8bfb7..5abbda9f2b 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceFactoryBean.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceFactoryBean.java @@ -32,6 +32,7 @@ import org.springframework.beans.factory.BeanClassLoaderAware; */ public class ServiceFactoryBean extends AbstractServiceLoaderBasedFactoryBean implements BeanClassLoaderAware { + @Override protected Object getObjectToExpose(ServiceLoader serviceLoader) { Iterator it = serviceLoader.iterator(); if (!it.hasNext()) { @@ -41,6 +42,7 @@ public class ServiceFactoryBean extends AbstractServiceLoaderBasedFactoryBean im return it.next(); } + @Override public Class getObjectType() { return getServiceType(); } diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceListFactoryBean.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceListFactoryBean.java index ae8b82deaa..b8cc3e77f2 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceListFactoryBean.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceListFactoryBean.java @@ -34,6 +34,7 @@ import org.springframework.beans.factory.BeanClassLoaderAware; */ public class ServiceListFactoryBean extends AbstractServiceLoaderBasedFactoryBean implements BeanClassLoaderAware { + @Override protected Object getObjectToExpose(ServiceLoader serviceLoader) { List result = new LinkedList(); Iterator it = serviceLoader.iterator(); @@ -43,6 +44,7 @@ public class ServiceListFactoryBean extends AbstractServiceLoaderBasedFactoryBea return result; } + @Override public Class getObjectType() { return List.class; } diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceLoaderFactoryBean.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceLoaderFactoryBean.java index acf8f2526a..34f3a1cf21 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceLoaderFactoryBean.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceLoaderFactoryBean.java @@ -30,10 +30,12 @@ import org.springframework.beans.factory.BeanClassLoaderAware; */ public class ServiceLoaderFactoryBean extends AbstractServiceLoaderBasedFactoryBean implements BeanClassLoaderAware { + @Override protected Object getObjectToExpose(ServiceLoader serviceLoader) { return serviceLoader; } + @Override public Class getObjectType() { return ServiceLoader.class; } diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java index 95235ccdca..fae278edc5 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java @@ -231,6 +231,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac } + @Override public void copyConfigurationFrom(ConfigurableBeanFactory otherFactory) { super.copyConfigurationFrom(otherFactory); if (otherFactory instanceof AbstractAutowireCapableBeanFactory) { @@ -373,6 +374,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac * populates the bean instance, applies post-processors, etc. * @see #doCreateBean */ + @Override protected Object createBean(final String beanName, final RootBeanDefinition mbd, final Object[] args) throws BeanCreationException { @@ -515,6 +517,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac return exposedObject; } + @Override protected Class predictBeanType(String beanName, RootBeanDefinition mbd, Class[] typesToMatch) { Class beanClass = null; if (mbd.getFactoryMethodName() != null) { @@ -610,6 +613,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac * FactoryBean. If the FactoryBean instance itself is not kept as singleton, * it will be fully created to check the type of its exposed object. */ + @Override protected Class getTypeForFactoryBean(String beanName, RootBeanDefinition mbd) { FactoryBean fb = (mbd.isSingleton() ? getSingletonFactoryBeanForTypeCheck(beanName, mbd) : @@ -1425,6 +1429,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac * object obtained from FactoryBeans (for example, to auto-proxy them). * @see #applyBeanPostProcessorsAfterInitialization */ + @Override protected Object postProcessObjectFromFactoryBean(Object object, String beanName) { return applyBeanPostProcessorsAfterInitialization(object, beanName); } @@ -1432,6 +1437,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac /** * Overridden to clear FactoryBean instance cache as well. */ + @Override protected void removeSingleton(String beanName) { super.removeSingleton(beanName); this.factoryBeanInstanceCache.remove(beanName); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java index 9ae49e81e3..31d67835ac 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java @@ -918,6 +918,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess * Delegates to {@link #cloneBeanDefinition()}. * @see java.lang.Object#clone() */ + @Override public Object clone() { return cloneBeanDefinition(); } @@ -930,6 +931,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess public abstract AbstractBeanDefinition cloneBeanDefinition(); + @Override public boolean equals(Object other) { if (this == other) { return true; @@ -969,6 +971,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess return super.equals(other); } + @Override public int hashCode() { int hashCode = ObjectUtils.nullSafeHashCode(getBeanClassName()); hashCode = 29 * hashCode + ObjectUtils.nullSafeHashCode(this.scope); @@ -980,6 +983,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess return hashCode; } + @Override public String toString() { StringBuffer sb = new StringBuffer("class ["); sb.append(getBeanClassName()).append("]"); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java index e6aa0066e2..a4e366f431 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java @@ -502,6 +502,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp } } + @Override public String[] getAliases(String name) { String beanName = transformedBeanName(name); List aliases = new ArrayList(); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java index 6076658c2d..e5fb9c6afb 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java @@ -54,10 +54,12 @@ class BeanDefinitionResource extends AbstractResource { } + @Override public boolean exists() { return false; } + @Override public boolean isReadable() { return false; } @@ -75,6 +77,7 @@ class BeanDefinitionResource extends AbstractResource { /** * This implementation compares the underlying BeanDefinition. */ + @Override public boolean equals(Object obj) { return (obj == this || (obj instanceof BeanDefinitionResource && @@ -84,6 +87,7 @@ class BeanDefinitionResource extends AbstractResource { /** * This implementation returns the hash code of the underlying BeanDefinition. */ + @Override public int hashCode() { return this.beanDefinition.hashCode(); } diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategy.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategy.java index 46ed762a71..c174976a39 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategy.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategy.java @@ -63,6 +63,7 @@ public class CglibSubclassingInstantiationStrategy extends SimpleInstantiationSt private static final int METHOD_REPLACER = 2; + @Override protected Object instantiateWithMethodInjection( RootBeanDefinition beanDefinition, String beanName, BeanFactory owner) { @@ -70,6 +71,7 @@ public class CglibSubclassingInstantiationStrategy extends SimpleInstantiationSt return new CglibSubclassCreator(beanDefinition, owner).instantiate(null, null); } + @Override protected Object instantiateWithMethodInjection( RootBeanDefinition beanDefinition, String beanName, BeanFactory owner, Constructor ctor, Object[] args) { @@ -133,11 +135,13 @@ public class CglibSubclassingInstantiationStrategy extends SimpleInstantiationSt return beanDefinition; } + @Override public boolean equals(Object other) { return (other.getClass().equals(getClass()) && ((CglibIdentitySupport) other).getBeanDefinition().equals(beanDefinition)); } + @Override public int hashCode() { return beanDefinition.hashCode(); } diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/ChildBeanDefinition.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/ChildBeanDefinition.java index dd7dea67fd..8dd4278295 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/ChildBeanDefinition.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/ChildBeanDefinition.java @@ -139,6 +139,7 @@ public class ChildBeanDefinition extends AbstractBeanDefinition { return this.parentName; } + @Override public void validate() throws BeanDefinitionValidationException { super.validate(); if (this.parentName == null) { @@ -147,10 +148,12 @@ public class ChildBeanDefinition extends AbstractBeanDefinition { } + @Override public AbstractBeanDefinition cloneBeanDefinition() { return new ChildBeanDefinition(this); } + @Override public boolean equals(Object other) { if (this == other) { return true; @@ -162,10 +165,12 @@ public class ChildBeanDefinition extends AbstractBeanDefinition { return (ObjectUtils.nullSafeEquals(this.parentName, that.parentName) && super.equals(other)); } + @Override public int hashCode() { return ObjectUtils.nullSafeHashCode(this.parentName) * 29 + super.hashCode(); } + @Override public String toString() { StringBuffer sb = new StringBuffer("Child bean with parent '"); sb.append(this.parentName).append("': ").append(super.toString()); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java index aee99c76d5..fefb9b1a2f 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java @@ -165,6 +165,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto } + @Override public void copyConfigurationFrom(ConfigurableBeanFactory otherFactory) { super.copyConfigurationFrom(otherFactory); if (otherFactory instanceof DefaultListableBeanFactory) { @@ -179,6 +180,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto // Implementation of ListableBeanFactory interface //--------------------------------------------------------------------- + @Override public boolean containsBeanDefinition(String beanName) { return this.beanDefinitionMap.containsKey(beanName); } @@ -378,6 +380,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto new BeanDefinitionHolder(mbd, beanName, getAliases(beanName)), descriptor); } + @Override public BeanDefinition getBeanDefinition(String beanName) throws NoSuchBeanDefinitionException { BeanDefinition bd = (BeanDefinition) this.beanDefinitionMap.get(beanName); if (bd == null) { @@ -405,6 +408,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto * if the factory's configuration has been marked as frozen. * @see #freezeConfiguration() */ + @Override protected boolean isBeanEligibleForMetadataCaching(String beanName) { return (this.configurationFrozen || super.isBeanEligibleForMetadataCaching(beanName)); } @@ -529,6 +533,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto /** * Only allows alias overriding if bean definition overriding is allowed. */ + @Override protected boolean allowAliasOverriding() { return this.allowBeanDefinitionOverriding; } @@ -729,6 +734,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto } + @Override public String toString() { StringBuffer sb = new StringBuffer(ObjectUtils.identityToString(this)); sb.append(": defining beans ["); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java index 2154caca73..02d015ecec 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java @@ -180,6 +180,7 @@ public abstract class FactoryBeanRegistrySupport extends DefaultSingletonBeanReg /** * Overridden to clear the FactoryBean object cache as well. */ + @Override protected void removeSingleton(String beanName) { super.removeSingleton(beanName); this.factoryBeanObjectCache.remove(beanName); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/GenericBeanDefinition.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/GenericBeanDefinition.java index a2a6bc6bd1..84dc678991 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/GenericBeanDefinition.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/GenericBeanDefinition.java @@ -74,14 +74,17 @@ public class GenericBeanDefinition extends AbstractBeanDefinition { } + @Override public AbstractBeanDefinition cloneBeanDefinition() { return new GenericBeanDefinition(this); } + @Override public boolean equals(Object other) { return (this == other || (other instanceof GenericBeanDefinition && super.equals(other))); } + @Override public String toString() { return "Generic bean: " + super.toString(); } diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/LookupOverride.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/LookupOverride.java index 985f5d8581..2a34093cf6 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/LookupOverride.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/LookupOverride.java @@ -59,20 +59,24 @@ public class LookupOverride extends MethodOverride { /** * Match method of the given name, with no parameters. */ + @Override public boolean matches(Method method) { return (method.getName().equals(getMethodName()) && method.getParameterTypes().length == 0); } + @Override public String toString() { return "LookupOverride for method '" + getMethodName() + "'; will return bean '" + this.beanName + "'"; } + @Override public boolean equals(Object other) { return (other instanceof LookupOverride && super.equals(other) && ObjectUtils.nullSafeEquals(this.beanName, ((LookupOverride) other).beanName)); } + @Override public int hashCode() { return (29 * super.hashCode() + ObjectUtils.nullSafeHashCode(this.beanName)); } diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/MethodOverride.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/MethodOverride.java index aa775d9395..a2b85bb2fe 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/MethodOverride.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/MethodOverride.java @@ -98,6 +98,7 @@ public abstract class MethodOverride implements BeanMetadataElement { public abstract boolean matches(Method method); + @Override public boolean equals(Object other) { if (this == other) { return true; @@ -111,6 +112,7 @@ public abstract class MethodOverride implements BeanMetadataElement { ObjectUtils.nullSafeEquals(this.source, that.source)); } + @Override public int hashCode() { int hashCode = ObjectUtils.nullSafeHashCode(this.methodName); hashCode = 29 * hashCode + ObjectUtils.nullSafeHashCode(this.source); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java index 732d2682f8..541955a685 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java @@ -99,6 +99,7 @@ public class MethodOverrides { return null; } + @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; @@ -110,6 +111,7 @@ public class MethodOverrides { return true; } + @Override public int hashCode() { return this.overrides.hashCode(); } diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/ReplaceOverride.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/ReplaceOverride.java index 0b6d93e793..12c82a5c63 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/ReplaceOverride.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/ReplaceOverride.java @@ -72,6 +72,7 @@ public class ReplaceOverride extends MethodOverride { } + @Override public boolean matches(Method method) { // TODO could cache result for efficiency if (!method.getName().equals(getMethodName())) { @@ -99,11 +100,13 @@ public class ReplaceOverride extends MethodOverride { } + @Override public String toString() { return "Replace override for method '" + getMethodName() + "; will call bean '" + this.methodReplacerBeanName + "'"; } + @Override public boolean equals(Object other) { if (!(other instanceof ReplaceOverride) || !super.equals(other)) { return false; @@ -113,6 +116,7 @@ public class ReplaceOverride extends MethodOverride { ObjectUtils.nullSafeEquals(this.typeIdentifiers, that.typeIdentifiers)); } + @Override public int hashCode() { int hashCode = super.hashCode(); hashCode = 29 * hashCode + ObjectUtils.nullSafeHashCode(this.methodReplacerBeanName); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java index 413db71343..e687273f91 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java @@ -244,14 +244,17 @@ public class RootBeanDefinition extends AbstractBeanDefinition { } + @Override public AbstractBeanDefinition cloneBeanDefinition() { return new RootBeanDefinition(this); } + @Override public boolean equals(Object other) { return (this == other || (other instanceof RootBeanDefinition && super.equals(other))); } + @Override public String toString() { return "Root bean: " + super.toString(); } diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/AbstractSimpleBeanDefinitionParser.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/AbstractSimpleBeanDefinitionParser.java index ac780cb070..abe347348d 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/AbstractSimpleBeanDefinitionParser.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/AbstractSimpleBeanDefinitionParser.java @@ -123,6 +123,7 @@ public abstract class AbstractSimpleBeanDefinitionParser extends AbstractSingleB * @param builder used to define the BeanDefinition * @see #extractPropertyName(String) */ + @Override protected final void doParse(Element element, BeanDefinitionBuilder builder) { NamedNodeMap attributes = element.getAttributes(); for (int x = 0; x < attributes.getLength(); x++) { diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/AbstractSingleBeanDefinitionParser.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/AbstractSingleBeanDefinitionParser.java index 1a1bd19e5c..b7a72c099d 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/AbstractSingleBeanDefinitionParser.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/AbstractSingleBeanDefinitionParser.java @@ -56,6 +56,7 @@ public abstract class AbstractSingleBeanDefinitionParser extends AbstractBeanDef * {@link #getBeanClass(org.w3c.dom.Element)} is null * @see #doParse */ + @Override protected final AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) { BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(); String parentName = getParentName(element); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/ResourceEntityResolver.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/ResourceEntityResolver.java index 78f0e04636..63e5a39f2d 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/ResourceEntityResolver.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/ResourceEntityResolver.java @@ -69,6 +69,7 @@ public class ResourceEntityResolver extends DelegatingEntityResolver { } + @Override public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException { InputSource source = super.resolveEntity(publicId, systemId); if (source == null && systemId != null) { diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/UtilNamespaceHandler.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/UtilNamespaceHandler.java index c43d083b37..128da8a46f 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/UtilNamespaceHandler.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/UtilNamespaceHandler.java @@ -57,10 +57,12 @@ public class UtilNamespaceHandler extends NamespaceHandlerSupport { private static class ConstantBeanDefinitionParser extends AbstractSimpleBeanDefinitionParser { + @Override protected Class getBeanClass(Element element) { return FieldRetrievingFactoryBean.class; } + @Override protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) { String id = super.resolveId(element, definition, parserContext); if (!StringUtils.hasText(id)) { @@ -73,10 +75,12 @@ public class UtilNamespaceHandler extends NamespaceHandlerSupport { private static class PropertyPathBeanDefinitionParser extends AbstractSingleBeanDefinitionParser { + @Override protected Class getBeanClass(Element element) { return PropertyPathFactoryBean.class; } + @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { String path = element.getAttribute("path"); if (!StringUtils.hasText(path)) { @@ -95,6 +99,7 @@ public class UtilNamespaceHandler extends NamespaceHandlerSupport { builder.addPropertyValue("propertyPath", propertyPath); } + @Override protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) { String id = super.resolveId(element, definition, parserContext); if (!StringUtils.hasText(id)) { @@ -107,10 +112,12 @@ public class UtilNamespaceHandler extends NamespaceHandlerSupport { private static class ListBeanDefinitionParser extends AbstractSingleBeanDefinitionParser { + @Override protected Class getBeanClass(Element element) { return ListFactoryBean.class; } + @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { String listClass = element.getAttribute("list-class"); List parsedList = parserContext.getDelegate().parseListElement(element, builder.getRawBeanDefinition()); @@ -128,10 +135,12 @@ public class UtilNamespaceHandler extends NamespaceHandlerSupport { private static class SetBeanDefinitionParser extends AbstractSingleBeanDefinitionParser { + @Override protected Class getBeanClass(Element element) { return SetFactoryBean.class; } + @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { String setClass = element.getAttribute("set-class"); Set parsedSet = parserContext.getDelegate().parseSetElement(element, builder.getRawBeanDefinition()); @@ -149,10 +158,12 @@ public class UtilNamespaceHandler extends NamespaceHandlerSupport { private static class MapBeanDefinitionParser extends AbstractSingleBeanDefinitionParser { + @Override protected Class getBeanClass(Element element) { return MapFactoryBean.class; } + @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { String mapClass = element.getAttribute("map-class"); Map parsedMap = parserContext.getDelegate().parseMapElement(element, builder.getRawBeanDefinition()); @@ -170,14 +181,17 @@ public class UtilNamespaceHandler extends NamespaceHandlerSupport { private static class PropertiesBeanDefinitionParser extends AbstractSimpleBeanDefinitionParser { + @Override protected Class getBeanClass(Element element) { return PropertiesFactoryBean.class; } + @Override protected boolean isEligibleAttribute(String attributeName) { return super.isEligibleAttribute(attributeName) && !SCOPE_ATTRIBUTE.equals(attributeName); } + @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { super.doParse(element, parserContext, builder); Properties parsedProps = parserContext.getDelegate().parsePropsElement(element); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/ByteArrayPropertyEditor.java b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/ByteArrayPropertyEditor.java index 6655bc2a42..9461c1fcdf 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/ByteArrayPropertyEditor.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/ByteArrayPropertyEditor.java @@ -28,10 +28,12 @@ import java.beans.PropertyEditorSupport; */ public class ByteArrayPropertyEditor extends PropertyEditorSupport { + @Override public void setAsText(String text) { setValue(text != null ? text.getBytes() : null); } + @Override public String getAsText() { byte[] value = (byte[]) getValue(); return (value != null ? new String(value) : ""); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CharArrayPropertyEditor.java b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CharArrayPropertyEditor.java index 088312d6da..32b76c5f2e 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CharArrayPropertyEditor.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CharArrayPropertyEditor.java @@ -28,10 +28,12 @@ import java.beans.PropertyEditorSupport; */ public class CharArrayPropertyEditor extends PropertyEditorSupport { + @Override public void setAsText(String text) { setValue(text != null ? text.toCharArray() : null); } + @Override public String getAsText() { char[] value = (char[]) getValue(); return (value != null ? new String(value) : ""); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CharacterEditor.java b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CharacterEditor.java index 5f24fb900d..bf20a7544c 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CharacterEditor.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CharacterEditor.java @@ -69,6 +69,7 @@ public class CharacterEditor extends PropertyEditorSupport { } + @Override public void setAsText(String text) throws IllegalArgumentException { if (this.allowEmpty && !StringUtils.hasLength(text)) { // Treat empty String as null value. @@ -89,6 +90,7 @@ public class CharacterEditor extends PropertyEditorSupport { } } + @Override public String getAsText() { Object value = getValue(); return (value != null ? value.toString() : ""); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CharsetEditor.java b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CharsetEditor.java index 67a9fe5a6d..c4f9d6cdb1 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CharsetEditor.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CharsetEditor.java @@ -33,6 +33,7 @@ import org.springframework.util.StringUtils; */ public class CharsetEditor extends PropertyEditorSupport { + @Override public void setAsText(String text) throws IllegalArgumentException { if (StringUtils.hasText(text)) { setValue(Charset.forName(text)); @@ -42,6 +43,7 @@ public class CharsetEditor extends PropertyEditorSupport { } } + @Override public String getAsText() { Charset value = (Charset) getValue(); return (value != null ? value.name() : ""); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/ClassArrayEditor.java b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/ClassArrayEditor.java index f42b2f97aa..9d831ca53c 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/ClassArrayEditor.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/ClassArrayEditor.java @@ -57,6 +57,7 @@ public class ClassArrayEditor extends PropertyEditorSupport { } + @Override public void setAsText(String text) throws IllegalArgumentException { if (StringUtils.hasText(text)) { String[] classNames = StringUtils.commaDelimitedListToStringArray(text); @@ -72,6 +73,7 @@ public class ClassArrayEditor extends PropertyEditorSupport { } } + @Override public String getAsText() { Class[] classes = (Class[]) getValue(); if (classes == null || classes.length == 0) { diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/ClassEditor.java b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/ClassEditor.java index c2e8c695de..afdc6ec69c 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/ClassEditor.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/ClassEditor.java @@ -58,6 +58,7 @@ public class ClassEditor extends PropertyEditorSupport { } + @Override public void setAsText(String text) throws IllegalArgumentException { if (StringUtils.hasText(text)) { setValue(ClassUtils.resolveClassName(text.trim(), this.classLoader)); @@ -67,6 +68,7 @@ public class ClassEditor extends PropertyEditorSupport { } } + @Override public String getAsText() { Class clazz = (Class) getValue(); if (clazz != null) { diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomBooleanEditor.java b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomBooleanEditor.java index a0dedcef22..b75520e06a 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomBooleanEditor.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomBooleanEditor.java @@ -97,6 +97,7 @@ public class CustomBooleanEditor extends PropertyEditorSupport { this.allowEmpty = allowEmpty; } + @Override public void setAsText(String text) throws IllegalArgumentException { String input = (text != null ? text.trim() : null); if (this.allowEmpty && !StringUtils.hasLength(input)) { @@ -124,6 +125,7 @@ public class CustomBooleanEditor extends PropertyEditorSupport { } } + @Override public String getAsText() { if (Boolean.TRUE.equals(getValue())) { return (this.trueString != null ? this.trueString : VALUE_TRUE); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomCollectionEditor.java b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomCollectionEditor.java index 705109758c..e882687024 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomCollectionEditor.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomCollectionEditor.java @@ -96,6 +96,7 @@ public class CustomCollectionEditor extends PropertyEditorSupport { /** * Convert the given text value to a Collection with a single element. */ + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(text); } @@ -103,6 +104,7 @@ public class CustomCollectionEditor extends PropertyEditorSupport { /** * Convert the given value to a Collection of the target type. */ + @Override public void setValue(Object value) { if (value == null && this.nullAsEmptyCollection) { super.setValue(createCollection(this.collectionType, 0)); @@ -199,6 +201,7 @@ public class CustomCollectionEditor extends PropertyEditorSupport { * This implementation returns null to indicate that * there is no appropriate text representation. */ + @Override public String getAsText() { return null; } diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomDateEditor.java b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomDateEditor.java index 42b094acb6..d832686fb2 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomDateEditor.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomDateEditor.java @@ -92,6 +92,7 @@ public class CustomDateEditor extends PropertyEditorSupport { /** * Parse the Date from the given text, using the specified DateFormat. */ + @Override public void setAsText(String text) throws IllegalArgumentException { if (this.allowEmpty && !StringUtils.hasText(text)) { // Treat empty String as null value. @@ -117,6 +118,7 @@ public class CustomDateEditor extends PropertyEditorSupport { /** * Format the Date as String, using the specified DateFormat. */ + @Override public String getAsText() { Date value = (Date) getValue(); return (value != null ? this.dateFormat.format(value) : ""); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomMapEditor.java b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomMapEditor.java index 5bab7ded5c..ef5ac89220 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomMapEditor.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomMapEditor.java @@ -86,6 +86,7 @@ public class CustomMapEditor extends PropertyEditorSupport { /** * Convert the given text value to a Map with a single element. */ + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(text); } @@ -93,6 +94,7 @@ public class CustomMapEditor extends PropertyEditorSupport { /** * Convert the given value to a Map of the target type. */ + @Override public void setValue(Object value) { if (value == null && this.nullAsEmptyMap) { super.setValue(createMap(this.mapType, 0)); @@ -192,6 +194,7 @@ public class CustomMapEditor extends PropertyEditorSupport { * This implementation returns null to indicate that * there is no appropriate text representation. */ + @Override public String getAsText() { return null; } diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java index 3be62066f1..e967672547 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java @@ -100,6 +100,7 @@ public class CustomNumberEditor extends PropertyEditorSupport { /** * Parse the Number from the given text, using the specified NumberFormat. */ + @Override public void setAsText(String text) throws IllegalArgumentException { if (this.allowEmpty && !StringUtils.hasText(text)) { // Treat empty String as null value. @@ -118,6 +119,7 @@ public class CustomNumberEditor extends PropertyEditorSupport { /** * Coerce a Number value into the required target class, if necessary. */ + @Override public void setValue(Object value) { if (value instanceof Number) { super.setValue(NumberUtils.convertNumberToTargetClass((Number) value, this.numberClass)); @@ -130,6 +132,7 @@ public class CustomNumberEditor extends PropertyEditorSupport { /** * Format the Number as String, using the specified NumberFormat. */ + @Override public String getAsText() { Object value = getValue(); if (value == null) { diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/FileEditor.java b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/FileEditor.java index 3c4e53ed54..b901e6daa6 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/FileEditor.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/FileEditor.java @@ -77,6 +77,7 @@ public class FileEditor extends PropertyEditorSupport { } + @Override public void setAsText(String text) throws IllegalArgumentException { // Check whether we got an absolute file path without "file:" prefix. // For backwards compatibility, we'll consider those as straight file path. @@ -108,6 +109,7 @@ public class FileEditor extends PropertyEditorSupport { } } + @Override public String getAsText() { File value = (File) getValue(); return (value != null ? value.getPath() : ""); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/InputStreamEditor.java b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/InputStreamEditor.java index 5b0e5a5f5f..c9e2c4dc82 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/InputStreamEditor.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/InputStreamEditor.java @@ -66,6 +66,7 @@ public class InputStreamEditor extends PropertyEditorSupport { } + @Override public void setAsText(String text) throws IllegalArgumentException { this.resourceEditor.setAsText(text); Resource resource = (Resource) this.resourceEditor.getValue(); @@ -82,6 +83,7 @@ public class InputStreamEditor extends PropertyEditorSupport { * This implementation returns null to indicate that * there is no appropriate text representation. */ + @Override public String getAsText() { return null; } diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/LocaleEditor.java b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/LocaleEditor.java index 92d4eeaace..49df579168 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/LocaleEditor.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/LocaleEditor.java @@ -34,10 +34,12 @@ import org.springframework.util.StringUtils; */ public class LocaleEditor extends PropertyEditorSupport { + @Override public void setAsText(String text) { setValue(StringUtils.parseLocaleString(text)); } + @Override public String getAsText() { Object value = getValue(); return (value != null ? value.toString() : ""); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/PatternEditor.java b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/PatternEditor.java index 0a0d82c73d..41f9952b5c 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/PatternEditor.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/PatternEditor.java @@ -55,10 +55,12 @@ public class PatternEditor extends PropertyEditorSupport { } + @Override public void setAsText(String text) { setValue(text != null ? Pattern.compile(text, this.flags) : null); } + @Override public String getAsText() { Pattern value = (Pattern) getValue(); return (value != null ? value.pattern() : ""); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/PropertiesEditor.java b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/PropertiesEditor.java index 932ff42118..6acc6819ee 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/PropertiesEditor.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/PropertiesEditor.java @@ -50,6 +50,7 @@ public class PropertiesEditor extends PropertyEditorSupport { * properties content. * @param text the text to be so converted */ + @Override public void setAsText(String text) throws IllegalArgumentException { Properties props = new Properties(); if (text != null) { @@ -69,6 +70,7 @@ public class PropertiesEditor extends PropertyEditorSupport { /** * Take {@link Properties} as-is; convert {@link Map} into Properties. */ + @Override public void setValue(Object value) { if (!(value instanceof Properties) && value instanceof Map) { Properties props = new Properties(); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/ResourceBundleEditor.java b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/ResourceBundleEditor.java index eb8406d73f..4f0f404d82 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/ResourceBundleEditor.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/ResourceBundleEditor.java @@ -79,6 +79,7 @@ public class ResourceBundleEditor extends PropertyEditorSupport { public static final String BASE_NAME_SEPARATOR = "_"; + @Override public void setAsText(String text) throws IllegalArgumentException { Assert.hasText(text, "'text' must not be empty"); ResourceBundle bundle; diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.java b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.java index 11aedb09e7..2249266cc3 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.java @@ -90,6 +90,7 @@ public class StringArrayPropertyEditor extends PropertyEditorSupport { } + @Override public void setAsText(String text) throws IllegalArgumentException { String[] array = StringUtils.delimitedListToStringArray(text, this.separator, this.charsToDelete); if (this.emptyArrayAsNull && array.length == 0) { @@ -100,6 +101,7 @@ public class StringArrayPropertyEditor extends PropertyEditorSupport { } } + @Override public String getAsText() { return StringUtils.arrayToDelimitedString(ObjectUtils.toObjectArray(getValue()), this.separator); } diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/StringTrimmerEditor.java b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/StringTrimmerEditor.java index b253d2fd1f..4ec85d9d8b 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/StringTrimmerEditor.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/StringTrimmerEditor.java @@ -61,6 +61,7 @@ public class StringTrimmerEditor extends PropertyEditorSupport { } + @Override public void setAsText(String text) { if (text == null) { setValue(null); @@ -79,6 +80,7 @@ public class StringTrimmerEditor extends PropertyEditorSupport { } } + @Override public String getAsText() { Object value = getValue(); return (value != null ? value.toString() : ""); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/URIEditor.java b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/URIEditor.java index efb5e9aa55..aaf852df4f 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/URIEditor.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/URIEditor.java @@ -67,6 +67,7 @@ public class URIEditor extends PropertyEditorSupport { } + @Override public void setAsText(String text) throws IllegalArgumentException { if (StringUtils.hasText(text)) { String uri = text.trim(); @@ -111,6 +112,7 @@ public class URIEditor extends PropertyEditorSupport { } + @Override public String getAsText() { URI value = (URI) getValue(); return (value != null ? value.toString() : ""); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/URLEditor.java b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/URLEditor.java index c5c89ebf13..bffeffc1ef 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/URLEditor.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/URLEditor.java @@ -66,6 +66,7 @@ public class URLEditor extends PropertyEditorSupport { } + @Override public void setAsText(String text) throws IllegalArgumentException { this.resourceEditor.setAsText(text); Resource resource = (Resource) this.resourceEditor.getValue(); @@ -77,6 +78,7 @@ public class URLEditor extends PropertyEditorSupport { } } + @Override public String getAsText() { URL value = (URL) getValue(); return (value != null ? value.toExternalForm() : ""); diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/support/ArgumentConvertingMethodInvoker.java b/org.springframework.beans/src/main/java/org/springframework/beans/support/ArgumentConvertingMethodInvoker.java index 3f6f341d5b..3bbcd5a037 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/support/ArgumentConvertingMethodInvoker.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/support/ArgumentConvertingMethodInvoker.java @@ -106,6 +106,7 @@ public class ArgumentConvertingMethodInvoker extends MethodInvoker { * This implementation looks for a method with matching parameter types. * @see #doFindMatchingMethod */ + @Override protected Method findMatchingMethod() { Method matchingMethod = super.findMatchingMethod(); // Second pass: look for method where arguments can be converted to parameter types. diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java b/org.springframework.beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java index 4992a3869c..e227dd59af 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java @@ -149,6 +149,7 @@ public class MutableSortDefinition implements SortDefinition, Serializable { } + @Override public boolean equals(Object other) { if (this == other) { return true; @@ -161,6 +162,7 @@ public class MutableSortDefinition implements SortDefinition, Serializable { isAscending() == otherSd.isAscending() && isIgnoreCase() == otherSd.isIgnoreCase()); } + @Override public int hashCode() { int hashCode = getProperty().hashCode(); hashCode = 29 * hashCode + (isIgnoreCase() ? 1 : 0);