Skip to content

Commit 684e733

Browse files
yx9oyx9o
authored
[ISSUE #9938] Rename misnamed Messing classes to Messaging (#9939)
1 parent fe5c17c commit 684e733

15 files changed

Lines changed: 62 additions & 62 deletions

proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/AbstractMessingActivity.java renamed to proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/AbstractMessagingActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
import org.apache.rocketmq.proxy.grpc.v2.common.GrpcValidator;
2626
import org.apache.rocketmq.proxy.processor.MessagingProcessor;
2727

28-
public abstract class AbstractMessingActivity {
28+
public abstract class AbstractMessagingActivity {
2929
protected static final Logger log = LoggerFactory.getLogger(LoggerName.PROXY_LOGGER_NAME);
3030
protected final MessagingProcessor messagingProcessor;
3131
protected final GrpcClientSettingsManager grpcClientSettingsManager;
3232
protected final GrpcChannelManager grpcChannelManager;
3333

34-
public AbstractMessingActivity(MessagingProcessor messagingProcessor,
35-
GrpcClientSettingsManager grpcClientSettingsManager, GrpcChannelManager grpcChannelManager) {
34+
public AbstractMessagingActivity(MessagingProcessor messagingProcessor,
35+
GrpcClientSettingsManager grpcClientSettingsManager, GrpcChannelManager grpcChannelManager) {
3636
this.messagingProcessor = messagingProcessor;
3737
this.grpcClientSettingsManager = grpcClientSettingsManager;
3838
this.grpcChannelManager = grpcChannelManager;

proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/DefaultGrpcMessingActivity.java renamed to proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/DefaultGrpcMessagingActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
import org.apache.rocketmq.proxy.grpc.v2.transaction.EndTransactionActivity;
6060
import org.apache.rocketmq.proxy.processor.MessagingProcessor;
6161

62-
public class DefaultGrpcMessingActivity extends AbstractStartAndShutdown implements GrpcMessingActivity {
62+
public class DefaultGrpcMessagingActivity extends AbstractStartAndShutdown implements GrpcMessagingActivity {
6363
private static final Logger log = LoggerFactory.getLogger(LoggerName.PROXY_LOGGER_NAME);
6464

6565
protected GrpcClientSettingsManager grpcClientSettingsManager;
@@ -74,7 +74,7 @@ public class DefaultGrpcMessingActivity extends AbstractStartAndShutdown impleme
7474
protected RouteActivity routeActivity;
7575
protected ClientActivity clientActivity;
7676

77-
protected DefaultGrpcMessingActivity(MessagingProcessor messagingProcessor) {
77+
protected DefaultGrpcMessagingActivity(MessagingProcessor messagingProcessor) {
7878
this.init(messagingProcessor);
7979
}
8080

proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/GrpcMessingActivity.java renamed to proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/GrpcMessagingActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import org.apache.rocketmq.proxy.common.ProxyContext;
4646
import org.apache.rocketmq.common.utils.StartAndShutdown;
4747

48-
public interface GrpcMessingActivity extends StartAndShutdown {
48+
public interface GrpcMessagingActivity extends StartAndShutdown {
4949

5050
CompletableFuture<QueryRouteResponse> queryRoute(ProxyContext ctx, QueryRouteRequest request);
5151

‎proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/GrpcMessagingApplication.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
public class GrpcMessagingApplication extends MessagingServiceGrpc.MessagingServiceImplBase implements StartAndShutdown {
7575
private final static Logger log = LoggerFactory.getLogger(LoggerName.PROXY_LOGGER_NAME);
7676

77-
private final GrpcMessingActivity grpcMessingActivity;
77+
private final GrpcMessagingActivity grpcMessagingActivity;
7878

7979
protected final RequestPipeline requestPipeline;
8080

@@ -85,8 +85,8 @@ public class GrpcMessagingApplication extends MessagingServiceGrpc.MessagingServ
8585
protected ThreadPoolExecutor transactionThreadPoolExecutor;
8686

8787

88-
protected GrpcMessagingApplication(GrpcMessingActivity grpcMessingActivity, RequestPipeline requestPipeline) {
89-
this.grpcMessingActivity = grpcMessingActivity;
88+
protected GrpcMessagingApplication(GrpcMessagingActivity grpcMessagingActivity, RequestPipeline requestPipeline) {
89+
this.grpcMessagingActivity = grpcMessagingActivity;
9090
this.requestPipeline = requestPipeline;
9191

9292
ProxyConfig config = ConfigurationManager.getProxyConfig();
@@ -156,7 +156,7 @@ public static GrpcMessagingApplication create(MessagingProcessor messagingProces
156156
.pipe(new AuthenticationPipeline(authConfig, messagingProcessor));
157157
}
158158
pipeline = pipeline.pipe(new ContextInitPipeline());
159-
return new GrpcMessagingApplication(new DefaultGrpcMessingActivity(messagingProcessor), pipeline);
159+
return new GrpcMessagingApplication(new DefaultGrpcMessagingActivity(messagingProcessor), pipeline);
160160
}
161161

162162
protected Status flowLimitStatus() {
@@ -208,7 +208,7 @@ public void queryRoute(QueryRouteRequest request, StreamObserver<QueryRouteRespo
208208
this.addExecutor(this.routeThreadPoolExecutor,
209209
context,
210210
request,
211-
() -> grpcMessingActivity.queryRoute(context, request)
211+
() -> grpcMessagingActivity.queryRoute(context, request)
212212
.whenComplete((response, throwable) -> writeResponse(context, request, response, responseObserver, throwable, statusResponseCreator)),
213213
responseObserver,
214214
statusResponseCreator);
@@ -225,7 +225,7 @@ public void heartbeat(HeartbeatRequest request, StreamObserver<HeartbeatResponse
225225
this.addExecutor(this.clientManagerThreadPoolExecutor,
226226
context,
227227
request,
228-
() -> grpcMessingActivity.heartbeat(context, request)
228+
() -> grpcMessagingActivity.heartbeat(context, request)
229229
.whenComplete((response, throwable) -> writeResponse(context, request, response, responseObserver, throwable, statusResponseCreator)),
230230
responseObserver,
231231
statusResponseCreator);
@@ -242,7 +242,7 @@ public void sendMessage(SendMessageRequest request, StreamObserver<SendMessageRe
242242
this.addExecutor(this.producerThreadPoolExecutor,
243243
context,
244244
request,
245-
() -> grpcMessingActivity.sendMessage(context, request)
245+
() -> grpcMessagingActivity.sendMessage(context, request)
246246
.whenComplete((response, throwable) -> writeResponse(context, request, response, responseObserver, throwable, statusResponseCreator)),
247247
responseObserver,
248248
statusResponseCreator);
@@ -260,7 +260,7 @@ public void queryAssignment(QueryAssignmentRequest request,
260260
this.addExecutor(this.routeThreadPoolExecutor,
261261
context,
262262
request,
263-
() -> grpcMessingActivity.queryAssignment(context, request)
263+
() -> grpcMessagingActivity.queryAssignment(context, request)
264264
.whenComplete((response, throwable) -> writeResponse(context, request, response, responseObserver, throwable, statusResponseCreator)),
265265
responseObserver,
266266
statusResponseCreator);
@@ -277,7 +277,7 @@ public void receiveMessage(ReceiveMessageRequest request, StreamObserver<Receive
277277
this.addExecutor(this.consumerThreadPoolExecutor,
278278
context,
279279
request,
280-
() -> grpcMessingActivity.receiveMessage(context, request, responseObserver),
280+
() -> grpcMessagingActivity.receiveMessage(context, request, responseObserver),
281281
responseObserver,
282282
statusResponseCreator);
283283
} catch (Throwable t) {
@@ -293,7 +293,7 @@ public void ackMessage(AckMessageRequest request, StreamObserver<AckMessageRespo
293293
this.addExecutor(this.consumerThreadPoolExecutor,
294294
context,
295295
request,
296-
() -> grpcMessingActivity.ackMessage(context, request)
296+
() -> grpcMessagingActivity.ackMessage(context, request)
297297
.whenComplete((response, throwable) -> writeResponse(context, request, response, responseObserver, throwable, statusResponseCreator)),
298298
responseObserver,
299299
statusResponseCreator);
@@ -311,7 +311,7 @@ public void forwardMessageToDeadLetterQueue(ForwardMessageToDeadLetterQueueReque
311311
this.addExecutor(this.producerThreadPoolExecutor,
312312
context,
313313
request,
314-
() -> grpcMessingActivity.forwardMessageToDeadLetterQueue(context, request)
314+
() -> grpcMessagingActivity.forwardMessageToDeadLetterQueue(context, request)
315315
.whenComplete((response, throwable) -> writeResponse(context, request, response, responseObserver, throwable, statusResponseCreator)),
316316
responseObserver,
317317
statusResponseCreator);
@@ -328,7 +328,7 @@ public void endTransaction(EndTransactionRequest request, StreamObserver<EndTran
328328
this.addExecutor(this.transactionThreadPoolExecutor,
329329
context,
330330
request,
331-
() -> grpcMessingActivity.endTransaction(context, request)
331+
() -> grpcMessagingActivity.endTransaction(context, request)
332332
.whenComplete((response, throwable) -> writeResponse(context, request, response, responseObserver, throwable, statusResponseCreator)),
333333
responseObserver,
334334
statusResponseCreator);
@@ -346,7 +346,7 @@ public void notifyClientTermination(NotifyClientTerminationRequest request,
346346
this.addExecutor(this.clientManagerThreadPoolExecutor,
347347
context,
348348
request,
349-
() -> grpcMessingActivity.notifyClientTermination(context, request)
349+
() -> grpcMessagingActivity.notifyClientTermination(context, request)
350350
.whenComplete((response, throwable) -> writeResponse(context, request, response, responseObserver, throwable, statusResponseCreator)),
351351
responseObserver,
352352
statusResponseCreator);
@@ -371,7 +371,7 @@ public void changeInvisibleDuration(ChangeInvisibleDurationRequest request,
371371
this.addExecutor(this.consumerThreadPoolExecutor,
372372
context,
373373
request,
374-
() -> grpcMessingActivity.changeInvisibleDuration(context, request)
374+
() -> grpcMessagingActivity.changeInvisibleDuration(context, request)
375375
.whenComplete((response, throwable) -> writeResponse(context, request, response, responseObserver, throwable, statusResponseCreator)),
376376
responseObserver,
377377
statusResponseCreator);
@@ -389,7 +389,7 @@ public void recallMessage(RecallMessageRequest request, StreamObserver<RecallMes
389389
this.addExecutor(this.producerThreadPoolExecutor, // reuse producer thread pool
390390
context,
391391
request,
392-
() -> grpcMessingActivity.recallMessage(context, request)
392+
() -> grpcMessagingActivity.recallMessage(context, request)
393393
.whenComplete((response, throwable) ->
394394
writeResponse(context, request, response, responseObserver, throwable, statusResponseCreator)),
395395
responseObserver,
@@ -402,7 +402,7 @@ public void recallMessage(RecallMessageRequest request, StreamObserver<RecallMes
402402
@Override
403403
public StreamObserver<TelemetryCommand> telemetry(StreamObserver<TelemetryCommand> responseObserver) {
404404
Function<Status, TelemetryCommand> statusResponseCreator = status -> TelemetryCommand.newBuilder().setStatus(status).build();
405-
ContextStreamObserver<TelemetryCommand> responseTelemetryCommand = grpcMessingActivity.telemetry(responseObserver);
405+
ContextStreamObserver<TelemetryCommand> responseTelemetryCommand = grpcMessagingActivity.telemetry(responseObserver);
406406
return new StreamObserver<TelemetryCommand>() {
407407
@Override
408408
public void onNext(TelemetryCommand value) {
@@ -433,7 +433,7 @@ public void onCompleted() {
433433

434434
@Override
435435
public void shutdown() throws Exception {
436-
this.grpcMessingActivity.shutdown();
436+
this.grpcMessagingActivity.shutdown();
437437

438438
this.routeThreadPoolExecutor.shutdown();
439439
this.routeThreadPoolExecutor.shutdown();
@@ -445,7 +445,7 @@ public void shutdown() throws Exception {
445445

446446
@Override
447447
public void start() throws Exception {
448-
this.grpcMessingActivity.start();
448+
this.grpcMessagingActivity.start();
449449
}
450450

451451
protected static class GrpcTask<V, T> implements Runnable {

‎proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/client/ClientActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
import org.apache.rocketmq.logging.org.slf4j.LoggerFactory;
5252
import org.apache.rocketmq.proxy.common.ProxyContext;
5353
import org.apache.rocketmq.proxy.common.channel.ChannelHelper;
54-
import org.apache.rocketmq.proxy.grpc.v2.AbstractMessingActivity;
54+
import org.apache.rocketmq.proxy.grpc.v2.AbstractMessagingActivity;
5555
import org.apache.rocketmq.proxy.grpc.v2.ContextStreamObserver;
5656
import org.apache.rocketmq.proxy.grpc.v2.channel.GrpcChannelManager;
5757
import org.apache.rocketmq.proxy.grpc.v2.channel.GrpcClientChannel;
@@ -71,7 +71,7 @@
7171
import org.apache.rocketmq.remoting.protocol.heartbeat.MessageModel;
7272
import org.apache.rocketmq.remoting.protocol.heartbeat.SubscriptionData;
7373

74-
public class ClientActivity extends AbstractMessingActivity {
74+
public class ClientActivity extends AbstractMessagingActivity {
7575

7676
private static final Logger log = LoggerFactory.getLogger(LoggerName.PROXY_LOGGER_NAME);
7777

‎proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/consumer/AckMessageActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import org.apache.rocketmq.proxy.common.MessageReceiptHandle;
3333
import org.apache.rocketmq.proxy.common.ProxyContext;
3434
import org.apache.rocketmq.proxy.config.ConfigurationManager;
35-
import org.apache.rocketmq.proxy.grpc.v2.AbstractMessingActivity;
35+
import org.apache.rocketmq.proxy.grpc.v2.AbstractMessagingActivity;
3636
import org.apache.rocketmq.proxy.grpc.v2.channel.GrpcChannelManager;
3737
import org.apache.rocketmq.proxy.grpc.v2.channel.GrpcClientChannel;
3838
import org.apache.rocketmq.proxy.grpc.v2.common.GrpcClientSettingsManager;
@@ -41,7 +41,7 @@
4141
import org.apache.rocketmq.proxy.processor.MessagingProcessor;
4242
import org.apache.rocketmq.proxy.service.message.ReceiptHandleMessage;
4343

44-
public class AckMessageActivity extends AbstractMessingActivity {
44+
public class AckMessageActivity extends AbstractMessagingActivity {
4545

4646
public AckMessageActivity(MessagingProcessor messagingProcessor, GrpcClientSettingsManager grpcClientSettingsManager,
4747
GrpcChannelManager grpcChannelManager) {

‎proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/consumer/ChangeInvisibleDurationActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
import org.apache.rocketmq.common.consumer.ReceiptHandle;
2727
import org.apache.rocketmq.proxy.common.MessageReceiptHandle;
2828
import org.apache.rocketmq.proxy.common.ProxyContext;
29-
import org.apache.rocketmq.proxy.grpc.v2.AbstractMessingActivity;
29+
import org.apache.rocketmq.proxy.grpc.v2.AbstractMessagingActivity;
3030
import org.apache.rocketmq.proxy.grpc.v2.channel.GrpcChannelManager;
3131
import org.apache.rocketmq.proxy.grpc.v2.common.GrpcClientSettingsManager;
3232
import org.apache.rocketmq.proxy.grpc.v2.common.ResponseBuilder;
3333
import org.apache.rocketmq.proxy.processor.MessagingProcessor;
3434

35-
public class ChangeInvisibleDurationActivity extends AbstractMessingActivity {
35+
public class ChangeInvisibleDurationActivity extends AbstractMessagingActivity {
3636

3737
public ChangeInvisibleDurationActivity(MessagingProcessor messagingProcessor,
3838
GrpcClientSettingsManager grpcClientSettingsManager, GrpcChannelManager grpcChannelManager) {

‎proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/consumer/ReceiveMessageActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.apache.rocketmq.proxy.common.ProxyContext;
3535
import org.apache.rocketmq.proxy.config.ConfigurationManager;
3636
import org.apache.rocketmq.proxy.config.ProxyConfig;
37-
import org.apache.rocketmq.proxy.grpc.v2.AbstractMessingActivity;
37+
import org.apache.rocketmq.proxy.grpc.v2.AbstractMessagingActivity;
3838
import org.apache.rocketmq.proxy.grpc.v2.channel.GrpcChannelManager;
3939
import org.apache.rocketmq.proxy.grpc.v2.channel.GrpcClientChannel;
4040
import org.apache.rocketmq.proxy.grpc.v2.common.GrpcClientSettingsManager;
@@ -48,7 +48,7 @@
4848
import org.apache.rocketmq.remoting.protocol.filter.FilterAPI;
4949
import org.apache.rocketmq.remoting.protocol.heartbeat.SubscriptionData;
5050

51-
public class ReceiveMessageActivity extends AbstractMessingActivity {
51+
public class ReceiveMessageActivity extends AbstractMessagingActivity {
5252
private static final String ILLEGAL_POLLING_TIME_INTRODUCED_CLIENT_VERSION = "5.0.3";
5353

5454
public ReceiveMessageActivity(MessagingProcessor messagingProcessor,

‎proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/producer/ForwardMessageToDLQActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
import org.apache.rocketmq.common.consumer.ReceiptHandle;
2323
import org.apache.rocketmq.proxy.common.MessageReceiptHandle;
2424
import org.apache.rocketmq.proxy.common.ProxyContext;
25-
import org.apache.rocketmq.proxy.grpc.v2.AbstractMessingActivity;
25+
import org.apache.rocketmq.proxy.grpc.v2.AbstractMessagingActivity;
2626
import org.apache.rocketmq.proxy.grpc.v2.channel.GrpcChannelManager;
2727
import org.apache.rocketmq.proxy.grpc.v2.common.GrpcClientSettingsManager;
2828
import org.apache.rocketmq.proxy.grpc.v2.common.ResponseBuilder;
2929
import org.apache.rocketmq.proxy.processor.MessagingProcessor;
3030
import org.apache.rocketmq.remoting.protocol.RemotingCommand;
3131

32-
public class ForwardMessageToDLQActivity extends AbstractMessingActivity {
32+
public class ForwardMessageToDLQActivity extends AbstractMessagingActivity {
3333

3434
public ForwardMessageToDLQActivity(MessagingProcessor messagingProcessor,
3535
GrpcClientSettingsManager grpcClientSettingsManager, GrpcChannelManager grpcChannelManager) {

‎proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/producer/RecallMessageActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import apache.rocketmq.v2.RecallMessageResponse;
2323
import apache.rocketmq.v2.Resource;
2424
import org.apache.rocketmq.proxy.common.ProxyContext;
25-
import org.apache.rocketmq.proxy.grpc.v2.AbstractMessingActivity;
25+
import org.apache.rocketmq.proxy.grpc.v2.AbstractMessagingActivity;
2626
import org.apache.rocketmq.proxy.grpc.v2.channel.GrpcChannelManager;
2727
import org.apache.rocketmq.proxy.grpc.v2.common.GrpcClientSettingsManager;
2828
import org.apache.rocketmq.proxy.grpc.v2.common.ResponseBuilder;
@@ -31,7 +31,7 @@
3131
import java.time.Duration;
3232
import java.util.concurrent.CompletableFuture;
3333

34-
public class RecallMessageActivity extends AbstractMessingActivity {
34+
public class RecallMessageActivity extends AbstractMessagingActivity {
3535

3636
public RecallMessageActivity(MessagingProcessor messagingProcessor,
3737
GrpcClientSettingsManager grpcClientSettingsManager, GrpcChannelManager grpcChannelManager) {

0 commit comments

Comments
 (0)