[ISSUE #488] Upgrade version to RocketMQ 5.0.0
diff --git a/rocketmq-spring-boot-parent/pom.xml b/rocketmq-spring-boot-parent/pom.xml
index 5825804..2936b38 100644
--- a/rocketmq-spring-boot-parent/pom.xml
+++ b/rocketmq-spring-boot-parent/pom.xml
@@ -40,7 +40,7 @@
<rocketmq.spring.boot.version>2.2.3-SNAPSHOT</rocketmq.spring.boot.version>
- <rocketmq.version>4.9.3</rocketmq.version>
+ <rocketmq.version>5.0.0</rocketmq.version>
<slf4j.version>1.7.25</slf4j.version>
<jackson.version>2.11.1</jackson.version>
<fastjson.version>1.2.83</fastjson.version>
diff --git a/rocketmq-spring-boot/src/test/java/org/apache/rocketmq/spring/annotation/RocketMQMessageListenerBeanPostProcessorTest.java b/rocketmq-spring-boot/src/test/java/org/apache/rocketmq/spring/annotation/RocketMQMessageListenerBeanPostProcessorTest.java
index 58b4c6a..4bddd57 100644
--- a/rocketmq-spring-boot/src/test/java/org/apache/rocketmq/spring/annotation/RocketMQMessageListenerBeanPostProcessorTest.java
+++ b/rocketmq-spring-boot/src/test/java/org/apache/rocketmq/spring/annotation/RocketMQMessageListenerBeanPostProcessorTest.java
@@ -42,7 +42,7 @@
withUserConfiguration(TestAnnotationEnhancerConfig.class, TestReceiverConfig.class).
run((context) -> {
// Started container failed. DefaultRocketMQListenerContainer{consumerGroup='Receiver-Custom-Consumer-Group' **
- assertThat(context).getFailure().hasMessageContaining("connect to [127.0.0.1:9876] failed");
+ assertThat(context).getFailure().hasMessageContaining("connect to null failed");
});
}
diff --git a/rocketmq-spring-boot/src/test/java/org/apache/rocketmq/spring/autoconfigure/RocketMQAutoConfigurationTest.java b/rocketmq-spring-boot/src/test/java/org/apache/rocketmq/spring/autoconfigure/RocketMQAutoConfigurationTest.java
index d448625..df81773 100644
--- a/rocketmq-spring-boot/src/test/java/org/apache/rocketmq/spring/autoconfigure/RocketMQAutoConfigurationTest.java
+++ b/rocketmq-spring-boot/src/test/java/org/apache/rocketmq/spring/autoconfigure/RocketMQAutoConfigurationTest.java
@@ -224,7 +224,7 @@
runner.withPropertyValues("rocketmq.name-server=127.0.0.1:9876").
withUserConfiguration(TestConfig.class).
run((context) -> {
- assertThat(context).getFailure().hasMessageContaining("connect to [127.0.0.1:9876] failed");
+ assertThat(context).getFailure().hasMessageContaining("connect to null failed");
});
}
@@ -233,7 +233,7 @@
runner.withPropertyValues("rocketmq.name-server=127.0.0.1:9876").
withUserConfiguration(TestConfigWithRocketMQReplyListener.class).
run((context) -> {
- assertThat(context).getFailure().hasMessageContaining("connect to [127.0.0.1:9876] failed");
+ assertThat(context).getFailure().hasMessageContaining("connect to null failed");
});
}
diff --git a/rocketmq-spring-boot/src/test/java/org/apache/rocketmq/spring/core/RocketMQTemplateTest.java b/rocketmq-spring-boot/src/test/java/org/apache/rocketmq/spring/core/RocketMQTemplateTest.java
index 4d9e3cc..49ce039 100644
--- a/rocketmq-spring-boot/src/test/java/org/apache/rocketmq/spring/core/RocketMQTemplateTest.java
+++ b/rocketmq-spring-boot/src/test/java/org/apache/rocketmq/spring/core/RocketMQTemplateTest.java
@@ -44,7 +44,6 @@
import java.util.concurrent.atomic.AtomicInteger;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(properties = {
@@ -73,7 +72,7 @@
try {
rocketMQTemplate.syncSend(topic, "payload");
} catch (MessagingException e) {
- assertThat(e).hasMessageContaining("org.apache.rocketmq.remoting.exception.RemotingConnectException: connect to [127.0.0.1:9876] failed");
+ assertThat(e).hasMessageContaining("org.apache.rocketmq.remoting.exception.RemotingConnectException: connect to null failed");
}
try {
@@ -93,7 +92,7 @@
try {
rocketMQTemplate.syncSendOrderly(topic, "payload", "hashkey");
} catch (MessagingException e) {
- assertThat(e).hasMessageContaining("org.apache.rocketmq.remoting.exception.RemotingConnectException: connect to [127.0.0.1:9876] failed");
+ assertThat(e).hasMessageContaining("org.apache.rocketmq.remoting.exception.RemotingConnectException: connect to null failed");
}
}
@Test
@@ -182,19 +181,19 @@
}
@Test
- public void testSendAndReceive_Sync() throws InterruptedException {
+ public void testSendAndReceive_Sync() {
try {
String responseMessage = rocketMQTemplate.sendAndReceive(stringRequestTopic, MessageBuilder.withPayload("requestTopicSync").build(), String.class);
assertThat(responseMessage).isNotNull();
} catch (MessagingException e) {
- assertThat(e).hasMessageContaining("org.apache.rocketmq.remoting.exception.RemotingConnectException: connect to [127.0.0.1:9876] failed");
+ assertThat(e).hasMessageContaining("org.apache.rocketmq.remoting.exception.RemotingConnectException: connect to null failed");
}
try {
String responseMessage = rocketMQTemplate.sendAndReceive(stringRequestTopic, "requestTopicSync", String.class, "orderId");
assertThat(responseMessage).isNotNull();
} catch (MessagingException e) {
- assertThat(e).hasMessageContaining("org.apache.rocketmq.remoting.exception.RemotingConnectException: connect to [127.0.0.1:9876] failed");
+ assertThat(e).hasMessageContaining("org.apache.rocketmq.remoting.exception.RemotingConnectException: connect to null failed");
}
}
@@ -211,7 +210,7 @@
}
});
} catch (MessagingException e) {
- assertThat(e).hasMessageContaining("org.apache.rocketmq.remoting.exception.RemotingConnectException: connect to [127.0.0.1:9876] failed");
+ assertThat(e).hasMessageContaining("org.apache.rocketmq.remoting.exception.RemotingConnectException: connect to null failed");
}
try {
@@ -225,7 +224,7 @@
}
}, "order-id");
} catch (MessagingException e) {
- assertThat(e).hasMessageContaining("org.apache.rocketmq.remoting.exception.RemotingConnectException: connect to [127.0.0.1:9876] failed");
+ assertThat(e).hasMessageContaining("org.apache.rocketmq.remoting.exception.RemotingConnectException: connect to null failed");
}
try {
@@ -239,7 +238,7 @@
}
}, "order-id", 5000);
} catch (MessagingException e) {
- assertThat(e).hasMessageContaining("org.apache.rocketmq.remoting.exception.RemotingConnectException: connect to [127.0.0.1:9876] failed");
+ assertThat(e).hasMessageContaining("org.apache.rocketmq.remoting.exception.RemotingConnectException: connect to null failed");
}
try {
rocketMQTemplate.sendAndReceive(objectRequestTopic, "requestTopicAsyncWithTimeout", new RocketMQLocalRequestCallback<MessageExt>() {
@@ -252,7 +251,7 @@
}
}, 5000);
} catch (MessagingException e) {
- assertThat(e).hasMessageContaining("org.apache.rocketmq.remoting.exception.RemotingConnectException: connect to [127.0.0.1:9876] failed");
+ assertThat(e).hasMessageContaining("org.apache.rocketmq.remoting.exception.RemotingConnectException: connect to null failed");
}
}
