Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
dee71f06
Commit
dee71f06
authored
Jan 14, 2020
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Harmonize Cassandra bean names
parent
aefe52e4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
CassandraAutoConfiguration.java
...t/autoconfigure/cassandra/CassandraAutoConfiguration.java
+3
-3
CassandraDataAutoConfiguration.java
...figure/data/cassandra/CassandraDataAutoConfiguration.java
+1
-1
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java
View file @
dee71f06
...
...
@@ -63,14 +63,14 @@ public class CassandraAutoConfiguration {
@Bean
@ConditionalOnMissingBean
@Lazy
public
CqlSession
c
ql
Session
(
CqlSessionBuilder
cqlSessionBuilder
)
{
public
CqlSession
c
assandra
Session
(
CqlSessionBuilder
cqlSessionBuilder
)
{
return
cqlSessionBuilder
.
build
();
}
@Bean
@ConditionalOnMissingBean
public
CqlSessionBuilder
c
qlSessionBuilder
(
CassandraProperties
properties
,
DriverConfigLoader
driverConfigLoader
,
ObjectProvider
<
CqlSessionBuilderCustomizer
>
builderCustomizers
)
{
public
CqlSessionBuilder
c
assandraSessionBuilder
(
CassandraProperties
properties
,
DriverConfigLoader
driverConfigLoader
,
ObjectProvider
<
CqlSessionBuilderCustomizer
>
builderCustomizers
)
{
CqlSessionBuilder
builder
=
CqlSession
.
builder
().
withConfigLoader
(
driverConfigLoader
);
configureSsl
(
properties
,
builder
);
builder
.
withKeyspace
(
properties
.
getKeyspaceName
());
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfiguration.java
View file @
dee71f06
...
...
@@ -96,7 +96,7 @@ public class CassandraDataAutoConfiguration {
@Bean
@ConditionalOnMissingBean
(
SessionFactory
.
class
)
public
SessionFactoryFactoryBean
cassandraSession
(
Environment
environment
,
CassandraConverter
converter
)
{
public
SessionFactoryFactoryBean
cassandraSession
Factory
(
Environment
environment
,
CassandraConverter
converter
)
{
SessionFactoryFactoryBean
session
=
new
SessionFactoryFactoryBean
();
session
.
setSession
(
this
.
session
);
session
.
setConverter
(
converter
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment