From 404bb2d171b5855d2536ddac5bcc7927f2da9813 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 11 Apr 2017 09:37:22 +0200 Subject: [PATCH 1/2] Polish See gh-8879 --- .../src/main/asciidoc/appendix-application-properties.adoc | 2 +- spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index 848dc77924..90185066db 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -1090,7 +1090,7 @@ content into your application; rather pick only the properties that you need. management.shell.ssh.idle-timeout = # Number of milliseconds after which unused connections are closed. management.shell.ssh.key-path= # Path to the SSH server key. management.shell.ssh.port=2000 # SSH port. - management.shell.telnet.enabled=false # Enable CRaSH telnet support. Enabled by default if the TelnetPlugin is available. + management.shell.telnet.enabled=false # Enable CRaSH telnet support. Enabled by default if the TelnetPlugin is available. management.shell.telnet.port=5000 # Telnet port. # TRACING ({sc-spring-boot-actuator}/trace/TraceProperties.{sc-ext}[TraceProperties]) diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index 529f0e93a0..108f7b1d4b 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -5847,7 +5847,7 @@ might not actually appear on the running application classpath. You can also use [TIP] ==== -If you are using `@ConditionalOnClass` or `@ConditionalOnMissingClass` as apart of a +If you are using `@ConditionalOnClass` or `@ConditionalOnMissingClass` as a part of a meta-annotation to compose your own composed annotations you must use `name` as referring to the class in such a case is not handled. ==== From 934d33685ac94ce26ca6fdedcb0270b0c11f9b90 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 11 Apr 2017 09:40:54 +0200 Subject: [PATCH 2/2] Polish See gh-8879 --- .../autoconfigure/DevToolsDataSourceAutoConfiguration.java | 2 +- .../DevToolsPooledDataSourceAutoConfigurationTests.java | 2 +- .../autoconfigure/data/mongo/DataMongoTypeExcludeFilter.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsDataSourceAutoConfiguration.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsDataSourceAutoConfiguration.java index 38da550c57..8ecf52b1bd 100644 --- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsDataSourceAutoConfiguration.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsDataSourceAutoConfiguration.java @@ -116,7 +116,7 @@ public class DevToolsDataSourceAutoConfiguration { H2("jdbc:h2:mem:", "org.h2.Driver", "org.h2.jdbcx.JdbcDataSource"), - HQSQLDB("jdbc:hsqldb:mem:", "org.hsqldb.jdbcDriver", + HSQLDB("jdbc:hsqldb:mem:", "org.hsqldb.jdbcDriver", "org.hsqldb.jdbc.JDBCDriver", "org.hsqldb.jdbc.pool.JDBCXADataSource"); diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/DevToolsPooledDataSourceAutoConfigurationTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/DevToolsPooledDataSourceAutoConfigurationTests.java index 043c6b237f..92a76259b2 100644 --- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/DevToolsPooledDataSourceAutoConfigurationTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/DevToolsPooledDataSourceAutoConfigurationTests.java @@ -69,7 +69,7 @@ public class DevToolsPooledDataSourceAutoConfigurationTests } @Test - public void inMemoryh2IsShutdown() throws SQLException { + public void inMemoryH2IsShutdown() throws SQLException { ConfigurableApplicationContext context = createContext("org.h2.Driver", "jdbc:h2:mem:test", DataSourceAutoConfiguration.class, DataSourceSpyConfiguration.class); diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTypeExcludeFilter.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTypeExcludeFilter.java index 66adfc5039..c35405c832 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTypeExcludeFilter.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTypeExcludeFilter.java @@ -33,7 +33,7 @@ class DataMongoTypeExcludeFilter extends AnnotationCustomizableTypeExcludeFilter private final DataMongoTest annotation; - DataMongoTypeExcludeFilter(final Class testClass) { + DataMongoTypeExcludeFilter(Class testClass) { this.annotation = AnnotatedElementUtils.getMergedAnnotation(testClass, DataMongoTest.class); }