mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Merge branch '1.4.x' into 1.5.x
This commit is contained in:
commit
e1f727719a
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2016 the original author or authors.
|
||||
* Copyright 2012-2017 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@ -112,8 +112,9 @@ public class CassandraDataAutoConfiguration {
|
||||
session.setCluster(this.cluster);
|
||||
session.setConverter(converter);
|
||||
session.setKeyspaceName(this.properties.getKeyspaceName());
|
||||
SchemaAction schemaAction = this.propertyResolver.getProperty("schemaAction",
|
||||
SchemaAction.class, SchemaAction.NONE);
|
||||
String name = this.propertyResolver.getProperty("schemaAction",
|
||||
SchemaAction.NONE.name());
|
||||
SchemaAction schemaAction = SchemaAction.valueOf(name.toUpperCase());
|
||||
session.setSchemaAction(schemaAction);
|
||||
return session;
|
||||
}
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2016 the original author or authors.
|
||||
* Copyright 2012-2017 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@ -72,8 +72,8 @@ public class CassandraDataAutoConfigurationIntegrationTests {
|
||||
String cityPackage = City.class.getPackage().getName();
|
||||
AutoConfigurationPackages.register(this.context, cityPackage);
|
||||
EnvironmentTestUtils.addEnvironment(this.context,
|
||||
"spring.data.cassandra.schemaAction:RECREATE_DROP_UNUSED",
|
||||
"spring.data.cassandra.keyspaceName:boot_test");
|
||||
"spring.data.cassandra.schemaAction=recreate_drop_unused",
|
||||
"spring.data.cassandra.keyspaceName=boot_test");
|
||||
this.context.register(CassandraAutoConfiguration.class,
|
||||
CassandraDataAutoConfiguration.class);
|
||||
this.context.refresh();
|
||||
|
Loading…
Reference in New Issue
Block a user