Skip to content

Commit d441a8a

Browse files
izeyesnicoll
authored andcommitted
1 parent 1314678 commit d441a8a

File tree

11 files changed

+13
-14
lines changed

11 files changed

+13
-14
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class EmbeddedLdapProperties {
4444
private Credential credential = new Credential();
4545

4646
/**
47-
* List of base DN.
47+
* List of base DNs.
4848
*/
4949
@Delimiter(Delimiter.NONE)
5050
private List<String> baseDn = new ArrayList<>();

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryCustomizer.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ public void customize(ConfigurableServletWebServerFactory factory) {
5757
.to(factory::setDisplayName);
5858
map.from(this.serverProperties.getServlet()::getSession).to(factory::setSession);
5959
map.from(this.serverProperties::getSsl).to(factory::setSsl);
60-
map.from(this.serverProperties::getServlet).as(ServerProperties.Servlet::getJsp)
61-
.to(factory::setJsp);
60+
map.from(this.serverProperties.getServlet()::getJsp).to(factory::setJsp);
6261
map.from(this.serverProperties::getCompression).to(factory::setCompression);
6362
map.from(this.serverProperties::getHttp2).to(factory::setHttp2);
6463
map.from(this.serverProperties::getServerHeader).to(factory::setServerHeader);

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfigurationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public void hikariAutoConfiguredWithoutDataSourceName()
8282
assertThat(this.context.getBean(HikariDataSource.class).isRegisterMbeans())
8383
.isTrue();
8484
// We can't rely on the number of MBeans so we're checking that the pool and pool
85-
// config mBeans were registered
85+
// config MBeans were registered
8686
assertThat(mBeanServer
8787
.queryMBeans(new ObjectName("com.zaxxer.hikari:type=*"), null).size())
8888
.isEqualTo(existingInstances.size() + 2);

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/RestartClassLoaderTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,14 @@ public void loadClassFromParent() throws Exception {
144144
public void getDeletedResource() {
145145
String name = PACKAGE_PATH + "/Sample.txt";
146146
this.updatedFiles.addFile(name, new ClassLoaderFile(Kind.DELETED, null));
147-
assertThat(this.reloadClassLoader.getResource(name)).isEqualTo(null);
147+
assertThat(this.reloadClassLoader.getResource(name)).isNull();
148148
}
149149

150150
@Test
151151
public void getDeletedResourceAsStream() {
152152
String name = PACKAGE_PATH + "/Sample.txt";
153153
this.updatedFiles.addFile(name, new ClassLoaderFile(Kind.DELETED, null));
154-
assertThat(this.reloadClassLoader.getResourceAsStream(name)).isEqualTo(null);
154+
assertThat(this.reloadClassLoader.getResourceAsStream(name)).isNull();
155155
}
156156

157157
@Test

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ content into your application. Rather, pick only the properties that you need.
370370
spring.ldap.username= # Login username of the server.
371371
372372
# EMBEDDED LDAP ({sc-spring-boot-autoconfigure}/ldap/embedded/EmbeddedLdapProperties.{sc-ext}[EmbeddedLdapProperties])
373-
spring.ldap.embedded.base-dn= # List of base DN.
373+
spring.ldap.embedded.base-dn= # List of base DNs.
374374
spring.ldap.embedded.credential.username= # Embedded LDAP username.
375375
spring.ldap.embedded.credential.password= # Embedded LDAP password.
376376
spring.ldap.embedded.ldif=classpath:schema.ldif # Schema (LDIF) script resource reference.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4466,7 +4466,7 @@ In yaml files, you can use the yaml list notation:
44664466
- dc=pivotal,dc=io
44674467
----
44684468
4469-
in properties files, you must include the index as part of the property name:
4469+
In properties files, you must include the index as part of the property name:
44704470
44714471
[source,properties,indent=0]
44724472
----

spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/Deprecation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public void setReason(String reason) {
6565
* A single-line, single-sentence reason why the related property is deprecated, if
6666
* any.
6767
* @return the short deprecation reason
68-
* @see #getShortReason()
68+
* @see #getReason()
6969
*/
7070
public String getShortReason() {
7171
return this.shortReason;

spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/java/org/springframework/boot/configurationmetadata/JsonReaderTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public void metadataHints() throws IOException {
121121
assertThat(valueHint.getDescription()).isEqualTo("One.");
122122
ValueHint valueHint2 = hint.getValueHints().get(1);
123123
assertThat(valueHint2.getValue()).isEqualTo("two");
124-
assertThat(valueHint2.getDescription()).isEqualTo(null);
124+
assertThat(valueHint2.getDescription()).isNull();
125125

126126
assertThat(hint.getValueProviders()).hasSize(2);
127127
ValueProvider valueProvider = hint.getValueProviders().get(0);
@@ -175,7 +175,7 @@ public void deprecatedMetadata() throws IOException {
175175
assertProperty(item3, "spring.server.name", "spring.server.name", String.class,
176176
null);
177177
assertThat(item3.isDeprecated()).isFalse();
178-
assertThat(item3.getDeprecation()).isEqualTo(null);
178+
assertThat(item3.getDeprecation()).isNull();
179179

180180
ConfigurationMetadataItem item4 = items.get(3);
181181
assertProperty(item4, "spring.server-name", "spring.server-name", String.class,

spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/java/org/springframework/boot/configurationmetadata/SentenceExtractorTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void extractFirstSentenceNoDotMultipleLines() {
6767

6868
@Test
6969
public void extractFirstSentenceNull() {
70-
assertThat(this.extractor.getFirstSentence(null)).isEqualTo(null);
70+
assertThat(this.extractor.getFirstSentence(null)).isNull();
7171
}
7272

7373
}

spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ public void noMainClassAndLayoutIsNoneWithNoMain() throws Exception {
209209
repackager.repackage(file, NO_LIBRARIES);
210210
Manifest actualManifest = getManifest(file);
211211
assertThat(actualManifest.getMainAttributes().getValue("Main-Class"))
212-
.isEqualTo(null);
212+
.isNull();
213213
assertThat(hasLauncherClasses(file)).isFalse();
214214
}
215215

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/PropertyMapperTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public void whenEqualToWhenValueIsNotEqualShouldNotMatch() {
143143
}
144144

145145
@Test
146-
public void whenInstanceOfToWhenValueIsTargetTypeShouldMatch() {
146+
public void whenInstanceOfWhenValueIsTargetTypeShouldMatch() {
147147
Long result = this.map.from(() -> 123L).whenInstanceOf(Long.class)
148148
.toInstance((value) -> value + 1);
149149
assertThat(result).isEqualTo(124L);

0 commit comments

Comments
 (0)