diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapProperties.java index f99826c079..388722d797 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapProperties.java @@ -44,7 +44,7 @@ public class EmbeddedLdapProperties { private Credential credential = new Credential(); /** - * List of base DN. + * List of base DNs. */ @Delimiter(Delimiter.NONE) private List baseDn = new ArrayList<>(); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryCustomizer.java index 0ccef444fe..e37876d8c4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryCustomizer.java @@ -57,8 +57,7 @@ public class ServletWebServerFactoryCustomizer implements .to(factory::setDisplayName); map.from(this.serverProperties.getServlet()::getSession).to(factory::setSession); map.from(this.serverProperties::getSsl).to(factory::setSsl); - map.from(this.serverProperties::getServlet).as(ServerProperties.Servlet::getJsp) - .to(factory::setJsp); + map.from(this.serverProperties.getServlet()::getJsp).to(factory::setJsp); map.from(this.serverProperties::getCompression).to(factory::setCompression); map.from(this.serverProperties::getHttp2).to(factory::setHttp2); map.from(this.serverProperties::getServerHeader).to(factory::setServerHeader); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfigurationTests.java index 4c0da1cdce..ae97502eb5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfigurationTests.java @@ -82,7 +82,7 @@ public class DataSourceJmxConfigurationTests { assertThat(this.context.getBean(HikariDataSource.class).isRegisterMbeans()) .isTrue(); // We can't rely on the number of MBeans so we're checking that the pool and pool - // config mBeans were registered + // config MBeans were registered assertThat(mBeanServer .queryMBeans(new ObjectName("com.zaxxer.hikari:type=*"), null).size()) .isEqualTo(existingInstances.size() + 2); diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/RestartClassLoaderTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/RestartClassLoaderTests.java index b985174649..f5ee4c6638 100644 --- a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/RestartClassLoaderTests.java +++ b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/RestartClassLoaderTests.java @@ -144,14 +144,14 @@ public class RestartClassLoaderTests { public void getDeletedResource() { String name = PACKAGE_PATH + "/Sample.txt"; this.updatedFiles.addFile(name, new ClassLoaderFile(Kind.DELETED, null)); - assertThat(this.reloadClassLoader.getResource(name)).isEqualTo(null); + assertThat(this.reloadClassLoader.getResource(name)).isNull(); } @Test public void getDeletedResourceAsStream() { String name = PACKAGE_PATH + "/Sample.txt"; this.updatedFiles.addFile(name, new ClassLoaderFile(Kind.DELETED, null)); - assertThat(this.reloadClassLoader.getResourceAsStream(name)).isEqualTo(null); + assertThat(this.reloadClassLoader.getResourceAsStream(name)).isNull(); } @Test diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index af5971b47b..9d419f04c2 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -370,7 +370,7 @@ content into your application. Rather, pick only the properties that you need. spring.ldap.username= # Login username of the server. # EMBEDDED LDAP ({sc-spring-boot-autoconfigure}/ldap/embedded/EmbeddedLdapProperties.{sc-ext}[EmbeddedLdapProperties]) - spring.ldap.embedded.base-dn= # List of base DN. + spring.ldap.embedded.base-dn= # List of base DNs. spring.ldap.embedded.credential.username= # Embedded LDAP username. spring.ldap.embedded.credential.password= # Embedded LDAP password. spring.ldap.embedded.ldif=classpath:schema.ldif # Schema (LDIF) script resource reference. diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index 1904f16ef8..80efda6365 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -4466,7 +4466,7 @@ In yaml files, you can use the yaml list notation: - dc=pivotal,dc=io ---- -in properties files, you must include the index as part of the property name: +In properties files, you must include the index as part of the property name: [source,properties,indent=0] ---- diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/Deprecation.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/Deprecation.java index 0cc184fe74..490c8869c0 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/Deprecation.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/Deprecation.java @@ -65,7 +65,7 @@ public class Deprecation implements Serializable { * A single-line, single-sentence reason why the related property is deprecated, if * any. * @return the short deprecation reason - * @see #getShortReason() + * @see #getReason() */ public String getShortReason() { return this.shortReason; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/java/org/springframework/boot/configurationmetadata/JsonReaderTests.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/java/org/springframework/boot/configurationmetadata/JsonReaderTests.java index 7fd2ddac5f..c6ce7db9a7 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/java/org/springframework/boot/configurationmetadata/JsonReaderTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/java/org/springframework/boot/configurationmetadata/JsonReaderTests.java @@ -121,7 +121,7 @@ public class JsonReaderTests extends AbstractConfigurationMetadataTests { assertThat(valueHint.getDescription()).isEqualTo("One."); ValueHint valueHint2 = hint.getValueHints().get(1); assertThat(valueHint2.getValue()).isEqualTo("two"); - assertThat(valueHint2.getDescription()).isEqualTo(null); + assertThat(valueHint2.getDescription()).isNull(); assertThat(hint.getValueProviders()).hasSize(2); ValueProvider valueProvider = hint.getValueProviders().get(0); @@ -175,7 +175,7 @@ public class JsonReaderTests extends AbstractConfigurationMetadataTests { assertProperty(item3, "spring.server.name", "spring.server.name", String.class, null); assertThat(item3.isDeprecated()).isFalse(); - assertThat(item3.getDeprecation()).isEqualTo(null); + assertThat(item3.getDeprecation()).isNull(); ConfigurationMetadataItem item4 = items.get(3); assertProperty(item4, "spring.server-name", "spring.server-name", String.class, diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/java/org/springframework/boot/configurationmetadata/SentenceExtractorTests.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/java/org/springframework/boot/configurationmetadata/SentenceExtractorTests.java index 1ca1c40956..4b206b2d06 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/java/org/springframework/boot/configurationmetadata/SentenceExtractorTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/java/org/springframework/boot/configurationmetadata/SentenceExtractorTests.java @@ -67,7 +67,7 @@ public class SentenceExtractorTests { @Test public void extractFirstSentenceNull() { - assertThat(this.extractor.getFirstSentence(null)).isEqualTo(null); + assertThat(this.extractor.getFirstSentence(null)).isNull(); } } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java index 24451d7ad4..16fb967ba6 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java @@ -209,7 +209,7 @@ public class RepackagerTests { repackager.repackage(file, NO_LIBRARIES); Manifest actualManifest = getManifest(file); assertThat(actualManifest.getMainAttributes().getValue("Main-Class")) - .isEqualTo(null); + .isNull(); assertThat(hasLauncherClasses(file)).isFalse(); } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/PropertyMapperTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/PropertyMapperTests.java index 2ebb70434a..c293176517 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/PropertyMapperTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/PropertyMapperTests.java @@ -143,7 +143,7 @@ public class PropertyMapperTests { } @Test - public void whenInstanceOfToWhenValueIsTargetTypeShouldMatch() { + public void whenInstanceOfWhenValueIsTargetTypeShouldMatch() { Long result = this.map.from(() -> 123L).whenInstanceOf(Long.class) .toInstance((value) -> value + 1); assertThat(result).isEqualTo(124L);