From 45f76965f6ec04eb86282ae15cc230c3bf363674 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 26 Apr 2017 15:47:20 +0200 Subject: [PATCH] Rename cassandra bean names Closes gh-8982 --- .../autoconfigure/cassandra/CassandraAutoConfiguration.java | 4 ++-- .../data/cassandra/CassandraDataAutoConfiguration.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java index ea2cf7027b..0571276196 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.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. @@ -61,7 +61,7 @@ public class CassandraAutoConfiguration { @Bean @ConditionalOnMissingBean - public Cluster cluster() { + public Cluster cassandraCluster() { CassandraProperties properties = this.properties; Cluster.Builder builder = Cluster.builder() .withClusterName(properties.getClusterName()) 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 5362945765..55d515ab97 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 @@ -106,7 +106,7 @@ public class CassandraDataAutoConfiguration { @Bean @ConditionalOnMissingBean(Session.class) - public CassandraSessionFactoryBean session(CassandraConverter converter) + public CassandraSessionFactoryBean cassandraSession(CassandraConverter converter) throws Exception { CassandraSessionFactoryBean session = new CassandraSessionFactoryBean(); session.setCluster(this.cluster);