Skip to content

Commit cf0fcaf

Browse files
dreis2211snicoll
authored andcommitted
Polish
See gh-27940
1 parent b8b2e56 commit cf0fcaf

File tree

41 files changed

+74
-74
lines changed

Some content is hidden

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

41 files changed

+74
-74
lines changed

Diff for: buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
* plugin is applied:
5858
*
5959
* <ul>
60-
* <li>The project is configered with source and target compatibility of 1.8
60+
* <li>The project is configured with source and target compatibility of 1.8
6161
* <li>{@link SpringJavaFormatPlugin Spring Java Format}, {@link CheckstylePlugin
6262
* Checkstyle}, {@link TestFailuresPlugin Test Failures}, and {@link TestRetryPlugin Test
6363
* Retry} plugins are applied

Diff for: spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ private boolean isReadable(BeanDescription beanDesc, BeanPropertyWriter writer)
502502
AnnotatedMethod setter = findSetter(beanDesc, writer);
503503
// If there's a setter, we assume it's OK to report on the value,
504504
// similarly, if there's no setter but the package names match, we assume
505-
// that its a nested class used solely for binding to config props, so it
505+
// that it is a nested class used solely for binding to config props, so it
506506
// should be kosher. Lists and Maps are also auto-detected by default since
507507
// that's what the metadata generator does. This filter is not used if there
508508
// is JSON metadata for the property, so it's mainly for user-defined beans.

Diff for: spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/SanitizingFunction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
public interface SanitizingFunction {
2828

2929
/**
30-
* Apply the sanitiing function to the given data.
30+
* Apply the sanitizing function to the given data.
3131
* @param data the data to sanitize
3232
* @return the sanitized data or the original instance is no sanitization is applied
3333
*/

Diff for: spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoke/OperationInvokerAdvisor.java

+2-2
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-2021 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.
@@ -34,7 +34,7 @@ public interface OperationInvokerAdvisor {
3434
* @param operationType the operation type
3535
* @param parameters the operation parameters
3636
* @param invoker the invoker to advise
37-
* @return an potentially new operation invoker with support for additional features
37+
* @return a potentially new operation invoker with support for additional features
3838
*/
3939
OperationInvoker apply(EndpointId endpointId, OperationType operationType, OperationParameters parameters,
4040
OperationInvoker invoker);

Diff for: spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/env/EnvironmentEndpoint.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ private void extract(String root, Map<String, PropertySource<?>> map, PropertySo
194194
}
195195

196196
/**
197-
* Apply sanitiation to the given name and value.
197+
* Apply sanitization to the given name and value.
198198
* @param key the name to sanitize
199199
* @param value the value to sanitize
200200
* @return the sanitized value

Diff for: spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthComponent.java

+2-2
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-2021 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.
@@ -19,7 +19,7 @@
1919
import com.fasterxml.jackson.annotation.JsonUnwrapped;
2020

2121
/**
22-
* An component that contributes data to results returned from the {@link HealthEndpoint}.
22+
* A component that contributes data to results returned from the {@link HealthEndpoint}.
2323
*
2424
* @author Phillip Webb
2525
* @since 2.2.0

Diff for: spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitConnectionFactoryBeanConfigurer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void setCredentialsRefreshService(CredentialsRefreshService credentialsRe
5757

5858
/**
5959
* Configure the specified rabbit connection factory bean. The factory bean can be
60-
* further tuned and default settings can be overridden. It is the repsonsiblity of
60+
* further tuned and default settings can be overridden. It is the responsibility of
6161
* the caller to invoke {@link RabbitConnectionFactoryBean#afterPropertiesSet()}
6262
* though.
6363
* @param factory the {@link RabbitConnectionFactoryBean} instance to configure

Diff for: spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/HttpHeaderAccessManager.java

+2-2
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-2021 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.util.Assert;
2121

2222
/**
23-
* {@link AccessManager} that checks for the presence of a HTTP header secret.
23+
* {@link AccessManager} that checks for the presence of an HTTP header secret.
2424
*
2525
* @author Rob Winch
2626
* @author Phillip Webb

Diff for: spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/HttpStatusHandler.java

+2-2
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-2021 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.
@@ -34,7 +34,7 @@ public class HttpStatusHandler implements Handler {
3434
private final HttpStatus status;
3535

3636
/**
37-
* Create a new {@link HttpStatusHandler} instance that will respond with a HTTP OK
37+
* Create a new {@link HttpStatusHandler} instance that will respond with an HTTP OK
3838
* 200 status.
3939
*/
4040
public HttpStatusHandler() {

Diff for: spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/AgentReloader.java

+2-2
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-2021 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.
@@ -23,7 +23,7 @@
2323
import org.springframework.util.ClassUtils;
2424

2525
/**
26-
* Utility to determine if an Java agent based reloader (e.g. JRebel) is being used.
26+
* Utility to determine if a Java agent based reloader (e.g. JRebel) is being used.
2727
*
2828
* @author Phillip Webb
2929
* @since 1.3.0

Diff for: spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/HttpRestartServer.java

+2-2
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-2021 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,7 +29,7 @@
2929
import org.springframework.util.Assert;
3030

3131
/**
32-
* A HTTP server that can be used to upload updated {@link ClassLoaderFiles} and trigger
32+
* An HTTP server that can be used to upload updated {@link ClassLoaderFiles} and trigger
3333
* restarts.
3434
*
3535
* @author Phillip Webb

Diff for: spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/package-info.java

+2-2
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-2021 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.
@@ -15,6 +15,6 @@
1515
*/
1616

1717
/**
18-
* Classes to deal with payloads sent over a HTTP tunnel.
18+
* Classes to deal with payloads sent over an HTTP tunnel.
1919
*/
2020
package org.springframework.boot.devtools.tunnel.payload;

Diff for: spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServer.java

+3-3
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-2021 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.
@@ -354,7 +354,7 @@ private void forwardToTargetServer(HttpConnection httpConnection) throws IOExcep
354354
}
355355

356356
/**
357-
* Encapsulates a HTTP request/response pair.
357+
* Encapsulates an HTTP request/response pair.
358358
*/
359359
protected static class HttpConnection {
360360

@@ -446,7 +446,7 @@ public boolean isDisconnectRequest() {
446446
}
447447

448448
/**
449-
* Send a HTTP status response.
449+
* Send an HTTP status response.
450450
* @param status the status to send
451451
* @throws IOException in case of I/O errors
452452
*/

Diff for: spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/metrics.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,7 @@ Metrics are published under the `spring.integration.` meter name.
947947
[[actuator.metrics.supported.kafka]]
948948
==== Kafka Metrics
949949
Auto-configuration registers a `MicrometerConsumerListener` and `MicrometerProducerListener` for the auto-configured consumer factory and producer factory, respectively.
950-
It alsos registers a `KafkaStreamsMicrometerListener` for `StreamsBuilderFactoryBean`.
950+
It also registers a `KafkaStreamsMicrometerListener` for `StreamsBuilderFactoryBean`.
951951
For more detail, see the {spring-kafka-docs}#micrometer-native[Micrometer Native Metrics] section of the Spring Kafka documentation.
952952

953953

Diff for: spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/servlet.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[[web.servlet]]
22
== Servlet Web Applications
3-
If you're looking to build servlet-based web applications, you can take advantange of Spring Boot's auto-configuration for Spring MVC or Jersey.
3+
If you're looking to build servlet-based web applications, you can take advantage of Spring Boot's auto-configuration for Spring MVC or Jersey.
44

55
[[web.servlet.spring-mvc]]
66
=== The "`Spring Web MVC Framework`"

Diff for: spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestEntityManager.java

+3-3
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-2021 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.
@@ -46,7 +46,7 @@ public TestEntityManager(EntityManagerFactory entityManagerFactory) {
4646
}
4747

4848
/**
49-
* Make an instance managed and persistent then return it's ID. Delegates to
49+
* Make an instance managed and persistent then return its ID. Delegates to
5050
* {@link EntityManager#persist(Object)} then {@link #getId(Object)}.
5151
* <p>
5252
* Helpful when setting up test data in a test: <pre class="code">
@@ -61,7 +61,7 @@ public Object persistAndGetId(Object entity) {
6161
}
6262

6363
/**
64-
* Make an instance managed and persistent then return it's ID. Delegates to
64+
* Make an instance managed and persistent then return its ID. Delegates to
6565
* {@link EntityManager#persist(Object)} then {@link #getId(Object, Class)}.
6666
* <p>
6767
* Helpful when setting up test data in a test: <pre class="code">

Diff for: spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildpackResolver.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package org.springframework.boot.buildpack.platform.build;
1818

1919
/**
20-
* Strategy inerface used to resolve a {@link BuildpackReference} to a {@link Buildpack}.
20+
* Strategy interface used to resolve a {@link BuildpackReference} to a {@link Buildpack}.
2121
*
2222
* @author Scott Frederick
2323
* @author Phillip Webb

Diff for: spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/EphemeralBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.springframework.boot.buildpack.platform.io.Owner;
2828

2929
/**
30-
* An short lived builder that is created for each {@link Lifecycle} run.
30+
* A short lived builder that is created for each {@link Lifecycle} run.
3131
*
3232
* @author Phillip Webb
3333
* @author Scott Frederick

Diff for: spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/transport/HttpClientTransport.java

+7-7
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-2021 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 @@ protected HttpClientTransport(CloseableHttpClient client, HttpHost host) {
6666
}
6767

6868
/**
69-
* Perform a HTTP GET operation.
69+
* Perform an HTTP GET operation.
7070
* @param uri the destination URI
7171
* @return the operation response
7272
*/
@@ -76,7 +76,7 @@ public Response get(URI uri) {
7676
}
7777

7878
/**
79-
* Perform a HTTP POST operation.
79+
* Perform an HTTP POST operation.
8080
* @param uri the destination URI
8181
* @return the operation response
8282
*/
@@ -86,7 +86,7 @@ public Response post(URI uri) {
8686
}
8787

8888
/**
89-
* Perform a HTTP POST operation.
89+
* Perform an HTTP POST operation.
9090
* @param uri the destination URI
9191
* @param registryAuth registry authentication credentials
9292
* @return the operation response
@@ -97,7 +97,7 @@ public Response post(URI uri, String registryAuth) {
9797
}
9898

9999
/**
100-
* Perform a HTTP POST operation.
100+
* Perform an HTTP POST operation.
101101
* @param uri the destination URI
102102
* @param contentType the content type to write
103103
* @param writer a content writer
@@ -109,7 +109,7 @@ public Response post(URI uri, String contentType, IOConsumer<OutputStream> write
109109
}
110110

111111
/**
112-
* Perform a HTTP PUT operation.
112+
* Perform an HTTP PUT operation.
113113
* @param uri the destination URI
114114
* @param contentType the content type to write
115115
* @param writer a content writer
@@ -121,7 +121,7 @@ public Response put(URI uri, String contentType, IOConsumer<OutputStream> writer
121121
}
122122

123123
/**
124-
* Perform a HTTP DELETE operation.
124+
* Perform an HTTP DELETE operation.
125125
* @param uri the destination URI
126126
* @return the operation response
127127
*/

Diff for: spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/transport/HttpTransport.java

+7-7
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-2021 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.
@@ -37,23 +37,23 @@
3737
public interface HttpTransport {
3838

3939
/**
40-
* Perform a HTTP GET operation.
40+
* Perform an HTTP GET operation.
4141
* @param uri the destination URI (excluding any host/port)
4242
* @return the operation response
4343
* @throws IOException on IO error
4444
*/
4545
Response get(URI uri) throws IOException;
4646

4747
/**
48-
* Perform a HTTP POST operation.
48+
* Perform an HTTP POST operation.
4949
* @param uri the destination URI (excluding any host/port)
5050
* @return the operation response
5151
* @throws IOException on IO error
5252
*/
5353
Response post(URI uri) throws IOException;
5454

5555
/**
56-
* Perform a HTTP POST operation.
56+
* Perform an HTTP POST operation.
5757
* @param uri the destination URI (excluding any host/port)
5858
* @param registryAuth registry authentication credentials
5959
* @return the operation response
@@ -62,7 +62,7 @@ public interface HttpTransport {
6262
Response post(URI uri, String registryAuth) throws IOException;
6363

6464
/**
65-
* Perform a HTTP POST operation.
65+
* Perform an HTTP POST operation.
6666
* @param uri the destination URI (excluding any host/port)
6767
* @param contentType the content type to write
6868
* @param writer a content writer
@@ -72,7 +72,7 @@ public interface HttpTransport {
7272
Response post(URI uri, String contentType, IOConsumer<OutputStream> writer) throws IOException;
7373

7474
/**
75-
* Perform a HTTP PUT operation.
75+
* Perform an HTTP PUT operation.
7676
* @param uri the destination URI (excluding any host/port)
7777
* @param contentType the content type to write
7878
* @param writer a content writer
@@ -82,7 +82,7 @@ public interface HttpTransport {
8282
Response put(URI uri, String contentType, IOConsumer<OutputStream> writer) throws IOException;
8383

8484
/**
85-
* Perform a HTTP DELETE operation.
85+
* Perform an HTTP DELETE operation.
8686
* @param uri the destination URI (excluding any host/port)
8787
* @return the operation response
8888
* @throws IOException on IO error

Diff for: spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/LombokMetadataGenerationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ void lombokInnerClassProperties() {
110110
// For some reason the annotation processor resolves a type for SimpleLombokPojo
111111
// that is resolved (compiled) and the source annotations are gone. Because we
112112
// don't see the @Data annotation anymore, no field is harvested. What is crazy is
113-
// that a sample project works fine so this seem to be related to the unit test
113+
// that a sample project works fine so this seems to be related to the unit test
114114
// environment for some reason. assertThat(metadata,
115115
// containsProperty("config.third.value"));
116116
assertThat(metadata).has(Metadata.withProperty("config.fourth"));

Diff for: spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/CamelCaseEndpoint.java

+2-2
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-2021 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.
@@ -19,7 +19,7 @@
1919
import org.springframework.boot.configurationsample.Endpoint;
2020

2121
/**
22-
* An endpoint with a upper camel case id.
22+
* An endpoint with an upper camel case id.
2323
*
2424
* @author Stephane Nicoll
2525
*/

Diff for: spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/packaging-oci-image.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ include::../gradle/packaging/boot-build-image-docker-host.gradle[tags=docker-hos
392392
include::../gradle/packaging/boot-build-image-docker-host.gradle.kts[tags=docker-host]
393393
----
394394

395-
If the builder or run image are stored in a private Docker registry that supports user authentication, authentication details can be provided using `docker.buiderRegistry` properties as shown in the following example:
395+
If the builder or run image are stored in a private Docker registry that supports user authentication, authentication details can be provided using `docker.builderRegistry` properties as shown in the following example:
396396

397397
[source,groovy,indent=0,subs="verbatim,attributes",role="primary"]
398398
.Groovy

0 commit comments

Comments
 (0)