From b7efec5401fee3eeff76d0ab3c64731fd330c504 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 14 Apr 2017 16:04:04 +0200 Subject: [PATCH] Support case insensitive value for Cassandra's SchemaAction Closes gh-8903 --- .../data/cassandra/CassandraDataAutoConfiguration.java | 7 ++++--- .../CassandraDataAutoConfigurationIntegrationTests.java | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfiguration.java index 26fb0d66748..b23ab03bac5 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfiguration.java @@ -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. @@ -106,8 +106,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; } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java index 074f9d0eab1..4173cab2b74 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java @@ -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();