diff --git a/org.springframework.context/src/main/java/org/springframework/context/access/ContextSingletonBeanFactoryLocator.java b/org.springframework.context/src/main/java/org/springframework/context/access/ContextSingletonBeanFactoryLocator.java index a86916a6f8..3f0d7d1416 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/access/ContextSingletonBeanFactoryLocator.java +++ b/org.springframework.context/src/main/java/org/springframework/context/access/ContextSingletonBeanFactoryLocator.java @@ -128,6 +128,7 @@ public class ContextSingletonBeanFactoryLocator extends SingletonBeanFactoryLoca *

The default implementation simply builds a * {@link org.springframework.context.support.ClassPathXmlApplicationContext}. */ + @Override protected BeanFactory createDefinition(String resourceLocation, String factoryKey) { return new ClassPathXmlApplicationContext(new String[] {resourceLocation}, false); } @@ -136,6 +137,7 @@ public class ContextSingletonBeanFactoryLocator extends SingletonBeanFactoryLoca * Overrides the default method to refresh the ApplicationContext, invoking * {@link ConfigurableApplicationContext#refresh ConfigurableApplicationContext.refresh()}. */ + @Override protected void initializeDefinition(BeanFactory groupDef) { if (groupDef instanceof ConfigurableApplicationContext) { ((ConfigurableApplicationContext) groupDef).refresh(); @@ -146,6 +148,7 @@ public class ContextSingletonBeanFactoryLocator extends SingletonBeanFactoryLoca * Overrides the default method to operate on an ApplicationContext, invoking * {@link ConfigurableApplicationContext#refresh ConfigurableApplicationContext.close()}. */ + @Override protected void destroyDefinition(BeanFactory groupDef, String selector) { if (groupDef instanceof ConfigurableApplicationContext) { if (logger.isTraceEnabled()) { diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java index af51a4a31b..4f0bb07569 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java +++ b/org.springframework.context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java @@ -271,6 +271,7 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean } + @Override public void postProcessMergedBeanDefinition(RootBeanDefinition beanDefinition, Class beanType, String beanName) { super.postProcessMergedBeanDefinition(beanDefinition, beanType, beanName); if (beanType != null) { @@ -508,6 +509,7 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean super(member, pd); } + @Override protected void initAnnotation(AnnotatedElement ae) { Resource resource = ae.getAnnotation(Resource.class); String resourceName = resource.name(); @@ -553,6 +555,7 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean super(member, pd); } + @Override protected void initAnnotation(AnnotatedElement ae) { WebServiceRef resource = ae.getAnnotation(WebServiceRef.class); String resourceName = resource.name(); @@ -639,6 +642,7 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean super(member, pd); } + @Override protected void initAnnotation(AnnotatedElement ae) { EJB resource = ae.getAnnotation(EJB.class); String resourceBeanName = resource.beanName(); @@ -704,6 +708,7 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean this.lookupType = lookupType; } + @Override public Class getDependencyType() { return this.lookupType; } diff --git a/org.springframework.context/src/main/java/org/springframework/context/config/AbstractPropertyLoadingBeanDefinitionParser.java b/org.springframework.context/src/main/java/org/springframework/context/config/AbstractPropertyLoadingBeanDefinitionParser.java index d18577b017..3e21461c25 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/config/AbstractPropertyLoadingBeanDefinitionParser.java +++ b/org.springframework.context/src/main/java/org/springframework/context/config/AbstractPropertyLoadingBeanDefinitionParser.java @@ -32,10 +32,12 @@ import org.springframework.util.StringUtils; */ abstract class AbstractPropertyLoadingBeanDefinitionParser extends AbstractSingleBeanDefinitionParser { + @Override protected boolean shouldGenerateId() { return true; } + @Override protected void doParse(Element element, BeanDefinitionBuilder builder) { String location = element.getAttribute("location"); if (StringUtils.hasLength(location)) { diff --git a/org.springframework.context/src/main/java/org/springframework/context/config/LoadTimeWeaverBeanDefinitionParser.java b/org.springframework.context/src/main/java/org/springframework/context/config/LoadTimeWeaverBeanDefinitionParser.java index 9d2e861d6d..2da793b321 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/config/LoadTimeWeaverBeanDefinitionParser.java +++ b/org.springframework.context/src/main/java/org/springframework/context/config/LoadTimeWeaverBeanDefinitionParser.java @@ -48,6 +48,7 @@ class LoadTimeWeaverBeanDefinitionParser extends AbstractSingleBeanDefinitionPar "org.springframework.context.weaving.AspectJWeavingEnabler"; + @Override protected String getBeanClassName(Element element) { if (element.hasAttribute(WEAVER_CLASS_ATTRIBUTE)) { return element.getAttribute(WEAVER_CLASS_ATTRIBUTE); @@ -55,10 +56,12 @@ class LoadTimeWeaverBeanDefinitionParser extends AbstractSingleBeanDefinitionPar return DEFAULT_LOAD_TIME_WEAVER_CLASS_NAME; } + @Override protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) { return ConfigurableApplicationContext.LOAD_TIME_WEAVER_BEAN_NAME; } + @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { builder.setRole(BeanDefinition.ROLE_INFRASTRUCTURE); diff --git a/org.springframework.context/src/main/java/org/springframework/context/config/MBeanExportBeanDefinitionParser.java b/org.springframework.context/src/main/java/org/springframework/context/config/MBeanExportBeanDefinitionParser.java index 2bc9437302..a04d26aa4d 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/config/MBeanExportBeanDefinitionParser.java +++ b/org.springframework.context/src/main/java/org/springframework/context/config/MBeanExportBeanDefinitionParser.java @@ -54,10 +54,12 @@ class MBeanExportBeanDefinitionParser extends AbstractBeanDefinitionParser { private static final String REGISTRATION_REPLACE_EXISTING = "replaceExisting"; + @Override protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) { return MBEAN_EXPORTER_BEAN_NAME; } + @Override protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) { String beanClassName = (JdkVersion.isAtLeastJava15() ? "org.springframework.jmx.export.annotation.AnnotationMBeanExporter" : diff --git a/org.springframework.context/src/main/java/org/springframework/context/config/MBeanServerBeanDefinitionParser.java b/org.springframework.context/src/main/java/org/springframework/context/config/MBeanServerBeanDefinitionParser.java index 08585b8910..4dae1f67b9 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/config/MBeanServerBeanDefinitionParser.java +++ b/org.springframework.context/src/main/java/org/springframework/context/config/MBeanServerBeanDefinitionParser.java @@ -55,11 +55,13 @@ class MBeanServerBeanDefinitionParser extends AbstractBeanDefinitionParser { "com.ibm.websphere.management.AdminServiceFactory", MBeanServerBeanDefinitionParser.class.getClassLoader()); + @Override protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) { String id = element.getAttribute(ID_ATTRIBUTE); return (StringUtils.hasText(id) ? id : MBEAN_SERVER_BEAN_NAME); } + @Override protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) { String agentId = element.getAttribute(AGENT_ID_ATTRIBUTE); if (StringUtils.hasText(agentId)) { diff --git a/org.springframework.context/src/main/java/org/springframework/context/config/PropertyOverrideBeanDefinitionParser.java b/org.springframework.context/src/main/java/org/springframework/context/config/PropertyOverrideBeanDefinitionParser.java index 0e00fb3934..6623cf044c 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/config/PropertyOverrideBeanDefinitionParser.java +++ b/org.springframework.context/src/main/java/org/springframework/context/config/PropertyOverrideBeanDefinitionParser.java @@ -28,6 +28,7 @@ import org.springframework.beans.factory.config.PropertyOverrideConfigurer; */ class PropertyOverrideBeanDefinitionParser extends AbstractPropertyLoadingBeanDefinitionParser { + @Override protected Class getBeanClass(Element element) { return PropertyOverrideConfigurer.class; } diff --git a/org.springframework.context/src/main/java/org/springframework/context/config/PropertyPlaceholderBeanDefinitionParser.java b/org.springframework.context/src/main/java/org/springframework/context/config/PropertyPlaceholderBeanDefinitionParser.java index 95aff2c8c2..3d5e898621 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/config/PropertyPlaceholderBeanDefinitionParser.java +++ b/org.springframework.context/src/main/java/org/springframework/context/config/PropertyPlaceholderBeanDefinitionParser.java @@ -28,6 +28,7 @@ import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer; */ class PropertyPlaceholderBeanDefinitionParser extends AbstractPropertyLoadingBeanDefinitionParser { + @Override protected Class getBeanClass(Element element) { return PropertyPlaceholderConfigurer.class; } diff --git a/org.springframework.context/src/main/java/org/springframework/context/i18n/SimpleLocaleContext.java b/org.springframework.context/src/main/java/org/springframework/context/i18n/SimpleLocaleContext.java index 9f0b8c04da..c55773f320 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/i18n/SimpleLocaleContext.java +++ b/org.springframework.context/src/main/java/org/springframework/context/i18n/SimpleLocaleContext.java @@ -46,6 +46,7 @@ public class SimpleLocaleContext implements LocaleContext { return this.locale; } + @Override public String toString() { return this.locale.toString(); } diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java b/org.springframework.context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java index 411d3e7437..58bf66e7e3 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java +++ b/org.springframework.context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java @@ -760,6 +760,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader if (this.shutdownHook == null) { // No shutdown hook registered yet. this.shutdownHook = new Thread() { + @Override public void run() { doClose(); } @@ -1153,6 +1154,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader /** * Return information about this context. */ + @Override public String toString() { StringBuffer sb = new StringBuffer(getId()); sb.append(": display name [").append(getDisplayName()); diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/AbstractMessageSource.java b/org.springframework.context/src/main/java/org/springframework/context/support/AbstractMessageSource.java index 47dad021c4..dd3a4ea1a5 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/support/AbstractMessageSource.java +++ b/org.springframework.context/src/main/java/org/springframework/context/support/AbstractMessageSource.java @@ -272,6 +272,7 @@ public abstract class AbstractMessageSource extends MessageSourceSupport impleme * @return the rendered default message (with resolved arguments) * @see #formatMessage(String, Object[], java.util.Locale) */ + @Override protected String renderDefaultMessage(String defaultMessage, Object[] args, Locale locale) { return formatMessage(defaultMessage, args, locale); } @@ -285,6 +286,7 @@ public abstract class AbstractMessageSource extends MessageSourceSupport impleme * @param locale the locale to resolve through * @return an array of arguments with any MessageSourceResolvables resolved */ + @Override protected Object[] resolveArguments(Object[] args, Locale locale) { if (args == null) { return new Object[0]; diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java b/org.springframework.context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java index 88e56ca179..df6f5061bf 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java +++ b/org.springframework.context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java @@ -112,6 +112,7 @@ public abstract class AbstractRefreshableApplicationContext extends AbstractAppl * bean factory, shutting down the previous bean factory (if any) and * initializing a fresh bean factory for the next phase of the context's lifecycle. */ + @Override protected final void refreshBeanFactory() throws BeansException { if (hasBeanFactory()) { destroyBeans(); @@ -131,6 +132,7 @@ public abstract class AbstractRefreshableApplicationContext extends AbstractAppl } } + @Override protected final void closeBeanFactory() { synchronized (this.beanFactoryMonitor) { this.beanFactory = null; @@ -147,6 +149,7 @@ public abstract class AbstractRefreshableApplicationContext extends AbstractAppl } } + @Override public final ConfigurableListableBeanFactory getBeanFactory() { synchronized (this.beanFactoryMonitor) { if (this.beanFactory == null) { diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/AbstractRefreshableConfigApplicationContext.java b/org.springframework.context/src/main/java/org/springframework/context/support/AbstractRefreshableConfigApplicationContext.java index a2ff6dd3c8..ca96d90b05 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/support/AbstractRefreshableConfigApplicationContext.java +++ b/org.springframework.context/src/main/java/org/springframework/context/support/AbstractRefreshableConfigApplicationContext.java @@ -124,6 +124,7 @@ public abstract class AbstractRefreshableConfigApplicationContext extends Abstra } + @Override public void setId(String id) { super.setId(id); this.setIdCalled = true; diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/AbstractXmlApplicationContext.java b/org.springframework.context/src/main/java/org/springframework/context/support/AbstractXmlApplicationContext.java index 24c7266e92..f81e278685 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/support/AbstractXmlApplicationContext.java +++ b/org.springframework.context/src/main/java/org/springframework/context/support/AbstractXmlApplicationContext.java @@ -65,6 +65,7 @@ public abstract class AbstractXmlApplicationContext extends AbstractRefreshableC * @see #initBeanDefinitionReader * @see #loadBeanDefinitions */ + @Override protected void loadBeanDefinitions(DefaultListableBeanFactory beanFactory) throws IOException { // Create a new XmlBeanDefinitionReader for the given BeanFactory. XmlBeanDefinitionReader beanDefinitionReader = new XmlBeanDefinitionReader(beanFactory); diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/ClassPathXmlApplicationContext.java b/org.springframework.context/src/main/java/org/springframework/context/support/ClassPathXmlApplicationContext.java index d22a74e1e1..78ef3a453b 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/support/ClassPathXmlApplicationContext.java +++ b/org.springframework.context/src/main/java/org/springframework/context/support/ClassPathXmlApplicationContext.java @@ -198,6 +198,7 @@ public class ClassPathXmlApplicationContext extends AbstractXmlApplicationContex } + @Override protected Resource[] getConfigResources() { return this.configResources; } diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/ContextTypeMatchClassLoader.java b/org.springframework.context/src/main/java/org/springframework/context/support/ContextTypeMatchClassLoader.java index dd7f347735..3f22caccd8 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/support/ContextTypeMatchClassLoader.java +++ b/org.springframework.context/src/main/java/org/springframework/context/support/ContextTypeMatchClassLoader.java @@ -58,6 +58,7 @@ class ContextTypeMatchClassLoader extends DecoratingClassLoader implements Smart super(parent); } + @Override public Class loadClass(String name) throws ClassNotFoundException { return new ContextOverridingClassLoader(getParent()).loadClass(name); } @@ -77,6 +78,7 @@ class ContextTypeMatchClassLoader extends DecoratingClassLoader implements Smart super(parent); } + @Override protected boolean isEligibleForOverriding(String className) { if (isExcluded(className) || ContextTypeMatchClassLoader.this.isExcluded(className)) { return false; @@ -92,6 +94,7 @@ class ContextTypeMatchClassLoader extends DecoratingClassLoader implements Smart return true; } + @Override protected Class loadClassForOverriding(String name) throws ClassNotFoundException { byte[] bytes = (byte[]) bytesCache.get(name); if (bytes == null) { diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java b/org.springframework.context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java index 4809dc1221..2dc72efe39 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java +++ b/org.springframework.context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java @@ -134,11 +134,13 @@ public class DefaultMessageSourceResolvable implements MessageSourceResolvable, * resolvable content through resolvableToString(). * @see #resolvableToString() */ + @Override public String toString() { return getClass().getName() + ": " + resolvableToString(); } + @Override public boolean equals(Object other) { if (this == other) { return true; @@ -152,6 +154,7 @@ public class DefaultMessageSourceResolvable implements MessageSourceResolvable, ObjectUtils.nullSafeEquals(getDefaultMessage(), otherResolvable.getDefaultMessage()); } + @Override public int hashCode() { int hashCode = ObjectUtils.nullSafeHashCode(getCodes()); hashCode = 29 * hashCode + ObjectUtils.nullSafeHashCode(getArguments()); diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/FileSystemXmlApplicationContext.java b/org.springframework.context/src/main/java/org/springframework/context/support/FileSystemXmlApplicationContext.java index c09dfdfddc..4faa98321e 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/support/FileSystemXmlApplicationContext.java +++ b/org.springframework.context/src/main/java/org/springframework/context/support/FileSystemXmlApplicationContext.java @@ -151,6 +151,7 @@ public class FileSystemXmlApplicationContext extends AbstractXmlApplicationConte * @return Resource handle * @see org.springframework.web.context.support.XmlWebApplicationContext#getResourceByPath */ + @Override protected Resource getResourceByPath(String path) { if (path != null && path.startsWith("/")) { path = path.substring(1); diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/GenericApplicationContext.java b/org.springframework.context/src/main/java/org/springframework/context/support/GenericApplicationContext.java index cc62a89e12..23bfecf00c 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/support/GenericApplicationContext.java +++ b/org.springframework.context/src/main/java/org/springframework/context/support/GenericApplicationContext.java @@ -139,6 +139,7 @@ public class GenericApplicationContext extends AbstractApplicationContext implem * the parent of the internal BeanFactory accordingly. * @see org.springframework.beans.factory.config.ConfigurableBeanFactory#setParentBeanFactory */ + @Override public void setParent(ApplicationContext parent) { super.setParent(parent); this.beanFactory.setParentBeanFactory(getInternalParentBeanFactory()); @@ -172,6 +173,7 @@ public class GenericApplicationContext extends AbstractApplicationContext implem * falling back to the default superclass behavior else. * @see #setResourceLoader */ + @Override public Resource getResource(String location) { if (this.resourceLoader != null) { return this.resourceLoader.getResource(location); @@ -185,6 +187,7 @@ public class GenericApplicationContext extends AbstractApplicationContext implem * default superclass behavior else. * @see #setResourceLoader */ + @Override public Resource[] getResources(String locationPattern) throws IOException { if (this.resourceLoader instanceof ResourcePatternResolver) { return ((ResourcePatternResolver) this.resourceLoader).getResources(locationPattern); @@ -202,6 +205,7 @@ public class GenericApplicationContext extends AbstractApplicationContext implem * to register beans through our public methods (or the BeanFactory's). * @see #registerBeanDefinition */ + @Override protected final void refreshBeanFactory() throws IllegalStateException { if (this.refreshed) { throw new IllegalStateException( @@ -214,6 +218,7 @@ public class GenericApplicationContext extends AbstractApplicationContext implem * Do nothing: We hold a single internal BeanFactory that will never * get released. */ + @Override protected final void closeBeanFactory() { } @@ -221,6 +226,7 @@ public class GenericApplicationContext extends AbstractApplicationContext implem * Return the single internal BeanFactory held by this context * (as ConfigurableListableBeanFactory). */ + @Override public final ConfigurableListableBeanFactory getBeanFactory() { return this.beanFactory; } diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/MessageSourceResourceBundle.java b/org.springframework.context/src/main/java/org/springframework/context/support/MessageSourceResourceBundle.java index e8a0e0568a..66ff4b7b61 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/support/MessageSourceResourceBundle.java +++ b/org.springframework.context/src/main/java/org/springframework/context/support/MessageSourceResourceBundle.java @@ -69,6 +69,7 @@ public class MessageSourceResourceBundle extends ResourceBundle { * This implementation resolves the code in the MessageSource. * Returns null if the message could not be resolved. */ + @Override protected Object handleGetObject(String code) { try { return this.messageSource.getMessage(code, null, this.locale); @@ -82,6 +83,7 @@ public class MessageSourceResourceBundle extends ResourceBundle { * This implementation returns null, as a MessageSource does * not allow for enumerating the defined message codes. */ + @Override public Enumeration getKeys() { return null; } @@ -90,6 +92,7 @@ public class MessageSourceResourceBundle extends ResourceBundle { * This implementation exposes the specified Locale for introspection * through the standard ResourceBundle.getLocale() method. */ + @Override public Locale getLocale() { return this.locale; } diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java b/org.springframework.context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java index e075a3a853..9c6c72c9a0 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java +++ b/org.springframework.context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java @@ -261,6 +261,7 @@ public class ReloadableResourceBundleMessageSource extends AbstractMessageSource * Resolves the given message code as key in the retrieved bundle files, * returning the value found in the bundle as-is (without MessageFormat parsing). */ + @Override protected String resolveCodeWithoutArguments(String code, Locale locale) { if (this.cacheMillis < 0) { PropertiesHolder propHolder = getMergedProperties(locale); @@ -289,6 +290,7 @@ public class ReloadableResourceBundleMessageSource extends AbstractMessageSource * Resolves the given message code as key in the retrieved bundle files, * using a cached MessageFormat instance per message code. */ + @Override protected MessageFormat resolveCode(String code, Locale locale) { if (this.cacheMillis < 0) { PropertiesHolder propHolder = getMergedProperties(locale); @@ -580,6 +582,7 @@ public class ReloadableResourceBundleMessageSource extends AbstractMessageSource } + @Override public String toString() { return getClass().getName() + ": basenames=[" + StringUtils.arrayToCommaDelimitedString(this.basenames) + "]"; } diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/ResourceBundleMessageSource.java b/org.springframework.context/src/main/java/org/springframework/context/support/ResourceBundleMessageSource.java index 90df82e8f7..e9ac2bb6b5 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/support/ResourceBundleMessageSource.java +++ b/org.springframework.context/src/main/java/org/springframework/context/support/ResourceBundleMessageSource.java @@ -161,6 +161,7 @@ public class ResourceBundleMessageSource extends AbstractMessageSource implement * Resolves the given message code as key in the registered resource bundles, * returning the value found in the bundle as-is (without MessageFormat parsing). */ + @Override protected String resolveCodeWithoutArguments(String code, Locale locale) { String result = null; for (int i = 0; result == null && i < this.basenames.length; i++) { @@ -176,6 +177,7 @@ public class ResourceBundleMessageSource extends AbstractMessageSource implement * Resolves the given message code as key in the registered resource bundles, * using a cached MessageFormat instance per message code. */ + @Override protected MessageFormat resolveCode(String code, Locale locale) { MessageFormat messageFormat = null; for (int i = 0; messageFormat == null && i < this.basenames.length; i++) { @@ -298,6 +300,7 @@ public class ResourceBundleMessageSource extends AbstractMessageSource implement /** * Show the configuration of this MessageSource. */ + @Override public String toString() { return getClass().getName() + ": basenames=[" + StringUtils.arrayToCommaDelimitedString(this.basenames) + "]"; diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/ResourceMapFactoryBean.java b/org.springframework.context/src/main/java/org/springframework/context/support/ResourceMapFactoryBean.java index 674d8daf6a..1c7708437c 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/support/ResourceMapFactoryBean.java +++ b/org.springframework.context/src/main/java/org/springframework/context/support/ResourceMapFactoryBean.java @@ -66,6 +66,7 @@ public class ResourceMapFactoryBean extends PropertiesFactoryBean implements Res } + @Override public Class getObjectType() { return Map.class; } @@ -73,6 +74,7 @@ public class ResourceMapFactoryBean extends PropertiesFactoryBean implements Res /** * Create the Map instance, populated with keys and Resource values. */ + @Override protected Object createInstance() throws IOException { Map resourceMap = new HashMap(); Properties props = mergeProperties(); diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/StaticMessageSource.java b/org.springframework.context/src/main/java/org/springframework/context/support/StaticMessageSource.java index 7f14893e24..06ab664bf4 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/support/StaticMessageSource.java +++ b/org.springframework.context/src/main/java/org/springframework/context/support/StaticMessageSource.java @@ -40,6 +40,7 @@ public class StaticMessageSource extends AbstractMessageSource { private final Map messages = new HashMap(); + @Override protected MessageFormat resolveCode(String code, Locale locale) { return (MessageFormat) this.messages.get(code + "_" + locale.toString()); } @@ -75,6 +76,7 @@ public class StaticMessageSource extends AbstractMessageSource { } + @Override public String toString() { return getClass().getName() + ": " + this.messages; } diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java b/org.springframework.context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java index 6a9271f2e2..fd088c88ff 100644 --- a/org.springframework.context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java +++ b/org.springframework.context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java @@ -83,6 +83,7 @@ public abstract class AbstractRemoteSlsbInvokerInterceptor extends AbstractSlsbI this.refreshHomeOnConnectFailure = refreshHomeOnConnectFailure; } + @Override protected boolean isHomeRefreshable() { return this.refreshHomeOnConnectFailure; } @@ -94,6 +95,7 @@ public abstract class AbstractRemoteSlsbInvokerInterceptor extends AbstractSlsbI * @see #setHomeInterface * @see javax.rmi.PortableRemoteObject#narrow */ + @Override protected Object lookup() throws NamingException { Object homeObject = super.lookup(); if (this.homeInterface != null) { @@ -111,6 +113,7 @@ public abstract class AbstractRemoteSlsbInvokerInterceptor extends AbstractSlsbI /** * Check for EJB3-style home object that serves as EJB component directly. */ + @Override protected Method getCreateMethod(Object home) throws EjbAccessException { if (this.homeAsComponent) { return null; @@ -132,6 +135,7 @@ public abstract class AbstractRemoteSlsbInvokerInterceptor extends AbstractSlsbI * @see #doInvoke * @see #refreshAndRetry */ + @Override public Object invokeInContext(MethodInvocation invocation) throws Throwable { try { return doInvoke(invocation); diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.java b/org.springframework.context/src/main/java/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.java index 887f390325..fb51f51634 100644 --- a/org.springframework.context/src/main/java/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.java +++ b/org.springframework.context/src/main/java/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.java @@ -101,6 +101,7 @@ public abstract class AbstractSlsbInvokerInterceptor extends JndiObjectLocator * @see #setLookupHomeOnStartup * @see #refreshHome */ + @Override public void afterPropertiesSet() throws NamingException { super.afterPropertiesSet(); if (this.lookupHomeOnStartup) { diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptor.java b/org.springframework.context/src/main/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptor.java index 83adeef066..8ce1aa9928 100644 --- a/org.springframework.context/src/main/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptor.java +++ b/org.springframework.context/src/main/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptor.java @@ -60,6 +60,7 @@ public class LocalSlsbInvokerInterceptor extends AbstractSlsbInvokerInterceptor * {@link #releaseSessionBeanInstance} to change EJB instance creation, * for example to hold a single shared EJB instance. */ + @Override public Object invokeInContext(MethodInvocation invocation) throws Throwable { Object ejb = null; try { @@ -104,6 +105,7 @@ public class LocalSlsbInvokerInterceptor extends AbstractSlsbInvokerInterceptor /** * Check for EJB3-style home object that serves as EJB component directly. */ + @Override protected Method getCreateMethod(Object home) throws EjbAccessException { if (this.homeAsComponent) { return null; diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBean.java b/org.springframework.context/src/main/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBean.java index 8fb7f64e4e..a3860c166d 100644 --- a/org.springframework.context/src/main/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBean.java +++ b/org.springframework.context/src/main/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBean.java @@ -81,6 +81,7 @@ public class LocalStatelessSessionProxyFactoryBean extends LocalSlsbInvokerInter this.beanClassLoader = classLoader; } + @Override public void afterPropertiesSet() throws NamingException { super.afterPropertiesSet(); if (this.businessInterface == null) { diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java b/org.springframework.context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java index 6be3b0b997..c133a61f65 100644 --- a/org.springframework.context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java +++ b/org.springframework.context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java @@ -91,6 +91,7 @@ public class SimpleRemoteSlsbInvokerInterceptor extends AbstractRemoteSlsbInvoke * {@link #releaseSessionBeanInstance} to change EJB instance creation, * for example to hold a single shared EJB component instance. */ + @Override protected Object doInvoke(MethodInvocation invocation) throws Throwable { Object ejb = null; try { @@ -157,6 +158,7 @@ public class SimpleRemoteSlsbInvokerInterceptor extends AbstractRemoteSlsbInvoke /** * Reset the cached session bean instance, if necessary. */ + @Override protected void refreshHome() throws NamingException { super.refreshHome(); if (this.cacheSessionBean) { diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBean.java b/org.springframework.context/src/main/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBean.java index e7f3136011..33d096e52d 100644 --- a/org.springframework.context/src/main/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBean.java +++ b/org.springframework.context/src/main/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBean.java @@ -95,6 +95,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBean extends SimpleRemoteSl this.beanClassLoader = classLoader; } + @Override public void afterPropertiesSet() throws NamingException { super.afterPropertiesSet(); if (this.businessInterface == null) { diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/config/AbstractJndiLocatingBeanDefinitionParser.java b/org.springframework.context/src/main/java/org/springframework/ejb/config/AbstractJndiLocatingBeanDefinitionParser.java index 8c96809d66..ffb51da94b 100644 --- a/org.springframework.context/src/main/java/org/springframework/ejb/config/AbstractJndiLocatingBeanDefinitionParser.java +++ b/org.springframework.context/src/main/java/org/springframework/ejb/config/AbstractJndiLocatingBeanDefinitionParser.java @@ -42,10 +42,12 @@ abstract class AbstractJndiLocatingBeanDefinitionParser extends AbstractSimpleBe public static final String JNDI_ENVIRONMENT = "jndiEnvironment"; + @Override protected boolean isEligibleAttribute(String attributeName) { return (super.isEligibleAttribute(attributeName) && !ENVIRONMENT_REF.equals(attributeName)); } + @Override protected void postProcess(BeanDefinitionBuilder definitionBuilder, Element element) { Object envValue = DomUtils.getChildElementValueByTagName(element, ENVIRONMENT); if (envValue != null) { diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/config/JndiLookupBeanDefinitionParser.java b/org.springframework.context/src/main/java/org/springframework/ejb/config/JndiLookupBeanDefinitionParser.java index 9c0c78eae1..266c9ebe5b 100644 --- a/org.springframework.context/src/main/java/org/springframework/ejb/config/JndiLookupBeanDefinitionParser.java +++ b/org.springframework.context/src/main/java/org/springframework/ejb/config/JndiLookupBeanDefinitionParser.java @@ -42,15 +42,18 @@ class JndiLookupBeanDefinitionParser extends AbstractJndiLocatingBeanDefinitionP public static final String DEFAULT_OBJECT = "defaultObject"; + @Override protected Class getBeanClass(Element element) { return JndiObjectFactoryBean.class; } + @Override protected boolean isEligibleAttribute(String attributeName) { return (super.isEligibleAttribute(attributeName) && !DEFAULT_VALUE.equals(attributeName) && !DEFAULT_REF.equals(attributeName)); } + @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { super.doParse(element, parserContext, builder); diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/config/LocalStatelessSessionBeanDefinitionParser.java b/org.springframework.context/src/main/java/org/springframework/ejb/config/LocalStatelessSessionBeanDefinitionParser.java index e921ad41ae..0a6f8bad14 100644 --- a/org.springframework.context/src/main/java/org/springframework/ejb/config/LocalStatelessSessionBeanDefinitionParser.java +++ b/org.springframework.context/src/main/java/org/springframework/ejb/config/LocalStatelessSessionBeanDefinitionParser.java @@ -31,6 +31,7 @@ import org.springframework.ejb.access.LocalStatelessSessionProxyFactoryBean; */ class LocalStatelessSessionBeanDefinitionParser extends AbstractJndiLocatingBeanDefinitionParser { + @Override protected String getBeanClassName(Element element) { return "org.springframework.ejb.access.LocalStatelessSessionProxyFactoryBean"; } diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/config/RemoteStatelessSessionBeanDefinitionParser.java b/org.springframework.context/src/main/java/org/springframework/ejb/config/RemoteStatelessSessionBeanDefinitionParser.java index ba73ade9cd..954dc100d3 100644 --- a/org.springframework.context/src/main/java/org/springframework/ejb/config/RemoteStatelessSessionBeanDefinitionParser.java +++ b/org.springframework.context/src/main/java/org/springframework/ejb/config/RemoteStatelessSessionBeanDefinitionParser.java @@ -31,6 +31,7 @@ import org.springframework.ejb.access.SimpleRemoteStatelessSessionProxyFactoryBe */ class RemoteStatelessSessionBeanDefinitionParser extends AbstractJndiLocatingBeanDefinitionParser { + @Override protected String getBeanClassName(Element element) { return "org.springframework.ejb.access.SimpleRemoteStatelessSessionProxyFactoryBean"; } diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java b/org.springframework.context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java index 6256180c66..18ae8f4c16 100644 --- a/org.springframework.context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java +++ b/org.springframework.context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java @@ -54,6 +54,7 @@ public abstract class AbstractStatefulSessionBean extends AbstractSessionBean { * removed via a call to unloadBeanFactory() from * the ejbPassivate() implementation. */ + @Override protected void loadBeanFactory() throws BeansException { super.loadBeanFactory(); } @@ -66,6 +67,7 @@ public abstract class AbstractStatefulSessionBean extends AbstractSessionBean { * must also be called from ejbPassivate(), with a corresponding * call to loadBeanFactory() from ejbActivate(). */ + @Override protected void unloadBeanFactory() throws FatalBeanException { super.unloadBeanFactory(); } diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.java b/org.springframework.context/src/main/java/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.java index 0e6582de46..02808a1807 100644 --- a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.java +++ b/org.springframework.context/src/main/java/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.java @@ -182,6 +182,7 @@ public class InstrumentationLoadTimeWeaver implements LoadTimeWeaver { loader, className, classBeingRedefined, protectionDomain, classfileBuffer); } + @Override public String toString() { return "FilteringClassFileTransformer for: " + this.targetTransformer.toString(); } diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/ShadowingClassLoader.java b/org.springframework.context/src/main/java/org/springframework/instrument/classloading/ShadowingClassLoader.java index 0ec1441eb1..76e63b423e 100644 --- a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/ShadowingClassLoader.java +++ b/org.springframework.context/src/main/java/org/springframework/instrument/classloading/ShadowingClassLoader.java @@ -93,6 +93,7 @@ public class ShadowingClassLoader extends DecoratingClassLoader { } + @Override public Class loadClass(String name) throws ClassNotFoundException { if (shouldShadow(name)) { Class cls = this.classCache.get(name); @@ -134,6 +135,7 @@ public class ShadowingClassLoader extends DecoratingClassLoader { * @return whether the specified class is excluded * @deprecated in favor of {@link #isEligibleForShadowing} */ + @Deprecated protected boolean isClassNameExcludedFromShadowing(String className) { return false; } @@ -180,14 +182,17 @@ public class ShadowingClassLoader extends DecoratingClassLoader { } + @Override public URL getResource(String name) { return this.enclosingClassLoader.getResource(name); } + @Override public InputStream getResourceAsStream(String name) { return this.enclosingClassLoader.getResourceAsStream(name); } + @Override public Enumeration getResources(String name) throws IOException { return this.enclosingClassLoader.getResources(name); } diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/access/MBeanClientInterceptor.java b/org.springframework.context/src/main/java/org/springframework/jmx/access/MBeanClientInterceptor.java index 5a4ebddebd..fb5239408e 100644 --- a/org.springframework.context/src/main/java/org/springframework/jmx/access/MBeanClientInterceptor.java +++ b/org.springframework.context/src/main/java/org/springframework/jmx/access/MBeanClientInterceptor.java @@ -584,6 +584,7 @@ public class MBeanClientInterceptor this.parameterTypes = (parameterTypes != null ? parameterTypes : new Class[0]); } + @Override public boolean equals(Object other) { if (other == this) { return true; @@ -592,6 +593,7 @@ public class MBeanClientInterceptor return (this.name.equals(otherKey.name) && Arrays.equals(this.parameterTypes, otherKey.parameterTypes)); } + @Override public int hashCode() { return this.name.hashCode(); } diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/access/MBeanProxyFactoryBean.java b/org.springframework.context/src/main/java/org/springframework/jmx/access/MBeanProxyFactoryBean.java index ec659a31be..206f3f11fa 100644 --- a/org.springframework.context/src/main/java/org/springframework/jmx/access/MBeanProxyFactoryBean.java +++ b/org.springframework.context/src/main/java/org/springframework/jmx/access/MBeanProxyFactoryBean.java @@ -69,6 +69,7 @@ public class MBeanProxyFactoryBean extends MBeanClientInterceptor this.proxyInterface = proxyInterface; } + @Override public void setBeanClassLoader(ClassLoader classLoader) { this.beanClassLoader = classLoader; } @@ -77,6 +78,7 @@ public class MBeanProxyFactoryBean extends MBeanClientInterceptor * Checks that the proxyInterface has been specified and then * generates the proxy for the target MBean. */ + @Override public void afterPropertiesSet() throws MBeanServerNotFoundException, MBeanInfoRetrievalException { super.afterPropertiesSet(); diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/MBeanExporter.java b/org.springframework.context/src/main/java/org/springframework/jmx/export/MBeanExporter.java index 18f6bdb1f5..b411430bcb 100644 --- a/org.springframework.context/src/main/java/org/springframework/jmx/export/MBeanExporter.java +++ b/org.springframework.context/src/main/java/org/springframework/jmx/export/MBeanExporter.java @@ -1001,6 +1001,7 @@ public class MBeanExporter extends MBeanRegistrationSupport * callback. * @param objectName the ObjectName of the registered MBean */ + @Override protected void onRegister(ObjectName objectName) { notifyListenersOfRegistration(objectName); } @@ -1015,6 +1016,7 @@ public class MBeanExporter extends MBeanRegistrationSupport * callback. * @param objectName the ObjectName of the unregistered MBean */ + @Override protected void onUnregister(ObjectName objectName) { notifyListenersOfUnregistration(objectName); } @@ -1083,6 +1085,7 @@ public class MBeanExporter extends MBeanRegistrationSupport this.objectName = objectName; } + @Override protected void postProcessTargetObject(Object targetObject) { injectNotificationPublisherIfNecessary(targetObject, this.modelMBean, this.objectName); } diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/SpringModelMBean.java b/org.springframework.context/src/main/java/org/springframework/jmx/export/SpringModelMBean.java index 6190116dfb..f313e65fbc 100644 --- a/org.springframework.context/src/main/java/org/springframework/jmx/export/SpringModelMBean.java +++ b/org.springframework.context/src/main/java/org/springframework/jmx/export/SpringModelMBean.java @@ -66,6 +66,7 @@ public class SpringModelMBean extends RequiredModelMBean { /** * Sets managed resource to expose and stores its {@link ClassLoader}. */ + @Override public void setManagedResource(Object managedResource, String managedResourceType) throws MBeanException, InstanceNotFoundException, InvalidTargetObjectTypeException { @@ -79,6 +80,7 @@ public class SpringModelMBean extends RequiredModelMBean { * managed resources {@link ClassLoader} before allowing the invocation to occur. * @see javax.management.modelmbean.ModelMBean#invoke */ + @Override public Object invoke(String opName, Object[] opArgs, String[] sig) throws MBeanException, ReflectionException { @@ -97,6 +99,7 @@ public class SpringModelMBean extends RequiredModelMBean { * managed resources {@link ClassLoader} before allowing the invocation to occur. * @see javax.management.modelmbean.ModelMBean#getAttribute */ + @Override public Object getAttribute(String attrName) throws AttributeNotFoundException, MBeanException, ReflectionException { @@ -115,6 +118,7 @@ public class SpringModelMBean extends RequiredModelMBean { * managed resources {@link ClassLoader} before allowing the invocation to occur. * @see javax.management.modelmbean.ModelMBean#getAttributes */ + @Override public AttributeList getAttributes(String[] attrNames) { ClassLoader currentClassLoader = Thread.currentThread().getContextClassLoader(); try { @@ -131,6 +135,7 @@ public class SpringModelMBean extends RequiredModelMBean { * managed resources {@link ClassLoader} before allowing the invocation to occur. * @see javax.management.modelmbean.ModelMBean#setAttribute */ + @Override public void setAttribute(Attribute attribute) throws AttributeNotFoundException, InvalidAttributeValueException, MBeanException, ReflectionException { @@ -149,6 +154,7 @@ public class SpringModelMBean extends RequiredModelMBean { * managed resources {@link ClassLoader} before allowing the invocation to occur. * @see javax.management.modelmbean.ModelMBean#setAttributes */ + @Override public AttributeList setAttributes(AttributeList attributes) { ClassLoader currentClassLoader = Thread.currentThread().getContextClassLoader(); try { diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/AbstractConfigurableMBeanInfoAssembler.java b/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/AbstractConfigurableMBeanInfoAssembler.java index 01efdcb537..d8a750cac1 100644 --- a/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/AbstractConfigurableMBeanInfoAssembler.java +++ b/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/AbstractConfigurableMBeanInfoAssembler.java @@ -65,6 +65,7 @@ public abstract class AbstractConfigurableMBeanInfoAssembler extends AbstractRef } + @Override protected ModelMBeanNotificationInfo[] getNotificationInfo(Object managedBean, String beanKey) { ModelMBeanNotificationInfo[] result = null; diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/AbstractReflectiveMBeanInfoAssembler.java b/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/AbstractReflectiveMBeanInfoAssembler.java index 08ea158686..8d1b3b710b 100644 --- a/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/AbstractReflectiveMBeanInfoAssembler.java +++ b/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/AbstractReflectiveMBeanInfoAssembler.java @@ -249,6 +249,7 @@ public abstract class AbstractReflectiveMBeanInfoAssembler extends AbstractMBean * @throws JMException in case of errors * @see #populateAttributeDescriptor */ + @Override protected ModelMBeanAttributeInfo[] getAttributeInfo(Object managedBean, String beanKey) throws JMException { PropertyDescriptor[] props = BeanUtils.getPropertyDescriptors(getClassToExpose(managedBean)); List infos = new ArrayList(); @@ -302,6 +303,7 @@ public abstract class AbstractReflectiveMBeanInfoAssembler extends AbstractMBean * @return the operation metadata * @see #populateOperationDescriptor */ + @Override protected ModelMBeanOperationInfo[] getOperationInfo(Object managedBean, String beanKey) { Method[] methods = getClassToExpose(managedBean).getMethods(); List infos = new ArrayList(); @@ -478,6 +480,7 @@ public abstract class AbstractReflectiveMBeanInfoAssembler extends AbstractMBean * @see #setDefaultCurrencyTimeLimit(Integer) * @see #applyDefaultCurrencyTimeLimit(javax.management.Descriptor) */ + @Override protected void populateMBeanDescriptor(Descriptor descriptor, Object managedBean, String beanKey) { applyDefaultCurrencyTimeLimit(descriptor); } diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssembler.java b/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssembler.java index d553706a61..cf4d01643e 100644 --- a/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssembler.java +++ b/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssembler.java @@ -165,6 +165,7 @@ public class InterfaceBasedMBeanInfoAssembler extends AbstractConfigurableMBeanI * @return true if the Method is declared in one of the * configured interfaces, otherwise false. */ + @Override protected boolean includeReadAttribute(Method method, String beanKey) { return isPublicInInterface(method, beanKey); } @@ -178,6 +179,7 @@ public class InterfaceBasedMBeanInfoAssembler extends AbstractConfigurableMBeanI * @return true if the Method is declared in one of the * configured interfaces, otherwise false. */ + @Override protected boolean includeWriteAttribute(Method method, String beanKey) { return isPublicInInterface(method, beanKey); } @@ -191,6 +193,7 @@ public class InterfaceBasedMBeanInfoAssembler extends AbstractConfigurableMBeanI * @return true if the Method is declared in one of the * configured interfaces, otherwise false. */ + @Override protected boolean includeOperation(Method method, String beanKey) { return isPublicInInterface(method, beanKey); } diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.java b/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.java index 0a0df23bac..85bceb70d6 100644 --- a/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.java +++ b/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.java @@ -102,6 +102,7 @@ public class MetadataMBeanInfoAssembler extends AbstractReflectiveMBeanInfoAssem * Throws an IllegalArgumentException if it encounters a JDK dynamic proxy. * Metadata can only be read from target classes and CGLIB proxies! */ + @Override protected void checkManagedBean(Object managedBean) throws IllegalArgumentException { if (AopUtils.isJdkDynamicProxy(managedBean)) { throw new IllegalArgumentException( @@ -126,6 +127,7 @@ public class MetadataMBeanInfoAssembler extends AbstractReflectiveMBeanInfoAssem * @param beanKey the key associated with the MBean in the beans map * @return whether the method has the appropriate metadata */ + @Override protected boolean includeReadAttribute(Method method, String beanKey) { return hasManagedAttribute(method); } @@ -136,6 +138,7 @@ public class MetadataMBeanInfoAssembler extends AbstractReflectiveMBeanInfoAssem * @param beanKey the key associated with the MBean in the beans map * @return whether the method has the appropriate metadata */ + @Override protected boolean includeWriteAttribute(Method method, String beanKey) { return hasManagedAttribute(method); } @@ -146,6 +149,7 @@ public class MetadataMBeanInfoAssembler extends AbstractReflectiveMBeanInfoAssem * @param beanKey the key associated with the MBean in the beans map * @return whether the method has the appropriate metadata */ + @Override protected boolean includeOperation(Method method, String beanKey) { PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method); if (pd != null) { @@ -176,6 +180,7 @@ public class MetadataMBeanInfoAssembler extends AbstractReflectiveMBeanInfoAssem * Reads managed resource description from the source level metadata. * Returns an empty String if no description can be found. */ + @Override protected String getDescription(Object managedBean, String beanKey) { ManagedResource mr = this.attributeSource.getManagedResource(getClassToExpose(managedBean)); return (mr != null ? mr.getDescription() : ""); @@ -186,6 +191,7 @@ public class MetadataMBeanInfoAssembler extends AbstractReflectiveMBeanInfoAssem * descriptor. Attempts to create the description using metadata from either * the getter or setter attributes, otherwise uses the property name. */ + @Override protected String getAttributeDescription(PropertyDescriptor propertyDescriptor, String beanKey) { Method readMethod = propertyDescriptor.getReadMethod(); Method writeMethod = propertyDescriptor.getWriteMethod(); @@ -208,6 +214,7 @@ public class MetadataMBeanInfoAssembler extends AbstractReflectiveMBeanInfoAssem * Retrieves the description for the supplied Method from the * metadata. Uses the method name is no description is present in the metadata. */ + @Override protected String getOperationDescription(Method method, String beanKey) { PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method); if (pd != null) { @@ -231,6 +238,7 @@ public class MetadataMBeanInfoAssembler extends AbstractReflectiveMBeanInfoAssem * attributes attached to a method. Returns an empty array of MBeanParameterInfo * if no attributes are found. */ + @Override protected MBeanParameterInfo[] getOperationParameters(Method method, String beanKey) { ManagedOperationParameter[] params = this.attributeSource.getManagedOperationParameters(method); if (params == null || params.length == 0) { @@ -253,6 +261,7 @@ public class MetadataMBeanInfoAssembler extends AbstractReflectiveMBeanInfoAssem * Reads the {@link ManagedNotification} metadata from the Class of the managed resource * and generates and returns the corresponding {@link ModelMBeanNotificationInfo} metadata. */ + @Override protected ModelMBeanNotificationInfo[] getNotificationInfo(Object managedBean, String beanKey) { ManagedNotification[] notificationAttributes = this.attributeSource.getManagedNotifications(getClassToExpose(managedBean)); @@ -273,6 +282,7 @@ public class MetadataMBeanInfoAssembler extends AbstractReflectiveMBeanInfoAssem * persistPolicy, persistPeriod, persistLocation * and persistName descriptor fields if they are present in the metadata. */ + @Override protected void populateMBeanDescriptor(Descriptor desc, Object managedBean, String beanKey) { ManagedResource mr = this.attributeSource.getManagedResource(getClassToExpose(managedBean)); if (mr == null) { @@ -309,6 +319,7 @@ public class MetadataMBeanInfoAssembler extends AbstractReflectiveMBeanInfoAssem * default, persistPolicy and persistPeriod * descriptor fields if they are present in the metadata. */ + @Override protected void populateAttributeDescriptor(Descriptor desc, Method getter, Method setter, String beanKey) { ManagedAttribute gma = (getter == null) ? ManagedAttribute.EMPTY : this.attributeSource.getManagedAttribute(getter); @@ -335,6 +346,7 @@ public class MetadataMBeanInfoAssembler extends AbstractReflectiveMBeanInfoAssem * to the attribute descriptor. Specifically, adds the currencyTimeLimit * descriptor field if it is present in the metadata. */ + @Override protected void populateOperationDescriptor(Descriptor desc, Method method, String beanKey) { ManagedOperation mo = this.attributeSource.getManagedOperation(method); if (mo != null) { diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssembler.java b/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssembler.java index 070052eaf6..f58adb32f4 100644 --- a/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssembler.java +++ b/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssembler.java @@ -89,14 +89,17 @@ public class MethodExclusionMBeanInfoAssembler extends AbstractConfigurableMBean } + @Override protected boolean includeReadAttribute(Method method, String beanKey) { return isNotIgnored(method, beanKey); } + @Override protected boolean includeWriteAttribute(Method method, String beanKey) { return isNotIgnored(method, beanKey); } + @Override protected boolean includeOperation(Method method, String beanKey) { return isNotIgnored(method, beanKey); } diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssembler.java b/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssembler.java index 100ae57285..f4b5095d3b 100644 --- a/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssembler.java +++ b/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssembler.java @@ -93,14 +93,17 @@ public class MethodNameBasedMBeanInfoAssembler extends AbstractConfigurableMBean } + @Override protected boolean includeReadAttribute(Method method, String beanKey) { return isMatch(method, beanKey); } + @Override protected boolean includeWriteAttribute(Method method, String beanKey) { return isMatch(method, beanKey); } + @Override protected boolean includeOperation(Method method, String beanKey) { return isMatch(method, beanKey); } diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/SimpleReflectiveMBeanInfoAssembler.java b/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/SimpleReflectiveMBeanInfoAssembler.java index 9f97485f48..0e1c26d398 100644 --- a/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/SimpleReflectiveMBeanInfoAssembler.java +++ b/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/SimpleReflectiveMBeanInfoAssembler.java @@ -32,6 +32,7 @@ public class SimpleReflectiveMBeanInfoAssembler extends AbstractConfigurableMBea /** * Always returns true. */ + @Override protected boolean includeReadAttribute(Method method, String beanKey) { return true; } @@ -39,6 +40,7 @@ public class SimpleReflectiveMBeanInfoAssembler extends AbstractConfigurableMBea /** * Always returns true. */ + @Override protected boolean includeWriteAttribute(Method method, String beanKey) { return true; } @@ -46,6 +48,7 @@ public class SimpleReflectiveMBeanInfoAssembler extends AbstractConfigurableMBea /** * Always returns true. */ + @Override protected boolean includeOperation(Method method, String beanKey) { return true; } diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/support/ConnectorServerFactoryBean.java b/org.springframework.context/src/main/java/org/springframework/jmx/support/ConnectorServerFactoryBean.java index 62e3504359..6339f0ff4d 100644 --- a/org.springframework.context/src/main/java/org/springframework/jmx/support/ConnectorServerFactoryBean.java +++ b/org.springframework.context/src/main/java/org/springframework/jmx/support/ConnectorServerFactoryBean.java @@ -149,6 +149,7 @@ public class ConnectorServerFactoryBean extends MBeanRegistrationSupport if (this.threaded) { // Start the connector server asynchronously (in a separate thread). Thread connectorThread = new Thread() { + @Override public void run() { try { connectorServer.start(); diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.java b/org.springframework.context/src/main/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.java index 3916315967..260c203e4e 100644 --- a/org.springframework.context/src/main/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.java +++ b/org.springframework.context/src/main/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.java @@ -174,10 +174,12 @@ public class MBeanServerConnectionFactoryBean */ private class JMXConnectorLazyInitTargetSource extends AbstractLazyCreationTargetSource { + @Override protected Object createObject() throws Exception { return JMXConnectorFactory.connect(serviceUrl, environment); } + @Override public Class getTargetClass() { return JMXConnector.class; } @@ -189,10 +191,12 @@ public class MBeanServerConnectionFactoryBean */ private class MBeanServerConnectionLazyInitTargetSource extends AbstractLazyCreationTargetSource { + @Override protected Object createObject() throws Exception { return connector.getMBeanServerConnection(); } + @Override public Class getTargetClass() { return MBeanServerConnection.class; } diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/support/NotificationListenerHolder.java b/org.springframework.context/src/main/java/org/springframework/jmx/support/NotificationListenerHolder.java index 6c2d7de722..48576f9dba 100644 --- a/org.springframework.context/src/main/java/org/springframework/jmx/support/NotificationListenerHolder.java +++ b/org.springframework.context/src/main/java/org/springframework/jmx/support/NotificationListenerHolder.java @@ -153,6 +153,7 @@ public class NotificationListenerHolder { } + @Override public boolean equals(Object other) { if (this == other) { return true; @@ -167,6 +168,7 @@ public class NotificationListenerHolder { ObjectUtils.nullSafeEquals(this.mappedObjectNames, otherNlh.mappedObjectNames)); } + @Override public int hashCode() { int hashCode = ObjectUtils.nullSafeHashCode(this.notificationListener); hashCode = 29 * hashCode + ObjectUtils.nullSafeHashCode(this.notificationFilter); diff --git a/org.springframework.context/src/main/java/org/springframework/jndi/JndiObjectFactoryBean.java b/org.springframework.context/src/main/java/org/springframework/jndi/JndiObjectFactoryBean.java index f4ae034478..694e56eafd 100644 --- a/org.springframework.context/src/main/java/org/springframework/jndi/JndiObjectFactoryBean.java +++ b/org.springframework.context/src/main/java/org/springframework/jndi/JndiObjectFactoryBean.java @@ -163,6 +163,7 @@ public class JndiObjectFactoryBean extends JndiObjectLocator implements FactoryB /** * Look up the JNDI object and store it. */ + @Override public void afterPropertiesSet() throws IllegalArgumentException, NamingException { super.afterPropertiesSet(); diff --git a/org.springframework.context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java b/org.springframework.context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java index f57040ab65..c474f16e30 100644 --- a/org.springframework.context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java +++ b/org.springframework.context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java @@ -90,6 +90,7 @@ public class JndiObjectTargetSource extends JndiObjectLocator implements TargetS this.cache = cache; } + @Override public void afterPropertiesSet() throws NamingException { super.afterPropertiesSet(); if (this.lookupOnStartup) { diff --git a/org.springframework.context/src/main/java/org/springframework/jndi/JndiTemplateEditor.java b/org.springframework.context/src/main/java/org/springframework/jndi/JndiTemplateEditor.java index 0c8852e2c2..1110a40bc9 100644 --- a/org.springframework.context/src/main/java/org/springframework/jndi/JndiTemplateEditor.java +++ b/org.springframework.context/src/main/java/org/springframework/jndi/JndiTemplateEditor.java @@ -32,6 +32,7 @@ public class JndiTemplateEditor extends PropertyEditorSupport { private final PropertiesEditor propertiesEditor = new PropertiesEditor(); + @Override public void setAsText(String text) throws IllegalArgumentException { if (text == null) { throw new IllegalArgumentException("JndiTemplate cannot be created from null string"); diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/rmi/CodebaseAwareObjectInputStream.java b/org.springframework.context/src/main/java/org/springframework/remoting/rmi/CodebaseAwareObjectInputStream.java index 2cab69bcb6..b50a0b491c 100644 --- a/org.springframework.context/src/main/java/org/springframework/remoting/rmi/CodebaseAwareObjectInputStream.java +++ b/org.springframework.context/src/main/java/org/springframework/remoting/rmi/CodebaseAwareObjectInputStream.java @@ -83,6 +83,7 @@ public class CodebaseAwareObjectInputStream extends ConfigurableObjectInputStrea } + @Override protected Class resolveFallbackIfPossible(String className, ClassNotFoundException ex) throws IOException, ClassNotFoundException { @@ -94,6 +95,7 @@ public class CodebaseAwareObjectInputStream extends ConfigurableObjectInputStrea return RMIClassLoader.loadClass(this.codebaseUrl, className); } + @Override protected ClassLoader getFallbackClassLoader() throws IOException { return RMIClassLoader.getClassLoader(this.codebaseUrl); } diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java b/org.springframework.context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java index d49d17b574..9c4373f125 100644 --- a/org.springframework.context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java +++ b/org.springframework.context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java @@ -167,6 +167,7 @@ public class JndiRmiClientInterceptor extends JndiObjectLocator implements Metho } + @Override public void afterPropertiesSet() throws NamingException { super.afterPropertiesSet(); prepare(); diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java b/org.springframework.context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java index 8d4fad43bc..09ad254355 100644 --- a/org.springframework.context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java +++ b/org.springframework.context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java @@ -72,6 +72,7 @@ public class JndiRmiProxyFactoryBean extends JndiRmiClientInterceptor implements this.beanClassLoader = classLoader; } + @Override public void afterPropertiesSet() throws NamingException { super.afterPropertiesSet(); if (getServiceInterface() == null) { diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiBasedExporter.java b/org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiBasedExporter.java index 829dd5f12a..e16f174bfc 100644 --- a/org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiBasedExporter.java +++ b/org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiBasedExporter.java @@ -66,6 +66,7 @@ public abstract class RmiBasedExporter extends RemoteInvocationBasedExporter { * Redefined here to be visible to RmiInvocationWrapper. * Simply delegates to the corresponding superclass method. */ + @Override protected Object invoke(RemoteInvocation invocation, Object targetObject) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException { diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java b/org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java index 1aeb99b24f..f3d08416b3 100644 --- a/org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java +++ b/org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java @@ -129,6 +129,7 @@ public class RmiClientInterceptor extends RemoteInvocationBasedAccessor } + @Override public void afterPropertiesSet() { super.afterPropertiesSet(); prepare(); @@ -405,6 +406,7 @@ public class RmiClientInterceptor extends RemoteInvocationBasedAccessor */ private static class DummyURLStreamHandler extends URLStreamHandler { + @Override protected URLConnection openConnection(URL url) throws IOException { throw new UnsupportedOperationException(); } diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java b/org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java index b26f6e43b6..cf4d1ebf2d 100644 --- a/org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java +++ b/org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java @@ -65,6 +65,7 @@ public abstract class RmiClientInterceptorUtils { * will be automatically converted to Spring's RemoteAccessException. * @deprecated as of Spring 2.5, in favor of {@link #invokeRemoteMethod} */ + @Deprecated public static Object invoke(MethodInvocation invocation, Remote stub, String serviceName) throws Throwable { try { return invokeRemoteMethod(invocation, stub); @@ -86,6 +87,7 @@ public abstract class RmiClientInterceptorUtils { * letting reflection exceptions through as-is. * @deprecated as of Spring 2.5, in favor of {@link #invokeRemoteMethod} */ + @Deprecated public static Object doInvoke(MethodInvocation invocation, Remote stub) throws InvocationTargetException { return invokeRemoteMethod(invocation, stub); } diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiProxyFactoryBean.java b/org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiProxyFactoryBean.java index 203d083f94..4e779d9bb3 100644 --- a/org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiProxyFactoryBean.java +++ b/org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiProxyFactoryBean.java @@ -63,6 +63,7 @@ public class RmiProxyFactoryBean extends RmiClientInterceptor implements Factory private Object serviceProxy; + @Override public void afterPropertiesSet() { super.afterPropertiesSet(); if (getServiceInterface() == null) { diff --git a/org.springframework.context/src/main/java/org/springframework/remoting/support/RemoteInvocation.java b/org.springframework.context/src/main/java/org/springframework/remoting/support/RemoteInvocation.java index aef851d990..9d6e68ff60 100644 --- a/org.springframework.context/src/main/java/org/springframework/remoting/support/RemoteInvocation.java +++ b/org.springframework.context/src/main/java/org/springframework/remoting/support/RemoteInvocation.java @@ -206,6 +206,7 @@ public class RemoteInvocation implements Serializable { } + @Override public String toString() { return "RemoteInvocation: method name '" + this.methodName + "'; parameter types " + ClassUtils.classNamesToString(this.parameterTypes); diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java b/org.springframework.context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java index 4b4c506b0a..62016bb236 100644 --- a/org.springframework.context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java +++ b/org.springframework.context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java @@ -224,6 +224,7 @@ public class ThreadPoolTaskExecutor extends CustomizableThreadFactory this.waitForTasksToCompleteOnShutdown = waitForJobsToCompleteOnShutdown; } + @Override public void setThreadNamePrefix(String threadNamePrefix) { super.setThreadNamePrefix(threadNamePrefix); this.threadNamePrefixSet = true; diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java b/org.springframework.context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java index 4ef738a92a..ab975275a8 100644 --- a/org.springframework.context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java +++ b/org.springframework.context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java @@ -223,6 +223,7 @@ public class ThreadPoolTaskExecutor extends CustomizableThreadFactory this.waitForTasksToCompleteOnShutdown = waitForJobsToCompleteOnShutdown; } + @Override public void setThreadNamePrefix(String threadNamePrefix) { super.setThreadNamePrefix(threadNamePrefix); this.threadNamePrefixSet = true; diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/support/MethodInvokingRunnable.java b/org.springframework.context/src/main/java/org/springframework/scheduling/support/MethodInvokingRunnable.java index e02ff8dd5f..18f77798b9 100644 --- a/org.springframework.context/src/main/java/org/springframework/scheduling/support/MethodInvokingRunnable.java +++ b/org.springframework.context/src/main/java/org/springframework/scheduling/support/MethodInvokingRunnable.java @@ -62,6 +62,7 @@ public class MethodInvokingRunnable extends ArgumentConvertingMethodInvoker this.beanClassLoader = classLoader; } + @Override protected Class resolveClassName(String className) throws ClassNotFoundException { return ClassUtils.forName(className, this.beanClassLoader); } diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/timer/DelegatingTimerTask.java b/org.springframework.context/src/main/java/org/springframework/scheduling/timer/DelegatingTimerTask.java index 2cd03e643a..ba8d365d1d 100644 --- a/org.springframework.context/src/main/java/org/springframework/scheduling/timer/DelegatingTimerTask.java +++ b/org.springframework.context/src/main/java/org/springframework/scheduling/timer/DelegatingTimerTask.java @@ -61,6 +61,7 @@ public class DelegatingTimerTask extends TimerTask { * Delegates execution to the underlying Runnable, catching any exception * or error thrown in order to continue scheduled execution. */ + @Override public void run() { try { this.delegate.run(); diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/timer/MethodInvokingTimerTaskFactoryBean.java b/org.springframework.context/src/main/java/org/springframework/scheduling/timer/MethodInvokingTimerTaskFactoryBean.java index a0aaf874ce..baa5a58c59 100644 --- a/org.springframework.context/src/main/java/org/springframework/scheduling/timer/MethodInvokingTimerTaskFactoryBean.java +++ b/org.springframework.context/src/main/java/org/springframework/scheduling/timer/MethodInvokingTimerTaskFactoryBean.java @@ -48,6 +48,7 @@ public class MethodInvokingTimerTaskFactoryBean extends MethodInvokingRunnable i private TimerTask timerTask; + @Override public void afterPropertiesSet() throws ClassNotFoundException, NoSuchMethodException { super.afterPropertiesSet(); this.timerTask = new DelegatingTimerTask(this); diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/timer/TimerFactoryBean.java b/org.springframework.context/src/main/java/org/springframework/scheduling/timer/TimerFactoryBean.java index 8a2b3c3e04..213cf20198 100644 --- a/org.springframework.context/src/main/java/org/springframework/scheduling/timer/TimerFactoryBean.java +++ b/org.springframework.context/src/main/java/org/springframework/scheduling/timer/TimerFactoryBean.java @@ -131,6 +131,7 @@ public class TimerFactoryBean implements FactoryBean, BeanNameAware, Initializin * Can be overridden in subclasses to provide custom Timer subclasses. * @deprecated as of Spring 2.0.1, in favor of {@link #createTimer(String, boolean)} */ + @Deprecated protected Timer createTimer(boolean daemon) { return null; } diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/bsh/BshScriptFactory.java b/org.springframework.context/src/main/java/org/springframework/scripting/bsh/BshScriptFactory.java index 0ba587ccf7..48dbbb8cb0 100644 --- a/org.springframework.context/src/main/java/org/springframework/scripting/bsh/BshScriptFactory.java +++ b/org.springframework.context/src/main/java/org/springframework/scripting/bsh/BshScriptFactory.java @@ -184,6 +184,7 @@ public class BshScriptFactory implements ScriptFactory, BeanClassLoaderAware { } + @Override public String toString() { return "BshScriptFactory: script source locator [" + this.scriptSourceLocator + "]"; } diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/config/ScriptBeanDefinitionParser.java b/org.springframework.context/src/main/java/org/springframework/scripting/config/ScriptBeanDefinitionParser.java index db184116af..d2091367ad 100644 --- a/org.springframework.context/src/main/java/org/springframework/scripting/config/ScriptBeanDefinitionParser.java +++ b/org.springframework.context/src/main/java/org/springframework/scripting/config/ScriptBeanDefinitionParser.java @@ -96,6 +96,7 @@ class ScriptBeanDefinitionParser extends AbstractBeanDefinitionParser { * Parses the dynamic object element and returns the resulting bean definition. * Registers a {@link ScriptFactoryPostProcessor} if needed. */ + @Override protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) { // Resolve the script source. String value = resolveScriptSource(element, parserContext.getReaderContext()); @@ -209,6 +210,7 @@ class ScriptBeanDefinitionParser extends AbstractBeanDefinitionParser { /** * Scripted beans may be anonymous as well. */ + @Override protected boolean shouldGenerateIdAsFallback() { return true; } diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/groovy/GroovyScriptFactory.java b/org.springframework.context/src/main/java/org/springframework/scripting/groovy/GroovyScriptFactory.java index 1144c05487..e94152011b 100644 --- a/org.springframework.context/src/main/java/org/springframework/scripting/groovy/GroovyScriptFactory.java +++ b/org.springframework.context/src/main/java/org/springframework/scripting/groovy/GroovyScriptFactory.java @@ -262,6 +262,7 @@ public class GroovyScriptFactory implements ScriptFactory, BeanFactoryAware, Bea } + @Override public String toString() { return "GroovyScriptFactory: script source locator [" + this.scriptSourceLocator + "]"; } diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/jruby/JRubyScriptFactory.java b/org.springframework.context/src/main/java/org/springframework/scripting/jruby/JRubyScriptFactory.java index 9591ff29a2..3611f04e5c 100644 --- a/org.springframework.context/src/main/java/org/springframework/scripting/jruby/JRubyScriptFactory.java +++ b/org.springframework.context/src/main/java/org/springframework/scripting/jruby/JRubyScriptFactory.java @@ -119,6 +119,7 @@ public class JRubyScriptFactory implements ScriptFactory, BeanClassLoaderAware { } + @Override public String toString() { return "JRubyScriptFactory: script source locator [" + this.scriptSourceLocator + "]"; } diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/support/RefreshableScriptTargetSource.java b/org.springframework.context/src/main/java/org/springframework/scripting/support/RefreshableScriptTargetSource.java index 6444660ce6..02cf979435 100644 --- a/org.springframework.context/src/main/java/org/springframework/scripting/support/RefreshableScriptTargetSource.java +++ b/org.springframework.context/src/main/java/org/springframework/scripting/support/RefreshableScriptTargetSource.java @@ -66,6 +66,7 @@ public class RefreshableScriptTargetSource extends BeanFactoryRefreshableTargetS * ScriptFactory's requiresScriptedObjectRefresh method. * @see ScriptFactory#requiresScriptedObjectRefresh(ScriptSource) */ + @Override protected boolean requiresRefresh() { return this.scriptFactory.requiresScriptedObjectRefresh(this.scriptSource); } @@ -73,6 +74,7 @@ public class RefreshableScriptTargetSource extends BeanFactoryRefreshableTargetS /** * Obtain a fresh target object, retrieving a FactoryBean if necessary. */ + @Override protected Object obtainFreshBean(BeanFactory beanFactory, String beanName) { return super.obtainFreshBean(beanFactory, (this.isFactoryBean ? BeanFactory.FACTORY_BEAN_PREFIX + beanName : beanName)); diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/support/ResourceScriptSource.java b/org.springframework.context/src/main/java/org/springframework/scripting/support/ResourceScriptSource.java index faf56c4b88..b21cd8bb10 100644 --- a/org.springframework.context/src/main/java/org/springframework/scripting/support/ResourceScriptSource.java +++ b/org.springframework.context/src/main/java/org/springframework/scripting/support/ResourceScriptSource.java @@ -124,6 +124,7 @@ public class ResourceScriptSource implements ScriptSource { } + @Override public String toString() { return this.resource.toString(); } diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java b/org.springframework.context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java index 9f5692aa26..1f31c84cc2 100644 --- a/org.springframework.context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java +++ b/org.springframework.context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java @@ -219,6 +219,7 @@ public class ScriptFactoryPostProcessor extends InstantiationAwareBeanPostProces } + @Override public Class predictBeanType(Class beanClass, String beanName) { // We only apply special treatment to ScriptFactory implementations here. if (!ScriptFactory.class.isAssignableFrom(beanClass)) { @@ -271,6 +272,7 @@ public class ScriptFactoryPostProcessor extends InstantiationAwareBeanPostProces return null; } + @Override public Object postProcessBeforeInstantiation(Class beanClass, String beanName) { // We only apply special treatment to ScriptFactory implementations here. if (!ScriptFactory.class.isAssignableFrom(beanClass)) { diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/support/StaticScriptSource.java b/org.springframework.context/src/main/java/org/springframework/scripting/support/StaticScriptSource.java index 2ad89e8f5e..4d70c6ae37 100644 --- a/org.springframework.context/src/main/java/org/springframework/scripting/support/StaticScriptSource.java +++ b/org.springframework.context/src/main/java/org/springframework/scripting/support/StaticScriptSource.java @@ -82,6 +82,7 @@ public class StaticScriptSource implements ScriptSource { } + @Override public String toString() { return "static script" + (this.className != null ? " [" + this.className + "]" : ""); } diff --git a/org.springframework.context/src/main/java/org/springframework/ui/ModelMap.java b/org.springframework.context/src/main/java/org/springframework/ui/ModelMap.java index d19715faa8..665dc56fb2 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/ModelMap.java +++ b/org.springframework.context/src/main/java/org/springframework/ui/ModelMap.java @@ -150,6 +150,7 @@ public class ModelMap extends LinkedHashMap { /** * @deprecated as of Spring 2.5, in favor of {@link #addAttribute(String, Object)} */ + @Deprecated public ModelMap addObject(String modelName, Object modelObject) { return addAttribute(modelName, modelObject); } @@ -157,6 +158,7 @@ public class ModelMap extends LinkedHashMap { /** * @deprecated as of Spring 2.5, in favor of {@link #addAttribute(Object)} */ + @Deprecated public ModelMap addObject(Object modelObject) { return addAttribute(modelObject); } @@ -164,6 +166,7 @@ public class ModelMap extends LinkedHashMap { /** * @deprecated as of Spring 2.5, in favor of {@link #addAllAttributes(Collection)} */ + @Deprecated public ModelMap addAllObjects(Collection objects) { return addAllAttributes(objects); } @@ -171,6 +174,7 @@ public class ModelMap extends LinkedHashMap { /** * @deprecated as of Spring 2.5, in favor of {@link #addAllAttributes(Map)} */ + @Deprecated public ModelMap addAllObjects(Map objects) { return addAllAttributes(objects); } 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 464dd9e23b..6d19a1fc85 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 @@ -135,14 +135,17 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi } + @Override public boolean hasErrors() { return !this.errors.isEmpty(); } + @Override public int getErrorCount() { return this.errors.size(); } + @Override public List getAllErrors() { return Collections.unmodifiableList(this.errors); } @@ -158,6 +161,7 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi return Collections.unmodifiableList(result); } + @Override public ObjectError getGlobalError() { for (Iterator it = this.errors.iterator(); it.hasNext();) { ObjectError objectError = (ObjectError) it.next(); @@ -179,6 +183,7 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi return Collections.unmodifiableList(result); } + @Override public FieldError getFieldError() { for (Iterator it = this.errors.iterator(); it.hasNext();) { Object error = it.next(); @@ -189,6 +194,7 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi return null; } + @Override public List getFieldErrors(String field) { List result = new LinkedList(); String fixedField = fixedField(field); @@ -201,6 +207,7 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi return Collections.unmodifiableList(result); } + @Override public FieldError getFieldError(String field) { String fixedField = fixedField(field); for (Iterator it = this.errors.iterator(); it.hasNext();) { @@ -238,6 +245,7 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi * the type from a descriptor, even for null values. * @see #getActualFieldValue */ + @Override public Class getFieldType(String field) { Object value = getActualFieldValue(fixedField(field)); if (value != null) { @@ -329,6 +337,7 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi } + @Override public boolean equals(Object other) { if (this == other) { return true; @@ -342,6 +351,7 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi getAllErrors().equals(otherResult.getAllErrors())); } + @Override public int hashCode() { return getObjectName().hashCode() * 29 + getTarget().hashCode(); } 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 d6acbd552e..f2ea296b94 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 @@ -210,6 +210,7 @@ public abstract class AbstractErrors implements Errors, Serializable { } + @Override public String toString() { StringBuffer sb = new StringBuffer(getClass().getName()); sb.append(": ").append(getErrorCount()).append(" errors"); diff --git a/org.springframework.context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java b/org.springframework.context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java index a7773862d6..2acff15795 100644 --- a/org.springframework.context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java +++ b/org.springframework.context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java @@ -51,6 +51,7 @@ public abstract class AbstractPropertyBindingResult extends AbstractBindingResul * Returns the underlying PropertyAccessor. * @see #getPropertyAccessor() */ + @Override public PropertyEditorRegistry getPropertyEditorRegistry() { return getPropertyAccessor(); } @@ -59,6 +60,7 @@ public abstract class AbstractPropertyBindingResult extends AbstractBindingResul * Returns the canonical property name. * @see org.springframework.beans.PropertyAccessorUtils#canonicalPropertyName */ + @Override protected String canonicalFieldName(String field) { return PropertyAccessorUtils.canonicalPropertyName(field); } @@ -67,6 +69,7 @@ public abstract class AbstractPropertyBindingResult extends AbstractBindingResul * Determines the field type from the property type. * @see #getPropertyAccessor() */ + @Override public Class getFieldType(String field) { return getPropertyAccessor().getPropertyType(fixedField(field)); } @@ -75,6 +78,7 @@ public abstract class AbstractPropertyBindingResult extends AbstractBindingResul * Fetches the field value from the PropertyAccessor. * @see #getPropertyAccessor() */ + @Override protected Object getActualFieldValue(String field) { return getPropertyAccessor().getPropertyValue(field); } @@ -83,6 +87,7 @@ public abstract class AbstractPropertyBindingResult extends AbstractBindingResul * Formats the field value based on registered PropertyEditors. * @see #getCustomEditor */ + @Override protected Object formatFieldValue(String field, Object value) { PropertyEditor customEditor = getCustomEditor(field); if (customEditor != null) { 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 40a34e129b..e5f2aceadf 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 @@ -58,6 +58,7 @@ public class BeanPropertyBindingResult extends AbstractPropertyBindingResult imp } + @Override public final Object getTarget() { return this.target; } @@ -67,6 +68,7 @@ public class BeanPropertyBindingResult extends AbstractPropertyBindingResult imp * Creates a new one if none existed before. * @see #createBeanWrapper() */ + @Override public final ConfigurablePropertyAccessor getPropertyAccessor() { if (this.beanWrapper == null) { this.beanWrapper = createBeanWrapper(); 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 30959acc6a..b71869203a 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 @@ -48,6 +48,7 @@ public class BindException extends Exception implements BindingResult { * @deprecated in favor of BindingResult.MODEL_KEY_PREFIX * @see BindingResult#MODEL_KEY_PREFIX */ + @Deprecated public static final String ERROR_KEY_PREFIX = BindException.class.getName() + "."; @@ -243,14 +244,17 @@ public class BindException extends Exception implements BindingResult { /** * Returns diagnostic information about the errors held in this object. */ + @Override public String getMessage() { return this.bindingResult.toString(); } + @Override public boolean equals(Object other) { return (this == other || this.bindingResult.equals(other)); } + @Override public int hashCode() { return this.bindingResult.hashCode(); } 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 15d5003255..4dce49550b 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 @@ -264,6 +264,7 @@ public class DataBinder implements PropertyEditorRegistry, TypeConverter { * to create a BindException instance if still needed. * @see #getBindingResult() */ + @Deprecated public BindException getErrors() { if (this.bindException == null) { this.bindException = new BindException(getBindingResult()); diff --git a/org.springframework.context/src/main/java/org/springframework/validation/DirectFieldBindingResult.java b/org.springframework.context/src/main/java/org/springframework/validation/DirectFieldBindingResult.java index f4e97ca03e..ce514e5244 100644 --- a/org.springframework.context/src/main/java/org/springframework/validation/DirectFieldBindingResult.java +++ b/org.springframework.context/src/main/java/org/springframework/validation/DirectFieldBindingResult.java @@ -52,6 +52,7 @@ public class DirectFieldBindingResult extends AbstractPropertyBindingResult { } + @Override public final Object getTarget() { return this.target; } @@ -61,6 +62,7 @@ public class DirectFieldBindingResult extends AbstractPropertyBindingResult { * Creates a new one if none existed before. * @see #createDirectFieldAccessor() */ + @Override public final ConfigurablePropertyAccessor getPropertyAccessor() { if (this.directFieldAccessor == null) { this.directFieldAccessor = createDirectFieldAccessor(); 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 be15e0afa5..7164f68dc3 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 @@ -96,11 +96,13 @@ public class FieldError extends ObjectError { } + @Override public String toString() { return "Field error in object '" + getObjectName() + "' on field '" + this.field + "': rejected value [" + this.rejectedValue + "]; " + resolvableToString(); } + @Override public boolean equals(Object other) { if (this == other) { return true; @@ -114,6 +116,7 @@ public class FieldError extends ObjectError { isBindingFailure() == otherError.isBindingFailure(); } + @Override public int hashCode() { int hashCode = super.hashCode(); hashCode = 29 * hashCode + getField().hashCode(); 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 8e5664ba24..5d0db273c3 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 @@ -54,10 +54,12 @@ public class MapBindingResult extends AbstractBindingResult implements Serializa return this.target; } + @Override public final Object getTarget() { return this.target; } + @Override protected Object getActualFieldValue(String field) { return this.target.get(field); } 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 20d74f708f..aaa7565b23 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 @@ -67,10 +67,12 @@ public class ObjectError extends DefaultMessageSourceResolvable { } + @Override public String toString() { return "Error in object '" + this.objectName + "': " + resolvableToString(); } + @Override public boolean equals(Object other) { if (this == other) { return true; @@ -82,6 +84,7 @@ public class ObjectError extends DefaultMessageSourceResolvable { return getObjectName().equals(otherError.getObjectName()); } + @Override public int hashCode() { return super.hashCode() * 29 + getObjectName().hashCode(); } diff --git a/org.springframework.context/src/main/java/org/springframework/validation/support/BindingAwareModelMap.java b/org.springframework.context/src/main/java/org/springframework/validation/support/BindingAwareModelMap.java index dca2de852a..29b953d6a8 100644 --- a/org.springframework.context/src/main/java/org/springframework/validation/support/BindingAwareModelMap.java +++ b/org.springframework.context/src/main/java/org/springframework/validation/support/BindingAwareModelMap.java @@ -36,11 +36,13 @@ import org.springframework.validation.BindingResult; */ public class BindingAwareModelMap extends ExtendedModelMap { + @Override public Object put(Object key, Object value) { removeBindingResultIfNecessary(key, value); return super.put(key, value); } + @Override public void putAll(Map map) { for (Map.Entry entry : (Set) map.entrySet()) { removeBindingResultIfNecessary(entry.getKey(), entry.getValue());