From 0b53c1096af41ed25e8a5f9bd3f194f4d4f8513d Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 25 Jun 2018 11:37:17 -0700 Subject: [PATCH] Always use 'this.' when accessing fields Ensure that `this.` is used consistently when accessing class fields. Issue: SPR-16968 --- .../aop/aspectj/DeclareParentsAdvisor.java | 2 +- .../aop/framework/ProxyFactoryBean.java | 2 +- .../support/RegexpMethodPointcutAdvisor.java | 4 +-- .../aop/support/RootClassFilter.java | 2 +- .../beans/BeanWrapperImpl.java | 2 +- .../beans/InvalidPropertyException.java | 4 +-- .../AutowiredAnnotationBeanPostProcessor.java | 6 ++-- ...nitDestroyAnnotationBeanPostProcessor.java | 4 +-- .../config/FieldRetrievingFactoryBean.java | 2 +- .../config/PropertyPlaceholderConfigurer.java | 3 +- .../groovy/GroovyBeanDefinitionReader.java | 2 +- .../support/AbstractBeanDefinition.java | 4 +-- .../support/BeanDefinitionBuilder.java | 6 ++-- .../factory/support/ConstructorResolver.java | 10 +++---- .../support/DefaultListableBeanFactory.java | 6 ++-- .../support/DisposableBeanAdapter.java | 12 ++++---- .../SimpleSecurityContextProvider.java | 4 +-- .../StringArrayPropertyEditor.java | 2 +- .../cache/caffeine/CaffeineCache.java | 4 +-- .../interceptor/CacheResolverAdapter.java | 2 +- .../DefaultCacheKeyInvocationContext.java | 4 +-- .../FreeMarkerConfigurationFactory.java | 2 +- .../CommonAnnotationBeanPostProcessor.java | 6 ++-- .../event/DefaultEventListenerFactory.java | 4 +-- .../event/EventExpressionRootObject.java | 6 ++-- .../PropertySourcesPlaceholderConfigurer.java | 6 ++-- .../support/FormattingConversionService.java | 4 +-- .../WebSphereClassPreDefinePlugin.java | 4 +-- .../ScheduledAnnotationBeanPostProcessor.java | 8 +++--- .../concurrent/ThreadPoolTaskScheduler.java | 4 +-- .../support/CronSequenceGenerator.java | 4 +-- .../support/DelegatingThemeSource.java | 4 +-- ...lVariableTableParameterNameDiscoverer.java | 4 +-- .../core/ReactiveAdapterRegistry.java | 2 +- .../support/GenericConversionService.java | 4 +-- .../core/env/AbstractEnvironment.java | 2 +- .../core/io/ClassPathResource.java | 4 +-- .../springframework/util/AntPathMatcher.java | 4 +-- .../springframework/util/CollectionUtils.java | 2 +- .../org/springframework/util/StreamUtils.java | 2 +- .../util/backoff/ExponentialBackOff.java | 10 +++---- .../util/backoff/FixedBackOff.java | 6 ++-- .../CompletableToListenableFutureAdapter.java | 4 +-- .../util/xml/DomContentHandler.java | 22 +++++++-------- .../util/xml/XMLEventStreamReader.java | 6 ++-- .../expression/spel/ast/InlineList.java | 8 +++--- .../expression/spel/ast/MethodReference.java | 2 +- .../spel/ast/VariableReference.java | 2 +- .../spel/standard/SpelCompiler.java | 4 +-- .../spel/standard/SpelExpression.java | 4 +-- .../metadata/OracleTableMetaDataProvider.java | 2 +- .../springframework/jdbc/object/SqlCall.java | 4 +-- .../CustomSQLExceptionTranslatorRegistry.java | 2 +- .../jdbc/support/SQLErrorCodes.java | 4 +-- .../config/JmsListenerEndpointRegistrar.java | 4 +-- .../AbstractMessageListenerContainer.java | 4 +-- .../SimpleMessageListenerContainer.java | 4 +-- .../endpoint/JmsMessageEndpointFactory.java | 2 +- .../SendToMethodReturnValueHandler.java | 2 +- .../stomp/StompBrokerRelayMessageHandler.java | 2 +- .../messaging/simp/stomp/StompHeaders.java | 10 +++---- ...AbstractMonoToListenableFutureAdapter.java | 6 ++-- .../tcp/reactor/ReactorNettyTcpClient.java | 10 +++---- .../HibernateTransactionManager.java | 2 +- .../jpa/support/AsyncRequestInterceptor.java | 4 +-- .../oxm/castor/CastorMarshaller.java | 2 +- .../oxm/jibx/JibxMarshaller.java | 12 ++++---- .../oxm/support/MarshallingSource.java | 2 +- .../mock/env/MockEnvironment.java | 6 ++-- .../reactive/MockClientHttpResponse.java | 2 +- .../mock/jndi/SimpleNamingContextBuilder.java | 2 +- .../mock/web/MockAsyncContext.java | 2 +- .../mock/web/MockFilterConfig.java | 6 ++-- .../mock/web/MockHttpServletRequest.java | 2 +- ...TransactionalJUnit4SpringContextTests.java | 4 +-- .../context/junit4/rules/SpringClassRule.java | 6 ++-- .../RunPrepareTestInstanceCallbacks.java | 4 +-- .../support/DefaultBootstrapContext.java | 6 ++-- .../context/support/DefaultTestContext.java | 2 +- .../support/TestPropertySourceAttributes.java | 12 ++++---- ...TransactionalTestNGSpringContextTests.java | 4 +-- .../transaction/TransactionContext.java | 2 +- .../test/util/XmlExpectationsHelper.java | 4 +-- .../MockMvcClientHttpRequestFactory.java | 4 +-- .../client/match/ContentRequestMatchers.java | 2 +- .../web/reactive/server/WiretapConnector.java | 4 +-- .../htmlunit/HtmlUnitRequestBuilder.java | 2 +- .../htmlunit/MockWebResponseBuilder.java | 2 +- .../servlet/result/ContentResultMatchers.java | 8 +++--- .../result/JsonPathResultMatchers.java | 28 +++++++++---------- .../servlet/result/XpathResultMatchers.java | 20 ++++++------- .../jca/work/SimpleTaskWorkManager.java | 4 +-- .../HeuristicCompletionException.java | 2 +- .../transaction/InvalidTimeoutException.java | 2 +- .../interceptor/RollbackRuleAttribute.java | 4 +-- .../http/ContentDisposition.java | 6 ++-- .../InterceptingAsyncClientHttpRequest.java | 4 +-- .../http/client/Netty4ClientHttpRequest.java | 2 +- .../client/support/AsyncHttpAccessor.java | 4 +-- .../multipart/MultipartHttpMessageWriter.java | 4 +-- .../SynchronossPartHttpMessageReader.java | 2 +- .../http/codec/xml/XmlEventDecoder.java | 8 +++--- .../BufferedImageHttpMessageConverter.java | 2 +- .../ConfigurableWebBindingInitializer.java | 4 +-- .../web/filter/ForwardedHeaderFilter.java | 2 +- .../web/server/MethodNotAllowedException.java | 4 +-- .../web/server/ResponseStatusException.java | 4 +-- .../pattern/CaptureTheRestPathElement.java | 2 +- .../pattern/CaptureVariablePathElement.java | 2 +- .../pattern/InternalPathPatternParser.java | 4 +-- .../web/util/pattern/LiteralPathElement.java | 10 +++---- .../web/util/pattern/PathPattern.java | 24 ++++++++-------- .../SingleCharWildcardedPathElement.java | 12 ++++---- .../resource/VersionResourceResolver.java | 4 +-- .../resource/WebJarsResourceResolver.java | 2 +- .../condition/ConsumesRequestCondition.java | 2 +- .../condition/HeadersRequestCondition.java | 2 +- .../condition/ParamsRequestCondition.java | 2 +- .../condition/PatternsRequestCondition.java | 4 +-- .../condition/ProducesRequestCondition.java | 4 +-- .../result/method/RequestMappingInfo.java | 2 +- .../adapter/JettyWebSocketHandlerAdapter.java | 8 +++--- .../UndertowWebSocketHandlerAdapter.java | 8 +++--- .../client/UndertowWebSocketClient.java | 2 +- .../upgrade/JettyRequestUpgradeStrategy.java | 2 +- .../ModelAndViewDefiningException.java | 2 +- .../annotation/ResourceHandlerRegistry.java | 2 +- .../handler/AbstractHandlerMapping.java | 2 +- .../SimpleMappingExceptionResolver.java | 2 +- .../condition/HeadersRequestCondition.java | 2 +- .../mvc/condition/ParamsRequestCondition.java | 2 +- .../RequestMappingHandlerAdapter.java | 2 +- .../resource/VersionResourceResolver.java | 4 +-- .../resource/WebJarsResourceResolver.java | 4 +-- .../web/servlet/tags/BindTag.java | 18 ++++++------ .../web/servlet/tags/MessageTag.java | 4 +-- .../web/servlet/tags/NestedPathTag.java | 8 +++--- .../web/servlet/tags/TransformTag.java | 4 +-- .../web/servlet/tags/UrlTag.java | 12 ++++---- .../tags/form/AbstractHtmlElementTag.java | 4 +-- .../web/servlet/tags/form/SelectTag.java | 4 +-- .../servlet/theme/CookieThemeResolver.java | 2 +- .../view/script/ScriptTemplateView.java | 2 +- .../client/WebSocketConnectionManager.java | 10 +++---- .../client/jetty/JettyWebSocketClient.java | 2 +- .../AnnotatedEndpointConnectionManager.java | 10 +++---- .../standard/EndpointConnectionManager.java | 12 ++++---- .../standard/StandardWebSocketClient.java | 4 +-- .../ConcurrentWebSocketSessionDecorator.java | 2 +- .../messaging/WebSocketStompClient.java | 4 +-- .../jetty/JettyRequestUpgradeStrategy.java | 4 +-- .../WebLogicRequestUpgradeStrategy.java | 16 +++++------ .../sockjs/client/JettyXhrTransport.java | 2 +- .../TransportHandlingSockJsService.java | 4 +-- 154 files changed, 374 insertions(+), 373 deletions(-) diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/DeclareParentsAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/DeclareParentsAdvisor.java index 0e4ae214733..aa020a0756e 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/DeclareParentsAdvisor.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/DeclareParentsAdvisor.java @@ -76,7 +76,7 @@ public class DeclareParentsAdvisor implements IntroductionAdvisor { // Excludes methods implemented. ClassFilter typePatternFilter = new TypePatternClassFilter(typePattern); - ClassFilter exclusion = (clazz -> !introducedInterface.isAssignableFrom(clazz)); + ClassFilter exclusion = (clazz -> !this.introducedInterface.isAssignableFrom(clazz)); this.typePatternClassFilter = ClassFilters.intersection(typePatternFilter, exclusion); } diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java index 0c7a63b2496..4b5c426d777 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java @@ -651,7 +651,7 @@ public class ProxyFactoryBean extends ProxyCreatorSupport } public String getBeanName() { - return beanName; + return this.beanName; } @Override diff --git a/spring-aop/src/main/java/org/springframework/aop/support/RegexpMethodPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/RegexpMethodPointcutAdvisor.java index 896963d36b2..538d0478662 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/RegexpMethodPointcutAdvisor.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/RegexpMethodPointcutAdvisor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -128,7 +128,7 @@ public class RegexpMethodPointcutAdvisor extends AbstractGenericPointcutAdvisor this.pointcut.setPatterns(this.patterns); } } - return pointcut; + return this.pointcut; } } diff --git a/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java b/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java index 7c4ba255faa..6b8073d69a2 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java @@ -38,7 +38,7 @@ public class RootClassFilter implements ClassFilter, Serializable { @Override public boolean matches(Class candidate) { - return clazz.isAssignableFrom(candidate); + return this.clazz.isAssignableFrom(candidate); } } diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java b/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java index eb8469a86d6..bfdd2456032 100644 --- a/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java +++ b/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java @@ -283,7 +283,7 @@ public class BeanWrapperImpl extends AbstractNestablePropertyAccessor implements @Override @Nullable public TypeDescriptor nested(int level) { - return TypeDescriptor.nested(property(pd), level); + return TypeDescriptor.nested(property(this.pd), level); } @Override diff --git a/spring-beans/src/main/java/org/springframework/beans/InvalidPropertyException.java b/spring-beans/src/main/java/org/springframework/beans/InvalidPropertyException.java index 0600580a679..7b7f6eff227 100644 --- a/spring-beans/src/main/java/org/springframework/beans/InvalidPropertyException.java +++ b/spring-beans/src/main/java/org/springframework/beans/InvalidPropertyException.java @@ -60,14 +60,14 @@ public class InvalidPropertyException extends FatalBeanException { * Return the offending bean class. */ public Class getBeanClass() { - return beanClass; + return this.beanClass; } /** * Return the name of the offending property. */ public String getPropertyName() { - return propertyName; + return this.propertyName; } } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java index c2a44deb427..5216c2645f8 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java @@ -245,10 +245,10 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean ReflectionUtils.doWithMethods(beanClass, method -> { Lookup lookup = method.getAnnotation(Lookup.class); if (lookup != null) { - Assert.state(beanFactory != null, "No BeanFactory available"); + Assert.state(this.beanFactory != null, "No BeanFactory available"); LookupOverride override = new LookupOverride(method, lookup.value()); try { - RootBeanDefinition mbd = (RootBeanDefinition) beanFactory.getMergedBeanDefinition(beanName); + RootBeanDefinition mbd = (RootBeanDefinition) this.beanFactory.getMergedBeanDefinition(beanName); mbd.getMethodOverrides().addOverride(override); } catch (NoSuchBeanDefinitionException ex) { @@ -541,7 +541,7 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean private Object resolvedCachedArgument(@Nullable String beanName, @Nullable Object cachedArgument) { if (cachedArgument instanceof DependencyDescriptor) { DependencyDescriptor descriptor = (DependencyDescriptor) cachedArgument; - Assert.state(beanFactory != null, "No BeanFactory available"); + Assert.state(this.beanFactory != null, "No BeanFactory available"); return this.beanFactory.resolveDependency(descriptor, beanName, null, null); } else { diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java index 422e61f57a5..d8aa005b7b2 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java @@ -205,14 +205,14 @@ public class InitDestroyAnnotationBeanPostProcessor final LinkedList currDestroyMethods = new LinkedList<>(); ReflectionUtils.doWithLocalMethods(targetClass, method -> { - if (initAnnotationType != null && method.isAnnotationPresent(initAnnotationType)) { + if (this.initAnnotationType != null && method.isAnnotationPresent(this.initAnnotationType)) { LifecycleElement element = new LifecycleElement(method); currInitMethods.add(element); if (debug) { logger.debug("Found init method on class [" + clazz.getName() + "]: " + method); } } - if (destroyAnnotationType != null && method.isAnnotationPresent(destroyAnnotationType)) { + if (this.destroyAnnotationType != null && method.isAnnotationPresent(this.destroyAnnotationType)) { currDestroyMethods.add(new LifecycleElement(method)); if (debug) { logger.debug("Found destroy method on class [" + clazz.getName() + "]: " + method); diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java index dc81576cb2b..ba731cbfff7 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java @@ -97,7 +97,7 @@ public class FieldRetrievingFactoryBean */ @Nullable public Class getTargetClass() { - return targetClass; + return this.targetClass; } /** diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurer.java index c6af2b7dcfe..9e18b281389 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurer.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurer.java @@ -261,7 +261,8 @@ public class PropertyPlaceholderConfigurer extends PlaceholderConfigurerSupport @Override @Nullable public String resolvePlaceholder(String placeholderName) { - return PropertyPlaceholderConfigurer.this.resolvePlaceholder(placeholderName, props, systemPropertiesMode); + return PropertyPlaceholderConfigurer.this.resolvePlaceholder(placeholderName, + this.props, systemPropertiesMode); } } 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 e0809831301..cb30ff8c88d 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 @@ -512,7 +512,7 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp } else { List constructorArgs = resolveConstructorArguments(args, 0, hasClosureArgument ? args.length - 1 : args.length); - currentBeanDefinition = new GroovyBeanDefinitionWrapper(beanName, null, constructorArgs); + this.currentBeanDefinition = new GroovyBeanDefinitionWrapper(beanName, null, constructorArgs); } if (hasClosureArgument) { diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java index 0f8784831d3..ec3e2d856e5 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java @@ -470,7 +470,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess */ @Override public boolean isSingleton() { - return SCOPE_SINGLETON.equals(scope) || SCOPE_DEFAULT.equals(scope); + return SCOPE_SINGLETON.equals(this.scope) || SCOPE_DEFAULT.equals(this.scope); } /** @@ -480,7 +480,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess */ @Override public boolean isPrototype() { - return SCOPE_PROTOTYPE.equals(scope); + return SCOPE_PROTOTYPE.equals(this.scope); } /** diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java index 170f394648b..ce8e6943e82 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java @@ -275,7 +275,7 @@ public final class BeanDefinitionBuilder { * Set the autowire mode for this definition. */ public BeanDefinitionBuilder setAutowireMode(int autowireMode) { - beanDefinition.setAutowireMode(autowireMode); + this.beanDefinition.setAutowireMode(autowireMode); return this; } @@ -283,7 +283,7 @@ public final class BeanDefinitionBuilder { * Set the depency check mode for this definition. */ public BeanDefinitionBuilder setDependencyCheck(int dependencyCheck) { - beanDefinition.setDependencyCheck(dependencyCheck); + this.beanDefinition.setDependencyCheck(dependencyCheck); return this; } @@ -316,7 +316,7 @@ public final class BeanDefinitionBuilder { */ public BeanDefinitionBuilder applyCustomizers(BeanDefinitionCustomizer... customizers) { for (BeanDefinitionCustomizer customizer : customizers) { - customizer.customize(beanDefinition); + customizer.customize(this.beanDefinition); } return this; } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java index dde17da10e2..0e1e476a1d6 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java @@ -261,15 +261,15 @@ class ConstructorResolver { } try { - final InstantiationStrategy strategy = beanFactory.getInstantiationStrategy(); + final InstantiationStrategy strategy = this.beanFactory.getInstantiationStrategy(); Object beanInstance; if (System.getSecurityManager() != null) { final Constructor ctorToUse = constructorToUse; final Object[] argumentsToUse = argsToUse; beanInstance = AccessController.doPrivileged((PrivilegedAction) () -> - strategy.instantiate(mbd, beanName, beanFactory, ctorToUse, argumentsToUse), - beanFactory.getAccessControlContext()); + strategy.instantiate(mbd, beanName, this.beanFactory, ctorToUse, argumentsToUse), + this.beanFactory.getAccessControlContext()); } else { beanInstance = strategy.instantiate(mbd, beanName, this.beanFactory, constructorToUse, argsToUse); @@ -575,8 +575,8 @@ class ConstructorResolver { final Method factoryMethod = factoryMethodToUse; final Object[] args = argsToUse; beanInstance = AccessController.doPrivileged((PrivilegedAction) () -> - beanFactory.getInstantiationStrategy().instantiate(mbd, beanName, beanFactory, fb, factoryMethod, args), - beanFactory.getAccessControlContext()); + this.beanFactory.getInstantiationStrategy().instantiate(mbd, beanName, this.beanFactory, fb, factoryMethod, args), + this.beanFactory.getAccessControlContext()); } else { beanInstance = this.beanFactory.getInstantiationStrategy().instantiate( diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java index 6b16402636b..066603fb448 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java @@ -1656,7 +1656,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto return createOptionalDependency(this.descriptor, this.beanName, args); } else { - DependencyDescriptor descriptorToUse = new DependencyDescriptor(descriptor) { + DependencyDescriptor descriptorToUse = new DependencyDescriptor(this.descriptor) { @Override public Object resolveCandidate(String beanName, Class requiredType, BeanFactory beanFactory) { return beanFactory.getBean(beanName, args); @@ -1677,7 +1677,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto return createOptionalDependency(this.descriptor, this.beanName); } else { - DependencyDescriptor descriptorToUse = new DependencyDescriptor(descriptor) { + DependencyDescriptor descriptorToUse = new DependencyDescriptor(this.descriptor) { @Override public boolean isRequired() { return false; @@ -1690,7 +1690,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto @Override @Nullable public Object getIfUnique() throws BeansException { - DependencyDescriptor descriptorToUse = new DependencyDescriptor(descriptor) { + DependencyDescriptor descriptorToUse = new DependencyDescriptor(this.descriptor) { @Override public boolean isRequired() { return false; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java index 5cd65f21b90..bd932ea3739 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -248,12 +248,12 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable { try { if (System.getSecurityManager() != null) { AccessController.doPrivileged((PrivilegedExceptionAction) () -> { - ((DisposableBean) bean).destroy(); + ((DisposableBean) this.bean).destroy(); return null; - }, acc); + }, this.acc); } else { - ((DisposableBean) bean).destroy(); + ((DisposableBean) this.bean).destroy(); } } catch (Throwable ex) { @@ -326,7 +326,7 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable { }); try { AccessController.doPrivileged((PrivilegedExceptionAction) () -> - destroyMethod.invoke(bean, args), acc); + destroyMethod.invoke(this.bean, args), this.acc); } catch (PrivilegedActionException pax) { throw (InvocationTargetException) pax.getException(); @@ -334,7 +334,7 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable { } else { ReflectionUtils.makeAccessible(destroyMethod); - destroyMethod.invoke(bean, args); + destroyMethod.invoke(this.bean, args); } } catch (InvocationTargetException ex) { diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java index 6693851316e..5bcf156fda7 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -56,7 +56,7 @@ public class SimpleSecurityContextProvider implements SecurityContextProvider { @Override public AccessControlContext getAccessControlContext() { - return (this.acc != null ? acc : AccessController.getContext()); + return (this.acc != null ? this.acc : AccessController.getContext()); } } diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.java index edc76b41c1c..a6ad9842b82 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.java @@ -128,7 +128,7 @@ public class StringArrayPropertyEditor extends PropertyEditorSupport { @Override public void setAsText(String text) throws IllegalArgumentException { String[] array = StringUtils.delimitedListToStringArray(text, this.separator, this.charsToDelete); - if (trimValues) { + if (this.trimValues) { array = StringUtils.trimArrayElements(array); } if (this.emptyArrayAsNull && array.length == 0) { diff --git a/spring-context-support/src/main/java/org/springframework/cache/caffeine/CaffeineCache.java b/spring-context-support/src/main/java/org/springframework/cache/caffeine/CaffeineCache.java index 7302b9de788..57e2d5e8205 100644 --- a/spring-context-support/src/main/java/org/springframework/cache/caffeine/CaffeineCache.java +++ b/spring-context-support/src/main/java/org/springframework/cache/caffeine/CaffeineCache.java @@ -159,10 +159,10 @@ public class CaffeineCache extends AbstractValueAdaptingCache { @Override public Object apply(Object o) { try { - return toStoreValue(valueLoader.call()); + return toStoreValue(this.valueLoader.call()); } catch (Exception ex) { - throw new ValueRetrievalException(o, valueLoader, ex); + throw new ValueRetrievalException(o, this.valueLoader, ex); } } } diff --git a/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/CacheResolverAdapter.java b/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/CacheResolverAdapter.java index f1efb621efa..db454f311c5 100644 --- a/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/CacheResolverAdapter.java +++ b/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/CacheResolverAdapter.java @@ -53,7 +53,7 @@ class CacheResolverAdapter implements CacheResolver { * that this instance is using. */ protected javax.cache.annotation.CacheResolver getTarget() { - return target; + return this.target; } @Override diff --git a/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/DefaultCacheKeyInvocationContext.java b/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/DefaultCacheKeyInvocationContext.java index 2a8bab042ed..7f9d03fe097 100644 --- a/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/DefaultCacheKeyInvocationContext.java +++ b/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/DefaultCacheKeyInvocationContext.java @@ -48,12 +48,12 @@ class DefaultCacheKeyInvocationContext @Override public CacheInvocationParameter[] getKeyParameters() { - return keyParameters.clone(); + return this.keyParameters.clone(); } @Override public CacheInvocationParameter getValueParameter() { - return valueParameter; + return this.valueParameter; } } diff --git a/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactory.java b/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactory.java index 633eeea655e..0250967f391 100644 --- a/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactory.java +++ b/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactory.java @@ -113,7 +113,7 @@ public class FreeMarkerConfigurationFactory { * @see #setTemplateLoaderPath */ public void setConfigLocation(Resource resource) { - configLocation = resource; + this.configLocation = resource; } /** diff --git a/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java b/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java index 6e5df87641a..98399344dc0 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -369,7 +369,7 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean if (Modifier.isStatic(field.getModifiers())) { throw new IllegalStateException("@Resource annotation is not supported on static fields"); } - if (!ignoredResourceTypes.contains(field.getType().getName())) { + if (!this.ignoredResourceTypes.contains(field.getType().getName())) { currElements.add(new ResourceElement(field, field, null)); } } @@ -409,7 +409,7 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean if (paramTypes.length != 1) { throw new IllegalStateException("@Resource annotation requires a single-arg method: " + method); } - if (!ignoredResourceTypes.contains(paramTypes[0].getName())) { + if (!this.ignoredResourceTypes.contains(paramTypes[0].getName())) { PropertyDescriptor pd = BeanUtils.findPropertyForMethod(bridgedMethod, clazz); currElements.add(new ResourceElement(method, bridgedMethod, pd)); } 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 8d6cd686445..02d71937c5b 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 @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,7 +35,7 @@ public class DefaultEventListenerFactory implements EventListenerFactory, Ordere @Override public int getOrder() { - return order; + return this.order; } public void setOrder(int order) { diff --git a/spring-context/src/main/java/org/springframework/context/event/EventExpressionRootObject.java b/spring-context/src/main/java/org/springframework/context/event/EventExpressionRootObject.java index 2b06fdb4bf8..28cc53bf548 100644 --- a/spring-context/src/main/java/org/springframework/context/event/EventExpressionRootObject.java +++ b/spring-context/src/main/java/org/springframework/context/event/EventExpressionRootObject.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,11 +36,11 @@ class EventExpressionRootObject { } public ApplicationEvent getEvent() { - return event; + return this.event; } public Object[] getArgs() { - return args; + return this.args; } } diff --git a/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java b/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java index 0a299aff3cb..99e85240105 100644 --- a/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java +++ b/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java @@ -170,13 +170,13 @@ public class PropertySourcesPlaceholderConfigurer extends PlaceholderConfigurerS propertyResolver.setValueSeparator(this.valueSeparator); StringValueResolver valueResolver = strVal -> { - String resolved = (ignoreUnresolvablePlaceholders ? + String resolved = (this.ignoreUnresolvablePlaceholders ? propertyResolver.resolvePlaceholders(strVal) : propertyResolver.resolveRequiredPlaceholders(strVal)); - if (trimValues) { + if (this.trimValues) { resolved = resolved.trim(); } - return (resolved.equals(nullValue) ? null : resolved); + return (resolved.equals(this.nullValue) ? null : resolved); }; doProcessProperties(beanFactoryToProcess, valueResolver); diff --git a/spring-context/src/main/java/org/springframework/format/support/FormattingConversionService.java b/spring-context/src/main/java/org/springframework/format/support/FormattingConversionService.java index 6136727225e..c217efa904a 100644 --- a/spring-context/src/main/java/org/springframework/format/support/FormattingConversionService.java +++ b/spring-context/src/main/java/org/springframework/format/support/FormattingConversionService.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -293,7 +293,7 @@ public class FormattingConversionService extends GenericConversionService @Override public Set getConvertibleTypes() { - return Collections.singleton(new ConvertiblePair(String.class, fieldType)); + return Collections.singleton(new ConvertiblePair(String.class, this.fieldType)); } @Override diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java index c2bdc26182b..a674e1eca7b 100644 --- a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java +++ b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -83,7 +83,7 @@ class WebSphereClassPreDefinePlugin implements InvocationHandler { throws Exception { // NB: WebSphere passes className as "." without class while the transformer expects a VM "/" format - byte[] result = transformer.transform(classLoader, className.replace('.', '/'), null, null, classfileBuffer); + byte[] result = this.transformer.transform(classLoader, className.replace('.', '/'), null, null, classfileBuffer); return (result != null ? result : classfileBuffer); } diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java index a853ecb1aba..9ad10c19590 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java +++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java @@ -250,12 +250,12 @@ public class ScheduledAnnotationBeanPostProcessor Assert.state(this.beanFactory != null, "BeanFactory must be set to find scheduler by type"); try { // Search for TaskScheduler bean... - this.registrar.setTaskScheduler(resolveSchedulerBean(beanFactory, TaskScheduler.class, false)); + this.registrar.setTaskScheduler(resolveSchedulerBean(this.beanFactory, TaskScheduler.class, false)); } catch (NoUniqueBeanDefinitionException ex) { logger.debug("Could not find unique TaskScheduler bean", ex); try { - this.registrar.setTaskScheduler(resolveSchedulerBean(beanFactory, TaskScheduler.class, true)); + this.registrar.setTaskScheduler(resolveSchedulerBean(this.beanFactory, TaskScheduler.class, true)); } catch (NoSuchBeanDefinitionException ex2) { if (logger.isInfoEnabled()) { @@ -271,12 +271,12 @@ public class ScheduledAnnotationBeanPostProcessor logger.debug("Could not find default TaskScheduler bean", ex); // Search for ScheduledExecutorService bean next... try { - this.registrar.setScheduler(resolveSchedulerBean(beanFactory, ScheduledExecutorService.class, false)); + this.registrar.setScheduler(resolveSchedulerBean(this.beanFactory, ScheduledExecutorService.class, false)); } catch (NoUniqueBeanDefinitionException ex2) { logger.debug("Could not find unique ScheduledExecutorService bean", ex2); try { - this.registrar.setScheduler(resolveSchedulerBean(beanFactory, ScheduledExecutorService.class, true)); + this.registrar.setScheduler(resolveSchedulerBean(this.beanFactory, ScheduledExecutorService.class, true)); } catch (NoSuchBeanDefinitionException ex3) { if (logger.isInfoEnabled()) { diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java index 960952f9f1c..b230fd1f404 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java @@ -284,8 +284,8 @@ public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport private void executeAndTrack(ExecutorService executor, ListenableFutureTask listenableFuture) { Future scheduledFuture = executor.submit(errorHandlingTask(listenableFuture, false)); this.listenableFutureMap.put(scheduledFuture, listenableFuture); - listenableFuture.addCallback(result -> listenableFutureMap.remove(scheduledFuture), - ex -> listenableFutureMap.remove(scheduledFuture)); + listenableFuture.addCallback(result -> this.listenableFutureMap.remove(scheduledFuture), + ex -> this.listenableFutureMap.remove(scheduledFuture)); } @Override diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java b/spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java index 6fcd8ed625d..dc4eee5def6 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java +++ b/spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -186,7 +186,7 @@ public class CronSequenceGenerator { int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK); int dayOfMonth = calendar.get(Calendar.DAY_OF_MONTH); - int updateDayOfMonth = findNextDay(calendar, this.daysOfMonth, dayOfMonth, daysOfWeek, dayOfWeek, resets); + int updateDayOfMonth = findNextDay(calendar, this.daysOfMonth, dayOfMonth, this.daysOfWeek, dayOfWeek, resets); if (dayOfMonth == updateDayOfMonth) { resets.add(Calendar.DAY_OF_MONTH); } diff --git a/spring-context/src/main/java/org/springframework/ui/context/support/DelegatingThemeSource.java b/spring-context/src/main/java/org/springframework/ui/context/support/DelegatingThemeSource.java index 7faaac57a5f..6c3c8f32559 100644 --- a/spring-context/src/main/java/org/springframework/ui/context/support/DelegatingThemeSource.java +++ b/spring-context/src/main/java/org/springframework/ui/context/support/DelegatingThemeSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,7 +46,7 @@ public class DelegatingThemeSource implements HierarchicalThemeSource { @Override @Nullable public ThemeSource getParentThemeSource() { - return parentThemeSource; + return this.parentThemeSource; } diff --git a/spring-core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java b/spring-core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java index 1f12d2f2f57..cbaca3a5231 100644 --- a/spring-core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java +++ b/spring-core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -164,7 +164,7 @@ public class LocalVariableTableParameterNameDiscoverer implements ParameterNameD public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { // exclude synthetic + bridged && static class initialization if (!isSyntheticOrBridged(access) && !STATIC_CLASS_INIT.equals(name)) { - return new LocalVariableTableVisitor(clazz, memberMap, name, desc, isStatic(access)); + return new LocalVariableTableVisitor(this.clazz, this.memberMap, name, desc, isStatic(access)); } return null; } diff --git a/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java b/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java index 374b339c1e9..f268fe9a3c5 100644 --- a/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java +++ b/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java @@ -118,7 +118,7 @@ public class ReactiveAdapterRegistry { public void registerReactiveType(ReactiveTypeDescriptor descriptor, Function> toAdapter, Function, Object> fromAdapter) { - if (reactorPresent) { + if (this.reactorPresent) { this.adapters.add(new ReactorAdapter(descriptor, toAdapter, fromAdapter)); } else { diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java b/spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java index aca727f40c5..3ee029c2693 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java +++ b/spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -642,7 +642,7 @@ public class GenericConversionService implements ConfigurableConversionService { private List getConverterStrings() { List converterStrings = new ArrayList<>(); - for (ConvertersForPair convertersForPair : converters.values()) { + for (ConvertersForPair convertersForPair : this.converters.values()) { converterStrings.add(convertersForPair.toString()); } Collections.sort(converterStrings); diff --git a/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java b/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java index 137f2b5d0ac..aab34351b29 100644 --- a/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java +++ b/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java @@ -106,7 +106,7 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment { private final Set defaultProfiles = new LinkedHashSet<>(getReservedDefaultProfiles()); - private final MutablePropertySources propertySources = new MutablePropertySources(this.logger); + private final MutablePropertySources propertySources = new MutablePropertySources(logger); private final ConfigurablePropertyResolver propertyResolver = new PropertySourcesPropertyResolver(this.propertySources); diff --git a/spring-core/src/main/java/org/springframework/core/io/ClassPathResource.java b/spring-core/src/main/java/org/springframework/core/io/ClassPathResource.java index be203770a69..bb9ac53a10f 100644 --- a/spring-core/src/main/java/org/springframework/core/io/ClassPathResource.java +++ b/spring-core/src/main/java/org/springframework/core/io/ClassPathResource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -226,7 +226,7 @@ public class ClassPathResource extends AbstractFileResolvingResource { @Override public String getDescription() { StringBuilder builder = new StringBuilder("class path resource ["); - String pathToUse = path; + String pathToUse = this.path; if (this.clazz != null && !pathToUse.startsWith("/")) { builder.append(ClassUtils.classPackageAsResourcePath(this.clazz)); builder.append('/'); diff --git a/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java b/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java index 669b3ae160d..ce3a6223478 100644 --- a/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java +++ b/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java @@ -750,8 +750,8 @@ public class AntPathMatcher implements PathMatcher { return -1; } - boolean pattern1EqualsPath = pattern1.equals(path); - boolean pattern2EqualsPath = pattern2.equals(path); + boolean pattern1EqualsPath = pattern1.equals(this.path); + boolean pattern2EqualsPath = pattern2.equals(this.path); if (pattern1EqualsPath && pattern2EqualsPath) { return 0; } diff --git a/spring-core/src/main/java/org/springframework/util/CollectionUtils.java b/spring-core/src/main/java/org/springframework/util/CollectionUtils.java index 7e2f5506e15..e27d5eef0df 100644 --- a/spring-core/src/main/java/org/springframework/util/CollectionUtils.java +++ b/spring-core/src/main/java/org/springframework/util/CollectionUtils.java @@ -557,7 +557,7 @@ public abstract class CollectionUtils { if (this == other) { return true; } - return map.equals(other); + return this.map.equals(other); } @Override diff --git a/spring-core/src/main/java/org/springframework/util/StreamUtils.java b/spring-core/src/main/java/org/springframework/util/StreamUtils.java index 3dcb60d2203..d9982b7f89c 100644 --- a/spring-core/src/main/java/org/springframework/util/StreamUtils.java +++ b/spring-core/src/main/java/org/springframework/util/StreamUtils.java @@ -260,7 +260,7 @@ public abstract class StreamUtils { @Override public void write(byte[] b, int off, int let) throws IOException { // It is critical that we override this method for performance - out.write(b, off, let); + this.out.write(b, off, let); } @Override diff --git a/spring-core/src/main/java/org/springframework/util/backoff/ExponentialBackOff.java b/spring-core/src/main/java/org/springframework/util/backoff/ExponentialBackOff.java index d0cbe277a64..0f1c53121d7 100644 --- a/spring-core/src/main/java/org/springframework/util/backoff/ExponentialBackOff.java +++ b/spring-core/src/main/java/org/springframework/util/backoff/ExponentialBackOff.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -117,7 +117,7 @@ public class ExponentialBackOff implements BackOff { * Return the initial interval in milliseconds. */ public long getInitialInterval() { - return initialInterval; + return this.initialInterval; } /** @@ -132,7 +132,7 @@ public class ExponentialBackOff implements BackOff { * Return the value to multiply the current interval by for each retry attempt. */ public double getMultiplier() { - return multiplier; + return this.multiplier; } /** @@ -146,7 +146,7 @@ public class ExponentialBackOff implements BackOff { * Return the maximum back off time. */ public long getMaxInterval() { - return maxInterval; + return this.maxInterval; } /** @@ -162,7 +162,7 @@ public class ExponentialBackOff implements BackOff { * {@link BackOffExecution#nextBackOff()} returns {@link BackOffExecution#STOP}. */ public long getMaxElapsedTime() { - return maxElapsedTime; + return this.maxElapsedTime; } @Override diff --git a/spring-core/src/main/java/org/springframework/util/backoff/FixedBackOff.java b/spring-core/src/main/java/org/springframework/util/backoff/FixedBackOff.java index 55c23b5e8a0..2218787cce5 100644 --- a/spring-core/src/main/java/org/springframework/util/backoff/FixedBackOff.java +++ b/spring-core/src/main/java/org/springframework/util/backoff/FixedBackOff.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -69,7 +69,7 @@ public class FixedBackOff implements BackOff { * Return the interval between two attempts in milliseconds. */ public long getInterval() { - return interval; + return this.interval; } /** @@ -83,7 +83,7 @@ public class FixedBackOff implements BackOff { * Return the maximum number of attempts in milliseconds. */ public long getMaxAttempts() { - return maxAttempts; + return this.maxAttempts; } @Override diff --git a/spring-core/src/main/java/org/springframework/util/concurrent/CompletableToListenableFutureAdapter.java b/spring-core/src/main/java/org/springframework/util/concurrent/CompletableToListenableFutureAdapter.java index 38da04df110..3d534fb6bbe 100644 --- a/spring-core/src/main/java/org/springframework/util/concurrent/CompletableToListenableFutureAdapter.java +++ b/spring-core/src/main/java/org/springframework/util/concurrent/CompletableToListenableFutureAdapter.java @@ -53,10 +53,10 @@ public class CompletableToListenableFutureAdapter implements ListenableFuture this.completableFuture = completableFuture; this.completableFuture.whenComplete((result, ex) -> { if (ex != null) { - callbacks.failure(ex); + this.callbacks.failure(ex); } else { - callbacks.success(result); + this.callbacks.success(result); } }); } diff --git a/spring-core/src/main/java/org/springframework/util/xml/DomContentHandler.java b/spring-core/src/main/java/org/springframework/util/xml/DomContentHandler.java index d2ade9a2628..9015afcab3f 100644 --- a/spring-core/src/main/java/org/springframework/util/xml/DomContentHandler.java +++ b/spring-core/src/main/java/org/springframework/util/xml/DomContentHandler.java @@ -55,27 +55,27 @@ class DomContentHandler implements ContentHandler { Assert.notNull(node, "node must not be null"); this.node = node; if (node instanceof Document) { - document = (Document) node; + this.document = (Document) node; } else { - document = node.getOwnerDocument(); + this.document = node.getOwnerDocument(); } - Assert.notNull(document, "document must not be null"); + Assert.notNull(this.document, "document must not be null"); } private Node getParent() { - if (!elements.isEmpty()) { - return elements.get(elements.size() - 1); + if (!this.elements.isEmpty()) { + return this.elements.get(this.elements.size() - 1); } else { - return node; + return this.node; } } @Override public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { Node parent = getParent(); - Element element = document.createElementNS(uri, qName); + Element element = this.document.createElementNS(uri, qName); for (int i = 0; i < attributes.getLength(); i++) { String attrUri = attributes.getURI(i); String attrQname = attributes.getQName(i); @@ -85,12 +85,12 @@ class DomContentHandler implements ContentHandler { } } element = (Element) parent.appendChild(element); - elements.add(element); + this.elements.add(element); } @Override public void endElement(String uri, String localName, String qName) throws SAXException { - elements.remove(elements.size() - 1); + this.elements.remove(this.elements.size() - 1); } @Override @@ -102,7 +102,7 @@ class DomContentHandler implements ContentHandler { ((Text) lastChild).appendData(data); } else { - Text text = document.createTextNode(data); + Text text = this.document.createTextNode(data); parent.appendChild(text); } } @@ -110,7 +110,7 @@ class DomContentHandler implements ContentHandler { @Override public void processingInstruction(String target, String data) throws SAXException { Node parent = getParent(); - ProcessingInstruction pi = document.createProcessingInstruction(target, data); + ProcessingInstruction pi = this.document.createProcessingInstruction(target, data); parent.appendChild(pi); } diff --git a/spring-core/src/main/java/org/springframework/util/xml/XMLEventStreamReader.java b/spring-core/src/main/java/org/springframework/util/xml/XMLEventStreamReader.java index cd5c82ee177..48ac35a354f 100644 --- a/spring-core/src/main/java/org/springframework/util/xml/XMLEventStreamReader.java +++ b/spring-core/src/main/java/org/springframework/util/xml/XMLEventStreamReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -95,7 +95,7 @@ class XMLEventStreamReader extends AbstractXMLStreamReader { @Override public boolean isStandalone() { if (this.event.isStartDocument()) { - return ((StartDocument) event).isStandalone(); + return ((StartDocument) this.event).isStandalone(); } else { throw new IllegalStateException(); @@ -152,7 +152,7 @@ class XMLEventStreamReader extends AbstractXMLStreamReader { @Override public String getText() { if (this.event.isCharacters()) { - return event.asCharacters().getData(); + return this.event.asCharacters().getData(); } else if (this.event.getEventType() == XMLEvent.COMMENT) { return ((Comment) this.event).getText(); diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java index 20dafbc0185..c0d5a6f4dd3 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -167,11 +167,11 @@ public class InlineList extends SpelNodeImpl { // The children might be further lists if they are not constants. In this // situation do not call back into generateCode() because it will register another clinit adder. // Instead, directly build the list here: - if (children[c] instanceof InlineList) { - ((InlineList)children[c]).generateClinitCode(clazzname, constantFieldName, mv, codeflow, true); + if (this.children[c] instanceof InlineList) { + ((InlineList)this.children[c]).generateClinitCode(clazzname, constantFieldName, mv, codeflow, true); } else { - children[c].generateCode(mv, codeflow); + this.children[c].generateCode(mv, codeflow); String lastDesc = codeflow.lastDescriptor(); if (CodeFlow.isPrimitive(lastDesc)) { CodeFlow.insertBoxIfNecessary(mv, lastDesc.charAt(0)); diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java index b6a7505ffc6..dabe76cf531 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java @@ -249,7 +249,7 @@ public class MethodReference extends SpelNodeImpl { Method method = ((ReflectiveMethodExecutor) executorToCheck.get()).getMethod(); String descriptor = CodeFlow.toDescriptor(method.getReturnType()); if (this.nullSafe && CodeFlow.isPrimitive(descriptor)) { - originalPrimitiveExitTypeDescriptor = descriptor; + this.originalPrimitiveExitTypeDescriptor = descriptor; this.exitTypeDescriptor = CodeFlow.toBoxedDescriptor(descriptor); } else { diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/VariableReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/VariableReference.java index 92b82f0b652..1013fde9b42 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/VariableReference.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/VariableReference.java @@ -116,7 +116,7 @@ public class VariableReference extends SpelNodeImpl { } else { mv.visitVarInsn(ALOAD, 2); - mv.visitLdcInsn(name); + mv.visitLdcInsn(this.name); mv.visitMethodInsn(INVOKEINTERFACE, "org/springframework/expression/EvaluationContext", "lookupVariable", "(Ljava/lang/String;)Ljava/lang/Object;",true); } CodeFlow.insertCheckCast(mv, this.exitTypeDescriptor); diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelCompiler.java b/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelCompiler.java index 5acf05d0b83..30126338e25 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelCompiler.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelCompiler.java @@ -256,12 +256,12 @@ public final class SpelCompiler implements Opcodes { } int getClassesDefinedCount() { - return classesDefinedCount; + return this.classesDefinedCount; } public Class defineClass(String name, byte[] bytes) { Class clazz = super.defineClass(name, bytes, 0, bytes.length); - classesDefinedCount++; + this.classesDefinedCount++; return clazz; } } diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpression.java b/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpression.java index fbb6fb76978..8a31cd6f1c0 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpression.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -185,7 +185,7 @@ public class SpelExpression implements Expression { public Object getValue(Object rootObject) throws EvaluationException { if (this.compiledAst != null) { try { - return this.compiledAst.getValue(rootObject, evaluationContext); + return this.compiledAst.getValue(rootObject, this.evaluationContext); } catch (Throwable ex) { // If running in mixed mode, revert to interpreted diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleTableMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleTableMetaDataProvider.java index 6987780b4d5..0c14c22cc3a 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleTableMetaDataProvider.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleTableMetaDataProvider.java @@ -103,7 +103,7 @@ public class OracleTableMetaDataProvider extends GenericTableMetaDataProvider { @Nullable protected String getDefaultSchema() { if (this.defaultSchema != null) { - return defaultSchema; + return this.defaultSchema; } return super.getDefaultSchema(); } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlCall.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlCall.java index 378267b0755..273a1f3c6e8 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlCall.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlCall.java @@ -103,7 +103,7 @@ public abstract class SqlCall extends RdbmsOperation { * Return whether this call is for a function. */ public boolean isFunction() { - return function; + return this.function; } /** @@ -117,7 +117,7 @@ public abstract class SqlCall extends RdbmsOperation { * Return whether the SQL can be used as is. */ public boolean isSqlReadyForUse() { - return sqlReadyForUse; + return this.sqlReadyForUse; } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/CustomSQLExceptionTranslatorRegistry.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/CustomSQLExceptionTranslatorRegistry.java index 0b5c571fca3..8c87fa9c022 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/CustomSQLExceptionTranslatorRegistry.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/CustomSQLExceptionTranslatorRegistry.java @@ -72,7 +72,7 @@ public final class CustomSQLExceptionTranslatorRegistry { * @param translator the custom translator */ public void registerTranslator(String dbName, SQLExceptionTranslator translator) { - SQLExceptionTranslator replaced = translatorMap.put(dbName, translator); + SQLExceptionTranslator replaced = this.translatorMap.put(dbName, translator); if (replaced != null) { logger.warn("Replacing custom translator [" + replaced + "] for database '" + dbName + "' with [" + translator + "]"); diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodes.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodes.java index 582f2806934..b650dd880d9 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodes.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodes.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -123,7 +123,7 @@ public class SQLErrorCodes { } public String[] getDuplicateKeyCodes() { - return duplicateKeyCodes; + return this.duplicateKeyCodes; } public void setDuplicateKeyCodes(String... duplicateKeyCodes) { diff --git a/spring-jms/src/main/java/org/springframework/jms/config/JmsListenerEndpointRegistrar.java b/spring-jms/src/main/java/org/springframework/jms/config/JmsListenerEndpointRegistrar.java index b334c4df53c..4b426057202 100644 --- a/spring-jms/src/main/java/org/springframework/jms/config/JmsListenerEndpointRegistrar.java +++ b/spring-jms/src/main/java/org/springframework/jms/config/JmsListenerEndpointRegistrar.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,7 +57,7 @@ public class JmsListenerEndpointRegistrar implements BeanFactoryAware, Initializ private boolean startImmediately; - private Object mutex = endpointDescriptors; + private Object mutex = this.endpointDescriptors; /** diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java index 1051d7b3a06..ab59c0a31b5 100644 --- a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java +++ b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -486,7 +486,7 @@ public abstract class AbstractMessageListenerContainer extends AbstractJmsListen @Override public boolean isReplyPubSubDomain() { if (this.replyPubSubDomain != null) { - return replyPubSubDomain; + return this.replyPubSubDomain; } else { return isPubSubDomain(); diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer.java index bf1dc8df9d2..eaf535fdec6 100644 --- a/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer.java +++ b/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -293,7 +293,7 @@ public class SimpleMessageListenerContainer extends AbstractMessageListenerConta MessageConsumer consumer = createConsumer(session, destination); if (this.taskExecutor != null) { - consumer.setMessageListener(message -> taskExecutor.execute(() -> processMessage(message, session))); + consumer.setMessageListener(message -> this.taskExecutor.execute(() -> processMessage(message, session))); } else { consumer.setMessageListener(message -> processMessage(message, session)); diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java index a18caa18c09..daf1374350b 100644 --- a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java +++ b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java @@ -64,7 +64,7 @@ public class JmsMessageEndpointFactory extends AbstractMessageEndpointFactory { * Return the JMS MessageListener for this endpoint. */ protected MessageListener getMessageListener() { - Assert.state(messageListener != null, "No MessageListener set"); + Assert.state(this.messageListener != null, "No MessageListener set"); return this.messageListener; } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandler.java index aef410a4cef..5f8cdd0ae46 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandler.java @@ -253,7 +253,7 @@ public class SendToMethodReturnValueHandler implements HandlerMethodReturnValueH @Override public String toString() { - return "SendToMethodReturnValueHandler [annotationRequired=" + annotationRequired + "]"; + return "SendToMethodReturnValueHandler [annotationRequired=" + this.annotationRequired + "]"; } 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 e1d1ba15502..6fbe05c8ad5 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 @@ -538,7 +538,7 @@ public class StompBrokerRelayMessageHandler extends AbstractBrokerMessageHandler } return; } - stats.incrementDisconnectCount(); + this.stats.incrementDisconnectCount(); handler.forward(message, stompAccessor); } else { diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaders.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaders.java index 8ed8bb6bec2..89f66c04d09 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaders.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaders.java @@ -431,7 +431,7 @@ public class StompHeaders implements MultiValueMap, Serializable @Override @Nullable public String getFirst(String headerName) { - List headerValues = headers.get(headerName); + List headerValues = this.headers.get(headerName); return headerValues != null ? headerValues.get(0) : null; } @@ -445,13 +445,13 @@ public class StompHeaders implements MultiValueMap, Serializable */ @Override public void add(String headerName, @Nullable String headerValue) { - List headerValues = headers.computeIfAbsent(headerName, k -> new LinkedList<>()); + List headerValues = this.headers.computeIfAbsent(headerName, k -> new LinkedList<>()); headerValues.add(headerValue); } @Override public void addAll(String headerName, List headerValues) { - List currentValues = headers.computeIfAbsent(headerName, k -> new LinkedList<>()); + List currentValues = this.headers.computeIfAbsent(headerName, k -> new LinkedList<>()); currentValues.addAll(headerValues); } @@ -472,7 +472,7 @@ public class StompHeaders implements MultiValueMap, Serializable public void set(String headerName, @Nullable String headerValue) { List headerValues = new LinkedList<>(); headerValues.add(headerValue); - headers.put(headerName, headerValues); + this.headers.put(headerName, headerValues); } @Override @@ -483,7 +483,7 @@ public class StompHeaders implements MultiValueMap, Serializable @Override public Map toSingleValueMap() { LinkedHashMap singleValueMap = new LinkedHashMap<>(this.headers.size()); - headers.forEach((key, value) -> singleValueMap.put(key, value.get(0))); + this.headers.forEach((key, value) -> singleValueMap.put(key, value.get(0))); return singleValueMap; } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/AbstractMonoToListenableFutureAdapter.java b/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/AbstractMonoToListenableFutureAdapter.java index 22b68f5b05b..29e73651c77 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/AbstractMonoToListenableFutureAdapter.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/AbstractMonoToListenableFutureAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,10 +57,10 @@ abstract class AbstractMonoToListenableFutureAdapter implements Listenable adapted = adapt(result); } catch (Throwable ex) { - registry.failure(ex); + this.registry.failure(ex); return; } - registry.success(adapted); + this.registry.success(adapted); }) .doOnError(this.registry::failure) .toProcessor(); diff --git a/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorNettyTcpClient.java b/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorNettyTcpClient.java index 9ad79638cc3..8de9e995493 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorNettyTcpClient.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorNettyTcpClient.java @@ -277,7 +277,7 @@ public class ReactorNettyTcpClient

implements TcpOperations

{ }); DirectProcessor completion = DirectProcessor.create(); TcpConnection

connection = new ReactorNettyTcpConnection<>(inbound, outbound, codec, completion); - scheduler.schedule(() -> connectionHandler.afterConnected(connection)); + scheduler.schedule(() -> this.connectionHandler.afterConnected(connection)); inbound.withConnection(conn -> conn.addHandler(new StompMessageDecoder<>(codec))); @@ -285,9 +285,9 @@ public class ReactorNettyTcpClient

implements TcpOperations

{ .cast(Message.class) .publishOn(scheduler, PUBLISH_ON_BUFFER_SIZE) .subscribe( - connectionHandler::handleMessage, - connectionHandler::handleFailure, - connectionHandler::afterConnectionClosed); + this.connectionHandler::handleMessage, + this.connectionHandler::handleFailure, + this.connectionHandler::afterConnectionClosed); return completion; } @@ -304,7 +304,7 @@ public class ReactorNettyTcpClient

implements TcpOperations

{ @Override protected void decode(ChannelHandlerContext ctx, ByteBuf in, List out) { - Collection> messages = codec.decode(in); + Collection> messages = this.codec.decode(in); out.addAll(messages); } } diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java index 397579c26b5..a4d7c30e2c2 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java @@ -336,7 +336,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana @Nullable public Interceptor getEntityInterceptor() throws IllegalStateException, BeansException { if (this.entityInterceptor instanceof Interceptor) { - return (Interceptor) entityInterceptor; + return (Interceptor) this.entityInterceptor; } else if (this.entityInterceptor instanceof String) { if (this.beanFactory == null) { diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/support/AsyncRequestInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/AsyncRequestInterceptor.java index 24c987aaefd..23b46f3b96a 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/support/AsyncRequestInterceptor.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/support/AsyncRequestInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -96,7 +96,7 @@ class AsyncRequestInterceptor implements CallableProcessingInterceptor, Deferred private void closeEntityManager() { if (this.timeoutInProgress || this.errorInProgress) { logger.debug("Closing JPA EntityManager after async request timeout/error"); - EntityManagerFactoryUtils.closeEntityManager(emHolder.getEntityManager()); + EntityManagerFactoryUtils.closeEntityManager(this.emHolder.getEntityManager()); } } diff --git a/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java index 72c65d430f9..e8ff21f386a 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java @@ -550,7 +550,7 @@ public class CastorMarshaller extends AbstractMarshaller implements Initializing @Override protected void marshalOutputStream(Object graph, OutputStream outputStream) throws XmlMappingException, IOException { - marshalWriter(graph, new OutputStreamWriter(outputStream, encoding)); + marshalWriter(graph, new OutputStreamWriter(outputStream, this.encoding)); } @Override diff --git a/spring-oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java index 578cc2a2e35..038d011ed36 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -230,8 +230,8 @@ public class JibxMarshaller extends AbstractMarshaller implements InitializingBe } } else if (this.targetPackage != null) { - if (!StringUtils.hasLength(bindingName)) { - bindingName = DEFAULT_BINDING_NAME; + if (!StringUtils.hasLength(this.bindingName)) { + this.bindingName = DEFAULT_BINDING_NAME; } if (logger.isInfoEnabled()) { logger.info("Configured for target package [" + this.targetPackage + "] using binding [" + this.bindingName + "]"); @@ -290,9 +290,9 @@ public class JibxMarshaller extends AbstractMarshaller implements InitializingBe } private void marshalDocument(IMarshallingContext marshallingContext, Object graph) throws IOException, JiBXException { - if (StringUtils.hasLength(docTypeRootElementName)) { + if (StringUtils.hasLength(this.docTypeRootElementName)) { IXMLWriter xmlWriter = marshallingContext.getXmlWriter(); - xmlWriter.writeDocType(docTypeRootElementName, docTypeSystemId, docTypePublicId, docTypeInternalSubset); + xmlWriter.writeDocType(this.docTypeRootElementName, this.docTypeSystemId, this.docTypePublicId, this.docTypeInternalSubset); } marshallingContext.marshalDocument(graph); } @@ -391,7 +391,7 @@ public class JibxMarshaller extends AbstractMarshaller implements InitializingBe protected Object unmarshalInputStream(InputStream inputStream) throws XmlMappingException, IOException { try { IUnmarshallingContext unmarshallingContext = createUnmarshallingContext(); - return unmarshallingContext.unmarshalDocument(inputStream, encoding); + return unmarshallingContext.unmarshalDocument(inputStream, this.encoding); } catch (JiBXException ex) { throw convertJibxException(ex, false); diff --git a/spring-oxm/src/main/java/org/springframework/oxm/support/MarshallingSource.java b/spring-oxm/src/main/java/org/springframework/oxm/support/MarshallingSource.java index 7bd396f87fd..e68d09f8f05 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/support/MarshallingSource.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/support/MarshallingSource.java @@ -193,7 +193,7 @@ public class MarshallingSource extends SAXSource { @Nullable public Object getProperty(String name) throws SAXNotRecognizedException { if ("http://xml.org/sax/properties/lexical-handler".equals(name)) { - return lexicalHandler; + return this.lexicalHandler; } else { throw new SAXNotRecognizedException(name); diff --git a/spring-test/src/main/java/org/springframework/mock/env/MockEnvironment.java b/spring-test/src/main/java/org/springframework/mock/env/MockEnvironment.java index 8042e6d1f60..70d57669562 100644 --- a/spring-test/src/main/java/org/springframework/mock/env/MockEnvironment.java +++ b/spring-test/src/main/java/org/springframework/mock/env/MockEnvironment.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,14 +37,14 @@ public class MockEnvironment extends AbstractEnvironment { * Create a new {@code MockEnvironment} with a single {@link MockPropertySource}. */ public MockEnvironment() { - getPropertySources().addLast(propertySource); + getPropertySources().addLast(this.propertySource); } /** * Set a property on the underlying {@link MockPropertySource} for this environment. */ public void setProperty(String key, String value) { - propertySource.setProperty(key, value); + this.propertySource.setProperty(key, value); } /** diff --git a/spring-test/src/main/java/org/springframework/mock/http/client/reactive/MockClientHttpResponse.java b/spring-test/src/main/java/org/springframework/mock/http/client/reactive/MockClientHttpResponse.java index ee0673c33bd..05efc2ce69a 100644 --- a/spring-test/src/main/java/org/springframework/mock/http/client/reactive/MockClientHttpResponse.java +++ b/spring-test/src/main/java/org/springframework/mock/http/client/reactive/MockClientHttpResponse.java @@ -120,7 +120,7 @@ public class MockClientHttpResponse implements ClientHttpResponse { public Mono getBodyAsString() { Charset charset = getCharset(); return Flux.from(getBody()) - .reduce(bufferFactory.allocateBuffer(), (previous, current) -> { + .reduce(this.bufferFactory.allocateBuffer(), (previous, current) -> { previous.write(current); DataBufferUtils.release(current); return previous; diff --git a/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java index 41ccdf8f9ea..959f1ab2411 100644 --- a/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java +++ b/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java @@ -226,7 +226,7 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder } // Default case... - return environment1 -> new SimpleNamingContext("", boundObjects, (Hashtable) environment1); + return environment1 -> new SimpleNamingContext("", this.boundObjects, (Hashtable) environment1); } } diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockAsyncContext.java b/spring-test/src/main/java/org/springframework/mock/web/MockAsyncContext.java index 1ca1fec66ae..d0bcbdcfe62 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockAsyncContext.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockAsyncContext.java @@ -116,7 +116,7 @@ public class MockAsyncContext implements AsyncContext { @Override public void complete() { - MockHttpServletRequest mockRequest = WebUtils.getNativeRequest(request, MockHttpServletRequest.class); + MockHttpServletRequest mockRequest = WebUtils.getNativeRequest(this.request, MockHttpServletRequest.class); if (mockRequest != null) { mockRequest.setAsyncStarted(false); } diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockFilterConfig.java b/spring-test/src/main/java/org/springframework/mock/web/MockFilterConfig.java index 0ff8c2f1bce..d9ad0576a9b 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockFilterConfig.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockFilterConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -82,12 +82,12 @@ public class MockFilterConfig implements FilterConfig { @Override public String getFilterName() { - return filterName; + return this.filterName; } @Override public ServletContext getServletContext() { - return servletContext; + return this.servletContext; } public void addInitParameter(String name, String value) { diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java index 45a186f0167..83bb95ca0e7 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java @@ -1285,7 +1285,7 @@ public class MockHttpServletRequest implements HttpServletRequest { public String changeSessionId() { Assert.isTrue(this.session != null, "The request does not have a session"); if (this.session instanceof MockHttpSession) { - return ((MockHttpSession) session).changeSessionId(); + return ((MockHttpSession) this.session).changeSessionId(); } return this.session.getId(); } diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/AbstractTransactionalJUnit4SpringContextTests.java b/spring-test/src/main/java/org/springframework/test/context/junit4/AbstractTransactionalJUnit4SpringContextTests.java index 2210f20ef76..3ff0c0674ee 100644 --- a/spring-test/src/main/java/org/springframework/test/context/junit4/AbstractTransactionalJUnit4SpringContextTests.java +++ b/spring-test/src/main/java/org/springframework/test/context/junit4/AbstractTransactionalJUnit4SpringContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -177,7 +177,7 @@ public abstract class AbstractTransactionalJUnit4SpringContextTests extends Abst * @see JdbcTestUtils#deleteFromTableWhere */ protected int deleteFromTableWhere(String tableName, String whereClause, Object... args) { - return JdbcTestUtils.deleteFromTableWhere(jdbcTemplate, tableName, whereClause, args); + return JdbcTestUtils.deleteFromTableWhere(this.jdbcTemplate, tableName, whereClause, args); } /** diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/rules/SpringClassRule.java b/spring-test/src/main/java/org/springframework/test/context/junit4/rules/SpringClassRule.java index 08b80d4b49a..6c97c471b38 100644 --- a/spring-test/src/main/java/org/springframework/test/context/junit4/rules/SpringClassRule.java +++ b/spring-test/src/main/java/org/springframework/test/context/junit4/rules/SpringClassRule.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -227,10 +227,10 @@ public class SpringClassRule implements TestRule { @Override public void evaluate() throws Throwable { try { - next.evaluate(); + this.next.evaluate(); } finally { - testContextManagerCache.remove(testClass); + testContextManagerCache.remove(this.testClass); } } } diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunPrepareTestInstanceCallbacks.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunPrepareTestInstanceCallbacks.java index 8494c67f08d..3837bbbd923 100644 --- a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunPrepareTestInstanceCallbacks.java +++ b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunPrepareTestInstanceCallbacks.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -60,7 +60,7 @@ public class RunPrepareTestInstanceCallbacks extends Statement { */ @Override public void evaluate() throws Throwable { - this.testContextManager.prepareTestInstance(testInstance); + this.testContextManager.prepareTestInstance(this.testInstance); this.next.evaluate(); } diff --git a/spring-test/src/main/java/org/springframework/test/context/support/DefaultBootstrapContext.java b/spring-test/src/main/java/org/springframework/test/context/support/DefaultBootstrapContext.java index d541c29b0d3..51ad1034509 100644 --- a/spring-test/src/main/java/org/springframework/test/context/support/DefaultBootstrapContext.java +++ b/spring-test/src/main/java/org/springframework/test/context/support/DefaultBootstrapContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -68,8 +68,8 @@ public class DefaultBootstrapContext implements BootstrapContext { @Override public String toString() { return new ToStringCreator(this)// - .append("testClass", testClass.getName())// - .append("cacheAwareContextLoaderDelegate", cacheAwareContextLoaderDelegate.getClass().getName())// + .append("testClass", this.testClass.getName())// + .append("cacheAwareContextLoaderDelegate", this.cacheAwareContextLoaderDelegate.getClass().getName())// .toString(); } 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 3ab7330f218..8547e7c68a2 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 @@ -110,7 +110,7 @@ public class DefaultTestContext implements TestContext { @SuppressWarnings("resource") ConfigurableApplicationContext cac = (ConfigurableApplicationContext) context; Assert.state(cac.isActive(), () -> - "The ApplicationContext loaded for [" + mergedContextConfiguration + + "The ApplicationContext loaded for [" + this.mergedContextConfiguration + "] is not active. This may be due to one of the following reasons: " + "1) the context was closed programmatically by user code; " + "2) the context was closed during parallel test execution either " + diff --git a/spring-test/src/main/java/org/springframework/test/context/support/TestPropertySourceAttributes.java b/spring-test/src/main/java/org/springframework/test/context/support/TestPropertySourceAttributes.java index fab45d0fcdd..2afffc62234 100644 --- a/spring-test/src/main/java/org/springframework/test/context/support/TestPropertySourceAttributes.java +++ b/spring-test/src/main/java/org/springframework/test/context/support/TestPropertySourceAttributes.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -141,11 +141,11 @@ class TestPropertySourceAttributes { @Override public String toString() { return new ToStringCreator(this)// - .append("declaringClass", declaringClass.getName())// - .append("locations", ObjectUtils.nullSafeToString(locations))// - .append("inheritLocations", inheritLocations)// - .append("properties", ObjectUtils.nullSafeToString(properties))// - .append("inheritProperties", inheritProperties)// + .append("declaringClass", this.declaringClass.getName())// + .append("locations", ObjectUtils.nullSafeToString(this.locations))// + .append("inheritLocations", this.inheritLocations)// + .append("properties", ObjectUtils.nullSafeToString(this.properties))// + .append("inheritProperties", this.inheritProperties)// .toString(); } diff --git a/spring-test/src/main/java/org/springframework/test/context/testng/AbstractTransactionalTestNGSpringContextTests.java b/spring-test/src/main/java/org/springframework/test/context/testng/AbstractTransactionalTestNGSpringContextTests.java index a0559717814..000ee8ce3a2 100644 --- a/spring-test/src/main/java/org/springframework/test/context/testng/AbstractTransactionalTestNGSpringContextTests.java +++ b/spring-test/src/main/java/org/springframework/test/context/testng/AbstractTransactionalTestNGSpringContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -161,7 +161,7 @@ public abstract class AbstractTransactionalTestNGSpringContextTests extends Abst * @see JdbcTestUtils#deleteFromTableWhere */ protected int deleteFromTableWhere(String tableName, String whereClause, Object... args) { - return JdbcTestUtils.deleteFromTableWhere(jdbcTemplate, tableName, whereClause, args); + return JdbcTestUtils.deleteFromTableWhere(this.jdbcTemplate, tableName, whereClause, args); } /** diff --git a/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionContext.java b/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionContext.java index 1692ab36e55..641d4a16588 100644 --- a/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionContext.java +++ b/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionContext.java @@ -106,7 +106,7 @@ class TransactionContext { if (logger.isInfoEnabled()) { logger.info(String.format( "Began transaction (%s) for test context %s; transaction manager [%s]; rollback [%s]", - transactionsStarted, this.testContext, this.transactionManager, flaggedForRollback)); + transactionsStarted, this.testContext, this.transactionManager, this.flaggedForRollback)); } } diff --git a/spring-test/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java b/spring-test/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java index 475c6ed8ff9..a1c22cbef99 100644 --- a/spring-test/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java +++ b/spring-test/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java @@ -104,12 +104,12 @@ public class XmlExpectationsHelper { public boolean hasDifferences() { - return diff.hasDifferences(); + return this.diff.hasDifferences(); } @Override public String toString() { - return diff.toString(); + return this.diff.toString(); } } diff --git a/spring-test/src/main/java/org/springframework/test/web/client/MockMvcClientHttpRequestFactory.java b/spring-test/src/main/java/org/springframework/test/web/client/MockMvcClientHttpRequestFactory.java index a38ab07e4ba..3fab85b20dc 100644 --- a/spring-test/src/main/java/org/springframework/test/web/client/MockMvcClientHttpRequestFactory.java +++ b/spring-test/src/main/java/org/springframework/test/web/client/MockMvcClientHttpRequestFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -85,7 +85,7 @@ public class MockMvcClientHttpRequestFactory HttpMethod httpMethod, URI uri, HttpHeaders requestHeaders, byte[] requestBody) { try { - MockHttpServletResponse servletResponse = mockMvc + MockHttpServletResponse servletResponse = this.mockMvc .perform(request(httpMethod, uri).content(requestBody).headers(requestHeaders)) .andReturn() .getResponse(); diff --git a/spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java b/spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java index e1098224736..bd7f884f80f 100644 --- a/spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java +++ b/spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java @@ -231,7 +231,7 @@ public class ContentRequestMatchers { return request -> { try { MockClientHttpRequest mockRequest = (MockClientHttpRequest) request; - jsonHelper.assertJsonEqual(expectedJsonContent, mockRequest.getBodyAsString(), strict); + this.jsonHelper.assertJsonEqual(expectedJsonContent, mockRequest.getBodyAsString(), strict); } catch (Exception ex) { throw new AssertionError("Failed to parse expected or actual JSON request content", ex); diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/WiretapConnector.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/WiretapConnector.java index e05aa85c1fe..7fa8208671a 100644 --- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/WiretapConnector.java +++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/WiretapConnector.java @@ -218,8 +218,8 @@ class WiretapConnector implements ClientHttpConnector { @Override public Flux getBody() { return super.getBody() - .doOnNext(buffer::write) - .doOnError(body::onError) + .doOnNext(this.buffer::write) + .doOnError(this.body::onError) .doOnCancel(this::handleOnComplete) .doOnComplete(this::handleOnComplete); } 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 91860229ba0..87b8ca8335d 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 @@ -490,7 +490,7 @@ final class HtmlUnitRequestBuilder implements RequestBuilder, Mergeable { synchronized (HtmlUnitRequestBuilder.this.sessions) { HtmlUnitRequestBuilder.this.sessions.remove(getId()); } - removeSessionCookie(request, getId()); + removeSessionCookie(this.request, getId()); } } diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/MockWebResponseBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/MockWebResponseBuilder.java index 1c5d2bed4d3..557c0b84e7c 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/MockWebResponseBuilder.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/MockWebResponseBuilder.java @@ -63,7 +63,7 @@ final class MockWebResponseBuilder { public WebResponse build() throws IOException { WebResponseData webResponseData = webResponseData(); long endTime = System.currentTimeMillis(); - return new WebResponse(webResponseData, webRequest, endTime - startTime); + return new WebResponse(webResponseData, this.webRequest, endTime - this.startTime); } private WebResponseData webResponseData() throws IOException { diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java index 2005a96cea8..6888c8bfa07 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java @@ -156,7 +156,7 @@ public class ContentResultMatchers { public ResultMatcher xml(final String xmlContent) { return result -> { String content = result.getResponse().getContentAsString(); - xmlHelper.assertXmlEqual(xmlContent, content); + this.xmlHelper.assertXmlEqual(xmlContent, content); }; } @@ -167,7 +167,7 @@ public class ContentResultMatchers { public ResultMatcher node(final Matcher matcher) { return result -> { String content = result.getResponse().getContentAsString(); - xmlHelper.assertNode(content, matcher); + this.xmlHelper.assertNode(content, matcher); }; } @@ -179,7 +179,7 @@ public class ContentResultMatchers { public ResultMatcher source(final Matcher matcher) { return result -> { String content = result.getResponse().getContentAsString(); - xmlHelper.assertSource(content, matcher); + this.xmlHelper.assertSource(content, matcher); }; } @@ -212,7 +212,7 @@ public class ContentResultMatchers { public ResultMatcher json(final String jsonContent, final boolean strict) { return result -> { String content = result.getResponse().getContentAsString(); - jsonHelper.assertJsonEqual(jsonContent, content, strict); + this.jsonHelper.assertJsonEqual(jsonContent, content, strict); }; } diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/result/JsonPathResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/JsonPathResultMatchers.java index 09c211e89d1..01382a6543a 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/result/JsonPathResultMatchers.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/result/JsonPathResultMatchers.java @@ -84,7 +84,7 @@ public class JsonPathResultMatchers { * @see #value(Object) */ public ResultMatcher value(Matcher matcher) { - return result -> jsonPathHelper.assertValue(getContent(result), matcher); + return result -> this.jsonPathHelper.assertValue(getContent(result), matcher); } /** @@ -98,7 +98,7 @@ public class JsonPathResultMatchers { * @see #value(Object) */ public ResultMatcher value(Matcher matcher, Class targetType) { - return result -> jsonPathHelper.assertValue(getContent(result), matcher, targetType); + return result -> this.jsonPathHelper.assertValue(getContent(result), matcher, targetType); } /** @@ -108,7 +108,7 @@ public class JsonPathResultMatchers { * @see #value(Matcher, Class) */ public ResultMatcher value(Object expectedValue) { - return result -> jsonPathHelper.assertValue(getContent(result), expectedValue); + return result -> this.jsonPathHelper.assertValue(getContent(result), expectedValue); } /** @@ -120,7 +120,7 @@ public class JsonPathResultMatchers { * empty. */ public ResultMatcher exists() { - return result -> jsonPathHelper.exists(getContent(result)); + return result -> this.jsonPathHelper.exists(getContent(result)); } /** @@ -131,7 +131,7 @@ public class JsonPathResultMatchers { * empty. */ public ResultMatcher doesNotExist() { - return result -> jsonPathHelper.doesNotExist(getContent(result)); + return result -> this.jsonPathHelper.doesNotExist(getContent(result)); } /** @@ -145,7 +145,7 @@ public class JsonPathResultMatchers { * @see #doesNotExist() */ public ResultMatcher isEmpty() { - return result -> jsonPathHelper.assertValueIsEmpty(getContent(result)); + return result -> this.jsonPathHelper.assertValueIsEmpty(getContent(result)); } /** @@ -159,7 +159,7 @@ public class JsonPathResultMatchers { * @see #doesNotExist() */ public ResultMatcher isNotEmpty() { - return result -> jsonPathHelper.assertValueIsNotEmpty(getContent(result)); + return result -> this.jsonPathHelper.assertValueIsNotEmpty(getContent(result)); } /** @@ -173,7 +173,7 @@ public class JsonPathResultMatchers { * @see #isNotEmpty() */ public ResultMatcher hasJsonPath() { - return result -> jsonPathHelper.hasJsonPath(getContent(result)); + return result -> this.jsonPathHelper.hasJsonPath(getContent(result)); } /** @@ -188,7 +188,7 @@ public class JsonPathResultMatchers { * @see #isEmpty() */ public ResultMatcher doesNotHaveJsonPath() { - return result -> jsonPathHelper.doesNotHaveJsonPath(getContent(result)); + return result -> this.jsonPathHelper.doesNotHaveJsonPath(getContent(result)); } /** @@ -197,7 +197,7 @@ public class JsonPathResultMatchers { * @since 4.2.1 */ public ResultMatcher isString() { - return result -> jsonPathHelper.assertValueIsString(getContent(result)); + return result -> this.jsonPathHelper.assertValueIsString(getContent(result)); } /** @@ -206,7 +206,7 @@ public class JsonPathResultMatchers { * @since 4.2.1 */ public ResultMatcher isBoolean() { - return result -> jsonPathHelper.assertValueIsBoolean(getContent(result)); + return result -> this.jsonPathHelper.assertValueIsBoolean(getContent(result)); } /** @@ -215,7 +215,7 @@ public class JsonPathResultMatchers { * @since 4.2.1 */ public ResultMatcher isNumber() { - return result -> jsonPathHelper.assertValueIsNumber(getContent(result)); + return result -> this.jsonPathHelper.assertValueIsNumber(getContent(result)); } /** @@ -223,7 +223,7 @@ public class JsonPathResultMatchers { * assert that the result is an array. */ public ResultMatcher isArray() { - return result -> jsonPathHelper.assertValueIsArray(getContent(result)); + return result -> this.jsonPathHelper.assertValueIsArray(getContent(result)); } /** @@ -232,7 +232,7 @@ public class JsonPathResultMatchers { * @since 4.2.1 */ public ResultMatcher isMap() { - return result -> jsonPathHelper.assertValueIsMap(getContent(result)); + return result -> this.jsonPathHelper.assertValueIsMap(getContent(result)); } private String getContent(MvcResult result) throws UnsupportedEncodingException { diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/result/XpathResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/XpathResultMatchers.java index 20bda54fdfd..50143161f4f 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/result/XpathResultMatchers.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/result/XpathResultMatchers.java @@ -64,7 +64,7 @@ public class XpathResultMatchers { public ResultMatcher node(final Matcher matcher) { return result -> { MockHttpServletResponse response = result.getResponse(); - xpathHelper.assertNode(response.getContentAsByteArray(), getDefinedEncoding(response), matcher); + this.xpathHelper.assertNode(response.getContentAsByteArray(), getDefinedEncoding(response), matcher); }; } @@ -82,7 +82,7 @@ public class XpathResultMatchers { public ResultMatcher exists() { return result -> { MockHttpServletResponse response = result.getResponse(); - xpathHelper.exists(response.getContentAsByteArray(), getDefinedEncoding(response)); + this.xpathHelper.exists(response.getContentAsByteArray(), getDefinedEncoding(response)); }; } @@ -92,7 +92,7 @@ public class XpathResultMatchers { public ResultMatcher doesNotExist() { return result -> { MockHttpServletResponse response = result.getResponse(); - xpathHelper.doesNotExist(response.getContentAsByteArray(), getDefinedEncoding(response)); + this.xpathHelper.doesNotExist(response.getContentAsByteArray(), getDefinedEncoding(response)); }; } @@ -103,7 +103,7 @@ public class XpathResultMatchers { public ResultMatcher nodeCount(final Matcher matcher) { return result -> { MockHttpServletResponse response = result.getResponse(); - xpathHelper.assertNodeCount(response.getContentAsByteArray(), getDefinedEncoding(response), matcher); + this.xpathHelper.assertNodeCount(response.getContentAsByteArray(), getDefinedEncoding(response), matcher); }; } @@ -113,7 +113,7 @@ public class XpathResultMatchers { public ResultMatcher nodeCount(final int expectedCount) { return result -> { MockHttpServletResponse response = result.getResponse(); - xpathHelper.assertNodeCount(response.getContentAsByteArray(), getDefinedEncoding(response), expectedCount); + this.xpathHelper.assertNodeCount(response.getContentAsByteArray(), getDefinedEncoding(response), expectedCount); }; } @@ -124,7 +124,7 @@ public class XpathResultMatchers { public ResultMatcher string(final Matcher matcher) { return result -> { MockHttpServletResponse response = result.getResponse(); - xpathHelper.assertString(response.getContentAsByteArray(), getDefinedEncoding(response), matcher); + this.xpathHelper.assertString(response.getContentAsByteArray(), getDefinedEncoding(response), matcher); }; } @@ -134,7 +134,7 @@ public class XpathResultMatchers { public ResultMatcher string(final String expectedValue) { return result -> { MockHttpServletResponse response = result.getResponse(); - xpathHelper.assertString(response.getContentAsByteArray(), getDefinedEncoding(response), expectedValue); + this.xpathHelper.assertString(response.getContentAsByteArray(), getDefinedEncoding(response), expectedValue); }; } @@ -145,7 +145,7 @@ public class XpathResultMatchers { public ResultMatcher number(final Matcher matcher) { return result -> { MockHttpServletResponse response = result.getResponse(); - xpathHelper.assertNumber(response.getContentAsByteArray(), getDefinedEncoding(response), matcher); + this.xpathHelper.assertNumber(response.getContentAsByteArray(), getDefinedEncoding(response), matcher); }; } @@ -155,7 +155,7 @@ public class XpathResultMatchers { public ResultMatcher number(final Double expectedValue) { return result -> { MockHttpServletResponse response = result.getResponse(); - xpathHelper.assertNumber(response.getContentAsByteArray(), getDefinedEncoding(response), expectedValue); + this.xpathHelper.assertNumber(response.getContentAsByteArray(), getDefinedEncoding(response), expectedValue); }; } @@ -165,7 +165,7 @@ public class XpathResultMatchers { public ResultMatcher booleanValue(final Boolean value) { return result -> { MockHttpServletResponse response = result.getResponse(); - xpathHelper.assertBoolean(response.getContentAsByteArray(), getDefinedEncoding(response), value); + this.xpathHelper.assertBoolean(response.getContentAsByteArray(), getDefinedEncoding(response), value); }; } diff --git a/spring-tx/src/main/java/org/springframework/jca/work/SimpleTaskWorkManager.java b/spring-tx/src/main/java/org/springframework/jca/work/SimpleTaskWorkManager.java index 62fddbbc09a..3f1056c4b72 100644 --- a/spring-tx/src/main/java/org/springframework/jca/work/SimpleTaskWorkManager.java +++ b/spring-tx/src/main/java/org/springframework/jca/work/SimpleTaskWorkManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -230,7 +230,7 @@ public class SimpleTaskWorkManager implements WorkManager { @Override public void run() { if (this.acceptOnExecution) { - this.workListener.workAccepted(new WorkEvent(this, WorkEvent.WORK_ACCEPTED, work, null)); + this.workListener.workAccepted(new WorkEvent(this, WorkEvent.WORK_ACCEPTED, this.work, null)); } synchronized (this.monitor) { this.started = true; diff --git a/spring-tx/src/main/java/org/springframework/transaction/HeuristicCompletionException.java b/spring-tx/src/main/java/org/springframework/transaction/HeuristicCompletionException.java index d0c25013beb..54cd4f6ba7b 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/HeuristicCompletionException.java +++ b/spring-tx/src/main/java/org/springframework/transaction/HeuristicCompletionException.java @@ -87,7 +87,7 @@ public class HeuristicCompletionException extends TransactionException { * @see #STATE_MIXED */ public int getOutcomeState() { - return outcomeState; + return this.outcomeState; } } diff --git a/spring-tx/src/main/java/org/springframework/transaction/InvalidTimeoutException.java b/spring-tx/src/main/java/org/springframework/transaction/InvalidTimeoutException.java index 4ba82146f75..80a9d47c2d5 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/InvalidTimeoutException.java +++ b/spring-tx/src/main/java/org/springframework/transaction/InvalidTimeoutException.java @@ -44,7 +44,7 @@ public class InvalidTimeoutException extends TransactionUsageException { * Return the invalid timeout value. */ public int getTimeout() { - return timeout; + return this.timeout; } } diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java index 918e38a455e..3a7091ac534 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -96,7 +96,7 @@ public class RollbackRuleAttribute implements Serializable{ * Return the pattern for the exception name. */ public String getExceptionName() { - return exceptionName; + return this.exceptionName; } /** diff --git a/spring-web/src/main/java/org/springframework/http/ContentDisposition.java b/spring-web/src/main/java/org/springframework/http/ContentDisposition.java index 85470d33884..3e0d924ab15 100644 --- a/spring-web/src/main/java/org/springframework/http/ContentDisposition.java +++ b/spring-web/src/main/java/org/springframework/http/ContentDisposition.java @@ -177,9 +177,9 @@ public final class ContentDisposition { result = 31 * result + ObjectUtils.nullSafeHashCode(this.filename); result = 31 * result + ObjectUtils.nullSafeHashCode(this.charset); result = 31 * result + ObjectUtils.nullSafeHashCode(this.size); - result = 31 * result + (creationDate != null ? creationDate.hashCode() : 0); - result = 31 * result + (modificationDate != null ? modificationDate.hashCode() : 0); - result = 31 * result + (readDate != null ? readDate.hashCode() : 0); + result = 31 * result + (this.creationDate != null ? this.creationDate.hashCode() : 0); + result = 31 * result + (this.modificationDate != null ? this.modificationDate.hashCode() : 0); + result = 31 * result + (this.readDate != null ? this.readDate.hashCode() : 0); return result; } diff --git a/spring-web/src/main/java/org/springframework/http/client/InterceptingAsyncClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/InterceptingAsyncClientHttpRequest.java index 125533d6f73..eee6272f520 100644 --- a/spring-web/src/main/java/org/springframework/http/client/InterceptingAsyncClientHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/client/InterceptingAsyncClientHttpRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -85,7 +85,7 @@ class InterceptingAsyncClientHttpRequest extends AbstractBufferingAsyncClientHtt @Override public URI getURI() { - return uri; + return this.uri; } diff --git a/spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpRequest.java index 9a64e6cc0c3..747fb09f947 100644 --- a/spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpRequest.java @@ -138,7 +138,7 @@ class Netty4ClientHttpRequest extends AbstractAsyncClientHttpRequest implements FullHttpRequest nettyRequest = new DefaultFullHttpRequest( HttpVersion.HTTP_1_1, nettyMethod, path, this.body.buffer()); - nettyRequest.headers().set(HttpHeaders.HOST, this.uri.getHost() + ":" + getPort(uri)); + nettyRequest.headers().set(HttpHeaders.HOST, this.uri.getHost() + ":" + getPort(this.uri)); nettyRequest.headers().set(HttpHeaders.CONNECTION, "close"); headers.forEach((headerName, headerValues) -> nettyRequest.headers().add(headerName, headerValues)); if (!nettyRequest.headers().contains(HttpHeaders.CONTENT_LENGTH) && this.body.buffer().readableBytes() > 0) { diff --git a/spring-web/src/main/java/org/springframework/http/client/support/AsyncHttpAccessor.java b/spring-web/src/main/java/org/springframework/http/client/support/AsyncHttpAccessor.java index 63239d1ef58..e9ebd975dc8 100644 --- a/spring-web/src/main/java/org/springframework/http/client/support/AsyncHttpAccessor.java +++ b/spring-web/src/main/java/org/springframework/http/client/support/AsyncHttpAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -66,7 +66,7 @@ public class AsyncHttpAccessor { * org.springframework.http.client.ClientHttpRequest HttpRequests}. */ public org.springframework.http.client.AsyncClientHttpRequestFactory getAsyncRequestFactory() { - Assert.state(asyncRequestFactory != null, "No AsyncClientHttpRequestFactory set"); + Assert.state(this.asyncRequestFactory != null, "No AsyncClientHttpRequestFactory set"); return this.asyncRequestFactory; } diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriter.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriter.java index 55fd510fce0..dbb3ce1386f 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriter.java +++ b/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriter.java @@ -150,7 +150,7 @@ public class MultipartHttpMessageWriter extends LoggingCodecSupport * @since 5.0.7 */ public List> getPartWriters() { - return Collections.unmodifiableList(partWriters); + return Collections.unmodifiableList(this.partWriters); } /** @@ -398,7 +398,7 @@ public class MultipartHttpMessageWriter extends LoggingCodecSupport private DataBuffer generateHeaders() { DataBuffer buffer = this.bufferFactory.allocateBuffer(); - for (Map.Entry> entry : headers.entrySet()) { + for (Map.Entry> entry : this.headers.entrySet()) { byte[] headerName = entry.getKey().getBytes(this.charset); for (String headerValueString : entry.getValue()) { byte[] headerValue = headerValueString.getBytes(this.charset); diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java index 8982529678e..0e3c34277d6 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java +++ b/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java @@ -142,7 +142,7 @@ public class SynchronossPartHttpMessageReader extends LoggingCodecSupport implem NioMultipartParserListener listener = new FluxSinkAdapterListener(emitter, this.bufferFactory, context); NioMultipartParser parser = Multipart .multipart(context) - .usePartBodyStreamStorageFactory(streamStorageFactory) + .usePartBodyStreamStorageFactory(this.streamStorageFactory) .forNIO(listener); this.inputMessage.getBody().subscribe(buffer -> { diff --git a/spring-web/src/main/java/org/springframework/http/codec/xml/XmlEventDecoder.java b/spring-web/src/main/java/org/springframework/http/codec/xml/XmlEventDecoder.java index 1acd6b865da..696f470c521 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/xml/XmlEventDecoder.java +++ b/spring-web/src/main/java/org/springframework/http/codec/xml/XmlEventDecoder.java @@ -97,7 +97,7 @@ public class XmlEventDecoder extends AbstractDecoder { @Nullable MimeType mimeType, @Nullable Map hints) { Flux flux = Flux.from(inputStream); - if (useAalto) { + if (this.useAalto) { AaltoDataBufferToXmlEvent aaltoMapper = new AaltoDataBufferToXmlEvent(); return flux.flatMap(aaltoMapper) .doFinally(signalType -> aaltoMapper.endOfInput()); @@ -135,15 +135,15 @@ public class XmlEventDecoder extends AbstractDecoder { @Override public Publisher apply(DataBuffer dataBuffer) { try { - streamReader.getInputFeeder().feedInput(dataBuffer.asByteBuffer()); + this.streamReader.getInputFeeder().feedInput(dataBuffer.asByteBuffer()); List events = new ArrayList<>(); while (true) { - if (streamReader.next() == AsyncXMLStreamReader.EVENT_INCOMPLETE) { + if (this.streamReader.next() == AsyncXMLStreamReader.EVENT_INCOMPLETE) { // no more events with what currently has been fed to the reader break; } else { - XMLEvent event = eventAllocator.allocate(streamReader); + XMLEvent event = this.eventAllocator.allocate(this.streamReader); events.add(event); if (event.isEndDocument()) { break; diff --git a/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java index 6290448250e..61197a5d29e 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java @@ -204,7 +204,7 @@ public class BufferedImageHttpMessageConverter implements HttpMessageConverter getSupportedMethods() { - return supportedMethods; + return this.supportedMethods; } } diff --git a/spring-web/src/main/java/org/springframework/web/server/ResponseStatusException.java b/spring-web/src/main/java/org/springframework/web/server/ResponseStatusException.java index 38491d8aac4..de32007af95 100644 --- a/spring-web/src/main/java/org/springframework/web/server/ResponseStatusException.java +++ b/spring-web/src/main/java/org/springframework/web/server/ResponseStatusException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -88,7 +88,7 @@ public class ResponseStatusException extends NestedRuntimeException { @Override public String getMessage() { - String msg = this.status + (this.reason != null ? " \"" + reason + "\"" : ""); + String msg = this.status + (this.reason != null ? " \"" + this.reason + "\"" : ""); return NestedExceptionUtils.buildMessage(msg, getCause()); } 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 b962cd4d276..17986e215eb 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 @@ -76,7 +76,7 @@ class CaptureTheRestPathElement extends PathElement { } } } - matchingContext.set(variableName, pathToString(pathIndex, matchingContext.pathElements), + matchingContext.set(this.variableName, pathToString(pathIndex, matchingContext.pathElements), parametersCollector == null?NO_PARAMETERS:parametersCollector); } return true; 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 3d8d2f64fe7..53b5cbd4d5d 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 @@ -85,7 +85,7 @@ class CaptureVariablePathElement extends PathElement { if (this.constraintPattern != null) { // TODO possible optimization - only regex match if rest of pattern matches? // Benefit likely to vary pattern to pattern - Matcher matcher = constraintPattern.matcher(candidateCapture); + Matcher matcher = this.constraintPattern.matcher(candidateCapture); if (matcher.groupCount() != 0) { throw new IllegalArgumentException( "No capture groups allowed in the constraint regex: " + this.constraintPattern.pattern()); diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/InternalPathPatternParser.java b/spring-web/src/main/java/org/springframework/web/util/pattern/InternalPathPatternParser.java index ecc50cb66f7..da504912bb0 100644 --- a/spring-web/src/main/java/org/springframework/web/util/pattern/InternalPathPatternParser.java +++ b/spring-web/src/main/java/org/springframework/web/util/pattern/InternalPathPatternParser.java @@ -135,7 +135,7 @@ class InternalPathPatternParser { // throw new PatternParseException(pos, pathPatternData, // PatternMessage.CANNOT_HAVE_ADJACENT_CAPTURES); this.insideVariableCapture = true; - this.variableCaptureStart = pos; + this.variableCaptureStart = this.pos; } else if (ch == '}') { if (!this.insideVariableCapture) { @@ -202,7 +202,7 @@ class InternalPathPatternParser { boolean previousBackslash = false; while (this.pos < this.pathPatternLength) { - char ch = this.pathPatternData[pos]; + char ch = this.pathPatternData[this.pos]; if (ch == '\\' && !previousBackslash) { this.pos++; previousBackslash = true; 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 6482b030ef9..558cd5be065 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 @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,7 +46,7 @@ class LiteralPathElement extends PathElement { else { // Force all the text lower case to make matching faster this.text = new char[literalText.length]; - for (int i = 0; i < len; i++) { + for (int i = 0; i < this.len; i++) { this.text[i] = Character.toLowerCase(literalText[i]); } } @@ -64,21 +64,21 @@ class LiteralPathElement extends PathElement { return false; } String value = ((PathSegment)element).valueToMatch(); - if (value.length() != len) { + if (value.length() != this.len) { // Not enough data to match this path element return false; } char[] data = ((PathContainer.PathSegment)element).valueToMatchAsChars(); if (this.caseSensitive) { - for (int i = 0; i < len; i++) { + for (int i = 0; i < this.len; i++) { if (data[i] != this.text[i]) { return false; } } } else { - for (int i = 0; i < len; i++) { + for (int i = 0; i < this.len; i++) { // TODO revisit performance if doing a lot of case insensitive matching if (Character.toLowerCase(data[i]) != this.text[i]) { return false; diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java b/spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java index 78585a8b2ee..22bd725652d 100644 --- a/spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java +++ b/spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java @@ -282,7 +282,7 @@ public class PathPattern implements Comparable { int startIndex = 0; // Find first path element that is not a separator or a literal (i.e. the first pattern based element) - PathElement elem = head; + PathElement elem = this.head; while (elem != null) { if (elem.getWildcardCount() != 0 || elem.getCaptureCount() != 0) { break; @@ -358,7 +358,7 @@ public class PathPattern implements Comparable { // If one of them is empty the result is the other. If both empty the result is "" if (!StringUtils.hasLength(this.patternString)) { if (!StringUtils.hasLength(pattern2string.patternString)) { - return parser.parse(""); + return this.parser.parse(""); } else { return pattern2string; @@ -381,7 +381,7 @@ public class PathPattern implements Comparable { // /hotels/* + /booking => /hotels/booking // /hotels/* + booking => /hotels/booking if (this.endsWithSeparatorWildcard) { - return parser.parse(concat( + return this.parser.parse(concat( this.patternString.substring(0, this.patternString.length() - 2), pattern2string.patternString)); } @@ -390,7 +390,7 @@ public class PathPattern implements Comparable { // /hotels + booking => /hotels/booking int starDotPos1 = this.patternString.indexOf("*."); // Are there any file prefix/suffix things to consider? if (this.capturedVariableCount != 0 || starDotPos1 == -1 || this.separator == '.') { - return parser.parse(concat(this.patternString, pattern2string.patternString)); + return this.parser.parse(concat(this.patternString, pattern2string.patternString)); } // /*.html + /hotel => /hotel.html @@ -406,7 +406,7 @@ public class PathPattern implements Comparable { throw new IllegalArgumentException( "Cannot combine patterns: " + this.patternString + " and " + pattern2string); } - return parser.parse(file2 + (firstExtensionWild ? secondExtension : firstExtension)); + return this.parser.parse(file2 + (firstExtensionWild ? secondExtension : firstExtension)); } public boolean equals(Object other) { @@ -519,7 +519,7 @@ public class PathPattern implements Comparable { private boolean pathContainerIsJustSeparator(PathContainer pathContainer) { return pathContainer.value().length() == 1 && - pathContainer.value().charAt(0) == separator; + pathContainer.value().charAt(0) == this.separator; } /** @@ -643,14 +643,14 @@ public class PathPattern implements Comparable { int remainingPathIndex; public MatchingContext(PathContainer pathContainer, boolean extractVariables) { - candidate = pathContainer; - pathElements = pathContainer.elements(); - pathLength = pathElements.size(); + this.candidate = pathContainer; + this.pathElements = pathContainer.elements(); + this.pathLength = this.pathElements.size(); this.extractingVariables = extractVariables; } public void setMatchAllowExtraPath() { - determineRemainingPath = true; + this.determineRemainingPath = true; } public boolean isMatchOptionalTrailingSeparator() { @@ -686,7 +686,7 @@ public class PathPattern implements Comparable { * @return {@code true} if element is a separator */ boolean isSeparator(int pathIndex) { - return pathElements.get(pathIndex) instanceof Separator; + return this.pathElements.get(pathIndex) instanceof Separator; } /** @@ -695,7 +695,7 @@ public class PathPattern implements Comparable { * @return the decoded value */ String pathElementValue(int pathIndex) { - Element element = (pathIndex < pathLength) ? pathElements.get(pathIndex) : null; + Element element = (pathIndex < this.pathLength) ? this.pathElements.get(pathIndex) : null; if (element instanceof PathContainer.PathSegment) { return ((PathContainer.PathSegment)element).valueToMatch(); } 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 bd6d94030f3..800df60cf2a 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 @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -50,7 +50,7 @@ class SingleCharWildcardedPathElement extends PathElement { } else { this.text = new char[literalText.length]; - for (int i = 0; i < len; i++) { + for (int i = 0; i < this.len; i++) { this.text[i] = Character.toLowerCase(literalText[i]); } } @@ -69,14 +69,14 @@ class SingleCharWildcardedPathElement extends PathElement { return false; } String value = ((PathSegment)element).valueToMatch(); - if (value.length() != len) { + if (value.length() != this.len) { // Not enough data to match this path element return false; } char[] data = ((PathSegment)element).valueToMatchAsChars(); if (this.caseSensitive) { - for (int i = 0; i < len; i++) { + for (int i = 0; i < this.len; i++) { char ch = this.text[i]; if ((ch != '?') && (ch != data[i])) { return false; @@ -84,7 +84,7 @@ class SingleCharWildcardedPathElement extends PathElement { } } else { - for (int i = 0; i < len; i++) { + for (int i = 0; i < this.len; i++) { char ch = this.text[i]; // TODO revisit performance if doing a lot of case insensitive matching if ((ch != '?') && (ch != Character.toLowerCase(data[i]))) { @@ -122,7 +122,7 @@ class SingleCharWildcardedPathElement extends PathElement { @Override public int getNormalizedLength() { - return len; + return this.len; } diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/VersionResourceResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/VersionResourceResolver.java index 49ecac407e0..b5ccc951150 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/VersionResourceResolver.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/VersionResourceResolver.java @@ -306,12 +306,12 @@ public class VersionResourceResolver extends AbstractResourceResolver { @Override public String getDescription() { - return original.getDescription(); + return this.original.getDescription(); } @Override public InputStream getInputStream() throws IOException { - return original.getInputStream(); + return this.original.getInputStream(); } @Override diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/WebJarsResourceResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/WebJarsResourceResolver.java index 0becb9500d9..8fc571245c2 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/WebJarsResourceResolver.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/WebJarsResourceResolver.java @@ -109,7 +109,7 @@ public class WebJarsResourceResolver extends AbstractResourceResolver { if (endOffset != -1) { String webjar = path.substring(startOffset, endOffset); String partialPath = path.substring(endOffset + 1); - String webJarPath = webJarAssetLocator.getFullPathExact(webjar, partialPath); + String webJarPath = this.webJarAssetLocator.getFullPathExact(webjar, partialPath); if (webJarPath != null) { return webJarPath.substring(WEBJARS_LOCATION_LENGTH); } 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 fc190243da6..f9133ae57de 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 @@ -166,7 +166,7 @@ public final class ConsumesRequestCondition extends AbstractRequestCondition result = new LinkedHashSet<>(expressions); + Set result = new LinkedHashSet<>(this.expressions); result.removeIf(expression -> !expression.match(exchange)); return (result.isEmpty()) ? null : new ConsumesRequestCondition(result); } diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/HeadersRequestCondition.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/HeadersRequestCondition.java index b08fbe1c9be..21d7b137fd4 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/HeadersRequestCondition.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/HeadersRequestCondition.java @@ -113,7 +113,7 @@ public final class HeadersRequestCondition extends AbstractRequestCondition getMatchingPatterns(ServerWebExchange exchange) { PathContainer lookupPath = exchange.getRequest().getPath().pathWithinApplication(); - return patterns.stream() + return this.patterns.stream() .filter(pattern -> pattern.matches(lookupPath)) .collect(Collectors.toCollection(TreeSet::new)); } diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ProducesRequestCondition.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ProducesRequestCondition.java index a225a4e984e..c7ab6056143 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ProducesRequestCondition.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ProducesRequestCondition.java @@ -190,7 +190,7 @@ public final class ProducesRequestCondition extends AbstractRequestCondition result = new LinkedHashSet<>(expressions); + Set result = new LinkedHashSet<>(this.expressions); result.removeIf(expression -> !expression.match(exchange)); return (result.isEmpty()) ? null : new ProducesRequestCondition(result, this.contentTypeResolver); } @@ -283,7 +283,7 @@ public final class ProducesRequestCondition extends AbstractRequestCondition getExpressionsToCompare() { - return (this.expressions.isEmpty() ? mediaTypeAllList : this.expressions); + return (this.expressions.isEmpty() ? this.mediaTypeAllList : this.expressions); } diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/RequestMappingInfo.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/RequestMappingInfo.java index 7074e151fbb..b8b8166e80d 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/RequestMappingInfo.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/RequestMappingInfo.java @@ -492,7 +492,7 @@ public final class RequestMappingInfo implements RequestCondition WebSocketMessage toMessage(Type type, T message) { if (Type.TEXT.equals(type)) { byte[] bytes = ((String) message).getBytes(StandardCharsets.UTF_8); - return new WebSocketMessage(Type.TEXT, session.bufferFactory().wrap(bytes)); + return new WebSocketMessage(Type.TEXT, this.session.bufferFactory().wrap(bytes)); } else if (Type.BINARY.equals(type)) { - DataBuffer buffer = session.bufferFactory().allocateBuffer().write((ByteBuffer[]) message); + DataBuffer buffer = this.session.bufferFactory().allocateBuffer().write((ByteBuffer[]) message); return new WebSocketMessage(Type.BINARY, buffer); } else if (Type.PONG.equals(type)) { - DataBuffer buffer = session.bufferFactory().allocateBuffer().write((ByteBuffer[]) message); + DataBuffer buffer = this.session.bufferFactory().allocateBuffer().write((ByteBuffer[]) message); return new WebSocketMessage(Type.PONG, buffer); } else { diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/UndertowWebSocketClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/UndertowWebSocketClient.java index ada88f42f71..673ad3f91b9 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/UndertowWebSocketClient.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/UndertowWebSocketClient.java @@ -190,7 +190,7 @@ public class UndertowWebSocketClient extends WebSocketClientSupport implements W DefaultNegotiation negotiation, WebSocketChannel channel) { HandshakeInfo info = afterHandshake(url, negotiation.getResponseHeaders()); - UndertowWebSocketSession session = new UndertowWebSocketSession(channel, info, bufferFactory, completion); + UndertowWebSocketSession session = new UndertowWebSocketSession(channel, info, this.bufferFactory, completion); UndertowWebSocketHandlerAdapter adapter = new UndertowWebSocketHandlerAdapter(session); channel.getReceiveSetter().set(adapter); diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyRequestUpgradeStrategy.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyRequestUpgradeStrategy.java index 81e3bbfc3cf..03a88989561 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyRequestUpgradeStrategy.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyRequestUpgradeStrategy.java @@ -84,7 +84,7 @@ public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy, Life */ @Nullable public WebSocketPolicy getWebSocketPolicy() { - return webSocketPolicy; + return this.webSocketPolicy; } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndViewDefiningException.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndViewDefiningException.java index b97e64f1241..d4a0baeafd6 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndViewDefiningException.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndViewDefiningException.java @@ -52,7 +52,7 @@ public class ModelAndViewDefiningException extends ServletException { * Return the ModelAndView that this exception contains for forwarding to. */ public ModelAndView getModelAndView() { - return modelAndView; + return this.modelAndView; } } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java index 34d1824f90c..92abb92533c 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java @@ -178,7 +178,7 @@ public class ResourceHandlerRegistry { } SimpleUrlHandlerMapping handlerMapping = new SimpleUrlHandlerMapping(); - handlerMapping.setOrder(order); + handlerMapping.setOrder(this.order); handlerMapping.setUrlMap(urlMap); return handlerMapping; } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java index c61215eed9f..77984ca17ff 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java @@ -152,7 +152,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport * Return the UrlPathHelper implementation to use for resolution of lookup paths. */ public UrlPathHelper getUrlPathHelper() { - return urlPathHelper; + return this.urlPathHelper; } /** diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolver.java index 69a702eb62c..e87046055ab 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolver.java @@ -133,7 +133,7 @@ public class SimpleMappingExceptionResolver extends AbstractHandlerExceptionReso * Keys are view names; values are status codes. */ public Map getStatusCodesAsMap() { - return Collections.unmodifiableMap(statusCodes); + return Collections.unmodifiableMap(this.statusCodes); } /** diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java index a88df25e16d..303f86ff567 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java @@ -113,7 +113,7 @@ public final class HeadersRequestCondition extends AbstractRequestCondition params, Set usedParams, boolean includeQueryStringDelimiter) throws JspException { - String encoding = pageContext.getResponse().getCharacterEncoding(); + String encoding = this.pageContext.getResponse().getCharacterEncoding(); StringBuilder qs = new StringBuilder(); for (Param param : params) { if (!usedParams.contains(param.getName()) && StringUtils.hasLength(param.getName())) { @@ -354,7 +354,7 @@ public class UrlTag extends HtmlEscapingAwareTag implements ParamAware { protected String replaceUriTemplateParams(String uri, List params, Set usedParams) throws JspException { - String encoding = pageContext.getResponse().getCharacterEncoding(); + String encoding = this.pageContext.getResponse().getCharacterEncoding(); for (Param param : params) { String template = URL_TEMPLATE_DELIMITER_PREFIX + param.getName() + URL_TEMPLATE_DELIMITER_SUFFIX; if (uri.contains(template)) { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java index bdf1dda7474..762cae60f62 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -403,7 +403,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen throw new IllegalArgumentException( "Attribute " + localName + "=\"" + value + "\" is not allowed"); } - dynamicAttributes.put(localName, value); + this.dynamicAttributes.put(localName, value); } /** diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java index e5de9dc595b..9c398a3c41a 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -489,7 +489,7 @@ public class SelectTag extends AbstractHtmlInputElementTag { public int doEndTag() throws JspException { if (this.tagWriter != null) { this.tagWriter.endTag(); - writeHiddenTagIfNecessary(tagWriter); + writeHiddenTagIfNecessary(this.tagWriter); } return EVAL_PAGE; } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/CookieThemeResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/CookieThemeResolver.java index 999c5c83511..641b6dd9265 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/CookieThemeResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/CookieThemeResolver.java @@ -81,7 +81,7 @@ public class CookieThemeResolver extends CookieGenerator implements ThemeResolve * Return the name of the default theme. */ public String getDefaultThemeName() { - return defaultThemeName; + return this.defaultThemeName; } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/script/ScriptTemplateView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/script/ScriptTemplateView.java index 80a25c00804..ba32b7faa79 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/script/ScriptTemplateView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/script/ScriptTemplateView.java @@ -266,7 +266,7 @@ public class ScriptTemplateView extends AbstractUrlBasedView { new EngineKey(this.engineName, this.scripts) : this.engineName); ScriptEngine engine = engines.get(engineKey); if (engine == null) { - engine = createEngineFromName(engineName); + engine = createEngineFromName(this.engineName); engines.put(engineKey, engine); } return engine; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/client/WebSocketConnectionManager.java b/spring-websocket/src/main/java/org/springframework/web/socket/client/WebSocketConnectionManager.java index b60837adfe6..9e7f525d1ab 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/client/WebSocketConnectionManager.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/client/WebSocketConnectionManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -116,16 +116,16 @@ public class WebSocketConnectionManager extends ConnectionManagerSupport { @Override public void startInternal() { - if (this.client instanceof Lifecycle && !((Lifecycle) client).isRunning()) { - ((Lifecycle) client).start(); + if (this.client instanceof Lifecycle && !((Lifecycle) this.client).isRunning()) { + ((Lifecycle) this.client).start(); } super.startInternal(); } @Override public void stopInternal() throws Exception { - if (this.client instanceof Lifecycle && ((Lifecycle) client).isRunning()) { - ((Lifecycle) client).stop(); + if (this.client instanceof Lifecycle && ((Lifecycle) this.client).isRunning()) { + ((Lifecycle) this.client).stop(); } super.stopInternal(); } diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/client/jetty/JettyWebSocketClient.java b/spring-websocket/src/main/java/org/springframework/web/socket/client/jetty/JettyWebSocketClient.java index d419367e001..c56c1e4743d 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/client/jetty/JettyWebSocketClient.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/client/jetty/JettyWebSocketClient.java @@ -154,7 +154,7 @@ public class JettyWebSocketClient extends AbstractWebSocketClient implements Lif final JettyWebSocketHandlerAdapter listener = new JettyWebSocketHandlerAdapter(wsHandler, wsSession); Callable connectTask = () -> { - Future future = client.connect(listener, uri, request); + Future future = this.client.connect(listener, uri, request); future.get(); return wsSession; }; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/AnnotatedEndpointConnectionManager.java b/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/AnnotatedEndpointConnectionManager.java index 97d70fc910e..c5d1c63310d 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/AnnotatedEndpointConnectionManager.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/AnnotatedEndpointConnectionManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -108,12 +108,12 @@ public class AnnotatedEndpointConnectionManager extends ConnectionManagerSupport if (logger.isInfoEnabled()) { logger.info("Connecting to WebSocket at " + getUri()); } - Object endpointToUse = endpoint; + Object endpointToUse = this.endpoint; if (endpointToUse == null) { - Assert.state(endpointProvider != null, "No endpoint set"); - endpointToUse = endpointProvider.getHandler(); + Assert.state(this.endpointProvider != null, "No endpoint set"); + endpointToUse = this.endpointProvider.getHandler(); } - session = webSocketContainer.connectToServer(endpointToUse, getUri()); + this.session = this.webSocketContainer.connectToServer(endpointToUse, getUri()); logger.info("Successfully connected to WebSocket"); } catch (Throwable ex) { diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/EndpointConnectionManager.java b/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/EndpointConnectionManager.java index 8ced5ac7096..76ba230f7f4 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/EndpointConnectionManager.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/EndpointConnectionManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -139,13 +139,13 @@ public class EndpointConnectionManager extends ConnectionManagerSupport implemen if (logger.isInfoEnabled()) { logger.info("Connecting to WebSocket at " + getUri()); } - Endpoint endpointToUse = endpoint; + Endpoint endpointToUse = this.endpoint; if (endpointToUse == null) { - Assert.state(endpointProvider != null, "No endpoint set"); - endpointToUse = endpointProvider.getHandler(); + Assert.state(this.endpointProvider != null, "No endpoint set"); + endpointToUse = this.endpointProvider.getHandler(); } - ClientEndpointConfig endpointConfig = configBuilder.build(); - session = getWebSocketContainer().connectToServer(endpointToUse, endpointConfig, getUri()); + ClientEndpointConfig endpointConfig = this.configBuilder.build(); + this.session = getWebSocketContainer().connectToServer(endpointToUse, endpointConfig, getUri()); logger.info("Successfully connected to WebSocket"); } catch (Throwable ex) { diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/StandardWebSocketClient.java b/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/StandardWebSocketClient.java index 10ba0b902eb..4506eaa86a6 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/StandardWebSocketClient.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/StandardWebSocketClient.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -147,7 +147,7 @@ public class StandardWebSocketClient extends AbstractWebSocketClient { final Endpoint endpoint = new StandardWebSocketHandlerAdapter(webSocketHandler, session); Callable connectTask = () -> { - webSocketContainer.connectToServer(endpoint, endpointConfig, uri); + this.webSocketContainer.connectToServer(endpoint, endpointConfig, uri); return session; }; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/handler/ConcurrentWebSocketSessionDecorator.java b/spring-websocket/src/main/java/org/springframework/web/socket/handler/ConcurrentWebSocketSessionDecorator.java index dc93ade1f92..43e80875e25 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/handler/ConcurrentWebSocketSessionDecorator.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/handler/ConcurrentWebSocketSessionDecorator.java @@ -156,7 +156,7 @@ public class ConcurrentWebSocketSessionDecorator extends WebSocketSessionDecorat } finally { this.sendStartTime = 0; - flushLock.unlock(); + this.flushLock.unlock(); } return true; } diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/WebSocketStompClient.java b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/WebSocketStompClient.java index 5248fc80abc..393db177d27 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/WebSocketStompClient.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/WebSocketStompClient.java @@ -404,7 +404,7 @@ public class WebSocketStompClient extends StompClientSupport implements SmartLif Assert.state(getTaskScheduler() != null, "No TaskScheduler configured"); this.lastReadTime = System.currentTimeMillis(); this.inactivityTasks.add(getTaskScheduler().scheduleWithFixedDelay(() -> { - if (System.currentTimeMillis() - lastReadTime > duration) { + if (System.currentTimeMillis() - this.lastReadTime > duration) { try { runnable.run(); } @@ -422,7 +422,7 @@ public class WebSocketStompClient extends StompClientSupport implements SmartLif Assert.state(getTaskScheduler() != null, "No TaskScheduler configured"); this.lastWriteTime = System.currentTimeMillis(); this.inactivityTasks.add(getTaskScheduler().scheduleWithFixedDelay(() -> { - if (System.currentTimeMillis() - lastWriteTime > duration) { + if (System.currentTimeMillis() - this.lastWriteTime > duration) { try { runnable.run(); } diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java index 32a384301e5..71010681365 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -115,7 +115,7 @@ public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy, Serv this.running = true; try { if (this.factory == null) { - this.factory = new WebSocketServerFactory(servletContext, this.policy); + this.factory = new WebSocketServerFactory(this.servletContext, this.policy); } this.factory.setCreator((request, response) -> { WebSocketHandlerContainer container = containerHolder.get(); diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/WebLogicRequestUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/WebLogicRequestUpgradeStrategy.java index d513e37facb..1733a4dd68b 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/WebLogicRequestUpgradeStrategy.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/WebLogicRequestUpgradeStrategy.java @@ -177,16 +177,16 @@ public class WebLogicRequestUpgradeStrategy extends AbstractTyrusRequestUpgradeS public SubjectHelper() { try { String className = "weblogic.servlet.internal.WebAppServletContext"; - securityContextMethod = method(className, "getSecurityContext"); + this.securityContextMethod = method(className, "getSecurityContext"); className = "weblogic.servlet.security.internal.SecurityModule"; - currentUserMethod = method(className, "getCurrentUser", + this.currentUserMethod = method(className, "getCurrentUser", type("weblogic.servlet.security.internal.ServletSecurityContext"), HttpServletRequest.class); className = "weblogic.servlet.security.internal.WebAppSecurity"; - providerMethod = method(className, "getProvider"); - anonymousSubjectMethod = providerMethod.getReturnType().getDeclaredMethod("getAnonymousSubject"); + this.providerMethod = method(className, "getProvider"); + this.anonymousSubjectMethod = this.providerMethod.getReturnType().getDeclaredMethod("getAnonymousSubject"); } catch (Exception ex) { throw new IllegalStateException("No compatible WebSocket version found", ex); @@ -196,11 +196,11 @@ public class WebLogicRequestUpgradeStrategy extends AbstractTyrusRequestUpgradeS public Object getSubject(HttpServletRequest request) { try { ServletContext servletContext = request.getServletContext(); - Object securityContext = securityContextMethod.invoke(servletContext); - Object subject = currentUserMethod.invoke(null, securityContext, request); + Object securityContext = this.securityContextMethod.invoke(servletContext); + Object subject = this.currentUserMethod.invoke(null, securityContext, request); if (subject == null) { - Object securityProvider = providerMethod.invoke(null); - subject = anonymousSubjectMethod.invoke(securityProvider); + Object securityProvider = this.providerMethod.invoke(null); + subject = this.anonymousSubjectMethod.invoke(securityProvider); } return subject; } diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/JettyXhrTransport.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/JettyXhrTransport.java index f9bf6c4071a..a07e9d3df42 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/JettyXhrTransport.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/JettyXhrTransport.java @@ -271,7 +271,7 @@ public class JettyXhrTransport extends AbstractXhrTransport implements Lifecycle @Override public void onFailure(Response response, Throwable failure) { - if (connectFuture.setException(failure)) { + if (this.connectFuture.setException(failure)) { return; } if (this.sockJsSession.isDisconnected()) { 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 febeffced24..7ab42c5cf69 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 @@ -367,10 +367,10 @@ public class TransportHandlingSockJsService extends AbstractSockJsService implem } this.sessionCleanupTask = getTaskScheduler().scheduleAtFixedRate(() -> { List removedIds = new ArrayList<>(); - for (SockJsSession session : sessions.values()) { + for (SockJsSession session : this.sessions.values()) { try { if (session.getTimeSinceLastActive() > getDisconnectDelay()) { - sessions.remove(session.getId()); + this.sessions.remove(session.getId()); removedIds.add(session.getId()); session.close(); }