Skip to content

Commit 24c4ba3

Browse files
philwebbphilwebb
committed
Merge pull request #31734 from marcwrobel
* pr/31734: Update copyright year for "Fix typos in code and documentation" Fix typos in code and documentation Closes gh-31734
2 parents 4bcec6e + f841284 commit 24c4ba3

File tree

59 files changed

+138
-143
lines changed

Some content is hidden

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

59 files changed

+138
-143
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -20,7 +20,7 @@
2020
import org.springframework.boot.build.bom.bomr.version.DependencyVersion;
2121

2222
/**
23-
* An upgrade to change a {@link Library} to use a new version}.
23+
* An upgrade to change a {@link Library} to use a new version.
2424
*
2525
* @author Andy Wilkinson
2626
*/

‎buildSrc/src/main/java/org/springframework/boot/build/testing/TestResultsOverview.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -29,8 +29,7 @@
2929
import org.gradle.tooling.events.OperationCompletionListener;
3030

3131
/**
32-
* {@link BuildService} that provides an overview of all of the test failures in the
33-
* build.
32+
* {@link BuildService} that provides an overview of all the test failures in the build.
3433
*
3534
* @author Andy Wilkinson
3635
*/

‎buildSrc/src/test/java/org/springframework/boot/build/bom/bomr/version/DependencyVersionTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -53,12 +53,12 @@ void parseWhenVersionWithCombinedPatchAndQualifierShouldReturnCombinedPatchAndQu
5353
}
5454

5555
@Test
56-
void parseWhenCalendarVersionShouldReturnArticatVersionDependencyVersion() {
56+
void parseWhenCalendarVersionShouldReturnArtifactVersionDependencyVersion() {
5757
assertThat(DependencyVersion.parse("2020.0.0")).isInstanceOf(CalendarVersionDependencyVersion.class);
5858
}
5959

6060
@Test
61-
void parseWhenCalendarVersionWithModifierShouldReturnArticatVersionDependencyVersion() {
61+
void parseWhenCalendarVersionWithModifierShouldReturnArtifactVersionDependencyVersion() {
6262
assertThat(DependencyVersion.parse("2020.0.0-M1")).isInstanceOf(CalendarVersionDependencyVersion.class);
6363
}
6464

‎buildSrc/src/test/resources/plugin.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -805,7 +805,7 @@ required to use this feature.</description>
805805
<type>long</type>
806806
<required>false</required>
807807
<editable>true</editable>
808-
<description>The number of milli-seconds to wait between each attempt to check if the spring
808+
<description>The number of milliseconds to wait between each attempt to check if the spring
809809
application is ready.</description>
810810
</parameter>
811811
<parameter>
@@ -880,7 +880,7 @@ application.</description>
880880
<type>int</type>
881881
<required>false</required>
882882
<editable>true</editable>
883-
<description>The port to use to lookup the platform MBeanServer if the application has been
883+
<description>The port to use to look up the platform MBeanServer if the application has been
884884
forked.</description>
885885
</parameter>
886886
<parameter>

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/ConditionalOnEnabledHealthIndicator.java

Lines changed: 4 additions & 4 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-2022 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.
@@ -25,9 +25,9 @@
2525
import org.springframework.context.annotation.Conditional;
2626

2727
/**
28-
* {@link Conditional @Conditional} that checks whether or not a default health indicator
29-
* is enabled. Matches if the value of the {@code management.health.<name>.enabled}
30-
* property is {@code true}. Otherwise, matches if the value of the
28+
* {@link Conditional @Conditional} that checks whether a default health indicator is
29+
* enabled. Matches if the value of the {@code management.health.<name>.enabled} property
30+
* is {@code true}. Otherwise, matches if the value of the
3131
* {@code management.health.defaults.enabled} property is {@code true} or if it is not
3232
* configured.
3333
*

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthProperties.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -44,8 +44,8 @@ public abstract class HealthProperties {
4444
private Show showComponents;
4545

4646
/**
47-
* Roles used to determine whether or not a user is authorized to be shown details.
48-
* When empty, all authenticated users are authorized.
47+
* Roles used to determine whether a user is authorized to be shown details. When
48+
* empty, all authenticated users are authorized.
4949
*/
5050
private Set<String> roles = new HashSet<>();
5151

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/info/ConditionalOnEnabledInfoContributor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -25,8 +25,8 @@
2525
import org.springframework.context.annotation.Conditional;
2626

2727
/**
28-
* {@link Conditional @Conditional} that checks whether or not an info contributor is
29-
* enabled. Matches if the value of the {@code management.info.<name>.enabled} property is
28+
* {@link Conditional @Conditional} that checks whether an info contributor is enabled.
29+
* Matches if the value of the {@code management.info.<name>.enabled} property is
3030
* {@code true}. Otherwise, use the specific {@link #fallback() fallback} method.
3131
*
3232
* @author Stephane Nicoll

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ConditionalOnEnabledMetricsExport.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -25,11 +25,11 @@
2525
import org.springframework.context.annotation.Conditional;
2626

2727
/**
28-
* {@link Conditional @Conditional} that checks whether or not a metrics exporter is
29-
* enabled. If the {@code management.metrics.export.<name>.enabled} property is configured
30-
* then its value is used to determine if it matches. Otherwise, matches if the value of
31-
* the {@code management.metrics.export.defaults.enabled} property is {@code true} or if
32-
* it is not configured.
28+
* {@link Conditional @Conditional} that checks whether a metrics exporter is enabled. If
29+
* the {@code management.metrics.export.<name>.enabled} property is configured then its
30+
* value is used to determine if it matches. Otherwise, matches if the value of the
31+
* {@code management.metrics.export.defaults.enabled} property is {@code true} or if it is
32+
* not configured.
3333
*
3434
* @author Chris Bono
3535
* @since 2.4.0

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaProperties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -66,7 +66,7 @@ public class GangliaProperties {
6666
private GMetric.UDPAddressingMode addressingMode = GMetric.UDPAddressingMode.MULTICAST;
6767

6868
/**
69-
* Time to live for metrics on Ganglia. Set the multi-cast Time-To-Live to be one
69+
* Time to live for metrics on Ganglia. Set the multicast Time-To-Live to be one
7070
* greater than the number of hops (routers) between the hosts.
7171
*/
7272
private Integer timeToLive = 1;

‎spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/InvocationContext.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -142,7 +142,7 @@ public <T> T resolveArgument(Class<T> argumentType) {
142142
}
143143

144144
/**
145-
* Returns whether or not the context is capable of resolving an argument of the given
145+
* Returns whether the context is capable of resolving an argument of the given
146146
* {@code type}. Note that, even when {@code true} is returned,
147147
* {@link #resolveArgument argument resolution} will return {@code null} if no
148148
* argument of the required type is available.

‎spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/Producible.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -49,9 +49,9 @@ public interface Producible<E extends Enum<E> & Producible<E>> {
4949

5050
/**
5151
* Return if this enum value should be used as the default value when an accept header
52-
* of &#42;&#47;&#42; is provided, or if the accept header is missing. Only one value
53-
* can be marked as default. If no value is marked, then the value with the highest
54-
* {@link Enum#ordinal() ordinal} is used as the default.
52+
* of &#42;&#47;&#42; is provided, or if the {@code Accept} header is missing. Only
53+
* one value can be marked as default. If no value is marked, then the value with the
54+
* highest {@link Enum#ordinal() ordinal} is used as the default.
5555
* @return if this value should be used as the default value
5656
* @since 2.5.6
5757
*/

‎spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/Link.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-2022 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.
@@ -52,7 +52,7 @@ public String getHref() {
5252
}
5353

5454
/**
55-
* Returns whether or not the {@link #getHref() href} is templated.
55+
* Returns whether the {@link #getHref() href} is templated.
5656
* @return {@code true} if the href is templated, otherwise {@code false}
5757
*/
5858
public boolean isTemplated() {

‎spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/ReactiveHealthIndicator.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-2022 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.
@@ -22,7 +22,7 @@
2222
* Strategy interface used to contribute {@link Health} to the results returned from the
2323
* reactive variant of the {@link HealthEndpoint}.
2424
* <p>
25-
* This is non blocking contract that is meant to be used in a reactive application. See
25+
* This is non-blocking contract that is meant to be used in a reactive application. See
2626
* {@link HealthIndicator} for the traditional contract.
2727
*
2828
* @author Stephane Nicoll

‎spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/startup/StartupTimeMetricsListenerTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ void metricRecordedWithoutMainAppClassTagAndAdditionalTags() {
8484
Tags tags = Tags.of("foo", "bar");
8585
this.listener = new StartupTimeMetricsListener(this.registry, "started", "ready", tags);
8686
this.listener.onApplicationEvent(new ApplicationReadyEvent(application, null, null, Duration.ofSeconds(2)));
87-
TimeGauge applicationReadyGague = this.registry.find("ready").timeGauge();
88-
assertThat(applicationReadyGague).isNotNull();
89-
assertThat(applicationReadyGague.getId().getTags()).containsExactlyElementsOf(tags);
87+
TimeGauge applicationReadyGauge = this.registry.find("ready").timeGauge();
88+
assertThat(applicationReadyGauge).isNotNull();
89+
assertThat(applicationReadyGauge.getId().getTags()).containsExactlyElementsOf(tags);
9090
}
9191

9292
@Test

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBean.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -80,14 +80,13 @@
8080

8181
/**
8282
* The annotation type decorating a bean that should be checked. The condition matches
83-
* when all of the annotations specified are defined on beans in the
84-
* {@link BeanFactory}.
83+
* when all the annotations specified are defined on beans in the {@link BeanFactory}.
8584
* @return the class-level annotation types to check
8685
*/
8786
Class<? extends Annotation>[] annotation() default {};
8887

8988
/**
90-
* The names of beans to check. The condition matches when all of the bean names
89+
* The names of beans to check. The condition matches when all the bean names
9190
* specified are contained in the {@link BeanFactory}.
9291
* @return the names of beans to check
9392
*/

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -345,7 +345,7 @@ public class FlywayProperties {
345345
private String oracleKerberosCacheFile;
346346

347347
/**
348-
* Location of the Oracle Wallet, used to sign-in to the database automatically.
348+
* Location of the Oracle Wallet, used to sign in to the database automatically.
349349
* Requires Flyway Teams.
350350
*/
351351
private String oracleWalletLocation;

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ public static class Streams {
695695
private String applicationId;
696696

697697
/**
698-
* Whether or not to auto-start the streams factory bean.
698+
* Whether to auto-start the streams factory bean.
699699
*/
700700
private boolean autoStartup = true;
701701

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -140,7 +140,7 @@ public LocalContainerEntityManagerFactoryBean entityManagerFactory(EntityManager
140140
protected abstract Map<String, Object> getVendorProperties();
141141

142142
/**
143-
* Customize vendor properties before they are used. Allows for post processing (for
143+
* Customize vendor properties before they are used. Allows for post-processing (for
144144
* example to configure JTA specific settings).
145145
* @param vendorProperties the vendor properties to customize
146146
*/

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -25,10 +25,9 @@
2525
import org.springframework.context.annotation.Conditional;
2626

2727
/**
28-
* {@link Conditional @Conditional} that checks whether or not the Spring resource
29-
* handling chain is enabled. Matches if
30-
* {@link WebProperties.Resources.Chain#getEnabled()} is {@code true} or if
31-
* {@code webjars-locator-core} is on the classpath.
28+
* {@link Conditional @Conditional} that checks whether the Spring resource handling chain
29+
* is enabled. Matches if {@link WebProperties.Resources.Chain#getEnabled()} is
30+
* {@code true} or if {@code webjars-locator-core} is on the classpath.
3231
*
3332
* @author Stephane Nicoll
3433
* @since 1.3.0

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -27,8 +27,7 @@
2727
import org.springframework.util.ClassUtils;
2828

2929
/**
30-
* {@link Condition} that checks whether or not the Spring resource handling chain is
31-
* enabled.
30+
* {@link Condition} that checks whether the Spring resource handling chain is enabled.
3231
*
3332
* @author Stephane Nicoll
3433
* @author Phillip Webb

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/neo4j/Neo4jAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ void determineServerUriWithDeprecatedPropertyShouldOverrideDefault() {
141141

142142
@Test
143143
@Deprecated
144-
void determineServerUriWithCustoUriShouldTakePrecedenceOverDeprecatedProperty() {
144+
void determineServerUriWithCustomUriShouldTakePrecedenceOverDeprecatedProperty() {
145145
URI customUri = URI.create("bolt://localhost:4242");
146146
URI anotherCustomURI = URI.create("bolt://localhost:2424");
147147
Neo4jProperties properties = new Neo4jProperties();

‎spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerationRequest.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,8 @@ void setOutput(String output) {
105105
}
106106

107107
/**
108-
* Whether or not the project archive should be extracted in the output location. If
109-
* the {@link #getOutput() output} ends with "/", the project is extracted
110-
* automatically.
108+
* Whether the project archive should be extracted in the output location. If the
109+
* {@link #getOutput() output} ends with "/", the project is extracted automatically.
111110
* @return {@code true} if the archive should be extracted, otherwise {@code false}
112111
*/
113112
boolean isExtract() {
@@ -242,7 +241,7 @@ void setFormat(String format) {
242241
}
243242

244243
/**
245-
* Whether or not the type should be detected based on the build and format value.
244+
* Whether the type should be detected based on the build and format value.
246245
* @return {@code true} if type detection will be performed, otherwise {@code false}
247246
*/
248247
boolean isDetectType() {

‎spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunner.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-2022 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.
@@ -96,7 +96,7 @@ public void compileAndRun() throws Exception {
9696
stop();
9797
Class<?>[] compiledSources = compile();
9898
monitorForChanges();
99-
// Run in new thread to ensure that the context classloader is setup
99+
// Run in new thread to ensure that the context classloader is set up
100100
this.runThread = new RunThread(compiledSources);
101101
this.runThread.start();
102102
this.runThread.join();

0 commit comments

Comments
 (0)