You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by aa...@apache.org on 2022/07/01 09:12:05 UTC
[rocketmq-clients] 02/02: Java: remove message batch publishing
This is an automated email from the ASF dual-hosted git repository.
aaronai pushed a commit to branch java
in repository https://gitbox.apache.org/repos/asf/rocketmq-clients.git
commit f9792612e1bdf2eca6303e8f971395f7168a9fde
Author: Aaron Ai <ya...@gmail.com>
AuthorDate: Fri Jul 1 17:11:46 2022 +0800
Java: remove message batch publishing
---
.../rocketmq/client/apis/producer/Producer.java | 13 -----
.../client/java/impl/producer/ProducerImpl.java | 10 ----
.../impl/producer/ProducerBuilderImplTest.java | 21 ---------
.../java/impl/producer/ProducerImplTest.java | 55 ----------------------
4 files changed, 99 deletions(-)
diff --git a/java/client-apis/src/main/java/org/apache/rocketmq/client/apis/producer/Producer.java b/java/client-apis/src/main/java/org/apache/rocketmq/client/apis/producer/Producer.java
index 14b3f8d..014aca9 100644
--- a/java/client-apis/src/main/java/org/apache/rocketmq/client/apis/producer/Producer.java
+++ b/java/client-apis/src/main/java/org/apache/rocketmq/client/apis/producer/Producer.java
@@ -19,7 +19,6 @@ package org.apache.rocketmq.client.apis.producer;
import java.io.Closeable;
import java.io.IOException;
-import java.util.List;
import java.util.concurrent.CompletableFuture;
import org.apache.rocketmq.client.apis.ClientException;
import org.apache.rocketmq.client.apis.message.Message;
@@ -61,18 +60,6 @@ public interface Producer extends Closeable {
*/
CompletableFuture<SendReceipt> sendAsync(Message message);
- /**
- * Sends batch messages synchronously.
- *
- * <p>This method does not return until it gets the definitive result.
- *
- * <p>All messages to send should have the same topic.
- *
- * @param messages batch messages to send.
- * @return collection indicates the send receipt.
- */
- List<SendReceipt> send(List<Message> messages) throws ClientException;
-
/**
* Begins a transaction.
*
diff --git a/java/client/src/main/java/org/apache/rocketmq/client/java/impl/producer/ProducerImpl.java b/java/client/src/main/java/org/apache/rocketmq/client/java/impl/producer/ProducerImpl.java
index 7ba3393..6434cca 100644
--- a/java/client/src/main/java/org/apache/rocketmq/client/java/impl/producer/ProducerImpl.java
+++ b/java/client/src/main/java/org/apache/rocketmq/client/java/impl/producer/ProducerImpl.java
@@ -234,16 +234,6 @@ class ProducerImpl extends ClientImpl implements Producer {
return FutureConverter.toCompletableFuture(future);
}
- /**
- * @see Producer#send(List)
- */
- @Override
- public List<SendReceipt> send(List<Message> messages) throws ClientException {
- final ListenableFuture<List<SendReceiptImpl>> future = send0(messages, false);
- final List<SendReceiptImpl> receipts = handleClientFuture(future);
- return new ArrayList<>(receipts);
- }
-
/**
* @see Producer#beginTransaction()
*/
diff --git a/java/client/src/test/java/org/apache/rocketmq/client/java/impl/producer/ProducerBuilderImplTest.java b/java/client/src/test/java/org/apache/rocketmq/client/java/impl/producer/ProducerBuilderImplTest.java
index 5fab2b2..6224628 100644
--- a/java/client/src/test/java/org/apache/rocketmq/client/java/impl/producer/ProducerBuilderImplTest.java
+++ b/java/client/src/test/java/org/apache/rocketmq/client/java/impl/producer/ProducerBuilderImplTest.java
@@ -17,26 +17,13 @@
package org.apache.rocketmq.client.java.impl.producer;
-import java.io.IOException;
import org.apache.commons.lang3.StringUtils;
-import org.apache.rocketmq.client.apis.ClientConfiguration;
-import org.apache.rocketmq.client.apis.ClientException;
-import org.apache.rocketmq.client.apis.ClientServiceProvider;
-import org.apache.rocketmq.client.apis.producer.Producer;
-import org.apache.rocketmq.client.apis.producer.ProducerBuilder;
-import org.apache.rocketmq.client.java.impl.ClientManager;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
public class ProducerBuilderImplTest {
- @Mock
- private ClientManager clientManager;
- @InjectMocks
- private ProducerBuilder producerBuilder = ClientServiceProvider.loadService().newProducerBuilder();
@Test(expected = NullPointerException.class)
public void testSetClientConfigurationWithNull() {
@@ -75,12 +62,4 @@ public class ProducerBuilderImplTest {
final ProducerBuilderImpl builder = new ProducerBuilderImpl();
builder.build();
}
-
- @Test
- public void testBuildWithoutTopic() throws ClientException, IOException {
- ClientConfiguration clientConfiguration = ClientConfiguration.newBuilder().setEndpoints("127.0.0.1:80").build();
- Producer producer = ClientServiceProvider.loadService().newProducerBuilder()
- .setClientConfiguration(clientConfiguration).build();
- producer.close();
- }
}
diff --git a/java/client/src/test/java/org/apache/rocketmq/client/java/impl/producer/ProducerImplTest.java b/java/client/src/test/java/org/apache/rocketmq/client/java/impl/producer/ProducerImplTest.java
index 29f4278..907a6fc 100644
--- a/java/client/src/test/java/org/apache/rocketmq/client/java/impl/producer/ProducerImplTest.java
+++ b/java/client/src/test/java/org/apache/rocketmq/client/java/impl/producer/ProducerImplTest.java
@@ -178,61 +178,6 @@ public class ProducerImplTest extends TestBase {
shutdown(producerWithoutTopicBinding);
}
- @Test
- public void testSendBatchMessage() throws ClientException, ExecutionException, InterruptedException {
- start(producer);
- verify(clientManager, times(1)).queryRoute(any(Endpoints.class), any(Metadata.class),
- any(QueryRouteRequest.class), any(Duration.class));
- verify(clientManager, times(1)).telemetry(any(Endpoints.class), any(Metadata.class),
- any(Duration.class), any(TelemetrySession.class));
- int batchMessageNum = 2;
- List<Message> messages = new ArrayList<>();
- for (int i = 0; i < batchMessageNum; i++) {
- final Message message = fakeMessage(FAKE_TOPIC_0);
- messages.add(message);
- }
-
- final ListenableFuture<SendMessageResponse> future = okBatchSendMessageResponseFuture();
- when(clientManager.sendMessage(any(Endpoints.class), any(Metadata.class), any(SendMessageRequest.class),
- any(Duration.class))).thenReturn(future);
- final SendMessageResponse response = future.get();
- assertEquals(batchMessageNum, response.getEntriesCount());
- final List<apache.rocketmq.v2.SendResultEntry> receipts = response.getEntriesList();
- final List<SendReceipt> sendReceipts = producer.send(messages);
- assertEquals(batchMessageNum, sendReceipts.size());
-
- assertEquals(receipts.get(0).getMessageId(), sendReceipts.get(0).getMessageId().toString());
- assertEquals(receipts.get(1).getMessageId(), sendReceipts.get(1).getMessageId().toString());
- shutdown(producer);
- }
-
- @Test(expected = IllegalArgumentException.class)
- public void testSendBatchMessageWithDifferentTopic() throws ClientException, ExecutionException,
- InterruptedException {
- start(producer);
- verify(clientManager, times(1)).queryRoute(any(Endpoints.class), any(Metadata.class),
- any(QueryRouteRequest.class), any(Duration.class));
- verify(clientManager, times(1)).telemetry(any(Endpoints.class), any(Metadata.class), any(Duration.class),
- any(TelemetrySession.class));
- int batchMessageNum = 2;
- List<Message> messages = new ArrayList<>();
-
- Message message0 = fakeMessage(FAKE_TOPIC_0);
- Message message1 = fakeMessage(FAKE_TOPIC_1);
-
- messages.add(message0);
- messages.add(message1);
-
- final ListenableFuture<SendMessageResponse> future = okBatchSendMessageResponseFuture();
- final SendMessageResponse response = future.get();
- assertEquals(batchMessageNum, response.getEntriesCount());
- try {
- producer.send(messages);
- } finally {
- shutdown(producer);
- }
- }
-
@Test(expected = ClientException.class)
public void testSendMessageWithFailure() throws ClientException {
start(producer);