Skip to content

Commit 2d62e9e

Browse files
committed
Merge pull request #13963 from izeye:polish-20180801
* pr/13963: Polish contribution Polish
2 parents 960817a + f7032bd commit 2d62e9e

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cassandra/CassandraReactiveHealthIndicatorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import static org.mockito.Mockito.mock;
3434

3535
/**
36-
* Tests for {@link CassandraReactiveHealthIndicatorTests}.
36+
* Tests for {@link CassandraReactiveHealthIndicator}.
3737
*
3838
* @author Artsiom Yudovin
3939
*/

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,8 +412,8 @@ public void process(AnnotationMetadata annotationMetadata,
412412
DeferredImportSelector deferredImportSelector) {
413413
Assert.state(
414414
deferredImportSelector instanceof AutoConfigurationImportSelector,
415-
String.format(
416-
"AutoConfigurationImportSelector only supports %s implementations, got %s",
415+
() -> String.format(
416+
"Only %s implementations are supported, got %s",
417417
AutoConfigurationImportSelector.class.getSimpleName(),
418418
deferredImportSelector.getClass().getName()));
419419
AutoConfigurationEntry autoConfigurationEntry = ((AutoConfigurationImportSelector) deferredImportSelector)

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReport.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public List<String> getExclusions() {
147147
*/
148148
public Set<String> getUnconditionalClasses() {
149149
Set<String> filtered = new HashSet<>(this.unconditionalClasses);
150-
filtered.removeIf(this.exclusions::contains);
150+
filtered.removeAll(this.exclusions);
151151
return Collections.unmodifiableSet(filtered);
152152
}
153153

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ content into your application. Rather, pick only the properties that you need.
259259
server.tomcat.protocol-header-https-value=https # Value of the protocol header indicating whether the incoming request uses SSL.
260260
server.tomcat.redirect-context-root= # Whether requests to the context root should be redirected by appending a / to the path.
261261
server.tomcat.remote-ip-header= # Name of the HTTP header from which the remote IP is extracted. For instance, `X-FORWARDED-FOR`.
262-
server.tomcat.resource.allow-caching= # Whether static resource caching is permitted for this web application.
262+
server.tomcat.resource.allow-caching=true # Whether static resource caching is permitted for this web application.
263263
server.tomcat.resource.cache-ttl= # Time-to-live of the static resource cache.
264264
server.tomcat.uri-encoding=UTF-8 # Character encoding to use to decode the URI.
265265
server.tomcat.use-relative-redirects= # Whether HTTP 1.1 and later location headers generated by a call to sendRedirect will use relative or absolute redirects.
@@ -571,14 +571,14 @@ content into your application. Rather, pick only the properties that you need.
571571
spring.liquibase.change-log=classpath:/db/changelog/db.changelog-master.yaml # Change log configuration path.
572572
spring.liquibase.check-change-log-location=true # Whether to check that the change log location exists.
573573
spring.liquibase.contexts= # Comma-separated list of runtime contexts to use.
574-
spring.liquibase.default-schema= # Default database schema.
575-
spring.liquibase.liquibase-schema= # Schema to use for Liquibase objects.
576-
spring.liquibase.liquibase-tablespace= # Tablespace to use for Liquibase objects.
577-
spring.liquibase.database-change-log-table=DATABASECHANGELOG # Name of table to use for tracking change history.
578574
spring.liquibase.database-change-log-lock-table=DATABASECHANGELOGLOCK # Name of table to use for tracking concurrent Liquibase usage.
575+
spring.liquibase.database-change-log-table=DATABASECHANGELOG # Name of table to use for tracking change history.
576+
spring.liquibase.default-schema= # Default database schema.
579577
spring.liquibase.drop-first=false # Whether to first drop the database schema.
580578
spring.liquibase.enabled=true # Whether to enable Liquibase support.
581579
spring.liquibase.labels= # Comma-separated list of runtime labels to use.
580+
spring.liquibase.liquibase-schema= # Schema to use for Liquibase objects.
581+
spring.liquibase.liquibase-tablespace= # Tablespace to use for Liquibase objects.
582582
spring.liquibase.parameters.*= # Change log parameters.
583583
spring.liquibase.password= # Login password of the database to migrate.
584584
spring.liquibase.rollback-file= # File to which rollback SQL is written when an update is performed.

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
@@ -763,7 +763,7 @@ additional dependency.
763763

764764
Spring Boot manages the version for the
765765
`io.netty:netty-tcnative-boringssl-static` "uber jar", containing native libraries for
766-
all platforms. Developers can choose to import only the required dependendencies using
766+
all platforms. Developers can choose to import only the required dependencies using
767767
a classifier (see http://netty.io/wiki/forked-tomcat-native.html[the Netty official
768768
documentation]).
769769

0 commit comments

Comments
 (0)