diff --git a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractInterfaceDrivenDependencyInjectionAspect.aj b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractInterfaceDrivenDependencyInjectionAspect.aj
index f48e0d9252e5..6e049a58a045 100644
--- a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractInterfaceDrivenDependencyInjectionAspect.aj
+++ b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractInterfaceDrivenDependencyInjectionAspect.aj
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -67,6 +67,7 @@ import java.io.Serializable;
* @since 2.5.2
*/
public abstract aspect AbstractInterfaceDrivenDependencyInjectionAspect extends AbstractDependencyInjectionAspect {
+
/**
* Select initialization join point as object construction
*/
diff --git a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AnnotationBeanConfigurerAspect.aj b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AnnotationBeanConfigurerAspect.aj
index 98599fb2e4e2..923e459b4438 100644
--- a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AnnotationBeanConfigurerAspect.aj
+++ b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AnnotationBeanConfigurerAspect.aj
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -47,22 +47,26 @@ import org.springframework.beans.factory.wiring.BeanConfigurerSupport;
public aspect AnnotationBeanConfigurerAspect extends AbstractInterfaceDrivenDependencyInjectionAspect
implements BeanFactoryAware, InitializingBean, DisposableBean {
- private BeanConfigurerSupport beanConfigurerSupport = new BeanConfigurerSupport();
+ private final BeanConfigurerSupport beanConfigurerSupport = new BeanConfigurerSupport();
+ @Override
public void setBeanFactory(BeanFactory beanFactory) {
this.beanConfigurerSupport.setBeanWiringInfoResolver(new AnnotationBeanWiringInfoResolver());
this.beanConfigurerSupport.setBeanFactory(beanFactory);
}
+ @Override
public void afterPropertiesSet() {
this.beanConfigurerSupport.afterPropertiesSet();
}
+ @Override
public void configureBean(Object bean) {
this.beanConfigurerSupport.configureBean(bean);
}
+ @Override
public void destroy() {
this.beanConfigurerSupport.destroy();
}
diff --git a/spring-core/src/main/java/org/springframework/util/FileCopyUtils.java b/spring-core/src/main/java/org/springframework/util/FileCopyUtils.java
index 620d27daa757..de807fe5acce 100644
--- a/spring-core/src/main/java/org/springframework/util/FileCopyUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/FileCopyUtils.java
@@ -171,15 +171,15 @@ public static int copy(Reader in, Writer out) throws IOException {
Assert.notNull(out, "No Writer specified");
try {
- int byteCount = 0;
+ int charCount = 0;
char[] buffer = new char[BUFFER_SIZE];
- int bytesRead = -1;
- while ((bytesRead = in.read(buffer)) != -1) {
- out.write(buffer, 0, bytesRead);
- byteCount += bytesRead;
+ int charsRead;
+ while ((charsRead = in.read(buffer)) != -1) {
+ out.write(buffer, 0, charsRead);
+ charCount += charsRead;
}
out.flush();
- return byteCount;
+ return charCount;
}
finally {
close(in);
@@ -188,7 +188,7 @@ public static int copy(Reader in, Writer out) throws IOException {
}
/**
- * Copy the contents of the given String to the given output Writer.
+ * Copy the contents of the given String to the given Writer.
* Closes the writer when done.
* @param in the String to copy from
* @param out the Writer to copy to
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 bcd408ee7757..0085f444d8be 100644
--- a/spring-core/src/main/java/org/springframework/util/StreamUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/StreamUtils.java
@@ -87,9 +87,9 @@ public static String copyToString(@Nullable InputStream in, Charset charset) thr
StringBuilder out = new StringBuilder();
InputStreamReader reader = new InputStreamReader(in, charset);
char[] buffer = new char[BUFFER_SIZE];
- int bytesRead = -1;
- while ((bytesRead = reader.read(buffer)) != -1) {
- out.append(buffer, 0, bytesRead);
+ int charsRead;
+ while ((charsRead = reader.read(buffer)) != -1) {
+ out.append(buffer, 0, charsRead);
}
return out.toString();
}
@@ -130,7 +130,7 @@ public static void copy(byte[] in, OutputStream out) throws IOException {
}
/**
- * Copy the contents of the given String to the given output OutputStream.
+ * Copy the contents of the given String to the given OutputStream.
* Leaves the stream open when done.
* @param in the String to copy from
* @param charset the Charset
@@ -161,7 +161,7 @@ public static int copy(InputStream in, OutputStream out) throws IOException {
int byteCount = 0;
byte[] buffer = new byte[BUFFER_SIZE];
- int bytesRead = -1;
+ int bytesRead;
while ((bytesRead = in.read(buffer)) != -1) {
out.write(buffer, 0, bytesRead);
byteCount += bytesRead;
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/WebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/WebRequest.java
index 7e6bb2946369..6985a3e564bf 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/WebRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/WebRequest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -140,7 +140,7 @@ public interface WebRequest extends RequestAttributes {
* and HTTP status when applicable.
*
Typical usage:
*
- * public String myHandleMethod(WebRequest webRequest, Model model) {
+ * public String myHandleMethod(WebRequest request, Model model) {
* long lastModified = // application-specific calculation
* if (request.checkNotModified(lastModified)) {
* // shortcut exit - no further processing necessary
@@ -177,7 +177,7 @@ public interface WebRequest extends RequestAttributes {
* and HTTP status when applicable.
* Typical usage:
*
- * public String myHandleMethod(WebRequest webRequest, Model model) {
+ * public String myHandleMethod(WebRequest request, Model model) {
* String eTag = // application-specific calculation
* if (request.checkNotModified(eTag)) {
* // shortcut exit - no further processing necessary
@@ -208,7 +208,7 @@ public interface WebRequest extends RequestAttributes {
* response headers, and HTTP status when applicable.
* Typical usage:
*
- * public String myHandleMethod(WebRequest webRequest, Model model) {
+ * public String myHandleMethod(WebRequest request, Model model) {
* String eTag = // application-specific calculation
* long lastModified = // application-specific calculation
* if (request.checkNotModified(eTag, lastModified)) {
diff --git a/src/docs/asciidoc/web/webmvc.adoc b/src/docs/asciidoc/web/webmvc.adoc
index ff1a441fa37d..129fa2827673 100644
--- a/src/docs/asciidoc/web/webmvc.adoc
+++ b/src/docs/asciidoc/web/webmvc.adoc
@@ -4835,7 +4835,7 @@ as the following example shows:
.Java
----
@RequestMapping
- public String myHandleMethod(WebRequest webRequest, Model model) {
+ public String myHandleMethod(WebRequest request, Model model) {
long eTag = ... // <1>
@@ -4855,7 +4855,7 @@ as the following example shows:
.Kotlin
----
@RequestMapping
- fun myHandleMethod(webRequest: WebRequest, model: Model): String? {
+ fun myHandleMethod(request: WebRequest, model: Model): String? {
val eTag: Long = ... // <1>