[rocketmq-clients] branch java_dev updated: Adapt to the latest protocol

[aaronai]

This is an automated email from the ASF dual-hosted git repository.

aaronai pushed a commit to branch java_dev
in repository https://gitbox.apache.org/repos/asf/rocketmq-clients.git


The following commit(s) were added to refs/heads/java_dev by this push:
     new 8c88e77  Adapt to the latest protocol
8c88e77 is described below

commit 8c88e7710abc2b091c2b71bf9df477c7c101cca7
Author: Aaron Ai <yangkun....@gmail.com>
AuthorDate: Tue Jul 12 15:42:39 2022 +0800

    Adapt to the latest protocol
---
 java/client-shade/src/main/resources/rocketmq.logback.xml            | 4 ++--
 .../java/org/apache/rocketmq/client/java/impl/TelemetrySession.java  | 2 +-
 .../org/apache/rocketmq/client/java/impl/producer/ProducerImpl.java  | 5 ++---
 java/client/src/main/resources/logback.xml                           | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/java/client-shade/src/main/resources/rocketmq.logback.xml 
b/java/client-shade/src/main/resources/rocketmq.logback.xml
index 8f113b0..b7f694b 100644
--- a/java/client-shade/src/main/resources/rocketmq.logback.xml
+++ b/java/client-shade/src/main/resources/rocketmq.logback.xml
@@ -33,6 +33,6 @@
         <appender-ref ref="DefaultAppender" additivity="false"/>
     </root>
     <!-- ref: https://github.com/grpc/grpc-java/issues/3033 -->
-    <!-- <logger name="io.grpc" level="error"/> -->
-    <!-- <logger name="org.apache.rocketmq.shaded.io.grpc" level="error"/> -->
+     <logger name="io.grpc" level="error"/>
+     <logger name="org.apache.rocketmq.shaded.io.grpc" level="error"/>
 </configuration>
\ No newline at end of file
diff --git 
a/java/client/src/main/java/org/apache/rocketmq/client/java/impl/TelemetrySession.java
 
b/java/client/src/main/java/org/apache/rocketmq/client/java/impl/TelemetrySession.java
index bcf2af1..36d74a5 100644
--- 
a/java/client/src/main/java/org/apache/rocketmq/client/java/impl/TelemetrySession.java
+++ 
b/java/client/src/main/java/org/apache/rocketmq/client/java/impl/TelemetrySession.java
@@ -179,7 +179,7 @@ public class TelemetrySession implements 
StreamObserver<TelemetryCommand> {
             }
         } catch (Throwable t) {
             LOGGER.error("[Bug] unexpected exception raised while receiving 
command from remote, command={}, "
-                + "clientId={}", command, client.getClientId());
+                + "clientId={}", command, client.getClientId(), t);
         }
     }
 
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 461c9b8..af192af 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
@@ -129,9 +129,8 @@ class ProducerImpl extends ClientImpl implements Producer {
 
     @Override
     public void onRecoverOrphanedTransactionCommand(Endpoints endpoints, 
RecoverOrphanedTransactionCommand command) {
-        final MessageQueueImpl mq = new 
MessageQueueImpl(command.getMessageQueue());
         final String transactionId = command.getTransactionId();
-        final String messageId = 
command.getOrphanedTransactionalMessage().getSystemProperties().getMessageId();
+        final String messageId = 
command.getMessage().getSystemProperties().getMessageId();
         if (null == checker) {
             LOGGER.error("No transaction checker registered, ignore it, 
messageId={}, transactionId={}, endpoints={},"
                 + " clientId={}", messageId, transactionId, endpoints, 
clientId);
@@ -139,7 +138,7 @@ class ProducerImpl extends ClientImpl implements Producer {
         }
         MessageViewImpl messageView;
         try {
-            messageView = 
MessageViewImpl.fromProtobuf(command.getOrphanedTransactionalMessage(), mq);
+            messageView = MessageViewImpl.fromProtobuf(command.getMessage());
         } catch (Throwable t) {
             LOGGER.error("[Bug] Failed to decode message during orphaned 
transaction message recovery, messageId={}, "
                 + "transactionId={}, endpoints={}, clientId={}", messageId, 
transactionId, endpoints, clientId, t);
diff --git a/java/client/src/main/resources/logback.xml 
b/java/client/src/main/resources/logback.xml
index b9c89fb..5e85f1e 100644
--- a/java/client/src/main/resources/logback.xml
+++ b/java/client/src/main/resources/logback.xml
@@ -33,6 +33,6 @@
         <appender-ref ref="DefaultAppender" additivity="false"/>
     </root>
     <!-- ref: https://github.com/grpc/grpc-java/issues/3033 -->
-    <!-- <logger name="io.grpc" level="error"/> -->
-    <!-- <logger name="org.apache.rocketmq.shaded.io.grpc" level="error"/> -->
+     <logger name="io.grpc" level="error"/>
+     <logger name="org.apache.rocketmq.shaded.io.grpc" level="error"/>
 </configuration>
\ No newline at end of file