Skip to content

Commit 24c4ba3

Browse files
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.

0 commit comments

Comments
 (0)