Skip to content

Commit e3d825d

Browse files
garyrussellartembilan
authored andcommitted
Fix tangle between listener and listener.adapter
- Move `ContainerUtils` to `listener.support` (new package) - Move `MessageRejectedWhileStoppingException` to `listener.exception`
1 parent 1fed5a7 commit e3d825d

File tree

9 files changed

+14
-3
lines changed

9 files changed

+14
-3
lines changed

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/AbstractMessageListenerContainer.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@
5656
import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener;
5757
import org.springframework.amqp.rabbit.listener.exception.FatalListenerExecutionException;
5858
import org.springframework.amqp.rabbit.listener.exception.FatalListenerStartupException;
59+
import org.springframework.amqp.rabbit.listener.exception.MessageRejectedWhileStoppingException;
60+
import org.springframework.amqp.rabbit.listener.support.ContainerUtils;
5961
import org.springframework.amqp.rabbit.support.DefaultMessagePropertiesConverter;
6062
import org.springframework.amqp.rabbit.support.ListenerExecutionFailedException;
6163
import org.springframework.amqp.rabbit.support.MessagePropertiesConverter;

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/BlockingQueueConsumer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
import org.springframework.amqp.rabbit.connection.RabbitResourceHolder;
5656
import org.springframework.amqp.rabbit.connection.RabbitUtils;
5757
import org.springframework.amqp.rabbit.listener.exception.FatalListenerStartupException;
58+
import org.springframework.amqp.rabbit.listener.support.ContainerUtils;
5859
import org.springframework.amqp.rabbit.support.ActiveObjectCounter;
5960
import org.springframework.amqp.rabbit.support.ConsumerCancelledException;
6061
import org.springframework.amqp.rabbit.support.Delivery;

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/DirectMessageListenerContainer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
import org.springframework.amqp.rabbit.connection.RabbitResourceHolder;
5656
import org.springframework.amqp.rabbit.connection.RabbitUtils;
5757
import org.springframework.amqp.rabbit.connection.SimpleResourceHolder;
58+
import org.springframework.amqp.rabbit.listener.support.ContainerUtils;
5859
import org.springframework.amqp.rabbit.support.ActiveObjectCounter;
5960
import org.springframework.amqp.rabbit.transaction.RabbitTransactionManager;
6061
import org.springframework.lang.Nullable;

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/adapter/AbstractAdaptableMessageListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
import org.springframework.amqp.core.Message;
3333
import org.springframework.amqp.core.MessagePostProcessor;
3434
import org.springframework.amqp.core.MessageProperties;
35-
import org.springframework.amqp.rabbit.listener.ContainerUtils;
3635
import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener;
36+
import org.springframework.amqp.rabbit.listener.support.ContainerUtils;
3737
import org.springframework.amqp.rabbit.support.DefaultMessagePropertiesConverter;
3838
import org.springframework.amqp.rabbit.support.MessagePropertiesConverter;
3939
import org.springframework.amqp.rabbit.support.RabbitExceptionTranslator;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.amqp.rabbit.listener;
17+
package org.springframework.amqp.rabbit.listener.exception;
1818

1919
import org.springframework.amqp.AmqpException;
2020

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/ContainerUtils.java renamed to spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/support/ContainerUtils.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.amqp.rabbit.listener;
17+
package org.springframework.amqp.rabbit.listener.support;
1818

1919
import org.apache.commons.logging.Log;
2020

2121
import org.springframework.amqp.AmqpRejectAndDontRequeueException;
2222
import org.springframework.amqp.ImmediateRequeueAmqpException;
23+
import org.springframework.amqp.rabbit.listener.exception.MessageRejectedWhileStoppingException;
2324

2425
/**
2526
* Utility methods for listener containers.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/**
2+
* Provides support classes for listeners.
3+
*/
4+
package org.springframework.amqp.rabbit.listener.support;

spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/BlockingQueueConsumerTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
import org.springframework.amqp.rabbit.connection.Connection;
5555
import org.springframework.amqp.rabbit.connection.ConnectionFactory;
5656
import org.springframework.amqp.rabbit.junit.LogLevels;
57+
import org.springframework.amqp.rabbit.listener.exception.MessageRejectedWhileStoppingException;
5758
import org.springframework.amqp.rabbit.support.ActiveObjectCounter;
5859
import org.springframework.amqp.rabbit.support.ConsumerCancelledException;
5960
import org.springframework.amqp.rabbit.support.DefaultMessagePropertiesConverter;

spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/ContainerUtilsTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
import org.springframework.amqp.AmqpRejectAndDontRequeueException;
2626
import org.springframework.amqp.ImmediateRequeueAmqpException;
27+
import org.springframework.amqp.rabbit.listener.support.ContainerUtils;
2728
import org.springframework.amqp.rabbit.support.ListenerExecutionFailedException;
2829

2930
/**

0 commit comments

Comments
 (0)