Skip to content

Commit 5b1b7bc

Browse files
snicollsnicoll
committed
Merge pull request #21007 from izeye
* pr/21007: Update copyright year of changed files Remove this keyword on member method invocations Closes gh-21007
2 parents f0d4192 + 85e9f71 commit 5b1b7bc

File tree

45 files changed

+97
-100
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+97
-100
lines changed

‎buildSrc/src/main/java/org/springframework/boot/build/bom/BomExtension.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,12 @@ private void addLibrary(Library library) {
107107
this.properties.put(library.getVersionProperty(), library.getVersion());
108108
for (Group group : library.getGroups()) {
109109
for (Module module : group.getModules()) {
110-
this.putArtifactVersionProperty(group.getId(), module.getName(), library.getVersionProperty());
110+
putArtifactVersionProperty(group.getId(), module.getName(), library.getVersionProperty());
111111
this.dependencyHandler.getConstraints().add(JavaPlatformPlugin.API_CONFIGURATION_NAME,
112112
createDependencyNotation(group.getId(), module.getName(), library.getVersion()));
113113
}
114114
for (String bomImport : group.getBoms()) {
115-
this.putArtifactVersionProperty(group.getId(), bomImport, library.getVersionProperty());
115+
putArtifactVersionProperty(group.getId(), bomImport, library.getVersionProperty());
116116
String bomDependency = createDependencyNotation(group.getId(), bomImport, library.getVersion());
117117
this.dependencyHandler.add(JavaPlatformPlugin.API_CONFIGURATION_NAME,
118118
this.dependencyHandler.platform(bomDependency));

‎buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/version/UnstructuredDependencyVersion.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,17 @@ private UnstructuredDependencyVersion(String version) {
3535

3636
@Override
3737
public boolean isNewerThan(DependencyVersion other) {
38-
return this.compareTo(other) > 0;
38+
return compareTo(other) > 0;
3939
}
4040

4141
@Override
4242
public boolean isSameMajorAndNewerThan(DependencyVersion other) {
43-
return this.compareTo(other) > 0;
43+
return compareTo(other) > 0;
4444
}
4545

4646
@Override
4747
public boolean isSameMinorAndNewerThan(DependencyVersion other) {
48-
return this.compareTo(other) > 0;
48+
return compareTo(other) > 0;
4949
}
5050

5151
@Override

‎buildSrc/src/main/java/org/springframework/boot/build/test/IntegrationTestPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public class IntegrationTestPlugin implements Plugin<Project> {
4646

4747
@Override
4848
public void apply(Project project) {
49-
project.getPlugins().withType(JavaPlugin.class, (javaPlugin) -> this.configureIntegrationTesting(project));
49+
project.getPlugins().withType(JavaPlugin.class, (javaPlugin) -> configureIntegrationTesting(project));
5050
}
5151

5252
private void configureIntegrationTesting(Project project) {

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryWebEndpointDiscovererTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -79,7 +79,7 @@ private WebOperation findMainReadOperation(ExposableWebEndpoint endpoint) {
7979
}
8080

8181
private void load(Class<?> configuration, Consumer<CloudFoundryWebEndpointDiscoverer> consumer) {
82-
this.load((id) -> null, EndpointId::toString, configuration, consumer);
82+
load((id) -> null, EndpointId::toString, configuration, consumer);
8383
}
8484

8585
private void load(Function<EndpointId, Long> timeToLive, PathMapper endpointPathMapper, Class<?> configuration,

‎spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/FilterRegistrationMappingDescription.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -42,15 +42,15 @@ public FilterRegistrationMappingDescription(FilterRegistration filterRegistratio
4242
* @return the mappings
4343
*/
4444
public Collection<String> getServletNameMappings() {
45-
return this.getRegistration().getServletNameMappings();
45+
return getRegistration().getServletNameMappings();
4646
}
4747

4848
/**
4949
* Returns the URL pattern mappings for the registered filter.
5050
* @return the mappings
5151
*/
5252
public Collection<String> getUrlPatternMappings() {
53-
return this.getRegistration().getUrlPatternMappings();
53+
return getRegistration().getUrlPatternMappings();
5454
}
5555

5656
}

‎spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/WebEndpointDiscovererTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -217,7 +217,7 @@ void getEndpointsWhenHasCustomPathShouldReturnCustomPath() {
217217
}
218218

219219
private void load(Class<?> configuration, Consumer<WebEndpointDiscoverer> consumer) {
220-
this.load((id) -> null, EndpointId::toString, configuration, consumer);
220+
load((id) -> null, EndpointId::toString, configuration, consumer);
221221
}
222222

223223
private void load(Function<EndpointId, Long> timeToLive, PathMapper endpointPathMapper, Class<?> configuration,

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ private void configure(Builder builder) {
145145
if (this.username != null && this.password != null) {
146146
builder.credentials(this.username, this.password);
147147
}
148-
builder.autoIndex(this.getAutoIndex().getName());
148+
builder.autoIndex(getAutoIndex().getName());
149149
if (this.useNativeTypes) {
150150
builder.useNativeTypes();
151151
}

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportLoggingListener.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -113,7 +113,7 @@ public void logAutoConfigurationReport(boolean isCrashReport) {
113113
this.report = ConditionEvaluationReport.get(this.applicationContext.getBeanFactory());
114114
}
115115
if (!this.report.getConditionAndOutcomesBySource().isEmpty()) {
116-
if (this.getLogLevelForReport().equals(LogLevel.INFO)) {
116+
if (getLogLevelForReport().equals(LogLevel.INFO)) {
117117
if (this.logger.isInfoEnabled()) {
118118
this.logger.info(new ConditionEvaluationReportMessage(this.report));
119119
}

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientProperties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@ public Map<String, Registration> getRegistration() {
5757

5858
@PostConstruct
5959
public void validate() {
60-
this.getRegistration().values().forEach(this::validateRegistration);
60+
getRegistration().values().forEach(this::validateRegistration);
6161
}
6262

6363
private void validateRegistration(Registration registration) {

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -394,23 +394,23 @@ public static class Tomcat {
394394
@Deprecated
395395
@DeprecatedConfigurationProperty(replacement = "server.tomcat.threads.max")
396396
public int getMaxThreads() {
397-
return this.getThreads().getMax();
397+
return getThreads().getMax();
398398
}
399399

400400
@Deprecated
401401
public void setMaxThreads(int maxThreads) {
402-
this.getThreads().setMax(maxThreads);
402+
getThreads().setMax(maxThreads);
403403
}
404404

405405
@Deprecated
406406
@DeprecatedConfigurationProperty(replacement = "server.tomcat.threads.min-spare")
407407
public int getMinSpareThreads() {
408-
return this.getThreads().getMinSpare();
408+
return getThreads().getMinSpare();
409409
}
410410

411411
@Deprecated
412412
public void setMinSpareThreads(int minSpareThreads) {
413-
this.getThreads().setMinSpare(minSpareThreads);
413+
getThreads().setMinSpare(minSpareThreads);
414414
}
415415

416416
public DataSize getMaxHttpFormPostSize() {
@@ -1066,67 +1066,67 @@ public void setMaxHttpFormPostSize(DataSize maxHttpFormPostSize) {
10661066
@Deprecated
10671067
@DeprecatedConfigurationProperty(replacement = "server.jetty.threads.acceptors")
10681068
public Integer getAcceptors() {
1069-
return this.getThreads().getAcceptors();
1069+
return getThreads().getAcceptors();
10701070
}
10711071

10721072
@Deprecated
10731073
public void setAcceptors(Integer acceptors) {
1074-
this.getThreads().setAcceptors(acceptors);
1074+
getThreads().setAcceptors(acceptors);
10751075
}
10761076

10771077
@Deprecated
10781078
@DeprecatedConfigurationProperty(replacement = "server.jetty.threads.selectors")
10791079
public Integer getSelectors() {
1080-
return this.getThreads().getSelectors();
1080+
return getThreads().getSelectors();
10811081
}
10821082

10831083
@Deprecated
10841084
public void setSelectors(Integer selectors) {
1085-
this.getThreads().setSelectors(selectors);
1085+
getThreads().setSelectors(selectors);
10861086
}
10871087

10881088
@Deprecated
10891089
@DeprecatedConfigurationProperty(replacement = "server.jetty.threads.min")
10901090
public Integer getMinThreads() {
1091-
return this.getThreads().getMin();
1091+
return getThreads().getMin();
10921092
}
10931093

10941094
@Deprecated
10951095
public void setMinThreads(Integer minThreads) {
1096-
this.getThreads().setMin(minThreads);
1096+
getThreads().setMin(minThreads);
10971097
}
10981098

10991099
@Deprecated
11001100
@DeprecatedConfigurationProperty(replacement = "server.jetty.threads.max")
11011101
public Integer getMaxThreads() {
1102-
return this.getThreads().getMax();
1102+
return getThreads().getMax();
11031103
}
11041104

11051105
@Deprecated
11061106
public void setMaxThreads(Integer maxThreads) {
1107-
this.getThreads().setMax(maxThreads);
1107+
getThreads().setMax(maxThreads);
11081108
}
11091109

11101110
@Deprecated
11111111
@DeprecatedConfigurationProperty(replacement = "server.jetty.threads.max-queue-capacity")
11121112
public Integer getMaxQueueCapacity() {
1113-
return this.getThreads().getMaxQueueCapacity();
1113+
return getThreads().getMaxQueueCapacity();
11141114
}
11151115

11161116
@Deprecated
11171117
public void setMaxQueueCapacity(Integer maxQueueCapacity) {
1118-
this.getThreads().setMaxQueueCapacity(maxQueueCapacity);
1118+
getThreads().setMaxQueueCapacity(maxQueueCapacity);
11191119
}
11201120

11211121
@Deprecated
11221122
@DeprecatedConfigurationProperty(replacement = "server.jetty.threads.idle-timeout")
11231123
public Duration getThreadIdleTimeout() {
1124-
return this.getThreads().getIdleTimeout();
1124+
return getThreads().getIdleTimeout();
11251125
}
11261126

11271127
@Deprecated
11281128
public void setThreadIdleTimeout(Duration threadIdleTimeout) {
1129-
this.getThreads().setIdleTimeout(threadIdleTimeout);
1129+
getThreads().setIdleTimeout(threadIdleTimeout);
11301130
}
11311131

11321132
public Duration getConnectionIdleTimeout() {
@@ -1482,23 +1482,23 @@ public void setBufferSize(DataSize bufferSize) {
14821482
@Deprecated
14831483
@DeprecatedConfigurationProperty(replacement = "server.undertow.threads.io")
14841484
public Integer getIoThreads() {
1485-
return this.getThreads().getIo();
1485+
return getThreads().getIo();
14861486
}
14871487

14881488
@Deprecated
14891489
public void setIoThreads(Integer ioThreads) {
1490-
this.getThreads().setIo(ioThreads);
1490+
getThreads().setIo(ioThreads);
14911491
}
14921492

14931493
@Deprecated
14941494
@DeprecatedConfigurationProperty(replacement = "server.undertow.threads.worker")
14951495
public Integer getWorkerThreads() {
1496-
return this.getThreads().getWorker();
1496+
return getThreads().getWorker();
14971497
}
14981498

14991499
@Deprecated
15001500
public void setWorkerThreads(Integer workerThreads) {
1501-
this.getThreads().setWorker(workerThreads);
1501+
getThreads().setWorker(workerThreads);
15021502
}
15031503

15041504
public Boolean getDirectBuffers() {

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/AbstractErrorController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ private List<ErrorViewResolver> sortErrorViewResolvers(List<ErrorViewResolver> r
7878
*/
7979
@Deprecated
8080
protected Map<String, Object> getErrorAttributes(HttpServletRequest request, boolean includeStackTrace) {
81-
return this.getErrorAttributes(request, includeStackTrace, false);
81+
return getErrorAttributes(request, includeStackTrace, false);
8282
}
8383

8484
protected Map<String, Object> getErrorAttributes(HttpServletRequest request, boolean includeStackTrace,

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/sendgrid/SendGridAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ void expectedSendGridBeanWithProxyCreated() {
7979
}
8080

8181
private void loadContext(String... environment) {
82-
this.loadContext(null, environment);
82+
loadContext(null, environment);
8383
}
8484

8585
private void loadContext(Class<?> additionalConfiguration, String... environment) {

‎spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/RunCommand.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -55,8 +55,8 @@ public String getUsageHelp() {
5555
}
5656

5757
public void stop() {
58-
if (this.getHandler() != null) {
59-
((RunOptionHandler) this.getHandler()).stop();
58+
if (getHandler() != null) {
59+
((RunOptionHandler) getHandler()).stop();
6060
}
6161
}
6262

‎spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngine.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -266,7 +266,7 @@ public Map<String, Map<String, List<String>>> enumerateGrapes() {
266266

267267
@Override
268268
public URI[] resolve(Map args, Map... dependencyMaps) {
269-
return this.resolve(args, null, dependencyMaps);
269+
return resolve(args, null, dependencyMaps);
270270
}
271271

272272
@Override

‎spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ void dependencyResolutionWithCustomClassLoader() {
139139
@Test
140140
void resolutionWithCustomResolver() {
141141
Map<String, Object> args = new HashMap<>();
142-
AetherGrapeEngine grapeEngine = this.createGrapeEngine();
142+
AetherGrapeEngine grapeEngine = createGrapeEngine();
143143
grapeEngine.addResolver(createResolver("spring-releases", "https://repo.spring.io/release"));
144144
Map<String, Object> dependency = createDependency("io.spring.docresources", "spring-doc-resources",
145145
"0.1.1.RELEASE");

‎spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/AbstractDevToolsDataSourceAutoConfigurationTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -101,11 +101,11 @@ protected ConfigurableApplicationContext getContext(Supplier<ConfigurableApplica
101101
}
102102

103103
protected final ConfigurableApplicationContext createContext(Class<?>... classes) {
104-
return this.createContext(null, classes);
104+
return createContext(null, classes);
105105
}
106106

107107
protected final ConfigurableApplicationContext createContext(String driverClassName, Class<?>... classes) {
108-
return this.createContext(driverClassName, null, classes);
108+
return createContext(driverClassName, null, classes);
109109
}
110110

111111
protected final ConfigurableApplicationContext createContext(String driverClassName, String url,

‎spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/BasicJsonTester.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -81,7 +81,7 @@ public BasicJsonTester(Class<?> resourceLoadClass, Charset charset) {
8181
* resources
8282
*/
8383
protected final void initialize(Class<?> resourceLoadClass) {
84-
this.initialize(resourceLoadClass, null);
84+
initialize(resourceLoadClass, null);
8585
}
8686

8787
/**

‎spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/JacksonTester.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -165,7 +165,7 @@ public static void initFields(Object testInstance, ObjectFactory<ObjectMapper> o
165165
* @return the new instance
166166
*/
167167
public JacksonTester<T> forView(Class<?> view) {
168-
return new JacksonTester<>(this.getResourceLoadClass(), this.getType(), this.objectMapper, view);
168+
return new JacksonTester<>(getResourceLoadClass(), getType(), this.objectMapper, view);
169169
}
170170

171171
/**

0 commit comments

Comments
 (0)