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
23a923d1
Commit
23a923d1
authored
May 30, 2019
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #17004 from nosan
* pr/17004: Polish CassandraDataAutoConfiguration Closes gh-17004
parents
2a66dafb
54061bd5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
CassandraDataAutoConfiguration.java
...figure/data/cassandra/CassandraDataAutoConfiguration.java
+4
-4
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfiguration.java
View file @
23a923d1
...
@@ -69,8 +69,8 @@ public class CassandraDataAutoConfiguration {
...
@@ -69,8 +69,8 @@ public class CassandraDataAutoConfiguration {
private
final
Cluster
cluster
;
private
final
Cluster
cluster
;
public
CassandraDataAutoConfiguration
(
BeanFactory
beanFactory
,
public
CassandraDataAutoConfiguration
(
CassandraProperties
properties
,
C
assandraProperties
properties
,
Cluster
cluster
,
Environment
environment
)
{
C
luster
cluster
)
{
this
.
properties
=
properties
;
this
.
properties
=
properties
;
this
.
cluster
=
cluster
;
this
.
cluster
=
cluster
;
}
}
...
@@ -109,7 +109,7 @@ public class CassandraDataAutoConfiguration {
...
@@ -109,7 +109,7 @@ public class CassandraDataAutoConfiguration {
@Bean
@Bean
@ConditionalOnMissingBean
(
Session
.
class
)
@ConditionalOnMissingBean
(
Session
.
class
)
public
CassandraSessionFactoryBean
cassandraSession
(
Environment
environment
,
public
CassandraSessionFactoryBean
cassandraSession
(
Environment
environment
,
CassandraConverter
converter
)
throws
Exception
{
CassandraConverter
converter
)
{
CassandraSessionFactoryBean
session
=
new
CassandraSessionFactoryBean
();
CassandraSessionFactoryBean
session
=
new
CassandraSessionFactoryBean
();
session
.
setCluster
(
this
.
cluster
);
session
.
setCluster
(
this
.
cluster
);
session
.
setConverter
(
converter
);
session
.
setConverter
(
converter
);
...
@@ -123,7 +123,7 @@ public class CassandraDataAutoConfiguration {
...
@@ -123,7 +123,7 @@ public class CassandraDataAutoConfiguration {
@Bean
@Bean
@ConditionalOnMissingBean
@ConditionalOnMissingBean
public
CassandraTemplate
cassandraTemplate
(
Session
session
,
public
CassandraTemplate
cassandraTemplate
(
Session
session
,
CassandraConverter
converter
)
throws
Exception
{
CassandraConverter
converter
)
{
return
new
CassandraTemplate
(
session
,
converter
);
return
new
CassandraTemplate
(
session
,
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