Skip to content

Commit 30072c9

Browse files
committed
Polish
1 parent c2f649d commit 30072c9

File tree

12 files changed

+21
-20
lines changed

12 files changed

+21
-20
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/audit/AuditEventsEndpointAutoConfigurationTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ public void runWhenEnabledPropertyIsFalseShouldNotHaveEndpointOrExtensionBean()
6363
this.contextRunner.withPropertyValues("endpoints.auditevents.enabled:false")
6464
.run((context) -> assertThat(context)
6565
.doesNotHaveBean(AuditEventsEndpoint.class)
66-
.doesNotHaveBean(AuditEventsJmxEndpointExtension.class));
66+
.doesNotHaveBean(AuditEventsJmxEndpointExtension.class)
67+
.doesNotHaveBean(AuditEventsWebEndpointExtension.class));
6768
}
6869

6970
}

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/session/SessionsEndpointAutoConfigurationTests.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,10 @@ public void runShouldHaveWebExtensionBean() {
5656
@Test
5757
public void runWhenEnabledPropertyIsFalseShouldNotHaveEndpointOrExtensionBean()
5858
throws Exception {
59-
this.contextRunner.withPropertyValues("endpoints.sessions.enabled:false").run(
60-
(context) -> assertThat(context).doesNotHaveBean(SessionsEndpoint.class));
59+
this.contextRunner.withPropertyValues("endpoints.sessions.enabled:false")
60+
.run((context) -> assertThat(context)
61+
.doesNotHaveBean(SessionsEndpoint.class)
62+
.doesNotHaveBean(SessionsWebEndpointExtension.class));
6163
}
6264

6365
@Configuration

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import org.springframework.context.annotation.Primary;
3737

3838
/**
39-
* {@link EnableAutoConfiguration Auto-Configuration} for Couchbase.
39+
* {@link EnableAutoConfiguration Auto-configuration} for Couchbase.
4040
*
4141
* @author Eddú Meléndez
4242
* @author Stephane Nicoll

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ public DefaultClientResources lettuceClientResources() {
7575
@ConditionalOnMissingBean(RedisConnectionFactory.class)
7676
public LettuceConnectionFactory redisConnectionFactory(
7777
ClientResources clientResources) throws UnknownHostException {
78-
LettuceClientConfiguration clientConfig;
79-
clientConfig = getLettuceClientConfiguration(clientResources,
78+
LettuceClientConfiguration clientConfig = getLettuceClientConfiguration(clientResources,
8079
this.properties.getLettuce().getPool());
8180
return createLettuceConnectionFactory(clientConfig);
8281
}

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ public void providerDisablesAutoCommitIsNotConfiguredIfPropertyIsSet() {
241241
}
242242

243243
@Test
244-
public void providerDisablesAutoCommitIsNotConfiguredWihJta() {
244+
public void providerDisablesAutoCommitIsNotConfiguredWithJta() {
245245
contextRunner()
246246
.withConfiguration(AutoConfigurations.of(JtaAutoConfiguration.class))
247247
.withPropertyValues(

spring-boot-project/spring-boot-cli/src/main/content/INSTALL.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ version you should run:
1616

1717
java -version
1818

19-
Alternatively, you can set the JAVA_HOME environment variable to point an suitable JDK.
19+
Alternatively, you can set the JAVA_HOME environment variable to point a suitable JDK.
2020

2121

2222
Environment Variables
2323
---------------------
2424
No specific environment variables are required to run the CLI, however, you may want to
25-
set SPRING_HOME to point to a specific installation. You should also add SPRING_HOME/bin
25+
set SPRING_HOME to point to a specific installation. You should also add SPRING_HOME/bin
2626
to your PATH environment variable.
2727

2828

@@ -37,7 +37,7 @@ location for your environment. For example, something like:
3737

3838
Checking Your Installation
3939
--------------------------
40-
To test if you have successfully install the CLI you can run the following command:
40+
To test if you have successfully installed the CLI you can run the following command:
4141

4242
spring --version
4343

spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1230,8 +1230,8 @@ content into your application; rather pick only the properties that you need.
12301230
management.endpoints.cors.exposed-headers= # Comma-separated list of headers to include in a response.
12311231
management.endpoints.cors.max-age=1800 # How long, in seconds, the response from a pre-flight request can be cached by clients.
12321232
1233-
# ENDPOINTS JMX CONFIGURATION ({sc-spring-boot-actuator}/autoconfigure/endpoint/ManagementEndpointProperties.{sc-ext}[JmxEndpointExporterProperties])
1234-
management.endpoints.web.base-path # Base path for Web endpoints. Relative to server.context-path or management.server.context-path if management.server.port is configured.
1233+
# ENDPOINTS WEB CONFIGURATION ({sc-spring-boot-actuator-autoconfigure}/endpoint/web/WebEndpointProperties.{sc-ext}[WebEndpointProperties])
1234+
management.endpoints.web.base-path=/application # Base path for Web endpoints. Relative to server.context-path or management.server.context-path if management.server.port is configured.
12351235
12361236
# ENDPOINTS JMX CONFIGURATION ({sc-spring-boot-actuator-autoconfigure}/endpoint/jmx/JmxEndpointExporterProperties.{sc-ext}[JmxEndpointExporterProperties])
12371237
management.endpoints.jmx.domain=org.springframework.boot # Endpoints JMX domain name. Fallback to 'spring.jmx.default-domain' if set.

spring-boot-project/spring-boot-docs/src/main/asciidoc/deployment.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ developed>> in the "`Getting Started`" section up and running in the Cloud.
4141
=== Cloud Foundry
4242
Cloud Foundry provides default buildpacks that come into play if no other buildpack is
4343
specified. The Cloud Foundry https://github.com/cloudfoundry/java-buildpack[Java buildpack]
44-
has excellent support for Spring applications, including Spring Boot. You can deploy
44+
has excellent support for Spring applications, including Spring Boot. You can deploy
4545
stand-alone executable jar applications, as well as traditional `.war` packaged
4646
applications.
4747

spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -439,10 +439,10 @@ support it.
439439
[TIP]
440440
====
441441
The http://spring.io[spring.io] web site contains many "`Getting Started`" guides
442-
that use Spring Boot. If you're looking to solve a specific problem; check there first.
442+
that use Spring Boot. If you're looking to solve a specific problem, check there first.
443443
444444
You can shortcut the steps below by going to https://start.spring.io and choosing the
445-
`web` starter from the dependencies searcher. This will automatically generate a new
445+
"Web" starter from the dependencies searcher. This will automatically generate a new
446446
project structure so that you can <<getting-started-first-application-code,start coding
447447
right away>>. Check the https://github.com/spring-io/initializr[documentation for
448448
more details].
@@ -527,7 +527,7 @@ This should give you a working build, you can test it out by running `mvn packag
527527
can ignore the "`jar will be empty - no content was marked for inclusion!`" warning for
528528
now).
529529

530-
NOTE: At this point you could import the project into an IDE (most modern Java IDE's
530+
NOTE: At this point you could import the project into an IDE (most modern Java IDEs
531531
include built-in support for Maven). For simplicity, we will continue to use a plain
532532
text editor for this example.
533533

@@ -584,7 +584,6 @@ file named `src/main/java/Example.java`:
584584
----
585585
import org.springframework.boot.*;
586586
import org.springframework.boot.autoconfigure.*;
587-
import org.springframework.stereotype.*;
588587
import org.springframework.web.bind.annotation.*;
589588
590589
@RestController

spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1251,7 +1251,7 @@ added.
12511251
Check out {sc-spring-boot-autoconfigure}/web/servlet/WebMvcAutoConfiguration.{sc-ext}[`WebMvcAutoConfiguration`],
12521252
{sc-spring-boot-autoconfigure}/thymeleaf/ThymeleafAutoConfiguration.{sc-ext}[`ThymeleafAutoConfiguration`],
12531253
{sc-spring-boot-autoconfigure}/freemarker/FreeMarkerAutoConfiguration.{sc-ext}[`FreeMarkerAutoConfiguration`] and
1254-
{sc-spring-boot-autoconfigure}/groovy/template/GroovyTemplateAutoConfiguration.{sc-ext}[`GroovyTemplateAutoConfiguration`]
1254+
{sc-spring-boot-autoconfigure}/groovy/template/GroovyTemplateAutoConfiguration.{sc-ext}[`GroovyTemplateAutoConfiguration`].
12551255

12561256

12571257

0 commit comments

Comments
 (0)