diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java index 5479fb5f918..938c3a9bf3e 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java @@ -182,10 +182,12 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp } + @Override public void setMetaClass(MetaClass metaClass) { this.metaClass = metaClass; } + @Override public MetaClass getMetaClass() { return this.metaClass; } @@ -216,6 +218,7 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp * @return the number of bean definitions found * @throws BeanDefinitionStoreException in case of loading or parsing errors */ + @Override public int loadBeanDefinitions(Resource resource) throws BeanDefinitionStoreException { return loadBeanDefinitions(new EncodedResource(resource)); } @@ -376,6 +379,7 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp * This method overrides method invocation to create beans for each method name that * takes a class argument. */ + @Override @SuppressWarnings("rawtypes") public Object invokeMethod(String name, Object arg) { Object[] args = (Object[])arg; @@ -609,6 +613,7 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp * This method overrides property setting in the scope of the {@code GroovyBeanDefinitionReader} * to set properties on the current bean definition. */ + @Override public void setProperty(String name, Object value) { if (this.currentBeanDefinition != null) { applyPropertyToBeanDefinition(name, value); @@ -656,6 +661,7 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp * properties from the {@code GroovyBeanDefinitionReader} itself * */ + @Override public Object getProperty(String name) { Binding binding = getBinding(); if (binding != null && binding.hasVariable(name)) { @@ -758,10 +764,12 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp this.metaClass = InvokerHelper.getMetaClass(this); } + @Override public MetaClass getMetaClass() { return this.metaClass; } + @Override public Object getProperty(String property) { if (property.equals("beanName")) { return getBeanName(); @@ -778,14 +786,17 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp } } + @Override public Object invokeMethod(String name, Object args) { return this.metaClass.invokeMethod(this, name, args); } + @Override public void setMetaClass(MetaClass metaClass) { this.metaClass = metaClass; } + @Override public void setProperty(String property, Object newValue) { if (!addDeferredProperty(property, newValue)) { this.beanDefinition.getBeanDefinition().getPropertyValues().add(property, newValue); diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java index 185a5807631..73756669126 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java @@ -612,6 +612,7 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements * should not have their own mutexes involved in singleton creation, * to avoid the potential for deadlocks in lazy-init situations. */ + @Override public final Object getSingletonMutex() { return this.singletonObjects; } diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java index a89e169f03e..a46b1957d99 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java @@ -138,6 +138,7 @@ public class BeanWrapperTests extends AbstractPropertyAccessorTests { } } + @Override @Test // Can't be shared: no type mismatch with a field public void setPropertyTypeMismatch() { PropertyTypeMismatch target = new PropertyTypeMismatch(); @@ -235,10 +236,12 @@ public class BeanWrapperTests extends AbstractPropertyAccessorTests { private String name; + @Override public void setName(String name) { this.name = name; } + @Override public String getName() { if (this.name == null) { throw new RuntimeException("name property must be set"); diff --git a/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/JCacheAspectSupport.java b/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/JCacheAspectSupport.java index dca7f6135f2..893e4a6b792 100644 --- a/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/JCacheAspectSupport.java +++ b/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/JCacheAspectSupport.java @@ -88,6 +88,7 @@ public class JCacheAspectSupport extends AbstractCacheInvoker implements Initial return this.cacheOperationSource; } + @Override public void afterPropertiesSet() { getCacheOperationSource(); diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalDataSourceJobStore.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalDataSourceJobStore.java index 76c3a1fec55..0817e9d76e9 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalDataSourceJobStore.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalDataSourceJobStore.java @@ -110,6 +110,7 @@ public class LocalDataSourceJobStore extends JobStoreCMT { // Do nothing - a Spring-managed DataSource has its own lifecycle. } /* Quartz 2.2 initialize method */ + @Override public void initialize() { // Do nothing - a Spring-managed DataSource has its own lifecycle. } @@ -138,6 +139,7 @@ public class LocalDataSourceJobStore extends JobStoreCMT { // Do nothing - a Spring-managed DataSource has its own lifecycle. } /* Quartz 2.2 initialize method */ + @Override public void initialize() { // Do nothing - a Spring-managed DataSource has its own lifecycle. } diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/ResourceLoaderClassLoadHelper.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/ResourceLoaderClassLoadHelper.java index 63cbb800bfa..1b274b79f31 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/ResourceLoaderClassLoadHelper.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/ResourceLoaderClassLoadHelper.java @@ -81,6 +81,7 @@ public class ResourceLoaderClassLoadHelper implements ClassLoadHelper { return ClassUtils.forName(name, this.resourceLoader.getClassLoader()); } + @Override @SuppressWarnings("unchecked") public Class loadClass(String name, Class clazz) throws ClassNotFoundException { return (Class) loadClass(name); diff --git a/spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/SpringValidatorAdapterTests.java b/spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/SpringValidatorAdapterTests.java index a6f82518a94..2a61c37dd55 100644 --- a/spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/SpringValidatorAdapterTests.java +++ b/spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/SpringValidatorAdapterTests.java @@ -367,12 +367,14 @@ public class SpringValidatorAdapterTests { private String message; + @Override public void initialize(Same constraintAnnotation) { field = constraintAnnotation.field(); comparingField = constraintAnnotation.comparingField(); message = constraintAnnotation.message(); } + @Override public boolean isValid(Object value, ConstraintValidatorContext context) { BeanWrapper beanWrapper = new BeanWrapperImpl(value); Object fieldValue = beanWrapper.getPropertyValue(field); diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheEvictOperation.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheEvictOperation.java index 04df8649e66..7e72078a1d2 100644 --- a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheEvictOperation.java +++ b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheEvictOperation.java @@ -78,6 +78,7 @@ public class CacheEvictOperation extends CacheOperation { return sb; } + @Override public CacheEvictOperation build() { return new CacheEvictOperation(this); } diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/CachePutOperation.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CachePutOperation.java index 58ae4f75144..d5b39ee788c 100644 --- a/spring-context/src/main/java/org/springframework/cache/interceptor/CachePutOperation.java +++ b/spring-context/src/main/java/org/springframework/cache/interceptor/CachePutOperation.java @@ -70,6 +70,7 @@ public class CachePutOperation extends CacheOperation { return sb; } + @Override public CachePutOperation build() { return new CachePutOperation(this); } diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigApplicationContext.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigApplicationContext.java index ee25c664593..1dafa1f1adb 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigApplicationContext.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigApplicationContext.java @@ -152,6 +152,7 @@ public class AnnotationConfigApplicationContext extends GenericApplicationContex * @see #scan(String...) * @see #refresh() */ + @Override public void register(Class... annotatedClasses) { Assert.notEmpty(annotatedClasses, "At least one annotated class must be specified"); this.reader.register(annotatedClasses); @@ -165,6 +166,7 @@ public class AnnotationConfigApplicationContext extends GenericApplicationContex * @see #register(Class...) * @see #refresh() */ + @Override public void scan(String... basePackages) { Assert.notEmpty(basePackages, "At least one base package must be specified"); this.scanner.scan(basePackages); diff --git a/spring-context/src/main/java/org/springframework/context/event/DefaultEventListenerFactory.java b/spring-context/src/main/java/org/springframework/context/event/DefaultEventListenerFactory.java index a5afa85d271..ab7a7dd4249 100644 --- a/spring-context/src/main/java/org/springframework/context/event/DefaultEventListenerFactory.java +++ b/spring-context/src/main/java/org/springframework/context/event/DefaultEventListenerFactory.java @@ -45,6 +45,7 @@ public class DefaultEventListenerFactory implements EventListenerFactory, Ordere } + @Override public boolean supportsMethod(Method method) { return true; } diff --git a/spring-context/src/main/java/org/springframework/context/support/GenericGroovyApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/GenericGroovyApplicationContext.java index 79950d44576..8e1f74ba45d 100644 --- a/spring-context/src/main/java/org/springframework/context/support/GenericGroovyApplicationContext.java +++ b/spring-context/src/main/java/org/springframework/context/support/GenericGroovyApplicationContext.java @@ -225,18 +225,22 @@ public class GenericGroovyApplicationContext extends GenericApplicationContext i // Implementation of the GroovyObject interface + @Override public void setMetaClass(MetaClass metaClass) { this.metaClass = metaClass; } + @Override public MetaClass getMetaClass() { return this.metaClass; } + @Override public Object invokeMethod(String name, Object args) { return this.metaClass.invokeMethod(this, name, args); } + @Override public void setProperty(String property, Object newValue) { if (newValue instanceof BeanDefinition) { registerBeanDefinition(property, (BeanDefinition) newValue); @@ -246,6 +250,7 @@ public class GenericGroovyApplicationContext extends GenericApplicationContext i } } + @Override @Nullable public Object getProperty(String property) { if (containsBean(property)) { diff --git a/spring-context/src/main/java/org/springframework/ui/ConcurrentModel.java b/spring-context/src/main/java/org/springframework/ui/ConcurrentModel.java index ea21fabc8de..d5c2fa43ddb 100644 --- a/spring-context/src/main/java/org/springframework/ui/ConcurrentModel.java +++ b/spring-context/src/main/java/org/springframework/ui/ConcurrentModel.java @@ -88,6 +88,7 @@ public class ConcurrentModel extends ConcurrentHashMap implement * @param attributeValue the model attribute value (ignored if {@code null}, * just removing an existing entry if any) */ + @Override public ConcurrentModel addAttribute(String attributeName, @Nullable Object attributeValue) { Assert.notNull(attributeName, "Model attribute name must not be null"); put(attributeName, attributeValue); @@ -103,6 +104,7 @@ public class ConcurrentModel extends ConcurrentHashMap implement * than for empty collections as is already done by JSTL tags. * @param attributeValue the model attribute value (never {@code null}) */ + @Override public ConcurrentModel addAttribute(Object attributeValue) { Assert.notNull(attributeValue, "Model attribute value must not be null"); if (attributeValue instanceof Collection && ((Collection) attributeValue).isEmpty()) { @@ -116,6 +118,7 @@ public class ConcurrentModel extends ConcurrentHashMap implement * {@code Map}, using attribute name generation for each element. * @see #addAttribute(Object) */ + @Override public ConcurrentModel addAllAttributes(@Nullable Collection attributeValues) { if (attributeValues != null) { for (Object attributeValue : attributeValues) { @@ -129,6 +132,7 @@ public class ConcurrentModel extends ConcurrentHashMap implement * Copy all attributes in the supplied {@code Map} into this {@code Map}. * @see #addAttribute(String, Object) */ + @Override public ConcurrentModel addAllAttributes(@Nullable Map attributes) { if (attributes != null) { putAll(attributes); @@ -141,6 +145,7 @@ public class ConcurrentModel extends ConcurrentHashMap implement * with existing objects of the same name taking precedence (i.e. not getting * replaced). */ + @Override public ConcurrentModel mergeAttributes(@Nullable Map attributes) { if (attributes != null) { attributes.forEach((key, value) -> { @@ -157,6 +162,7 @@ public class ConcurrentModel extends ConcurrentHashMap implement * @param attributeName the name of the model attribute (never {@code null}) * @return whether this model contains a corresponding attribute */ + @Override public boolean containsAttribute(String attributeName) { return containsKey(attributeName); } diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java index 85824adeab1..fb6878f8f92 100644 --- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java +++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java @@ -414,6 +414,7 @@ public class LocalValidatorFactoryBean extends SpringValidatorAdapter throw new ValidationException("Cannot unwrap to " + type); } + @Override public void close() { if (this.validatorFactory != null) { this.validatorFactory.close(); diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringConstraintValidatorFactory.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringConstraintValidatorFactory.java index 227814d0408..5b68f072835 100644 --- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringConstraintValidatorFactory.java +++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringConstraintValidatorFactory.java @@ -57,6 +57,7 @@ public class SpringConstraintValidatorFactory implements ConstraintValidatorFact } // Bean Validation 1.1 releaseInstance method + @Override public void releaseInstance(ConstraintValidator instance) { this.beanFactory.destroyBean(instance); } diff --git a/spring-context/src/test/groovy/org/springframework/context/groovy/GroovyBeanDefinitionReaderTests.groovy b/spring-context/src/test/groovy/org/springframework/context/groovy/GroovyBeanDefinitionReaderTests.groovy index e268d3a3b52..eac5493d907 100644 --- a/spring-context/src/test/groovy/org/springframework/context/groovy/GroovyBeanDefinitionReaderTests.groovy +++ b/spring-context/src/test/groovy/org/springframework/context/groovy/GroovyBeanDefinitionReaderTests.groovy @@ -1003,22 +1003,27 @@ class TestScope implements Scope { int instanceCount + @Override public Object remove(String name) { // do nothing } + @Override public void registerDestructionCallback(String name, Runnable callback) { } + @Override public String getConversationId() { return "mock" } + @Override public Object get(String name, ObjectFactory objectFactory) { instanceCount++ objectFactory.getObject() } + @Override public Object resolveContextualObject(String s) { return null; // noop } diff --git a/spring-context/src/test/java/org/springframework/cache/interceptor/CacheErrorHandlerTests.java b/spring-context/src/test/java/org/springframework/cache/interceptor/CacheErrorHandlerTests.java index 94b808cae33..cfcd9cd713a 100644 --- a/spring-context/src/test/java/org/springframework/cache/interceptor/CacheErrorHandlerTests.java +++ b/spring-context/src/test/java/org/springframework/cache/interceptor/CacheErrorHandlerTests.java @@ -183,6 +183,7 @@ public class CacheErrorHandlerTests { return new SimpleService(); } + @Override @Bean public CacheManager cacheManager() { SimpleCacheManager cacheManager = new SimpleCacheManager(); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java index a189d5b440b..e8e58a0757e 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java @@ -1281,6 +1281,7 @@ public class ConfigurationClassPostProcessorTests { public interface RepositoryInterface { + @Override String toString(); } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/LazyAutowiredAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/LazyAutowiredAnnotationBeanPostProcessorTests.java index f35c2e48796..ca79a4c60bc 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/LazyAutowiredAnnotationBeanPostProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/LazyAutowiredAnnotationBeanPostProcessorTests.java @@ -167,6 +167,7 @@ public class LazyAutowiredAnnotationBeanPostProcessorTests { @Autowired @Lazy private List testBeans; + @Override public TestBean getTestBean() { return this.testBean; } @@ -185,6 +186,7 @@ public class LazyAutowiredAnnotationBeanPostProcessorTests { @Autowired(required = false) @Lazy private List testBeans; + @Override public TestBean getTestBean() { return this.testBean; } @@ -200,6 +202,7 @@ public class LazyAutowiredAnnotationBeanPostProcessorTests { @LazyInject private TestBean testBean; + @Override public TestBean getTestBean() { return this.testBean; } @@ -218,6 +221,7 @@ public class LazyAutowiredAnnotationBeanPostProcessorTests { this.testBean = testBean; } + @Override public TestBean getTestBean() { return this.testBean; } @@ -236,6 +240,7 @@ public class LazyAutowiredAnnotationBeanPostProcessorTests { this.testBean = testBean; } + @Override public TestBean getTestBean() { return this.testBean; } @@ -254,6 +259,7 @@ public class LazyAutowiredAnnotationBeanPostProcessorTests { this.testBean = testBean; } + @Override public TestBean getTestBean() { return this.testBean; } @@ -269,6 +275,7 @@ public class LazyAutowiredAnnotationBeanPostProcessorTests { this.testBean = testBean; } + @Override public TestBean getTestBean() { return this.testBean; } @@ -284,6 +291,7 @@ public class LazyAutowiredAnnotationBeanPostProcessorTests { this.testBean = testBean; } + @Override public TestBean getTestBean() { return this.testBean; } @@ -299,6 +307,7 @@ public class LazyAutowiredAnnotationBeanPostProcessorTests { this.testBean = testBean; } + @Override public TestBean getTestBean() { return this.testBean; } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java index a7826ffb40f..686d3090780 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java @@ -361,6 +361,7 @@ public class ConfigurationClassProcessingTests { static TestBean testBean = new TestBean(ConfigWithBeanWithProviderImplementation.class.getSimpleName()); + @Override @Bean(name = "customName") public TestBean get() { return testBean; @@ -373,6 +374,7 @@ public class ConfigurationClassProcessingTests { static Set set = Collections.singleton("value"); + @Override @Bean(name = "customName") public Set get() { return set; diff --git a/spring-context/src/test/java/org/springframework/context/annotation/spr16756/ScannedComponent.java b/spring-context/src/test/java/org/springframework/context/annotation/spr16756/ScannedComponent.java index 264c872b023..5aae3afcd86 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/spr16756/ScannedComponent.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/spr16756/ScannedComponent.java @@ -42,6 +42,7 @@ public class ScannedComponent { @Scope(proxyMode = ScopedProxyMode.INTERFACES, value = "prototype") public static class StateImpl implements State { + @Override public String anyMethod() { return "anyMethod called"; } diff --git a/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java b/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java index 8618107c153..6d07d022e10 100644 --- a/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java @@ -840,6 +840,7 @@ public class AnnotationDrivenEventListenerTests { this.eventCollector.addEvent(this, event); } + @Override @EventListener @Async public void handleAsync(AnotherTestEvent event) { @@ -866,6 +867,7 @@ public class AnnotationDrivenEventListenerTests { this.eventCollector.addEvent(this, event); } + @Override @EventListener @Async public void handleAsync(AnotherTestEvent event) { @@ -988,11 +990,13 @@ public class AnnotationDrivenEventListenerTests { super.handleString(payload); } + @Override @ConditionalEvent("#root.event.timestamp > #p0") public void handleTimestamp(Long timestamp) { collectEvent(timestamp); } + @Override @ConditionalEvent("@conditionEvaluator.valid(#p0)") public void handleRatio(Double ratio) { collectEvent(ratio); diff --git a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java index 3896d96382a..e568860a40e 100644 --- a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java @@ -633,6 +633,7 @@ public class ApplicationContextEventTests extends AbstractApplicationEventListen private ApplicationContext applicationContext; + @Override public void setApplicationContext(ApplicationContext applicationContext) { this.applicationContext = applicationContext; } diff --git a/spring-context/src/test/java/org/springframework/context/expression/FactoryBeanAccessTests.java b/spring-context/src/test/java/org/springframework/context/expression/FactoryBeanAccessTests.java index fb20b5e48f9..d184a07710f 100644 --- a/spring-context/src/test/java/org/springframework/context/expression/FactoryBeanAccessTests.java +++ b/spring-context/src/test/java/org/springframework/context/expression/FactoryBeanAccessTests.java @@ -77,14 +77,17 @@ public class FactoryBeanAccessTests { static class CarFactoryBean implements FactoryBean { + @Override public Car getObject() { return new Car(); } + @Override public Class getObjectType() { return Car.class; } + @Override public boolean isSingleton() { return false; } diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java index 691ce11ac92..bf9d831ee6a 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java @@ -565,11 +565,13 @@ public class AsyncExecutionTests { @Async public static class AsyncClassBeanWithInterface implements RegularInterface { + @Override public void doSomething(int i) { boolean condition = !Thread.currentThread().getName().equals(originalThreadName); assertThat(condition).isTrue(); } + @Override public Future returnSomething(int i) { boolean condition = !Thread.currentThread().getName().equals(originalThreadName); assertThat(condition).isTrue(); diff --git a/spring-context/src/test/java/org/springframework/validation/beanvalidation/SpringValidatorAdapterTests.java b/spring-context/src/test/java/org/springframework/validation/beanvalidation/SpringValidatorAdapterTests.java index 4d78f3b7ab2..1cddf838fb9 100644 --- a/spring-context/src/test/java/org/springframework/validation/beanvalidation/SpringValidatorAdapterTests.java +++ b/spring-context/src/test/java/org/springframework/validation/beanvalidation/SpringValidatorAdapterTests.java @@ -322,12 +322,14 @@ public class SpringValidatorAdapterTests { private String message; + @Override public void initialize(Same constraintAnnotation) { field = constraintAnnotation.field(); comparingField = constraintAnnotation.comparingField(); message = constraintAnnotation.message(); } + @Override public boolean isValid(Object value, ConstraintValidatorContext context) { BeanWrapper beanWrapper = new BeanWrapperImpl(value); Object fieldValue = beanWrapper.getPropertyValue(field); diff --git a/spring-context/src/test/resources/org/springframework/scripting/groovy/Calculator.groovy b/spring-context/src/test/resources/org/springframework/scripting/groovy/Calculator.groovy index af1f105bdd9..2817bb919f3 100644 --- a/spring-context/src/test/resources/org/springframework/scripting/groovy/Calculator.groovy +++ b/spring-context/src/test/resources/org/springframework/scripting/groovy/Calculator.groovy @@ -4,6 +4,7 @@ import org.springframework.scripting.Calculator class GroovyCalculator implements Calculator { + @Override int add(int x, int y) { return x + y; } diff --git a/spring-context/src/test/resources/org/springframework/scripting/groovy/CallCounter.groovy b/spring-context/src/test/resources/org/springframework/scripting/groovy/CallCounter.groovy index 790d3960266..18712db4074 100644 --- a/spring-context/src/test/resources/org/springframework/scripting/groovy/CallCounter.groovy +++ b/spring-context/src/test/resources/org/springframework/scripting/groovy/CallCounter.groovy @@ -10,10 +10,12 @@ class GroovyCallCounter implements CallCounter { count = 0; } + @Override void before() { count++; } + @Override int getCalls() { return count; } diff --git a/spring-context/src/test/resources/org/springframework/scripting/groovy/DelegatingCalculator.groovy b/spring-context/src/test/resources/org/springframework/scripting/groovy/DelegatingCalculator.groovy index d8b8280dcdd..02e8c8c505f 100644 --- a/spring-context/src/test/resources/org/springframework/scripting/groovy/DelegatingCalculator.groovy +++ b/spring-context/src/test/resources/org/springframework/scripting/groovy/DelegatingCalculator.groovy @@ -6,6 +6,7 @@ class DelegatingCalculator implements Calculator { def Calculator delegate; + @Override int add(int x, int y) { //println "hello" //println this.metaClass.getClass() diff --git a/spring-context/src/test/resources/org/springframework/scripting/groovy/ScriptBean.groovy b/spring-context/src/test/resources/org/springframework/scripting/groovy/ScriptBean.groovy index f83f9a5fe41..718afab987a 100644 --- a/spring-context/src/test/resources/org/springframework/scripting/groovy/ScriptBean.groovy +++ b/spring-context/src/test/resources/org/springframework/scripting/groovy/ScriptBean.groovy @@ -9,10 +9,12 @@ class GroovyScriptBean implements ContextScriptBean, ApplicationContextAware { private int age + @Override int getAge() { return this.age } + @Override void setAge(int age) { this.age = age } diff --git a/spring-context/src/test/resources/org/springframework/scripting/groovy/TestFactoryBean.groovy b/spring-context/src/test/resources/org/springframework/scripting/groovy/TestFactoryBean.groovy index 9e8da5df674..51c0bda2ca7 100644 --- a/spring-context/src/test/resources/org/springframework/scripting/groovy/TestFactoryBean.groovy +++ b/spring-context/src/test/resources/org/springframework/scripting/groovy/TestFactoryBean.groovy @@ -4,14 +4,17 @@ import org.springframework.beans.factory.FactoryBean class TestFactoryBean implements FactoryBean { + @Override public boolean isSingleton() { true } + @Override public Class getObjectType() { String.class } + @Override public Object getObject() { "test" } diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AbstractMergedAnnotation.java b/spring-core/src/main/java/org/springframework/core/annotation/AbstractMergedAnnotation.java index eb065d6f647..45bf025492e 100644 --- a/spring-core/src/main/java/org/springframework/core/annotation/AbstractMergedAnnotation.java +++ b/spring-core/src/main/java/org/springframework/core/annotation/AbstractMergedAnnotation.java @@ -54,91 +54,113 @@ abstract class AbstractMergedAnnotation implements MergedA return !hasDefaultValue(attributeName); } + @Override public byte getByte(String attributeName) { return getRequiredAttributeValue(attributeName, Byte.class); } + @Override public byte[] getByteArray(String attributeName) { return getRequiredAttributeValue(attributeName, byte[].class); } + @Override public boolean getBoolean(String attributeName) { return getRequiredAttributeValue(attributeName, Boolean.class); } + @Override public boolean[] getBooleanArray(String attributeName) { return getRequiredAttributeValue(attributeName, boolean[].class); } + @Override public char getChar(String attributeName) { return getRequiredAttributeValue(attributeName, Character.class); } + @Override public char[] getCharArray(String attributeName) { return getRequiredAttributeValue(attributeName, char[].class); } + @Override public short getShort(String attributeName) { return getRequiredAttributeValue(attributeName, Short.class); } + @Override public short[] getShortArray(String attributeName) { return getRequiredAttributeValue(attributeName, short[].class); } + @Override public int getInt(String attributeName) { return getRequiredAttributeValue(attributeName, Integer.class); } + @Override public int[] getIntArray(String attributeName) { return getRequiredAttributeValue(attributeName, int[].class); } + @Override public long getLong(String attributeName) { return getRequiredAttributeValue(attributeName, Long.class); } + @Override public long[] getLongArray(String attributeName) { return getRequiredAttributeValue(attributeName, long[].class); } + @Override public double getDouble(String attributeName) { return getRequiredAttributeValue(attributeName, Double.class); } + @Override public double[] getDoubleArray(String attributeName) { return getRequiredAttributeValue(attributeName, double[].class); } + @Override public float getFloat(String attributeName) { return getRequiredAttributeValue(attributeName, Float.class); } + @Override public float[] getFloatArray(String attributeName) { return getRequiredAttributeValue(attributeName, float[].class); } + @Override public String getString(String attributeName) { return getRequiredAttributeValue(attributeName, String.class); } + @Override public String[] getStringArray(String attributeName) { return getRequiredAttributeValue(attributeName, String[].class); } + @Override public Class getClass(String attributeName) { return getRequiredAttributeValue(attributeName, Class.class); } + @Override public Class[] getClassArray(String attributeName) { return getRequiredAttributeValue(attributeName, Class[].class); } + @Override public > E getEnum(String attributeName, Class type) { Assert.notNull(type, "Type must not be null"); return getRequiredAttributeValue(attributeName, type); } + @Override @SuppressWarnings("unchecked") public > E[] getEnumArray(String attributeName, Class type) { Assert.notNull(type, "Type must not be null"); diff --git a/spring-core/src/main/java/org/springframework/core/annotation/MissingMergedAnnotation.java b/spring-core/src/main/java/org/springframework/core/annotation/MissingMergedAnnotation.java index ffba2c46749..caa764caf11 100644 --- a/spring-core/src/main/java/org/springframework/core/annotation/MissingMergedAnnotation.java +++ b/spring-core/src/main/java/org/springframework/core/annotation/MissingMergedAnnotation.java @@ -87,6 +87,7 @@ final class MissingMergedAnnotation extends AbstractMerged return -1; } + @Override public boolean hasNonDefaultValue(String attributeName) { throw new NoSuchElementException( "Unable to check non-default value for missing annotation"); @@ -160,6 +161,7 @@ final class MissingMergedAnnotation extends AbstractMerged "Unable to get attribute value for missing annotation"); } + @Override protected A createSynthesized() { throw new NoSuchElementException("Unable to synthesize missing annotation"); } diff --git a/spring-core/src/main/java/org/springframework/core/annotation/TypeMappedAnnotation.java b/spring-core/src/main/java/org/springframework/core/annotation/TypeMappedAnnotation.java index a1e1a8b77b2..05577438140 100644 --- a/spring-core/src/main/java/org/springframework/core/annotation/TypeMappedAnnotation.java +++ b/spring-core/src/main/java/org/springframework/core/annotation/TypeMappedAnnotation.java @@ -377,6 +377,7 @@ final class TypeMappedAnnotation extends AbstractMergedAnn return String.valueOf(value); } + @Override @Nullable protected T getAttributeValue(String attributeName, Class type) { int attributeIndex = getAttributeIndex(attributeName, false); diff --git a/spring-core/src/main/java/org/springframework/core/annotation/TypeMappedAnnotations.java b/spring-core/src/main/java/org/springframework/core/annotation/TypeMappedAnnotations.java index a0fdcd6f7bf..09675be62f6 100644 --- a/spring-core/src/main/java/org/springframework/core/annotation/TypeMappedAnnotations.java +++ b/spring-core/src/main/java/org/springframework/core/annotation/TypeMappedAnnotations.java @@ -562,6 +562,7 @@ final class TypeMappedAnnotations implements MergedAnnotations { this.aggregateCursor = 0; } + @Override public boolean tryAdvance(Consumer> action) { while (this.aggregateCursor < this.aggregates.size()) { Aggregate aggregate = this.aggregates.get(this.aggregateCursor); diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorMatches.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorMatches.java index cf461ad0cef..22795a92879 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorMatches.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorMatches.java @@ -118,15 +118,18 @@ public class OperatorMatches extends Operator { this.access = access; } + @Override public char charAt(int index) { this.access.check(); return this.value.charAt(index); } + @Override public CharSequence subSequence(int start, int end) { return new MatcherInput(this.value.subSequence(start, end), this.access); } + @Override public int length() { return this.value.length(); } diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java index 45e5bc5cd3a..fdb81dd2b78 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java @@ -5188,6 +5188,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests { public static class MyMessage implements Message { + @Override public MessageHeaders getHeaders() { MessageHeaders mh = new MessageHeaders(); mh.put("command", "wibble"); @@ -5195,8 +5196,10 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests { return mh; } + @Override public int[] getIa() { return new int[] {5,3}; } + @Override @SuppressWarnings({"rawtypes", "unchecked"}) public List getList() { List l = new ArrayList(); @@ -5253,24 +5256,29 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests { private Method method; + @Override public Class[] getSpecificTargetClasses() { return new Class[] {Payload2.class}; } + @Override public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException { // target is a Payload2 instance return true; } + @Override public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException { Payload2 payload2 = (Payload2)target; return new TypedValue(payload2.getField(name)); } + @Override public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException { return false; } + @Override public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException { } @@ -5496,6 +5504,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests { public Three getThree() { return three; } + @Override public String toString() { return "instanceof Two"; } @@ -6108,6 +6117,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests { return "pb"; } + @Override public String toString() { return "sh"; } diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java index f35780b6378..1257824ed72 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java @@ -2261,6 +2261,7 @@ public class SpelReproTests extends AbstractExpressionTests { this.string = string; } + @Override public boolean equals(Object other) { return (this == other || (other instanceof TestClass2 && this.string.equals(((TestClass2) other).string))); diff --git a/spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java b/spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java index e99cb2964de..d84b54e874e 100644 --- a/spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java +++ b/spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java @@ -280,92 +280,110 @@ final class LogAdapter { this.logger = logger; } + @Override public boolean isFatalEnabled() { return isErrorEnabled(); } + @Override public boolean isErrorEnabled() { return this.logger.isErrorEnabled(); } + @Override public boolean isWarnEnabled() { return this.logger.isWarnEnabled(); } + @Override public boolean isInfoEnabled() { return this.logger.isInfoEnabled(); } + @Override public boolean isDebugEnabled() { return this.logger.isDebugEnabled(); } + @Override public boolean isTraceEnabled() { return this.logger.isTraceEnabled(); } + @Override public void fatal(Object message) { error(message); } + @Override public void fatal(Object message, Throwable exception) { error(message, exception); } + @Override public void error(Object message) { if (message instanceof String || this.logger.isErrorEnabled()) { this.logger.error(String.valueOf(message)); } } + @Override public void error(Object message, Throwable exception) { if (message instanceof String || this.logger.isErrorEnabled()) { this.logger.error(String.valueOf(message), exception); } } + @Override public void warn(Object message) { if (message instanceof String || this.logger.isWarnEnabled()) { this.logger.warn(String.valueOf(message)); } } + @Override public void warn(Object message, Throwable exception) { if (message instanceof String || this.logger.isWarnEnabled()) { this.logger.warn(String.valueOf(message), exception); } } + @Override public void info(Object message) { if (message instanceof String || this.logger.isInfoEnabled()) { this.logger.info(String.valueOf(message)); } } + @Override public void info(Object message, Throwable exception) { if (message instanceof String || this.logger.isInfoEnabled()) { this.logger.info(String.valueOf(message), exception); } } + @Override public void debug(Object message) { if (message instanceof String || this.logger.isDebugEnabled()) { this.logger.debug(String.valueOf(message)); } } + @Override public void debug(Object message, Throwable exception) { if (message instanceof String || this.logger.isDebugEnabled()) { this.logger.debug(String.valueOf(message), exception); } } + @Override public void trace(Object message) { if (message instanceof String || this.logger.isTraceEnabled()) { this.logger.trace(String.valueOf(message)); } } + @Override public void trace(Object message, Throwable exception) { if (message instanceof String || this.logger.isTraceEnabled()) { this.logger.trace(String.valueOf(message), exception); @@ -486,74 +504,92 @@ final class LogAdapter { this.logger = java.util.logging.Logger.getLogger(name); } + @Override public boolean isFatalEnabled() { return isErrorEnabled(); } + @Override public boolean isErrorEnabled() { return this.logger.isLoggable(java.util.logging.Level.SEVERE); } + @Override public boolean isWarnEnabled() { return this.logger.isLoggable(java.util.logging.Level.WARNING); } + @Override public boolean isInfoEnabled() { return this.logger.isLoggable(java.util.logging.Level.INFO); } + @Override public boolean isDebugEnabled() { return this.logger.isLoggable(java.util.logging.Level.FINE); } + @Override public boolean isTraceEnabled() { return this.logger.isLoggable(java.util.logging.Level.FINEST); } + @Override public void fatal(Object message) { error(message); } + @Override public void fatal(Object message, Throwable exception) { error(message, exception); } + @Override public void error(Object message) { log(java.util.logging.Level.SEVERE, message, null); } + @Override public void error(Object message, Throwable exception) { log(java.util.logging.Level.SEVERE, message, exception); } + @Override public void warn(Object message) { log(java.util.logging.Level.WARNING, message, null); } + @Override public void warn(Object message, Throwable exception) { log(java.util.logging.Level.WARNING, message, exception); } + @Override public void info(Object message) { log(java.util.logging.Level.INFO, message, null); } + @Override public void info(Object message, Throwable exception) { log(java.util.logging.Level.INFO, message, exception); } + @Override public void debug(Object message) { log(java.util.logging.Level.FINE, message, null); } + @Override public void debug(Object message, Throwable exception) { log(java.util.logging.Level.FINE, message, exception); } + @Override public void trace(Object message) { log(java.util.logging.Level.FINEST, message, null); } + @Override public void trace(Object message, Throwable exception) { log(java.util.logging.Level.FINEST, message, exception); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/HsqlDatabasePopulatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/HsqlDatabasePopulatorTests.java index aeb03aa3d3a..0b43cd74a3c 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/HsqlDatabasePopulatorTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/HsqlDatabasePopulatorTests.java @@ -24,6 +24,7 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; */ public class HsqlDatabasePopulatorTests extends AbstractDatabasePopulatorTests { + @Override protected EmbeddedDatabaseType getEmbeddedDatabaseType() { return EmbeddedDatabaseType.HSQL; } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ScriptUtilsIntegrationTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ScriptUtilsIntegrationTests.java index bb7aa44d843..541611a0571 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ScriptUtilsIntegrationTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ScriptUtilsIntegrationTests.java @@ -34,6 +34,7 @@ import static org.springframework.jdbc.datasource.init.ScriptUtils.executeSqlScr */ public class ScriptUtilsIntegrationTests extends AbstractDatabaseInitializationTests { + @Override protected EmbeddedDatabaseType getEmbeddedDatabaseType() { return EmbeddedDatabaseType.HSQL; } diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageProducer.java b/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageProducer.java index e7960c2e5e4..daae35af0aa 100644 --- a/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageProducer.java +++ b/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageProducer.java @@ -89,6 +89,7 @@ class CachedMessageProducer implements MessageProducer, QueueSender, TopicPublis return this.target.getDisableMessageTimestamp(); } + @Override public void setDeliveryDelay(long deliveryDelay) throws JMSException { if (this.originalDeliveryDelay == null) { this.originalDeliveryDelay = this.target.getDeliveryDelay(); @@ -96,6 +97,7 @@ class CachedMessageProducer implements MessageProducer, QueueSender, TopicPublis this.target.setDeliveryDelay(deliveryDelay); } + @Override public long getDeliveryDelay() throws JMSException { return this.target.getDeliveryDelay(); } diff --git a/spring-jms/src/test/java/org/springframework/jms/StubTextMessage.java b/spring-jms/src/test/java/org/springframework/jms/StubTextMessage.java index 23353f6d5b8..2bb5efa6738 100644 --- a/spring-jms/src/test/java/org/springframework/jms/StubTextMessage.java +++ b/spring-jms/src/test/java/org/springframework/jms/StubTextMessage.java @@ -65,91 +65,112 @@ public class StubTextMessage implements TextMessage { } + @Override public String getText() throws JMSException { return this.text; } + @Override public void setText(String text) throws JMSException { this.text = text; } + @Override public void acknowledge() throws JMSException { throw new UnsupportedOperationException(); } + @Override public void clearBody() throws JMSException { this.text = null; } + @Override public void clearProperties() throws JMSException { this.properties.clear(); } + @Override public boolean getBooleanProperty(String name) throws JMSException { Object value = this.properties.get(name); return (value instanceof Boolean) ? ((Boolean) value).booleanValue() : false; } + @Override public byte getByteProperty(String name) throws JMSException { Object value = this.properties.get(name); return (value instanceof Byte) ? ((Byte) value).byteValue() : 0; } + @Override public double getDoubleProperty(String name) throws JMSException { Object value = this.properties.get(name); return (value instanceof Double) ? ((Double) value).doubleValue() : 0; } + @Override public float getFloatProperty(String name) throws JMSException { Object value = this.properties.get(name); return (value instanceof Float) ? ((Float) value).floatValue() : 0; } + @Override public int getIntProperty(String name) throws JMSException { Object value = this.properties.get(name); return (value instanceof Integer) ? ((Integer) value).intValue() : 0; } + @Override public String getJMSCorrelationID() throws JMSException { return this.correlationId; } + @Override public byte[] getJMSCorrelationIDAsBytes() throws JMSException { return this.correlationId.getBytes(); } + @Override public int getJMSDeliveryMode() throws JMSException { return this.deliveryMode; } + @Override public Destination getJMSDestination() throws JMSException { return this.destination; } + @Override public long getJMSExpiration() throws JMSException { return this.expiration; } + @Override public String getJMSMessageID() throws JMSException { return this.messageId; } + @Override public int getJMSPriority() throws JMSException { return this.priority; } + @Override public boolean getJMSRedelivered() throws JMSException { return this.redelivered; } + @Override public Destination getJMSReplyTo() throws JMSException { return this.replyTo; } + @Override public long getJMSTimestamp() throws JMSException { return this.timestamp; } + @Override public String getJMSType() throws JMSException { return this.type; } @@ -159,93 +180,115 @@ public class StubTextMessage implements TextMessage { return this.deliveryTime; } + @Override public long getLongProperty(String name) throws JMSException { Object value = this.properties.get(name); return (value instanceof Long) ? ((Long) value).longValue() : 0; } + @Override public Object getObjectProperty(String name) throws JMSException { return this.properties.get(name); } + @Override public Enumeration getPropertyNames() throws JMSException { return this.properties.keys(); } + @Override public short getShortProperty(String name) throws JMSException { Object value = this.properties.get(name); return (value instanceof Short) ? ((Short) value).shortValue() : 0; } + @Override public String getStringProperty(String name) throws JMSException { Object value = this.properties.get(name); return (value instanceof String) ? (String) value : null; } + @Override public boolean propertyExists(String name) throws JMSException { return this.properties.containsKey(name); } + @Override public void setBooleanProperty(String name, boolean value) throws JMSException { this.properties.put(name, value); } + @Override public void setByteProperty(String name, byte value) throws JMSException { this.properties.put(name, value); } + @Override public void setDoubleProperty(String name, double value) throws JMSException { this.properties.put(name, value); } + @Override public void setFloatProperty(String name, float value) throws JMSException { this.properties.put(name, value); } + @Override public void setIntProperty(String name, int value) throws JMSException { this.properties.put(name, value); } + @Override public void setJMSCorrelationID(String correlationId) throws JMSException { this.correlationId = correlationId; } + @Override public void setJMSCorrelationIDAsBytes(byte[] correlationID) throws JMSException { this.correlationId = new String(correlationID); } + @Override public void setJMSDeliveryMode(int deliveryMode) throws JMSException { this.deliveryMode = deliveryMode; } + @Override public void setJMSDestination(Destination destination) throws JMSException { this.destination = destination; } + @Override public void setJMSExpiration(long expiration) throws JMSException { this.expiration = expiration; } + @Override public void setJMSMessageID(String id) throws JMSException { this.messageId = id; } + @Override public void setJMSPriority(int priority) throws JMSException { this.priority = priority; } + @Override public void setJMSRedelivered(boolean redelivered) throws JMSException { this.redelivered = redelivered; } + @Override public void setJMSReplyTo(Destination replyTo) throws JMSException { this.replyTo = replyTo; } + @Override public void setJMSTimestamp(long timestamp) throws JMSException { this.timestamp = timestamp; } + @Override public void setJMSType(String type) throws JMSException { this.type = type; } @@ -255,18 +298,22 @@ public class StubTextMessage implements TextMessage { this.deliveryTime = deliveryTime; } + @Override public void setLongProperty(String name, long value) throws JMSException { this.properties.put(name, value); } + @Override public void setObjectProperty(String name, Object value) throws JMSException { this.properties.put(name, value); } + @Override public void setShortProperty(String name, short value) throws JMSException { this.properties.put(name, value); } + @Override public void setStringProperty(String name, String value) throws JMSException { this.properties.put(name, value); } diff --git a/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryIntegrationTests.java b/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryIntegrationTests.java index bac32b0f979..34034e59ccc 100644 --- a/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryIntegrationTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryIntegrationTests.java @@ -166,6 +166,7 @@ public class JmsListenerContainerFactoryIntegrationTests { private final Map invocations = new HashMap<>(); + @Override public void handleIt(@Payload String msg, @Header("my-header") String myHeader) { invocations.put("handleIt", true); assertThat(msg).as("Unexpected payload message").isEqualTo("FOO-BAR"); diff --git a/spring-messaging/src/main/java/org/springframework/messaging/MessageHeaders.java b/spring-messaging/src/main/java/org/springframework/messaging/MessageHeaders.java index 42886a6e89e..9f98ebfc710 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/MessageHeaders.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/MessageHeaders.java @@ -220,35 +220,43 @@ public class MessageHeaders implements Map, Serializable { // Delegating Map implementation + @Override public boolean containsKey(Object key) { return this.headers.containsKey(key); } + @Override public boolean containsValue(Object value) { return this.headers.containsValue(value); } + @Override public Set> entrySet() { return Collections.unmodifiableMap(this.headers).entrySet(); } + @Override @Nullable public Object get(Object key) { return this.headers.get(key); } + @Override public boolean isEmpty() { return this.headers.isEmpty(); } + @Override public Set keySet() { return Collections.unmodifiableSet(this.headers.keySet()); } + @Override public int size() { return this.headers.size(); } + @Override public Collection values() { return Collections.unmodifiableCollection(this.headers.values()); } @@ -260,6 +268,7 @@ public class MessageHeaders implements Map, Serializable { * Since MessageHeaders are immutable, the call to this method * will result in {@link UnsupportedOperationException}. */ + @Override public Object put(String key, Object value) { throw new UnsupportedOperationException("MessageHeaders is immutable"); } @@ -268,6 +277,7 @@ public class MessageHeaders implements Map, Serializable { * Since MessageHeaders are immutable, the call to this method * will result in {@link UnsupportedOperationException}. */ + @Override public void putAll(Map map) { throw new UnsupportedOperationException("MessageHeaders is immutable"); } @@ -276,6 +286,7 @@ public class MessageHeaders implements Map, Serializable { * Since MessageHeaders are immutable, the call to this method * will result in {@link UnsupportedOperationException}. */ + @Override public Object remove(Object key) { throw new UnsupportedOperationException("MessageHeaders is immutable"); } @@ -284,6 +295,7 @@ public class MessageHeaders implements Map, Serializable { * Since MessageHeaders are immutable, the call to this method * will result in {@link UnsupportedOperationException}. */ + @Override public void clear() { throw new UnsupportedOperationException("MessageHeaders is immutable"); } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler.java index b43b9a265a8..edff270766c 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler.java @@ -303,6 +303,7 @@ public class SimpAnnotationMethodMessageHandler extends AbstractMethodMessageHan } + @Override protected List initArgumentResolvers() { ApplicationContext context = getApplicationContext(); ConfigurableBeanFactory beanFactory = (context instanceof ConfigurableApplicationContext ? diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/OrderedMessageSender.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/OrderedMessageSender.java index 18bb5b00a9b..c155da7d681 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/OrderedMessageSender.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/OrderedMessageSender.java @@ -59,6 +59,7 @@ class OrderedMessageSender implements MessageChannel { } + @Override public boolean send(Message message) { return send(message, -1); } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/StompBrokerRelayRegistration.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/StompBrokerRelayRegistration.java index 1040d7254e2..8db37b7e977 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/StompBrokerRelayRegistration.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/StompBrokerRelayRegistration.java @@ -231,6 +231,7 @@ public class StompBrokerRelayRegistration extends AbstractBrokerRegistration { } + @Override protected StompBrokerRelayMessageHandler getMessageHandler(SubscribableChannel brokerChannel) { StompBrokerRelayMessageHandler handler = new StompBrokerRelayMessageHandler( diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/DefaultStompSession.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/DefaultStompSession.java index 3bd04271ff9..18687736cfc 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/DefaultStompSession.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/DefaultStompSession.java @@ -689,8 +689,10 @@ public class DefaultStompSession implements ConnectionHandlingStompSession { if (conn != null) { conn.send(HEARTBEAT).addCallback( new ListenableFutureCallback() { + @Override public void onSuccess(@Nullable Void result) { } + @Override public void onFailure(Throwable ex) { handleFailure(ex); } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java index d39a7fccdbb..3cb2b87db71 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java @@ -1086,6 +1086,7 @@ public class StompBrokerRelayMessageHandler extends AbstractBrokerMessageHandler return this.disconnect.get(); } + @Override public String toString() { return (connectionHandlers.size() + " sessions, " + getTcpClientInfo() + (isBrokerAvailable() ? " (available)" : " (not available)") + diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompReactorNettyCodec.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompReactorNettyCodec.java index aeaa3e4fe22..f8dc3602271 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompReactorNettyCodec.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompReactorNettyCodec.java @@ -53,6 +53,7 @@ public class StompReactorNettyCodec extends AbstractNioBufferReactorNettyCodec message) { return ByteBuffer.wrap(this.encoder.encode(message)); } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/support/ChannelInterceptorAdapter.java b/spring-messaging/src/main/java/org/springframework/messaging/support/ChannelInterceptorAdapter.java index 7bdf7b1969d..a8477f58436 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/support/ChannelInterceptorAdapter.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/support/ChannelInterceptorAdapter.java @@ -47,6 +47,7 @@ public abstract class ChannelInterceptorAdapter implements ChannelInterceptor { public void afterSendCompletion(Message message, MessageChannel channel, boolean sent, @Nullable Exception ex) { } + @Override public boolean preReceive(MessageChannel channel) { return true; } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/support/GenericMessage.java b/spring-messaging/src/main/java/org/springframework/messaging/support/GenericMessage.java index b1c06282e04..0191e649f8b 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/support/GenericMessage.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/support/GenericMessage.java @@ -77,15 +77,18 @@ public class GenericMessage implements Message, Serializable { } + @Override public T getPayload() { return this.payload; } + @Override public MessageHeaders getHeaders() { return this.headers; } + @Override public boolean equals(@Nullable Object other) { if (this == other) { return true; @@ -98,11 +101,13 @@ public class GenericMessage implements Message, Serializable { return (ObjectUtils.nullSafeEquals(this.payload, otherMsg.payload) && this.headers.equals(otherMsg.headers)); } + @Override public int hashCode() { // Using nullSafeHashCode for proper array hashCode handling return (ObjectUtils.nullSafeHashCode(this.payload) * 23 + this.headers.hashCode()); } + @Override public String toString() { StringBuilder sb = new StringBuilder(getClass().getSimpleName()); sb.append(" [payload="); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/MethodMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/MethodMessageHandlerTests.java index eb9283ad22f..89d036a8706 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/MethodMessageHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/MethodMessageHandlerTests.java @@ -190,6 +190,7 @@ public class MethodMessageHandlerTests { super.detectHandlerMethods(handler); } + @Override public void registerHandlerMethod(Object handler, Method method, String mapping) { super.registerHandlerMethod(handler, method, mapping); } diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java index fa2fe9fa145..0bc63122db4 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java @@ -316,11 +316,13 @@ public class LocalContainerEntityManagerFactoryBeanTests extends AbstractEntityM } // JPA 2.1 method + @Override public void generateSchema(PersistenceUnitInfo persistenceUnitInfo, Map map) { throw new UnsupportedOperationException(); } // JPA 2.1 method + @Override public boolean generateSchema(String persistenceUnitName, Map map) { throw new UnsupportedOperationException(); } diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java index e34329a265f..b391608f632 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java @@ -102,11 +102,13 @@ public class LocalEntityManagerFactoryBeanTests extends AbstractEntityManagerFac } // JPA 2.1 method + @Override public void generateSchema(PersistenceUnitInfo persistenceUnitInfo, Map map) { throw new UnsupportedOperationException(); } // JPA 2.1 method + @Override public boolean generateSchema(String persistenceUnitName, Map map) { throw new UnsupportedOperationException(); } diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java index 169babc3352..5653474b60d 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java @@ -46,6 +46,7 @@ public class HibernateMultiEntityManagerFactoryIntegrationTests extends Abstract } + @Override @Test public void testEntityManagerFactoryImplementsEntityManagerFactoryInfo() { boolean condition = this.entityManagerFactory instanceof EntityManagerFactoryInfo; diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateNativeEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateNativeEntityManagerFactoryIntegrationTests.java index 317b43067e7..d83a36d57a9 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateNativeEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateNativeEntityManagerFactoryIntegrationTests.java @@ -53,6 +53,7 @@ public class HibernateNativeEntityManagerFactoryIntegrationTests extends Abstrac } + @Override @Test public void testEntityManagerFactoryImplementsEntityManagerFactoryInfo() { boolean condition = entityManagerFactory instanceof EntityManagerFactoryInfo; diff --git a/spring-test/src/main/java/org/springframework/test/context/support/DefaultTestContext.java b/spring-test/src/main/java/org/springframework/test/context/support/DefaultTestContext.java index 7f0c97ae46b..5cc2dbf9121 100644 --- a/spring-test/src/main/java/org/springframework/test/context/support/DefaultTestContext.java +++ b/spring-test/src/main/java/org/springframework/test/context/support/DefaultTestContext.java @@ -118,6 +118,7 @@ public class DefaultTestContext implements TestContext { * loader delegate is not active (i.e., has been closed) * @see CacheAwareContextLoaderDelegate#loadContext */ + @Override public ApplicationContext getApplicationContext() { ApplicationContext context = this.cacheAwareContextLoaderDelegate.loadContext(this.mergedContextConfiguration); if (context instanceof ConfigurableApplicationContext) { @@ -142,20 +143,24 @@ public class DefaultTestContext implements TestContext { * that was supplied when this {@code TestContext} was constructed. * @see CacheAwareContextLoaderDelegate#closeContext */ + @Override public void markApplicationContextDirty(@Nullable HierarchyMode hierarchyMode) { this.cacheAwareContextLoaderDelegate.closeContext(this.mergedContextConfiguration, hierarchyMode); } + @Override public final Class getTestClass() { return this.testClass; } + @Override public final Object getTestInstance() { Object testInstance = this.testInstance; Assert.state(testInstance != null, "No test instance"); return testInstance; } + @Override public final Method getTestMethod() { Method testMethod = this.testMethod; Assert.state(testMethod != null, "No test method"); @@ -168,6 +173,7 @@ public class DefaultTestContext implements TestContext { return this.testException; } + @Override public void updateState(@Nullable Object testInstance, @Nullable Method testMethod, @Nullable Throwable testException) { this.testInstance = testInstance; this.testMethod = testMethod; diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java index 6c5a7188604..97585877bef 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java @@ -106,6 +106,7 @@ final class HtmlUnitRequestBuilder implements RequestBuilder, Mergeable { } + @Override public MockHttpServletRequest buildRequest(ServletContext servletContext) { Charset charset = getCharset(); String httpMethod = this.webRequest.getHttpMethod().name(); diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebConnection.java b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebConnection.java index 3b11003aaa1..cbe396dc861 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebConnection.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebConnection.java @@ -125,6 +125,7 @@ public final class MockMvcWebConnection implements WebConnection { } + @Override public WebResponse getResponse(WebRequest webRequest) throws IOException { long startTime = System.currentTimeMillis(); HtmlUnitRequestBuilder requestBuilder = new HtmlUnitRequestBuilder(this.sessions, this.webClient, webRequest); diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/AbstractMockMvcBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/AbstractMockMvcBuilder.java index 876f3feddef..9741812ae3c 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/AbstractMockMvcBuilder.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/AbstractMockMvcBuilder.java @@ -67,6 +67,7 @@ public abstract class AbstractMockMvcBuilder private final List configurers = new ArrayList<>(4); + @Override public final T addFilters(Filter... filters) { Assert.notNull(filters, "filters cannot be null"); for (Filter f : filters) { @@ -76,6 +77,7 @@ public abstract class AbstractMockMvcBuilder return self(); } + @Override public final T addFilter(Filter filter, String... urlPatterns) { Assert.notNull(filter, "filter cannot be null"); Assert.notNull(urlPatterns, "urlPatterns cannot be null"); @@ -86,16 +88,19 @@ public abstract class AbstractMockMvcBuilder return self(); } + @Override public final T defaultRequest(RequestBuilder requestBuilder) { this.defaultRequestBuilder = requestBuilder; return self(); } + @Override public final T alwaysExpect(ResultMatcher resultMatcher) { this.globalResultMatchers.add(resultMatcher); return self(); } + @Override public final T alwaysDo(ResultHandler resultHandler) { this.globalResultHandlers.add(resultHandler); return self(); @@ -106,11 +111,13 @@ public abstract class AbstractMockMvcBuilder return self(); } + @Override public final T dispatchOptions(boolean dispatchOptions) { return addDispatcherServletCustomizer( dispatcherServlet -> dispatcherServlet.setDispatchOptionsRequest(dispatchOptions)); } + @Override public final T apply(MockMvcConfigurer configurer) { configurer.afterConfigurerAdded(this); this.configurers.add(configurer); diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackFalseRollbackAnnotationTransactionalTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackFalseRollbackAnnotationTransactionalTests.java index 433bf43bda4..acfe92bfceb 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackFalseRollbackAnnotationTransactionalTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackFalseRollbackAnnotationTransactionalTests.java @@ -46,6 +46,7 @@ public class RollbackOverrideDefaultRollbackFalseRollbackAnnotationTransactional private static JdbcTemplate jdbcTemplate; + @Override @Autowired public void setDataSource(DataSource dataSource) { jdbcTemplate = new JdbcTemplate(dataSource); diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalTests.java index 60a6183def0..3661ceca9f6 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalTests.java @@ -44,6 +44,7 @@ public class RollbackOverrideDefaultRollbackTrueTransactionalTests private static JdbcTemplate jdbcTemplate; + @Override @Autowired public void setDataSource(DataSource dataSource) { jdbcTemplate = new JdbcTemplate(dataSource); diff --git a/spring-test/src/test/java/org/springframework/test/util/subpackage/PersonEntity.java b/spring-test/src/test/java/org/springframework/test/util/subpackage/PersonEntity.java index df45b57f06e..45b841983e3 100644 --- a/spring-test/src/test/java/org/springframework/test/util/subpackage/PersonEntity.java +++ b/spring-test/src/test/java/org/springframework/test/util/subpackage/PersonEntity.java @@ -38,6 +38,7 @@ public class PersonEntity extends PersistentEntity implements Person { private Number favoriteNumber; + @Override public String getName() { return this.name; } @@ -47,6 +48,7 @@ public class PersonEntity extends PersistentEntity implements Person { this.name = name; } + @Override public int getAge() { return this.age; } @@ -55,6 +57,7 @@ public class PersonEntity extends PersistentEntity implements Person { this.age = age; } + @Override public String getEyeColor() { return this.eyeColor; } @@ -63,6 +66,7 @@ public class PersonEntity extends PersistentEntity implements Person { this.eyeColor = eyeColor; } + @Override public boolean likesPets() { return this.likesPets; } @@ -71,6 +75,7 @@ public class PersonEntity extends PersistentEntity implements Person { this.likesPets = likesPets; } + @Override public Number getFavoriteNumber() { return this.favoriteNumber; } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java index 547f03eda01..3c67f2a7dfd 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java @@ -538,6 +538,7 @@ public class MockHttpServletRequestBuilderTests { return this; } + @Override public MockHttpServletRequest postProcessRequest(MockHttpServletRequest request) { request.setAttribute(attr, value); return request; diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/EncodedUriTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/EncodedUriTests.java index 431e0511334..aac7d7985be 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/EncodedUriTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/EncodedUriTests.java @@ -115,6 +115,7 @@ public class EncodedUriTests { @Component private static class HandlerMappingConfigurer implements BeanPostProcessor, PriorityOrdered { + @Override public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { if (bean instanceof RequestMappingHandlerMapping) { RequestMappingHandlerMapping requestMappingHandlerMapping = (RequestMappingHandlerMapping) bean; @@ -125,10 +126,12 @@ public class EncodedUriTests { return bean; } + @Override public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { return bean; } + @Override public int getOrder() { return PriorityOrdered.HIGHEST_PRECEDENCE; } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java index f1f78a7ad74..fd864e7573b 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java @@ -249,6 +249,7 @@ public class AsyncTests { public DeferredResult getDeferredResultWithDelayedError() { final DeferredResult deferredResult = new DeferredResult<>(); new Thread() { + @Override public void run() { try { Thread.sleep(100); diff --git a/spring-web/src/main/java/org/springframework/http/converter/AbstractGenericHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/AbstractGenericHttpMessageConverter.java index fe17ad9cf46..3b34625e5a2 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/AbstractGenericHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/AbstractGenericHttpMessageConverter.java @@ -80,6 +80,7 @@ public abstract class AbstractGenericHttpMessageConverter extends AbstractHtt * This implementation sets the default headers by calling {@link #addDefaultHeaders}, * and then calls {@link #writeInternal}. */ + @Override public final void write(final T t, @Nullable final Type type, @Nullable MediaType contentType, HttpOutputMessage outputMessage) throws IOException, HttpMessageNotWritableException { diff --git a/spring-web/src/main/java/org/springframework/http/server/DefaultPathContainer.java b/spring-web/src/main/java/org/springframework/http/server/DefaultPathContainer.java index 95d6079756c..7d5a586a9b0 100644 --- a/spring-web/src/main/java/org/springframework/http/server/DefaultPathContainer.java +++ b/spring-web/src/main/java/org/springframework/http/server/DefaultPathContainer.java @@ -295,6 +295,7 @@ final class DefaultPathContainer implements PathContainer { return this.value.hashCode(); } + @Override public String toString() { return "[value='" + this.value + "']"; } diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpRequest.java index 84c2e9597ad..4f4d628c684 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpRequest.java @@ -83,6 +83,7 @@ public abstract class AbstractServerHttpRequest implements ServerHttpRequest { } + @Override public String getId() { if (this.id == null) { this.id = initId(); diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java index 2cb8e42cd5b..8f4f0f7bf7b 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java @@ -177,6 +177,7 @@ class ServletServerHttpRequest extends AbstractServerHttpRequest { return new InetSocketAddress(this.request.getRemoteHost(), this.request.getRemotePort()); } + @Override @Nullable protected SslInfo initSslInfo() { X509Certificate[] certificates = getX509Certificates(); diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/SpringWebConstraintValidatorFactory.java b/spring-web/src/main/java/org/springframework/web/bind/support/SpringWebConstraintValidatorFactory.java index d92cad063d8..b795b3eb718 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/support/SpringWebConstraintValidatorFactory.java +++ b/spring-web/src/main/java/org/springframework/web/bind/support/SpringWebConstraintValidatorFactory.java @@ -45,6 +45,7 @@ public class SpringWebConstraintValidatorFactory implements ConstraintValidatorF } // Bean Validation 1.1 releaseInstance method + @Override public void releaseInstance(ConstraintValidator instance) { getWebApplicationContext().getAutowireCapableBeanFactory().destroyBean(instance); } diff --git a/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncTask.java b/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncTask.java index 5d3a91121c3..4c523bb7fd0 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncTask.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncTask.java @@ -118,6 +118,7 @@ public class WebAsyncTask implements BeanFactoryAware { *

This factory reference will automatically be set when * {@code WebAsyncTask} is used within a Spring MVC controller. */ + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } diff --git a/spring-web/src/main/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.java b/spring-web/src/main/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.java index 78adc67ecb9..b3d1ed90ccc 100644 --- a/spring-web/src/main/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.java +++ b/spring-web/src/main/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.java @@ -147,6 +147,7 @@ public class AnnotationConfigWebApplicationContext extends AbstractRefreshableWe * @see #setConfigLocation(String) * @see #refresh() */ + @Override public void register(Class... annotatedClasses) { Assert.notEmpty(annotatedClasses, "At least one annotated class must be specified"); Collections.addAll(this.annotatedClasses, annotatedClasses); @@ -162,6 +163,7 @@ public class AnnotationConfigWebApplicationContext extends AbstractRefreshableWe * @see #setConfigLocation(String) * @see #refresh() */ + @Override public void scan(String... basePackages) { Assert.notEmpty(basePackages, "At least one base package must be specified"); Collections.addAll(this.basePackages, basePackages); diff --git a/spring-web/src/main/java/org/springframework/web/context/support/GroovyWebApplicationContext.java b/spring-web/src/main/java/org/springframework/web/context/support/GroovyWebApplicationContext.java index ca344393bea..25610fd6a3d 100644 --- a/spring-web/src/main/java/org/springframework/web/context/support/GroovyWebApplicationContext.java +++ b/spring-web/src/main/java/org/springframework/web/context/support/GroovyWebApplicationContext.java @@ -154,22 +154,27 @@ public class GroovyWebApplicationContext extends AbstractRefreshableWebApplicati // Implementation of the GroovyObject interface + @Override public void setMetaClass(MetaClass metaClass) { this.metaClass = metaClass; } + @Override public MetaClass getMetaClass() { return this.metaClass; } + @Override public Object invokeMethod(String name, Object args) { return this.metaClass.invokeMethod(this, name, args); } + @Override public void setProperty(String property, Object newValue) { this.metaClass.setProperty(this, property, newValue); } + @Override @Nullable public Object getProperty(String property) { if (containsBean(property)) { diff --git a/spring-web/src/main/java/org/springframework/web/server/session/InMemoryWebSessionStore.java b/spring-web/src/main/java/org/springframework/web/server/session/InMemoryWebSessionStore.java index ac86290a1ff..cb23bb313d5 100644 --- a/spring-web/src/main/java/org/springframework/web/server/session/InMemoryWebSessionStore.java +++ b/spring-web/src/main/java/org/springframework/web/server/session/InMemoryWebSessionStore.java @@ -140,6 +140,7 @@ public class InMemoryWebSessionStore implements WebSessionStore { return Mono.empty(); } + @Override public Mono updateLastAccessTime(WebSession session) { return Mono.fromSupplier(() -> { Assert.isInstanceOf(InMemoryWebSession.class, session); diff --git a/spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java b/spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java index 3161b5fd8c5..5fd631d1c0a 100644 --- a/spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java +++ b/spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java @@ -127,6 +127,7 @@ public class ContentCachingResponseWrapper extends HttpServletResponseWrapper { } // Overrides Servlet 3.1 setContentLengthLong(long) at runtime + @Override public void setContentLengthLong(long len) { if (len > Integer.MAX_VALUE) { throw new IllegalArgumentException("Content-Length exceeds ContentCachingResponseWrapper's maximum (" + diff --git a/spring-web/src/main/java/org/springframework/web/util/DefaultUriBuilderFactory.java b/spring-web/src/main/java/org/springframework/web/util/DefaultUriBuilderFactory.java index 0cc18286424..d7654582436 100644 --- a/spring-web/src/main/java/org/springframework/web/util/DefaultUriBuilderFactory.java +++ b/spring-web/src/main/java/org/springframework/web/util/DefaultUriBuilderFactory.java @@ -195,16 +195,19 @@ public class DefaultUriBuilderFactory implements UriBuilderFactory { // UriTemplateHandler + @Override public URI expand(String uriTemplate, Map uriVars) { return uriString(uriTemplate).build(uriVars); } + @Override public URI expand(String uriTemplate, Object... uriVars) { return uriString(uriTemplate).build(uriVars); } // UriBuilderFactory + @Override public UriBuilder uriString(String uriTemplate) { return new DefaultUriBuilder(uriTemplate); } diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/CaptureTheRestPathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/CaptureTheRestPathElement.java index b1a9ad8e488..4cf59596397 100644 --- a/spring-web/src/main/java/org/springframework/web/util/pattern/CaptureTheRestPathElement.java +++ b/spring-web/src/main/java/org/springframework/web/util/pattern/CaptureTheRestPathElement.java @@ -112,6 +112,7 @@ class CaptureTheRestPathElement extends PathElement { } + @Override public String toString() { return "CaptureTheRest(/{*" + this.variableName + "})"; } diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/CaptureVariablePathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/CaptureVariablePathElement.java index 88ad319fb72..c99d7f84224 100644 --- a/spring-web/src/main/java/org/springframework/web/util/pattern/CaptureVariablePathElement.java +++ b/spring-web/src/main/java/org/springframework/web/util/pattern/CaptureVariablePathElement.java @@ -150,11 +150,13 @@ class CaptureVariablePathElement extends PathElement { } + @Override public String toString() { return "CaptureVariable({" + this.variableName + (this.constraintPattern != null ? ":" + this.constraintPattern.pattern() : "") + "})"; } + @Override public char[] getChars() { StringBuilder b = new StringBuilder(); b.append("{"); diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/LiteralPathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/LiteralPathElement.java index ca2c239a4db..715831f7004 100644 --- a/spring-web/src/main/java/org/springframework/web/util/pattern/LiteralPathElement.java +++ b/spring-web/src/main/java/org/springframework/web/util/pattern/LiteralPathElement.java @@ -113,11 +113,13 @@ class LiteralPathElement extends PathElement { return this.len; } + @Override public char[] getChars() { return this.text; } + @Override public String toString() { return "Literal(" + String.valueOf(this.text) + ")"; } diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java index e08a9dac8d5..fbd6b7f4df5 100644 --- a/spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java +++ b/spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java @@ -203,6 +203,7 @@ class RegexPathElement extends PathElement { } + @Override public String toString() { return "Regex(" + String.valueOf(this.regex) + ")"; } diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/SeparatorPathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/SeparatorPathElement.java index 43968a1b4c7..19cbd3d319e 100644 --- a/spring-web/src/main/java/org/springframework/web/util/pattern/SeparatorPathElement.java +++ b/spring-web/src/main/java/org/springframework/web/util/pattern/SeparatorPathElement.java @@ -62,10 +62,12 @@ class SeparatorPathElement extends PathElement { return 1; } + @Override public String toString() { return "Separator(" + this.separator + ")"; } + @Override public char[] getChars() { return new char[] {this.separator}; } diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/SingleCharWildcardedPathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/SingleCharWildcardedPathElement.java index b6d8327d58a..717a7c4a978 100644 --- a/spring-web/src/main/java/org/springframework/web/util/pattern/SingleCharWildcardedPathElement.java +++ b/spring-web/src/main/java/org/springframework/web/util/pattern/SingleCharWildcardedPathElement.java @@ -126,6 +126,7 @@ class SingleCharWildcardedPathElement extends PathElement { } + @Override public String toString() { return "SingleCharWildcarded(" + String.valueOf(this.text) + ")"; } diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/WildcardPathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/WildcardPathElement.java index 9b1101a47d0..1f4f0b3e87a 100644 --- a/spring-web/src/main/java/org/springframework/web/util/pattern/WildcardPathElement.java +++ b/spring-web/src/main/java/org/springframework/web/util/pattern/WildcardPathElement.java @@ -97,6 +97,7 @@ class WildcardPathElement extends PathElement { } + @Override public String toString() { return "Wildcard(*)"; } diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/WildcardTheRestPathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/WildcardTheRestPathElement.java index b494a72af75..25a72d58831 100644 --- a/spring-web/src/main/java/org/springframework/web/util/pattern/WildcardTheRestPathElement.java +++ b/spring-web/src/main/java/org/springframework/web/util/pattern/WildcardTheRestPathElement.java @@ -53,6 +53,7 @@ class WildcardTheRestPathElement extends PathElement { } + @Override public String toString() { return "WildcardTheRest(" + this.separator + "**)"; } diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java index 7cd38eefb92..a630f6cd781 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java @@ -455,10 +455,12 @@ public class MappingJackson2HttpMessageConverterTests { private String string; + @Override public String getString() { return string; } + @Override public void setString(String string) { this.string = string; } diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/SpringHandlerInstantiatorTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/SpringHandlerInstantiatorTests.java index 5bd5860a3ea..085025ced5f 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/json/SpringHandlerInstantiatorTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/json/SpringHandlerInstantiatorTests.java @@ -228,6 +228,7 @@ public class SpringHandlerInstantiatorTests { } // New in Jackson 2.7 + @Override public String getDescForKnownTypeIds() { return null; } diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ConsumesRequestCondition.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ConsumesRequestCondition.java index 6592b6d4444..3bd28717c6e 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ConsumesRequestCondition.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ConsumesRequestCondition.java @@ -132,6 +132,7 @@ public final class ConsumesRequestCondition extends AbstractRequestCondition { + @Override @RequestMapping(path = "/{id}", method = RequestMethod.GET) public Person get(@PathVariable Long id) { return new Person(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java index 7162d231ca6..8de52b115c5 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java @@ -3230,11 +3230,13 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @RequestMapping(path = ApiConstants.ARTICLES_PATH) public static class ArticleController implements ApiConstants, ResourceEndpoint { + @Override @GetMapping(params = "page") public Collection

find(String pageable, ArticlePredicate predicate) { throw new UnsupportedOperationException("not implemented"); } + @Override @GetMapping public List
find(boolean sort, ArticlePredicate predicate) { throw new UnsupportedOperationException("not implemented"); diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/AbstractWebSocketMessage.java b/spring-websocket/src/main/java/org/springframework/web/socket/AbstractWebSocketMessage.java index 0348d847cbf..b3a3b3ae635 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/AbstractWebSocketMessage.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/AbstractWebSocketMessage.java @@ -60,6 +60,7 @@ public abstract class AbstractWebSocketMessage implements WebSocketMessage /** * Return the message payload (never {@code null}). */ + @Override public T getPayload() { return this.payload; } @@ -67,6 +68,7 @@ public abstract class AbstractWebSocketMessage implements WebSocketMessage /** * Whether this is the last part of a message sent as a series of partial messages. */ + @Override public boolean isLast() { return this.last; } diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/StandardWebSocketSession.java b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/StandardWebSocketSession.java index c12a4bbad14..42e8baa530b 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/StandardWebSocketSession.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/StandardWebSocketSession.java @@ -139,6 +139,7 @@ public class StandardWebSocketSession extends AbstractWebSocketSession return this.extensions; } + @Override public Principal getPrincipal() { return this.user; } diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketMessageBrokerStats.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketMessageBrokerStats.java index 91182e1b238..6b35ac0398b 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketMessageBrokerStats.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketMessageBrokerStats.java @@ -209,6 +209,7 @@ public class WebSocketMessageBrokerStats { return str.substring(str.indexOf("pool"), str.length() - 1); } + @Override public String toString() { return "WebSocketSession[" + getWebSocketSessionStatsInfo() + "]" + ", stompSubProtocol[" + getStompSubProtocolStatsInfo() + "]" + diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/DefaultSimpUserRegistry.java b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/DefaultSimpUserRegistry.java index e87688327a7..ffc07460f98 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/DefaultSimpUserRegistry.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/DefaultSimpUserRegistry.java @@ -169,6 +169,7 @@ public class DefaultSimpUserRegistry implements SimpUserRegistry, SmartApplicati return this.users.size(); } + @Override public Set findSubscriptions(SimpSubscriptionMatcher matcher) { Set result = new HashSet<>(); for (LocalSimpSession session : this.sessions.values()) { diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java index e5764b1c27e..39e8c97a86a 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java @@ -221,6 +221,7 @@ public class StompSubProtocolHandler implements SubProtocolHandler, ApplicationE /** * Handle incoming WebSocket messages from clients. */ + @Override public void handleMessageFromClient(WebSocketSession session, WebSocketMessage webSocketMessage, MessageChannel outputChannel) { @@ -716,6 +717,7 @@ public class StompSubProtocolHandler implements SubProtocolHandler, ApplicationE return this.disconnect.get(); } + @Override public String toString() { return "processed CONNECT(" + this.connect.get() + ")-CONNECTED(" + this.connected.get() + ")-DISCONNECT(" + this.disconnect.get() + ")"; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/SubProtocolWebSocketHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/SubProtocolWebSocketHandler.java index 206b1c7a44a..222223b4f4a 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/SubProtocolWebSocketHandler.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/SubProtocolWebSocketHandler.java @@ -187,6 +187,7 @@ public class SubProtocolWebSocketHandler /** * Return all supported protocols. */ + @Override public List getSubProtocols() { return new ArrayList<>(this.protocolHandlerLookup.keySet()); } @@ -676,6 +677,7 @@ public class SubProtocolWebSocketHandler } } + @Override public String toString() { return SubProtocolWebSocketHandler.this.sessions.size() + " current WS(" + this.webSocket.get() + diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/AbstractXhrTransport.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/AbstractXhrTransport.java index aff2c6d2558..f4c275bbedc 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/AbstractXhrTransport.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/AbstractXhrTransport.java @@ -82,6 +82,7 @@ public abstract class AbstractXhrTransport implements XhrTransport { /** * Whether XHR streaming is disabled or not. */ + @Override public boolean isXhrStreamingDisabled() { return this.xhrStreamingDisabled; } diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportHandlingSockJsService.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportHandlingSockJsService.java index 62719510ba9..fc13a2ef5ab 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportHandlingSockJsService.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportHandlingSockJsService.java @@ -135,6 +135,7 @@ public class TransportHandlingSockJsService extends AbstractSockJsService implem this.messageCodec = messageCodec; } + @Override public SockJsMessageCodec getMessageCodec() { Assert.state(this.messageCodec != null, "A SockJsMessageCodec is required but not available: " + "Add Jackson to the classpath, or configure a custom SockJsMessageCodec."); diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractHttpSockJsSession.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractHttpSockJsSession.java index 4f024511f12..c975f2f0b3d 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractHttpSockJsSession.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractHttpSockJsSession.java @@ -137,6 +137,7 @@ public abstract class AbstractHttpSockJsSession extends AbstractSockJsSession { /** * Return the selected sub-protocol to use. */ + @Override @Nullable public String getAcceptedProtocol() { return this.acceptedProtocol; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java index 6c691af57f8..9115f64d9b8 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java @@ -162,6 +162,7 @@ public abstract class AbstractSockJsSession implements SockJsSession { // Message sending + @Override public final void sendMessage(WebSocketMessage message) throws IOException { Assert.state(!isClosed(), "Cannot send a message when session is closed"); Assert.isInstanceOf(TextMessage.class, message, "SockJS supports text messages only"); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/handler/TestWebSocketSession.java b/spring-websocket/src/test/java/org/springframework/web/socket/handler/TestWebSocketSession.java index e5a91616b34..cff89526519 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/handler/TestWebSocketSession.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/handler/TestWebSocketSession.java @@ -137,6 +137,7 @@ public class TestWebSocketSession implements WebSocketSession { this.remoteAddress = remoteAddress; } + @Override public String getAcceptedProtocol() { return this.protocol; } diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/server/support/HandshakeInterceptorChainTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/server/support/HandshakeInterceptorChainTests.java index ab6f479622c..aa8f29a6d7c 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/server/support/HandshakeInterceptorChainTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/server/support/HandshakeInterceptorChainTests.java @@ -53,6 +53,7 @@ public class HandshakeInterceptorChainTests extends AbstractHttpRequestTests { private Map attributes; + @Override @BeforeEach public void setup() { super.setup(); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/StubSockJsServiceConfig.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/StubSockJsServiceConfig.java index 490c05e088d..d8521ce4c20 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/StubSockJsServiceConfig.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/StubSockJsServiceConfig.java @@ -74,6 +74,7 @@ public class StubSockJsServiceConfig implements SockJsServiceConfig { this.messageCodec = messageCodec; } + @Override public int getHttpMessageCacheSize() { return this.httpMessageCacheSize; }