Skip to content

S
spring-boot
Commit b7efec54 authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Support case insensitive value for Cassandra's SchemaAction 

Closes gh-8903
parent 4fd9a8c4
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfiguration.java
View file @ b7efec54
/* /*
* 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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -106,8 +106,9 @@ public class CassandraDataAutoConfiguration { ...@@ -106,8 +106,9 @@ public class CassandraDataAutoConfiguration {
session.setCluster(this.cluster); session.setCluster(this.cluster);
session.setConverter(converter); session.setConverter(converter);
session.setKeyspaceName(this.properties.getKeyspaceName()); session.setKeyspaceName(this.properties.getKeyspaceName());
SchemaAction schemaAction = this.propertyResolver.getProperty("schemaAction", String name = this.propertyResolver.getProperty("schemaAction",
SchemaAction.class, SchemaAction.NONE); SchemaAction.NONE.name());
SchemaAction schemaAction = SchemaAction.valueOf(name.toUpperCase());
session.setSchemaAction(schemaAction); session.setSchemaAction(schemaAction);
return session; return session;
} }
......
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java
View file @ b7efec54
/* /*
* 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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -72,8 +72,8 @@ public class CassandraDataAutoConfigurationIntegrationTests { ...@@ -72,8 +72,8 @@ public class CassandraDataAutoConfigurationIntegrationTests {
String cityPackage = City.class.getPackage().getName(); String cityPackage = City.class.getPackage().getName();
AutoConfigurationPackages.register(this.context, cityPackage); AutoConfigurationPackages.register(this.context, cityPackage);
EnvironmentTestUtils.addEnvironment(this.context, EnvironmentTestUtils.addEnvironment(this.context,
"spring.data.cassandra.schemaAction:RECREATE_DROP_UNUSED", "spring.data.cassandra.schemaAction=recreate_drop_unused",
"spring.data.cassandra.keyspaceName:boot_test"); "spring.data.cassandra.keyspaceName=boot_test");
this.context.register(CassandraAutoConfiguration.class, this.context.register(CassandraAutoConfiguration.class,
CassandraDataAutoConfiguration.class); CassandraDataAutoConfiguration.class);
this.context.refresh(); this.context.refresh();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment