Skip to content

Commit 991314c

Browse files
wilkinsonawilkinsona
committed
Merge branch '1.5.x'
2 parents 5730071 + 5912235 commit 991314c

File tree

36 files changed

+109
-111
lines changed

36 files changed

+109
-111
lines changed

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfiguration.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import org.springframework.data.cassandra.core.CassandraTemplate;
4343
import org.springframework.data.cassandra.core.convert.CassandraConverter;
4444
import org.springframework.data.cassandra.core.convert.MappingCassandraConverter;
45-
import org.springframework.data.cassandra.core.mapping.BasicCassandraMappingContext;
4645
import org.springframework.data.cassandra.core.mapping.CassandraMappingContext;
4746
import org.springframework.data.cassandra.core.mapping.SimpleUserTypeResolver;
4847
import org.springframework.util.StringUtils;
@@ -81,7 +80,7 @@ public CassandraDataAutoConfiguration(BeanFactory beanFactory,
8180
@Bean
8281
@ConditionalOnMissingBean
8382
public CassandraMappingContext cassandraMapping() throws ClassNotFoundException {
84-
BasicCassandraMappingContext context = new BasicCassandraMappingContext();
83+
CassandraMappingContext context = new CassandraMappingContext();
8584
List<String> packages = EntityScanPackages.get(this.beanFactory)
8685
.getPackageNames();
8786
if (packages.isEmpty() && AutoConfigurationPackages.has(this.beanFactory)) {

‎spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveRepositoriesAutoConfigurationTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import org.springframework.context.annotation.ComponentScan.Filter;
3737
import org.springframework.context.annotation.Configuration;
3838
import org.springframework.context.annotation.FilterType;
39-
import org.springframework.data.cassandra.core.mapping.BasicCassandraMappingContext;
39+
import org.springframework.data.cassandra.core.mapping.CassandraMappingContext;
4040
import org.springframework.data.cassandra.repository.config.EnableReactiveCassandraRepositories;
4141
import org.springframework.data.cql.core.session.ReactiveSession;
4242
import org.springframework.test.util.ReflectionTestUtils;
@@ -87,8 +87,8 @@ public void doesNotTriggerDefaultRepositoryDetectionIfCustomized() {
8787

8888
@SuppressWarnings("unchecked")
8989
private Set<Class<?>> getInitialEntitySet() {
90-
BasicCassandraMappingContext mappingContext = this.context
91-
.getBean(BasicCassandraMappingContext.class);
90+
CassandraMappingContext mappingContext = this.context
91+
.getBean(CassandraMappingContext.class);
9292
return (Set<Class<?>>) ReflectionTestUtils.getField(mappingContext,
9393
"initialEntitySet");
9494
}

‎spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraRepositoriesAutoConfigurationTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import org.springframework.context.annotation.ComponentScan;
3737
import org.springframework.context.annotation.Configuration;
3838
import org.springframework.context.annotation.FilterType;
39-
import org.springframework.data.cassandra.core.mapping.BasicCassandraMappingContext;
39+
import org.springframework.data.cassandra.core.mapping.CassandraMappingContext;
4040
import org.springframework.data.cassandra.repository.config.EnableCassandraRepositories;
4141
import org.springframework.test.util.ReflectionTestUtils;
4242

@@ -88,8 +88,8 @@ public void doesNotTriggerDefaultRepositoryDetectionIfCustomized() {
8888

8989
@SuppressWarnings("unchecked")
9090
private Set<Class<?>> getInitialEntitySet() {
91-
BasicCassandraMappingContext mappingContext = this.context
92-
.getBean(BasicCassandraMappingContext.class);
91+
CassandraMappingContext mappingContext = this.context
92+
.getBean(CassandraMappingContext.class);
9393
return (Set<Class<?>>) ReflectionTestUtils.getField(mappingContext,
9494
"initialEntitySet");
9595
}

‎spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -210,19 +210,16 @@ private void testExplicitType() {
210210
@Test
211211
public void testExplicitDriverClassClearsUsername() throws Exception {
212212
TestPropertyValues.of(
213-
"spring.datasource.driverClassName:"
214-
+ "org.springframework.boot.autoconfigure.jdbc."
215-
+ "DataSourceAutoConfigurationTests$DatabaseTestDriver",
213+
"spring.datasource.driverClassName:" + DatabaseTestDriver.class.getName(),
216214
"spring.datasource.url:jdbc:foo://localhost").applyTo(this.context);
217215
this.context.register(DataSourceAutoConfiguration.class,
218216
PropertyPlaceholderAutoConfiguration.class);
219217
this.context.refresh();
220-
DataSource bean = this.context.getBean(DataSource.class);
221-
assertThat(bean).isNotNull();
222-
HikariDataSource pool = (HikariDataSource) bean;
223-
assertThat(pool.getDriverClassName()).isEqualTo(
224-
"org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfigurationTests$DatabaseTestDriver");
225-
assertThat(pool.getUsername()).isNull();
218+
DataSource dataSource = this.context.getBean(DataSource.class);
219+
assertThat(dataSource).isNotNull();
220+
assertThat(((HikariDataSource) dataSource).getDriverClassName())
221+
.isEqualTo(DatabaseTestDriver.class.getName());
222+
assertThat(((HikariDataSource) dataSource).getUsername()).isNull();
226223
}
227224

228225
@Test

‎spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ public void producerProperties() {
168168
.isEmpty();
169169
}
170170

171+
@SuppressWarnings("unchecked")
171172
@Test
172173
public void listenerProperties() {
173174
load("spring.kafka.template.default-topic=testTopic",
@@ -176,8 +177,8 @@ public void listenerProperties() {
176177
"spring.kafka.listener.ack-time=456",
177178
"spring.kafka.listener.concurrency=3",
178179
"spring.kafka.listener.poll-timeout=2000",
179-
"spring.kafka.listener.type=batch",
180-
"spring.kafka.jaas.enabled=true", "spring.kafka.jaas.login-module=foo",
180+
"spring.kafka.listener.type=batch", "spring.kafka.jaas.enabled=true",
181+
"spring.kafka.jaas.login-module=foo",
181182
"spring.kafka.jaas.control-flag=REQUISITE",
182183
"spring.kafka.jaas.options.useKeyTab=true");
183184
DefaultKafkaProducerFactory<?, ?> producerFactory = this.context
@@ -199,8 +200,7 @@ public void listenerProperties() {
199200
assertThat(dfa.getPropertyValue("concurrency")).isEqualTo(3);
200201
assertThat(dfa.getPropertyValue("containerProperties.pollTimeout"))
201202
.isEqualTo(2000L);
202-
assertThat(dfa.getPropertyValue("batchListener"))
203-
.isEqualTo(true);
203+
assertThat(dfa.getPropertyValue("batchListener")).isEqualTo(true);
204204
assertThat(this.context.getBeansOfType(KafkaJaasLoginModuleInitializer.class))
205205
.hasSize(1);
206206
KafkaJaasLoginModuleInitializer jaas = this.context

‎spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfigurationTests.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -354,11 +354,8 @@ public SchedulerFactoryBeanCustomizer customizer() {
354354

355355
public static class ComponentThatUsesScheduler {
356356

357-
private Scheduler scheduler;
358-
359357
public ComponentThatUsesScheduler(Scheduler scheduler) {
360358
Assert.notNull(scheduler, "Scheduler must not be null");
361-
this.scheduler = scheduler;
362359
}
363360

364361
}

‎spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ClassLoaderFilesResourcePatternResolver.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,8 @@ private ResourceLoader createResourceLoader(
216216
ApplicationContext applicationContext) {
217217
DefaultResourceLoader resourceLoader = new DefaultResourceLoader();
218218
if (applicationContext instanceof DefaultResourceLoader) {
219-
Collection<ProtocolResolver> protocolResolvers =
220-
((DefaultResourceLoader) applicationContext).getProtocolResolvers();
219+
Collection<ProtocolResolver> protocolResolvers = ((DefaultResourceLoader) applicationContext)
220+
.getProtocolResolvers();
221221
for (ProtocolResolver protocolResolver : protocolResolvers) {
222222
resourceLoader.addProtocolResolver(protocolResolver);
223223
}
@@ -247,11 +247,11 @@ public ResourcePatternResolver getResourcePatternResolver(
247247

248248
private ResourceLoader createResourceLoader(
249249
WebApplicationContext applicationContext) {
250-
WebApplicationContextResourceLoader resourceLoader =
251-
new WebApplicationContextResourceLoader(applicationContext);
250+
WebApplicationContextResourceLoader resourceLoader = new WebApplicationContextResourceLoader(
251+
applicationContext);
252252
if (applicationContext instanceof DefaultResourceLoader) {
253-
Collection<ProtocolResolver> protocolResolvers =
254-
((DefaultResourceLoader) applicationContext).getProtocolResolvers();
253+
Collection<ProtocolResolver> protocolResolvers = ((DefaultResourceLoader) applicationContext)
254+
.getProtocolResolvers();
255255
for (ProtocolResolver protocolResolver : protocolResolvers) {
256256
resourceLoader.addProtocolResolver(protocolResolver);
257257
}

‎spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/AbstractDevToolsDataSourceAutoConfigurationTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,9 @@ protected final ConfigurableApplicationContext createContext(String driverClassN
110110
context.register(classes);
111111
context.register(DevToolsDataSourceAutoConfiguration.class);
112112
if (driverClassName != null) {
113-
TestPropertyValues.of(
114-
"spring.datasource.driver-class-name:" + driverClassName).applyTo(context);
113+
TestPropertyValues
114+
.of("spring.datasource.driver-class-name:" + driverClassName)
115+
.applyTo(context);
115116
}
116117
if (url != null) {
117118
TestPropertyValues.of("spring.datasource.url:" + url).applyTo(context);

‎spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/ClassLoaderFilesResourcePatternResolverTests.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
import org.springframework.web.context.support.ServletContextResource;
4040

4141
import static org.assertj.core.api.Assertions.assertThat;
42+
import static org.mockito.ArgumentMatchers.any;
43+
import static org.mockito.ArgumentMatchers.eq;
4244
import static org.mockito.BDDMockito.given;
43-
import static org.mockito.Matchers.any;
44-
import static org.mockito.Matchers.eq;
4545
import static org.mockito.Mockito.mock;
4646
import static org.mockito.Mockito.verify;
4747

@@ -168,8 +168,7 @@ public void customProtocolResolverIsUsedInWebApplication() throws Exception {
168168

169169
private ProtocolResolver mockProtocolResolver(String path, Resource resource) {
170170
ProtocolResolver resolver = mock(ProtocolResolver.class);
171-
given(resolver.resolve(eq(path), any(ResourceLoader.class)))
172-
.willReturn(resource);
171+
given(resolver.resolve(eq(path), any(ResourceLoader.class))).willReturn(resource);
173172
return resolver;
174173
}
175174

‎spring-boot-samples/spring-boot-sample-hypermedia-ui-secure/src/test/java/sample/hypermedia/ui/secure/SampleHypermediaUiSecureApplicationTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,16 @@ public void testInsecureNestedPath() throws Exception {
4747
ResponseEntity<String> entity = this.restTemplate.getForEntity("/application/env",
4848
String.class);
4949
assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
50-
ResponseEntity<String> user = this.restTemplate.getForEntity("/application/env/foo",
51-
String.class);
50+
ResponseEntity<String> user = this.restTemplate
51+
.getForEntity("/application/env/foo", String.class);
5252
assertThat(user.getStatusCode()).isEqualTo(HttpStatus.OK);
5353
assertThat(user.getBody()).contains("{\"foo\":");
5454
}
5555

5656
@Test
5757
public void testSecurePath() throws Exception {
58-
ResponseEntity<String> entity = this.restTemplate.getForEntity("/application/metrics",
59-
String.class);
58+
ResponseEntity<String> entity = this.restTemplate
59+
.getForEntity("/application/metrics", String.class);
6060
assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.UNAUTHORIZED);
6161
}
6262
}

0 commit comments

Comments
 (0)