Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.3.x'

Browse Source 
# Conflicts:
#	spring-jms/src/main/java/org/springframework/jms/listener/endpoint/StandardJmsActivationSpecFactory.java
This commit is contained in:
Sam Brannen
2022-07-13 14:06:53 +02:00
parent ddd11610cf 46db372951
commit 89f66ccf6a
55 changed files with 98 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-jms/src/test/java/org/springframework/jms/annotation/AbstractJmsAnnotationDrivenTests.java
View File

@@ -112,9 +112,9 @@ abstract class AbstractJmsAnnotationDrivenTests {
}
/**
* Test for {@link CustomBean} and an manually endpoint registered
* Test for {@link CustomBean} and an endpoint manually registered
* with "myCustomEndpointId". The custom endpoint does not provide
* any factory so it's registered with the default one
* any factory, so it's registered with the default one
*/
protected void testCustomConfiguration(ApplicationContext context) {
JmsListenerContainerTestFactory defaultFactory =

6
spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java
View File

@@ -270,7 +270,7 @@ class JmsTemplateTests {
/**
* Test sending to a destination using the method
* send(String d, MessageCreator messageCreator)
* {@code send(String d, MessageCreator messageCreator)}
*/
@Test
void testSendDestinationName() throws Exception {
@@ -279,7 +279,7 @@ class JmsTemplateTests {
/**
* Test sending to a destination using the method
* send(Destination d, MessageCreator messageCreator) using QOS parameters.
* {@code send(Destination d, MessageCreator messageCreator)} using QOS parameters.
*/
@Test
void testSendDestinationWithQOS() throws Exception {
@@ -288,7 +288,7 @@ class JmsTemplateTests {
/**
* Test sending to a destination using the method
* send(String d, MessageCreator messageCreator) using QOS parameters.
* {@code send(String d, MessageCreator messageCreator)} using QOS parameters.
*/
@Test
void testSendDestinationNameWithQOS() throws Exception {