mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Polish
closes gh-9729
This commit is contained in:
parent
8e3baf3130
commit
360e3a492c
@ -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) {
|
||||
|
@ -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 <a href="http://blog.btmatthews.com/?p=40#comment-33797"> Inject application
|
||||
* @see <a href="http://blog.btmatthews.com/?p=40#comment-33797">Inject application
|
||||
* context dependencies in Quartz job beans</a>
|
||||
*/
|
||||
class AutowireCapableBeanJobFactory extends SpringBeanJobFactory {
|
||||
|
@ -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));
|
||||
}
|
||||
|
||||
|
@ -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();
|
||||
});
|
||||
|
@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -42,7 +42,7 @@ import static org.mockito.Mockito.verify;
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
*/
|
||||
public class JooqPropertiesTest {
|
||||
public class JooqPropertiesTests {
|
||||
|
||||
private AnnotationConfigApplicationContext context;
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
|
@ -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();
|
||||
|
||||
|
@ -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.
|
||||
|
@ -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
|
||||
|
@ -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) {
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user