Skip to content

Commit 6b603af

Browse files
committed
revert changes as requested for fixing JmsClient javadoc
Signed-off-by: NeatGuyCoding <[email protected]>
1 parent b3954a6 commit 6b603af

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

spring-jms/src/main/java/org/springframework/jms/core/JmsClient.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ interface JmsClient {
6767
/**
6868
* Create a new {@code JmsClient} for the given {@link ConnectionFactory}.
6969
* @param connectionFactory the factory to obtain JMS connections from
70-
* @return a new {@code JmsClient} instance
7170
*/
7271
static JmsClient create(ConnectionFactory connectionFactory) {
7372
return new DefaultJmsClient(connectionFactory, null);
@@ -77,7 +76,6 @@ static JmsClient create(ConnectionFactory connectionFactory) {
7776
* Create a new {@code JmsClient} for the given {@link ConnectionFactory}.
7877
* @param connectionFactory the factory to obtain JMS connections from
7978
* @param messageConverter the message converter for payload objects
80-
* @return a new {@code JmsClient} instance
8179
*/
8280
static JmsClient create(ConnectionFactory connectionFactory, MessageConverter messageConverter) {
8381
return new DefaultJmsClient(connectionFactory, messageConverter);
@@ -87,7 +85,6 @@ static JmsClient create(ConnectionFactory connectionFactory, MessageConverter me
8785
* Create a new {@code JmsClient} for the given {@link JmsOperations}.
8886
* @param jmsTemplate the {@link JmsTemplate} to use for performing operations
8987
* (can be a custom {@link JmsOperations} implementation as well)
90-
* @return a new {@code JmsClient} instance
9188
*/
9289
static JmsClient create(JmsOperations jmsTemplate) {
9390
return new DefaultJmsClient(jmsTemplate, null);
@@ -98,7 +95,6 @@ static JmsClient create(JmsOperations jmsTemplate) {
9895
* @param jmsTemplate the {@link JmsTemplate} to use for performing operations
9996
* (can be a custom {@link JmsOperations} implementation as well)
10097
* @param messageConverter the message converter for payload objects
101-
* @return a new {@code JmsClient} instance
10298
*/
10399
static JmsClient create(JmsOperations jmsTemplate, MessageConverter messageConverter) {
104100
return new DefaultJmsClient(jmsTemplate, messageConverter);

spring-jms/src/test/java/org/springframework/jms/core/JmsClientTests.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -121,28 +121,24 @@ void convertAndSendPayloadName() throws JMSException {
121121
}
122122

123123
@Test
124-
void convertAndSendPayloadAndHeaders() throws JMSException {
124+
void convertAndSendPayloadAndHeaders() {
125125
Destination destination = new Destination() {};
126126
Map<String, Object> headers = new HashMap<>();
127127
headers.put("foo", "bar");
128128

129129
this.jmsClient.destination(destination).send("Hello", headers);
130130
verify(this.jmsTemplate).send(eq(destination), this.messageCreator.capture());
131131
assertTextMessage(this.messageCreator.getValue()); // see createTextMessage
132-
TextMessage jmsMessage = createTextMessage(this.messageCreator.getValue());
133-
assertThat(jmsMessage.getStringProperty("foo")).isEqualTo("bar");
134132
}
135133

136134
@Test
137-
void convertAndSendPayloadAndHeadersName() throws JMSException {
135+
void convertAndSendPayloadAndHeadersName() {
138136
Map<String, Object> headers = new HashMap<>();
139137
headers.put("foo", "bar");
140138

141139
this.jmsClient.destination("myQueue").send("Hello", headers);
142140
verify(this.jmsTemplate).send(eq("myQueue"), this.messageCreator.capture());
143141
assertTextMessage(this.messageCreator.getValue()); // see createTextMessage
144-
TextMessage jmsMessage = createTextMessage(this.messageCreator.getValue());
145-
assertThat(jmsMessage.getStringProperty("foo")).isEqualTo("bar");
146142
}
147143

148144
@Test
@@ -516,4 +512,4 @@ protected TextMessage createTextMessage(MessageCreator creator) throws JMSExcept
516512
return (TextMessage) message;
517513
}
518514

519-
}
515+
}

0 commit comments

Comments
 (0)