Merge branch '1.5.x'

Author: snicoll

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.
@@ -112,8 +112,9 @@ public CassandraSessionFactoryBean session(CassandraConverter converter)
 		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;
 	}

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 void hasRecreateSchemaActionSet() {
 		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();