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
1b91c170
Commit
1b91c170
authored
Apr 01, 2021
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ensure that Cassandra's DriverConfigLoader is only closed once
Fixes gh-25796
parent
cbf37b3a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
94 additions
and
1 deletion
+94
-1
CassandraAutoConfiguration.java
...t/autoconfigure/cassandra/CassandraAutoConfiguration.java
+1
-1
CassandraAutoConfigurationIntegrationTests.java
...cassandra/CassandraAutoConfigurationIntegrationTests.java
+93
-0
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java
View file @
1b91c170
...
...
@@ -104,7 +104,7 @@ public class CassandraAutoConfiguration {
}
}
@Bean
@Bean
(
destroyMethod
=
""
)
@ConditionalOnMissingBean
public
DriverConfigLoader
cassandraDriverConfigLoader
(
CassandraProperties
properties
,
ObjectProvider
<
DriverConfigLoaderBuilderCustomizer
>
builderCustomizers
)
{
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationIntegrationTests.java
0 → 100644
View file @
1b91c170
/*
* Copyright 2012-2021 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.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org
.
springframework
.
boot
.
autoconfigure
.
cassandra
;
import
java.time.Duration
;
import
com.datastax.oss.driver.api.core.CqlSession
;
import
com.datastax.oss.driver.api.core.config.DriverConfigLoader
;
import
org.junit.jupiter.api.Test
;
import
org.testcontainers.containers.CassandraContainer
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Testcontainers
;
import
org.springframework.beans.BeansException
;
import
org.springframework.beans.factory.config.BeanPostProcessor
;
import
org.springframework.beans.factory.support.BeanDefinitionRegistry
;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
import
org.springframework.boot.test.context.runner.ApplicationContextRunner
;
import
org.springframework.boot.testsupport.testcontainers.DockerImageNames
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
import
static
org
.
mockito
.
Mockito
.
spy
;
import
static
org
.
mockito
.
Mockito
.
verify
;
/**
* Integration tests for {@link CassandraAutoConfiguration}.
*
* @author Andy Wilkinson
*/
@Testcontainers
(
disabledWithoutDocker
=
true
)
class
CassandraAutoConfigurationIntegrationTests
{
@Container
static
final
CassandraContainer
<?>
cassandra
=
new
CassandraContainer
<>(
DockerImageNames
.
cassandra
())
.
withStartupAttempts
(
5
).
withStartupTimeout
(
Duration
.
ofMinutes
(
10
));
private
final
ApplicationContextRunner
contextRunner
=
new
ApplicationContextRunner
()
.
withConfiguration
(
AutoConfigurations
.
of
(
CassandraAutoConfiguration
.
class
)).
withPropertyValues
(
"spring.data.cassandra.contact-points:"
+
cassandra
.
getHost
()
+
":"
+
cassandra
.
getFirstMappedPort
(),
"spring.data.cassandra.local-datacenter=datacenter1"
,
"spring.data.cassandra.request.timeout=20s"
,
"spring.data.cassandra.connection.init-query-timeout=10s"
);
@Test
void
whenTheContextIsClosedThenTheDriverConfigLoaderIsClosed
()
{
this
.
contextRunner
.
withUserConfiguration
(
DriverConfigLoaderSpyConfiguration
.
class
).
run
((
context
)
->
{
assertThat
(((
BeanDefinitionRegistry
)
context
.
getSourceApplicationContext
())
.
getBeanDefinition
(
"cassandraDriverConfigLoader"
).
getDestroyMethodName
()).
isEmpty
();
// Initialize lazy bean
context
.
getBean
(
CqlSession
.
class
);
DriverConfigLoader
driverConfigLoader
=
context
.
getBean
(
DriverConfigLoader
.
class
);
context
.
close
();
verify
(
driverConfigLoader
).
close
();
});
}
@Configuration
(
proxyBeanMethods
=
false
)
static
class
DriverConfigLoaderSpyConfiguration
{
@Bean
static
BeanPostProcessor
driverConfigLoaderSpy
()
{
return
new
BeanPostProcessor
()
{
@Override
public
Object
postProcessAfterInitialization
(
Object
bean
,
String
beanName
)
throws
BeansException
{
if
(
bean
instanceof
DriverConfigLoader
)
{
return
spy
(
bean
);
}
return
bean
;
}
};
}
}
}
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