Skip to content

Commit 55b99d1

Browse files
garyrussellartembilan
authored andcommitted
Fix new package tangle
- tangle between `connection` and `listener` since `ActiveObjectCounter` is now used in `CachingConnectionFactory` - move `ActiveObjectCounter` from `listener` to `support`
1 parent 3e451e6 commit 55b99d1

File tree

10 files changed

+10
-4
lines changed

10 files changed

+10
-4
lines changed

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/CachingConnectionFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
import org.springframework.amqp.AmqpApplicationContextClosedException;
5151
import org.springframework.amqp.AmqpException;
5252
import org.springframework.amqp.AmqpTimeoutException;
53-
import org.springframework.amqp.rabbit.listener.ActiveObjectCounter;
53+
import org.springframework.amqp.rabbit.support.ActiveObjectCounter;
5454
import org.springframework.amqp.support.ConditionalExceptionLogger;
5555
import org.springframework.beans.factory.InitializingBean;
5656
import org.springframework.jmx.export.annotation.ManagedAttribute;

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.support.ActiveObjectCounter;
5859
import org.springframework.amqp.rabbit.support.ConsumerCancelledException;
5960
import org.springframework.amqp.rabbit.support.Delivery;
6061
import org.springframework.amqp.rabbit.support.MessagePropertiesConverter;

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
@@ -54,6 +54,7 @@
5454
import org.springframework.amqp.rabbit.connection.RabbitResourceHolder;
5555
import org.springframework.amqp.rabbit.connection.RabbitUtils;
5656
import org.springframework.amqp.rabbit.connection.SimpleResourceHolder;
57+
import org.springframework.amqp.rabbit.support.ActiveObjectCounter;
5758
import org.springframework.amqp.rabbit.transaction.RabbitTransactionManager;
5859
import org.springframework.lang.Nullable;
5960
import org.springframework.scheduling.TaskScheduler;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import org.springframework.amqp.rabbit.connection.SimpleResourceHolder;
4949
import org.springframework.amqp.rabbit.listener.exception.FatalListenerExecutionException;
5050
import org.springframework.amqp.rabbit.listener.exception.FatalListenerStartupException;
51+
import org.springframework.amqp.rabbit.support.ActiveObjectCounter;
5152
import org.springframework.amqp.rabbit.support.ConsumerCancelledException;
5253
import org.springframework.amqp.rabbit.support.ListenerContainerAware;
5354
import org.springframework.amqp.rabbit.support.ListenerExecutionFailedException;

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

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.support;
1818

1919
import java.util.Collection;
2020
import java.util.HashSet;

spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitBindingIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
import org.springframework.amqp.rabbit.connection.RabbitAccessor;
3434
import org.springframework.amqp.rabbit.junit.BrokerRunning;
3535
import org.springframework.amqp.rabbit.junit.BrokerTestUtils;
36-
import org.springframework.amqp.rabbit.listener.ActiveObjectCounter;
3736
import org.springframework.amqp.rabbit.listener.BlockingQueueConsumer;
37+
import org.springframework.amqp.rabbit.support.ActiveObjectCounter;
3838
import org.springframework.amqp.rabbit.support.DefaultMessagePropertiesConverter;
3939
import org.springframework.amqp.support.converter.SimpleMessageConverter;
4040

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.springframework.amqp.rabbit.junit.BrokerRunning;
3838
import org.springframework.amqp.rabbit.junit.BrokerTestUtils;
3939
import org.springframework.amqp.rabbit.listener.exception.FatalListenerStartupException;
40+
import org.springframework.amqp.rabbit.support.ActiveObjectCounter;
4041
import org.springframework.amqp.rabbit.support.DefaultMessagePropertiesConverter;
4142
import org.springframework.amqp.rabbit.test.LogLevelAdjuster;
4243

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
@@ -55,6 +55,7 @@
5555
import org.springframework.amqp.rabbit.connection.ChannelProxy;
5656
import org.springframework.amqp.rabbit.connection.Connection;
5757
import org.springframework.amqp.rabbit.connection.ConnectionFactory;
58+
import org.springframework.amqp.rabbit.support.ActiveObjectCounter;
5859
import org.springframework.amqp.rabbit.support.ConsumerCancelledException;
5960
import org.springframework.amqp.rabbit.support.DefaultMessagePropertiesConverter;
6061
import org.springframework.amqp.rabbit.test.LogLevelAdjuster;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import org.springframework.amqp.rabbit.junit.LongRunningIntegrationTest;
5151
import org.springframework.amqp.rabbit.listener.adapter.MessageListenerAdapter;
5252
import org.springframework.amqp.rabbit.listener.exception.FatalListenerStartupException;
53+
import org.springframework.amqp.rabbit.support.ActiveObjectCounter;
5354
import org.springframework.amqp.rabbit.test.LogLevelAdjuster;
5455
import org.springframework.amqp.utils.test.TestUtils;
5556
import org.springframework.beans.DirectFieldAccessor;

spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/ActiveObjectCounterTests.java renamed to spring-rabbit/src/test/java/org/springframework/amqp/rabbit/support/ActiveObjectCounterTests.java

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.support;
1818

1919
import static org.assertj.core.api.Assertions.assertThat;
2020

0 commit comments

Comments
 (0)