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
75937f5b
Commit
75937f5b
authored
Sep 04, 2018
by
Madhura Bhave
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make jmsListenerContainerFactory @ConditionalOnSingleCandidate
Closes gh-12700
parent
59b5c544
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
0 deletions
+24
-0
JmsAnnotationDrivenConfiguration.java
...t/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java
+2
-0
JmsAutoConfigurationTests.java
...ork/boot/autoconfigure/jms/JmsAutoConfigurationTests.java
+22
-0
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java
View file @
75937f5b
...
@@ -22,6 +22,7 @@ import org.springframework.beans.factory.ObjectProvider;
...
@@ -22,6 +22,7 @@ import org.springframework.beans.factory.ObjectProvider;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnClass
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnClass
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnJndi
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnJndi
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.jms.annotation.EnableJms
;
import
org.springframework.jms.annotation.EnableJms
;
...
@@ -73,6 +74,7 @@ class JmsAnnotationDrivenConfiguration {
...
@@ -73,6 +74,7 @@ class JmsAnnotationDrivenConfiguration {
}
}
@Bean
@Bean
@ConditionalOnSingleCandidate
(
ConnectionFactory
.
class
)
@ConditionalOnMissingBean
(
name
=
"jmsListenerContainerFactory"
)
@ConditionalOnMissingBean
(
name
=
"jmsListenerContainerFactory"
)
public
DefaultJmsListenerContainerFactory
jmsListenerContainerFactory
(
public
DefaultJmsListenerContainerFactory
jmsListenerContainerFactory
(
DefaultJmsListenerContainerFactoryConfigurer
configurer
,
DefaultJmsListenerContainerFactoryConfigurer
configurer
,
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java
View file @
75937f5b
...
@@ -149,6 +149,13 @@ public class JmsAutoConfigurationTests {
...
@@ -149,6 +149,13 @@ public class JmsAutoConfigurationTests {
SimpleJmsListenerContainerFactory
.
class
));
SimpleJmsListenerContainerFactory
.
class
));
}
}
@Test
public
void
jmsListenerContainerFactoryWhenMultipleConnectionFactoryBeansShouldBackOff
()
{
this
.
contextRunner
.
withUserConfiguration
(
TestConfiguration10
.
class
)
.
run
((
context
)
->
assertThat
(
context
)
.
doesNotHaveBean
(
JmsListenerContainerFactory
.
class
));
}
@Test
@Test
public
void
testJmsListenerContainerFactoryWithCustomSettings
()
{
public
void
testJmsListenerContainerFactoryWithCustomSettings
()
{
this
.
contextRunner
.
withUserConfiguration
(
EnableJmsConfiguration
.
class
)
this
.
contextRunner
.
withUserConfiguration
(
EnableJmsConfiguration
.
class
)
...
@@ -572,6 +579,21 @@ public class JmsAutoConfigurationTests {
...
@@ -572,6 +579,21 @@ public class JmsAutoConfigurationTests {
}
}
@Configuration
protected
static
class
TestConfiguration10
{
@Bean
public
ConnectionFactory
connectionFactory1
()
{
return
new
ActiveMQConnectionFactory
();
}
@Bean
public
ConnectionFactory
connectionFactory2
()
{
return
new
ActiveMQConnectionFactory
();
}
}
@Configuration
@Configuration
@EnableJms
@EnableJms
protected
static
class
EnableJmsConfiguration
{
protected
static
class
EnableJmsConfiguration
{
...
...
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