diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/SqlDialectLookup.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/SqlDialectLookup.java index 300d3310dcc..400365bc518 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/SqlDialectLookup.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/SqlDialectLookup.java @@ -66,11 +66,11 @@ final class SqlDialectLookup { return SQLDialect.DEFAULT; } try { - String url = (String) JdbcUtils.extractDatabaseMetaData(dataSource, "getURL"); + String url = JdbcUtils.extractDatabaseMetaData(dataSource, "getURL"); DatabaseDriver driver = DatabaseDriver.fromJdbcUrl(url); - SQLDialect sQLDialect = LOOKUP.get(driver); - if (sQLDialect != null) { - return sQLDialect; + SQLDialect sqlDialect = LOOKUP.get(driver); + if (sqlDialect != null) { + return sqlDialect; } } catch (MetaDataAccessException ex) { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/AutowireCapableBeanJobFactory.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/AutowireCapableBeanJobFactory.java index 36828976da0..e114f17a93a 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/AutowireCapableBeanJobFactory.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/AutowireCapableBeanJobFactory.java @@ -26,8 +26,7 @@ import org.springframework.util.Assert; * Subclass of {@link SpringBeanJobFactory} that supports auto-wiring job beans. * * @author Vedran Pavic - * @since 2.0.0 - * @see Inject application + * @see Inject application * context dependencies in Quartz job beans */ class AutowireCapableBeanJobFactory extends SpringBeanJobFactory { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfigurationTests.java index 14731341c99..bcca1fa92ad 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfigurationTests.java @@ -18,7 +18,6 @@ package org.springframework.boot.autoconfigure.data.elasticsearch; import java.util.List; -import org.assertj.core.api.Assertions; import org.elasticsearch.client.Client; import org.elasticsearch.client.transport.TransportClient; import org.elasticsearch.cluster.node.DiscoveryNode; @@ -63,9 +62,9 @@ public class ElasticsearchAutoConfigurationTests { PropertyPlaceholderAutoConfiguration.class, ElasticsearchAutoConfiguration.class); this.context.refresh(); - Assertions.assertThat(this.context.getBeanNamesForType(Client.class).length) + assertThat(this.context.getBeanNamesForType(Client.class).length) .isEqualTo(1); - Assertions.assertThat(this.context.getBean("myClient")) + assertThat(this.context.getBean("myClient")) .isSameAs(this.context.getBean(Client.class)); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java index 9d03a098a90..cc2142167c7 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java @@ -61,16 +61,16 @@ public class ElasticsearchRepositoriesAutoConfigurationTests { @Test public void testNoRepositoryConfiguration() throws Exception { - new ElasticsearchNodeTemplate().doWithNode((address) -> { - load(EmptyConfiguration.class, address); + new ElasticsearchNodeTemplate().doWithNode((node) -> { + load(EmptyConfiguration.class, node); assertThat(this.context.getBean(Client.class)).isNotNull(); }); } @Test public void doesNotTriggerDefaultRepositoryDetectionIfCustomized() { - new ElasticsearchNodeTemplate().doWithNode((address) -> { - load(CustomizedConfiguration.class, address); + new ElasticsearchNodeTemplate().doWithNode((node) -> { + load(CustomizedConfiguration.class, node); assertThat(this.context.getBean(CityElasticsearchDbRepository.class)) .isNotNull(); }); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java index 1975116fc05..fd509674a95 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java @@ -16,7 +16,6 @@ package org.springframework.boot.autoconfigure.data.neo4j; -import org.assertj.core.api.Assertions; import org.junit.After; import org.junit.Test; import org.neo4j.ogm.session.Session; @@ -159,7 +158,7 @@ public class Neo4jDataAutoConfigurationTests { private static void assertDomainTypesDiscovered(Neo4jMappingContext mappingContext, Class... types) { for (Class type : types) { - Assertions.assertThat(mappingContext.getPersistentEntity(type)).isNotNull(); + assertThat(mappingContext.getPersistentEntity(type)).isNotNull(); } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqPropertiesTest.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqPropertiesTests.java similarity index 99% rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqPropertiesTest.java rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqPropertiesTests.java index 362885137f1..588f4e17b80 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqPropertiesTest.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqPropertiesTests.java @@ -42,7 +42,7 @@ import static org.mockito.Mockito.verify; * * @author Stephane Nicoll */ -public class JooqPropertiesTest { +public class JooqPropertiesTests { private AnnotationConfigApplicationContext context; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/SqlDialectLookupTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/SqlDialectLookupTests.java index 70d1a17f40e..7f58df9be73 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/SqlDialectLookupTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/SqlDialectLookupTests.java @@ -68,7 +68,7 @@ public class SqlDialectLookupTests { } @Test - public void getSqlDialectWhenOracleShouldReturnOracle() throws Exception { + public void getSqlDialectWhenOracleShouldReturnDefault() throws Exception { testGetSqlDialect("jdbc:oracle:", SQLDialect.DEFAULT); } @@ -78,17 +78,17 @@ public class SqlDialectLookupTests { } @Test - public void getSqlDialectWhenSqlserverShouldReturnSqlserver() throws Exception { + public void getSqlDialectWhenSqlserverShouldReturnDefault() throws Exception { testGetSqlDialect("jdbc:sqlserver:", SQLDialect.DEFAULT); } @Test - public void getSqlDialectWhenDb2ShouldReturnDb2() throws Exception { + public void getSqlDialectWhenDb2ShouldReturnDefault() throws Exception { testGetSqlDialect("jdbc:db2:", SQLDialect.DEFAULT); } @Test - public void getSqlDialectWhenInformixShouldReturnInformix() throws Exception { + public void getSqlDialectWhenInformixShouldReturnDefault() throws Exception { testGetSqlDialect("jdbc:informix-sqli:", SQLDialect.DEFAULT); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfigurationTests.java index 8212e2a8848..73a439fef06 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfigurationTests.java @@ -24,7 +24,6 @@ import javax.sql.DataSource; import org.junit.After; import org.junit.Rule; import org.junit.Test; -import org.junit.rules.ExpectedException; import org.quartz.Calendar; import org.quartz.JobBuilder; import org.quartz.JobDetail; @@ -72,9 +71,6 @@ import static org.hamcrest.CoreMatchers.containsString; */ public class QuartzAutoConfigurationTests { - @Rule - public final ExpectedException thrown = ExpectedException.none(); - @Rule public OutputCapture output = new OutputCapture(); 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 fb062670134..3496be961c7 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -775,7 +775,7 @@ content into your application; rather pick only the properties that you need. spring.jta.atomikos.properties.max-timeout=300000 # Maximum timeout (in milliseconds) that can be allowed for transactions. spring.jta.atomikos.properties.recovery.delay=10000 # Delay between two recovery scans. spring.jta.atomikos.properties.recovery.forget-orphaned-log-entries-delay=86400000 # Delay after which recovery can cleanup pending ('orphaned') log entries. - spring.jta.atomikos.properties.recovery.max-retries=5 # Number of retries attempts to commit the transaction before throwing an exception. + spring.jta.atomikos.properties.recovery.max-retries=5 # Number of retry attempts to commit the transaction before throwing an exception. spring.jta.atomikos.properties.recovery.retry-interval=10000 # Delay between retry attempts. spring.jta.atomikos.properties.serial-jta-transactions=true # Specify if sub-transactions should be joined when possible. spring.jta.atomikos.properties.service= # Transaction manager implementation that should be started. 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 63e3b212027..18ae574f58c 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -5470,7 +5470,7 @@ provided with the Quartz library. It is also possible to provide a custom script `spring.quartz.jdbc.schema` property. Quartz Scheduler configuration can be customized using Quartz configuration properties (see -`spring.quartz.properties.*`) and `SchedulerFactoryBeanCustomizer` beans which allows +`spring.quartz.properties.*`) and `SchedulerFactoryBeanCustomizer` beans which allow programmatic `SchedulerFactoryBean` customization. Job can define setters to inject data map properties. Regular beans can also be injected diff --git a/spring-boot-samples/spring-boot-sample-data-elasticsearch/src/test/java/sample/data/elasticsearch/SampleElasticsearchApplicationTests.java b/spring-boot-samples/spring-boot-sample-data-elasticsearch/src/test/java/sample/data/elasticsearch/SampleElasticsearchApplicationTests.java index 5d5ea9e5f10..8487c8ba0d6 100644 --- a/spring-boot-samples/spring-boot-sample-data-elasticsearch/src/test/java/sample/data/elasticsearch/SampleElasticsearchApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-data-elasticsearch/src/test/java/sample/data/elasticsearch/SampleElasticsearchApplicationTests.java @@ -18,7 +18,6 @@ package sample.data.elasticsearch; import java.io.File; -import org.assertj.core.api.Assertions; import org.elasticsearch.client.transport.NoNodeAvailableException; import org.junit.ClassRule; import org.junit.Rule; @@ -30,6 +29,8 @@ import org.junit.runners.model.Statement; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.test.rule.OutputCapture; +import static org.assertj.core.api.Assertions.assertThat; + /** * Tests for {@link SampleElasticsearchApplication}. * @@ -55,7 +56,7 @@ public class SampleElasticsearchApplicationTests { throw ex; } String output = this.outputCapture.toString(); - Assertions.assertThat(output).contains("firstName='Alice', lastName='Smith'"); + assertThat(output).contains("firstName='Alice', lastName='Smith'"); } private boolean elasticsearchRunning(Exception ex) { diff --git a/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosProperties.java b/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosProperties.java index d3936c9c8db..bf222325288 100644 --- a/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosProperties.java +++ b/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosProperties.java @@ -352,7 +352,7 @@ public class AtomikosProperties { private long delay = 10000; /** - * Number of retries attempts to commit the transaction before throwing an + * Number of retry attempts to commit the transaction before throwing an * exception. */ private int maxRetries = 5;