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-apis.git
commit 6a751400e577ef2ddcfdbc3b8ba02011c362aa94 Author: 凌楚 <[email protected]> AuthorDate: Tue Jul 12 15:07:56 2022 +0800 Apply IDL update --- src/main/java/apache/rocketmq/v2/MQService.java | 182 +++++----- .../v2/RecoverOrphanedTransactionCommand.java | 390 ++++++--------------- ...RecoverOrphanedTransactionCommandOrBuilder.java | 35 +- .../proto/apache/rocketmq/v2/service.proto | 5 +- 4 files changed, 203 insertions(+), 409 deletions(-) diff --git a/src/main/java/apache/rocketmq/v2/MQService.java b/src/main/java/apache/rocketmq/v2/MQService.java index e6d3a12..4fc0398 100644 --- a/src/main/java/apache/rocketmq/v2/MQService.java +++ b/src/main/java/apache/rocketmq/v2/MQService.java @@ -265,97 +265,95 @@ public final class MQService { "\n\024VerifyMessageCommand\022\r\n\005nonce\030\001 \001(\t\022,\n" + "\007message\030\002 \001(\0132\033.apache.rocketmq.v2.Mess" + "age\"$\n\023VerifyMessageResult\022\r\n\005nonce\030\001 \001(" + - "\t\"\271\001\n!RecoverOrphanedTransactionCommand\022" + - "7\n\rmessage_queue\030\001 \001(\0132 .apache.rocketmq" + - ".v2.MessageQueue\022C\n\036orphaned_transaction" + - "al_message\030\002 \001(\0132\033.apache.rocketmq.v2.Me" + - "ssage\022\026\n\016transaction_id\030\003 \001(\t\"p\n\nPublish" + - "ing\022,\n\006topics\030\001 \003(\0132\034.apache.rocketmq.v2" + - ".Resource\022\025\n\rmax_body_size\030\002 \001(\005\022\035\n\025vali" + - "date_message_type\030\003 \001(\010\"\263\002\n\014Subscription" + - "\0220\n\005group\030\001 \001(\0132\034.apache.rocketmq.v2.Res" + - "ourceH\000\210\001\001\022<\n\rsubscriptions\030\002 \003(\0132%.apac" + - "he.rocketmq.v2.SubscriptionEntry\022\021\n\004fifo" + - "\030\003 \001(\010H\001\210\001\001\022\037\n\022receive_batch_size\030\004 \001(\005H" + - "\002\210\001\001\022<\n\024long_polling_timeout\030\005 \001(\0132\031.goo" + - "gle.protobuf.DurationH\003\210\001\001B\010\n\006_groupB\007\n\005" + - "_fifoB\025\n\023_receive_batch_sizeB\027\n\025_long_po" + - "lling_timeout\"Y\n\006Metric\022\n\n\002on\030\001 \001(\010\0225\n\te" + - "ndpoints\030\002 \001(\0132\035.apache.rocketmq.v2.Endp" + - "ointsH\000\210\001\001B\014\n\n_endpoints\"\220\004\n\010Settings\0228\n" + - "\013client_type\030\001 \001(\0162\036.apache.rocketmq.v2." + - "ClientTypeH\001\210\001\001\0228\n\014access_point\030\002 \001(\0132\035." + - "apache.rocketmq.v2.EndpointsH\002\210\001\001\022<\n\016bac" + - "koff_policy\030\003 \001(\0132\037.apache.rocketmq.v2.R" + - "etryPolicyH\003\210\001\001\0227\n\017request_timeout\030\004 \001(\013" + - "2\031.google.protobuf.DurationH\004\210\001\001\0224\n\npubl" + - "ishing\030\005 \001(\0132\036.apache.rocketmq.v2.Publis" + - "hingH\000\0228\n\014subscription\030\006 \001(\0132 .apache.ro" + - "cketmq.v2.SubscriptionH\000\022*\n\nuser_agent\030\007" + - " \001(\0132\026.apache.rocketmq.v2.UA\022*\n\006metric\030\010" + - " \001(\0132\032.apache.rocketmq.v2.MetricB\t\n\007pub_" + - "subB\016\n\014_client_typeB\017\n\r_access_pointB\021\n\017" + - "_backoff_policyB\022\n\020_request_timeout\"\252\004\n\020" + - "TelemetryCommand\022/\n\006status\030\001 \001(\0132\032.apach" + - "e.rocketmq.v2.StatusH\001\210\001\001\0220\n\010settings\030\002 " + - "\001(\0132\034.apache.rocketmq.v2.SettingsH\000\022B\n\022t" + - "hread_stack_trace\030\003 \001(\0132$.apache.rocketm" + - "q.v2.ThreadStackTraceH\000\022H\n\025verify_messag" + - "e_result\030\004 \001(\0132\'.apache.rocketmq.v2.Veri" + - "fyMessageResultH\000\022e\n$recover_orphaned_tr" + - "ansaction_command\030\005 \001(\01325.apache.rocketm" + - "q.v2.RecoverOrphanedTransactionCommandH\000" + - "\022\\\n print_thread_stack_trace_command\030\006 \001" + - "(\01320.apache.rocketmq.v2.PrintThreadStack" + - "TraceCommandH\000\022J\n\026verify_message_command" + - "\030\007 \001(\0132(.apache.rocketmq.v2.VerifyMessag" + - "eCommandH\000B\t\n\007commandB\t\n\007_status\"\\\n\036Noti" + - "fyClientTerminationRequest\0220\n\005group\030\001 \001(" + - "\0132\034.apache.rocketmq.v2.ResourceH\000\210\001\001B\010\n\006" + - "_group\"M\n\037NotifyClientTerminationRespons" + - "e\022*\n\006status\030\001 \001(\0132\032.apache.rocketmq.v2.S" + - "tatus\"\335\001\n\036ChangeInvisibleDurationRequest" + - "\022+\n\005group\030\001 \001(\0132\034.apache.rocketmq.v2.Res" + - "ource\022+\n\005topic\030\002 \001(\0132\034.apache.rocketmq.v" + - "2.Resource\022\026\n\016receipt_handle\030\003 \001(\t\0225\n\022in" + - "visible_duration\030\004 \001(\0132\031.google.protobuf" + - ".Duration\022\022\n\nmessage_id\030\005 \001(\t\"e\n\037ChangeI" + - "nvisibleDurationResponse\022*\n\006status\030\001 \001(\013" + - "2\032.apache.rocketmq.v2.Status\022\026\n\016receipt_" + - "handle\030\002 \001(\t2\340\t\n\020MessagingService\022]\n\nQue" + - "ryRoute\022%.apache.rocketmq.v2.QueryRouteR" + - "equest\032&.apache.rocketmq.v2.QueryRouteRe" + - "sponse\"\000\022Z\n\tHeartbeat\022$.apache.rocketmq." + - "v2.HeartbeatRequest\032%.apache.rocketmq.v2" + - ".HeartbeatResponse\"\000\022`\n\013SendMessage\022&.ap" + - "ache.rocketmq.v2.SendMessageRequest\032\'.ap" + - "ache.rocketmq.v2.SendMessageResponse\"\000\022l" + - "\n\017QueryAssignment\022*.apache.rocketmq.v2.Q" + - "ueryAssignmentRequest\032+.apache.rocketmq." + - "v2.QueryAssignmentResponse\"\000\022k\n\016ReceiveM" + - "essage\022).apache.rocketmq.v2.ReceiveMessa" + - "geRequest\032*.apache.rocketmq.v2.ReceiveMe" + - "ssageResponse\"\0000\001\022]\n\nAckMessage\022%.apache" + - ".rocketmq.v2.AckMessageRequest\032&.apache." + - "rocketmq.v2.AckMessageResponse\"\000\022\234\001\n\037For" + - "wardMessageToDeadLetterQueue\022:.apache.ro" + - "cketmq.v2.ForwardMessageToDeadLetterQueu" + - "eRequest\032;.apache.rocketmq.v2.ForwardMes" + - "sageToDeadLetterQueueResponse\"\000\022i\n\016EndTr" + - "ansaction\022).apache.rocketmq.v2.EndTransa" + - "ctionRequest\032*.apache.rocketmq.v2.EndTra" + - "nsactionResponse\"\000\022]\n\tTelemetry\022$.apache" + - ".rocketmq.v2.TelemetryCommand\032$.apache.r" + - "ocketmq.v2.TelemetryCommand\"\000(\0010\001\022\204\001\n\027No" + - "tifyClientTermination\0222.apache.rocketmq." + - "v2.NotifyClientTerminationRequest\0323.apac" + - "he.rocketmq.v2.NotifyClientTerminationRe" + - "sponse\"\000\022\204\001\n\027ChangeInvisibleDuration\0222.a" + - "pache.rocketmq.v2.ChangeInvisibleDuratio" + - "nRequest\0323.apache.rocketmq.v2.ChangeInvi" + - "sibleDurationResponse\"\000B<\n\022apache.rocket" + - "mq.v2B\tMQServiceP\001\240\001\001\330\001\001\252\002\022Apache.Rocket" + - "mq.V2b\006proto3" + "\t\"i\n!RecoverOrphanedTransactionCommand\022," + + "\n\007message\030\001 \001(\0132\033.apache.rocketmq.v2.Mes" + + "sage\022\026\n\016transaction_id\030\002 \001(\t\"p\n\nPublishi" + + "ng\022,\n\006topics\030\001 \003(\0132\034.apache.rocketmq.v2." + + "Resource\022\025\n\rmax_body_size\030\002 \001(\005\022\035\n\025valid" + + "ate_message_type\030\003 \001(\010\"\263\002\n\014Subscription\022" + + "0\n\005group\030\001 \001(\0132\034.apache.rocketmq.v2.Reso" + + "urceH\000\210\001\001\022<\n\rsubscriptions\030\002 \003(\0132%.apach" + + "e.rocketmq.v2.SubscriptionEntry\022\021\n\004fifo\030" + + "\003 \001(\010H\001\210\001\001\022\037\n\022receive_batch_size\030\004 \001(\005H\002" + + "\210\001\001\022<\n\024long_polling_timeout\030\005 \001(\0132\031.goog" + + "le.protobuf.DurationH\003\210\001\001B\010\n\006_groupB\007\n\005_" + + "fifoB\025\n\023_receive_batch_sizeB\027\n\025_long_pol" + + "ling_timeout\"Y\n\006Metric\022\n\n\002on\030\001 \001(\010\0225\n\ten" + + "dpoints\030\002 \001(\0132\035.apache.rocketmq.v2.Endpo" + + "intsH\000\210\001\001B\014\n\n_endpoints\"\220\004\n\010Settings\0228\n\013" + + "client_type\030\001 \001(\0162\036.apache.rocketmq.v2.C" + + "lientTypeH\001\210\001\001\0228\n\014access_point\030\002 \001(\0132\035.a" + + "pache.rocketmq.v2.EndpointsH\002\210\001\001\022<\n\016back" + + "off_policy\030\003 \001(\0132\037.apache.rocketmq.v2.Re" + + "tryPolicyH\003\210\001\001\0227\n\017request_timeout\030\004 \001(\0132" + + "\031.google.protobuf.DurationH\004\210\001\001\0224\n\npubli" + + "shing\030\005 \001(\0132\036.apache.rocketmq.v2.Publish" + + "ingH\000\0228\n\014subscription\030\006 \001(\0132 .apache.roc" + + "ketmq.v2.SubscriptionH\000\022*\n\nuser_agent\030\007 " + + "\001(\0132\026.apache.rocketmq.v2.UA\022*\n\006metric\030\010 " + + "\001(\0132\032.apache.rocketmq.v2.MetricB\t\n\007pub_s" + + "ubB\016\n\014_client_typeB\017\n\r_access_pointB\021\n\017_" + + "backoff_policyB\022\n\020_request_timeout\"\252\004\n\020T" + + "elemetryCommand\022/\n\006status\030\001 \001(\0132\032.apache" + + ".rocketmq.v2.StatusH\001\210\001\001\0220\n\010settings\030\002 \001" + + "(\0132\034.apache.rocketmq.v2.SettingsH\000\022B\n\022th" + + "read_stack_trace\030\003 \001(\0132$.apache.rocketmq" + + ".v2.ThreadStackTraceH\000\022H\n\025verify_message" + + "_result\030\004 \001(\0132\'.apache.rocketmq.v2.Verif" + + "yMessageResultH\000\022e\n$recover_orphaned_tra" + + "nsaction_command\030\005 \001(\01325.apache.rocketmq" + + ".v2.RecoverOrphanedTransactionCommandH\000\022" + + "\\\n print_thread_stack_trace_command\030\006 \001(" + + "\01320.apache.rocketmq.v2.PrintThreadStackT" + + "raceCommandH\000\022J\n\026verify_message_command\030" + + "\007 \001(\0132(.apache.rocketmq.v2.VerifyMessage" + + "CommandH\000B\t\n\007commandB\t\n\007_status\"\\\n\036Notif" + + "yClientTerminationRequest\0220\n\005group\030\001 \001(\013" + + "2\034.apache.rocketmq.v2.ResourceH\000\210\001\001B\010\n\006_" + + "group\"M\n\037NotifyClientTerminationResponse" + + "\022*\n\006status\030\001 \001(\0132\032.apache.rocketmq.v2.St" + + "atus\"\335\001\n\036ChangeInvisibleDurationRequest\022" + + "+\n\005group\030\001 \001(\0132\034.apache.rocketmq.v2.Reso" + + "urce\022+\n\005topic\030\002 \001(\0132\034.apache.rocketmq.v2" + + ".Resource\022\026\n\016receipt_handle\030\003 \001(\t\0225\n\022inv" + + "isible_duration\030\004 \001(\0132\031.google.protobuf." + + "Duration\022\022\n\nmessage_id\030\005 \001(\t\"e\n\037ChangeIn" + + "visibleDurationResponse\022*\n\006status\030\001 \001(\0132" + + "\032.apache.rocketmq.v2.Status\022\026\n\016receipt_h" + + "andle\030\002 \001(\t2\340\t\n\020MessagingService\022]\n\nQuer" + + "yRoute\022%.apache.rocketmq.v2.QueryRouteRe" + + "quest\032&.apache.rocketmq.v2.QueryRouteRes" + + "ponse\"\000\022Z\n\tHeartbeat\022$.apache.rocketmq.v" + + "2.HeartbeatRequest\032%.apache.rocketmq.v2." + + "HeartbeatResponse\"\000\022`\n\013SendMessage\022&.apa" + + "che.rocketmq.v2.SendMessageRequest\032\'.apa" + + "che.rocketmq.v2.SendMessageResponse\"\000\022l\n" + + "\017QueryAssignment\022*.apache.rocketmq.v2.Qu" + + "eryAssignmentRequest\032+.apache.rocketmq.v" + + "2.QueryAssignmentResponse\"\000\022k\n\016ReceiveMe" + + "ssage\022).apache.rocketmq.v2.ReceiveMessag" + + "eRequest\032*.apache.rocketmq.v2.ReceiveMes" + + "sageResponse\"\0000\001\022]\n\nAckMessage\022%.apache." + + "rocketmq.v2.AckMessageRequest\032&.apache.r" + + "ocketmq.v2.AckMessageResponse\"\000\022\234\001\n\037Forw" + + "ardMessageToDeadLetterQueue\022:.apache.roc" + + "ketmq.v2.ForwardMessageToDeadLetterQueue" + + "Request\032;.apache.rocketmq.v2.ForwardMess" + + "ageToDeadLetterQueueResponse\"\000\022i\n\016EndTra" + + "nsaction\022).apache.rocketmq.v2.EndTransac" + + "tionRequest\032*.apache.rocketmq.v2.EndTran" + + "sactionResponse\"\000\022]\n\tTelemetry\022$.apache." + + "rocketmq.v2.TelemetryCommand\032$.apache.ro" + + "cketmq.v2.TelemetryCommand\"\000(\0010\001\022\204\001\n\027Not" + + "ifyClientTermination\0222.apache.rocketmq.v" + + "2.NotifyClientTerminationRequest\0323.apach" + + "e.rocketmq.v2.NotifyClientTerminationRes" + + "ponse\"\000\022\204\001\n\027ChangeInvisibleDuration\0222.ap" + + "ache.rocketmq.v2.ChangeInvisibleDuration" + + "Request\0323.apache.rocketmq.v2.ChangeInvis" + + "ibleDurationResponse\"\000B<\n\022apache.rocketm" + + "q.v2B\tMQServiceP\001\240\001\001\330\001\001\252\002\022Apache.Rocketm" + + "q.V2b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -507,7 +505,7 @@ public final class MQService { internal_static_apache_rocketmq_v2_RecoverOrphanedTransactionCommand_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_apache_rocketmq_v2_RecoverOrphanedTransactionCommand_descriptor, - new java.lang.String[] { "MessageQueue", "OrphanedTransactionalMessage", "TransactionId", }); + new java.lang.String[] { "Message", "TransactionId", }); internal_static_apache_rocketmq_v2_Publishing_descriptor = getDescriptor().getMessageTypes().get(24); internal_static_apache_rocketmq_v2_Publishing_fieldAccessorTable = new diff --git a/src/main/java/apache/rocketmq/v2/RecoverOrphanedTransactionCommand.java b/src/main/java/apache/rocketmq/v2/RecoverOrphanedTransactionCommand.java index 9908ed8..6b18c19 100644 --- a/src/main/java/apache/rocketmq/v2/RecoverOrphanedTransactionCommand.java +++ b/src/main/java/apache/rocketmq/v2/RecoverOrphanedTransactionCommand.java @@ -50,32 +50,19 @@ private static final long serialVersionUID = 0L; done = true; break; case 10: { - apache.rocketmq.v2.MessageQueue.Builder subBuilder = null; - if (messageQueue_ != null) { - subBuilder = messageQueue_.toBuilder(); - } - messageQueue_ = input.readMessage(apache.rocketmq.v2.MessageQueue.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(messageQueue_); - messageQueue_ = subBuilder.buildPartial(); - } - - break; - } - case 18: { apache.rocketmq.v2.Message.Builder subBuilder = null; - if (orphanedTransactionalMessage_ != null) { - subBuilder = orphanedTransactionalMessage_.toBuilder(); + if (message_ != null) { + subBuilder = message_.toBuilder(); } - orphanedTransactionalMessage_ = input.readMessage(apache.rocketmq.v2.Message.parser(), extensionRegistry); + message_ = input.readMessage(apache.rocketmq.v2.Message.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(orphanedTransactionalMessage_); - orphanedTransactionalMessage_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(message_); + message_ = subBuilder.buildPartial(); } break; } - case 26: { + case 18: { java.lang.String s = input.readStringRequireUtf8(); transactionId_ = s; @@ -113,62 +100,36 @@ private static final long serialVersionUID = 0L; apache.rocketmq.v2.RecoverOrphanedTransactionCommand.class, apache.rocketmq.v2.RecoverOrphanedTransactionCommand.Builder.class); } - public static final int MESSAGE_QUEUE_FIELD_NUMBER = 1; - private apache.rocketmq.v2.MessageQueue messageQueue_; - /** - * <code>.apache.rocketmq.v2.MessageQueue message_queue = 1;</code> - * @return Whether the messageQueue field is set. - */ - @java.lang.Override - public boolean hasMessageQueue() { - return messageQueue_ != null; - } - /** - * <code>.apache.rocketmq.v2.MessageQueue message_queue = 1;</code> - * @return The messageQueue. - */ - @java.lang.Override - public apache.rocketmq.v2.MessageQueue getMessageQueue() { - return messageQueue_ == null ? apache.rocketmq.v2.MessageQueue.getDefaultInstance() : messageQueue_; - } - /** - * <code>.apache.rocketmq.v2.MessageQueue message_queue = 1;</code> - */ - @java.lang.Override - public apache.rocketmq.v2.MessageQueueOrBuilder getMessageQueueOrBuilder() { - return getMessageQueue(); - } - - public static final int ORPHANED_TRANSACTIONAL_MESSAGE_FIELD_NUMBER = 2; - private apache.rocketmq.v2.Message orphanedTransactionalMessage_; + public static final int MESSAGE_FIELD_NUMBER = 1; + private apache.rocketmq.v2.Message message_; /** - * <code>.apache.rocketmq.v2.Message orphaned_transactional_message = 2;</code> - * @return Whether the orphanedTransactionalMessage field is set. + * <code>.apache.rocketmq.v2.Message message = 1;</code> + * @return Whether the message field is set. */ @java.lang.Override - public boolean hasOrphanedTransactionalMessage() { - return orphanedTransactionalMessage_ != null; + public boolean hasMessage() { + return message_ != null; } /** - * <code>.apache.rocketmq.v2.Message orphaned_transactional_message = 2;</code> - * @return The orphanedTransactionalMessage. + * <code>.apache.rocketmq.v2.Message message = 1;</code> + * @return The message. */ @java.lang.Override - public apache.rocketmq.v2.Message getOrphanedTransactionalMessage() { - return orphanedTransactionalMessage_ == null ? apache.rocketmq.v2.Message.getDefaultInstance() : orphanedTransactionalMessage_; + public apache.rocketmq.v2.Message getMessage() { + return message_ == null ? apache.rocketmq.v2.Message.getDefaultInstance() : message_; } /** - * <code>.apache.rocketmq.v2.Message orphaned_transactional_message = 2;</code> + * <code>.apache.rocketmq.v2.Message message = 1;</code> */ @java.lang.Override - public apache.rocketmq.v2.MessageOrBuilder getOrphanedTransactionalMessageOrBuilder() { - return getOrphanedTransactionalMessage(); + public apache.rocketmq.v2.MessageOrBuilder getMessageOrBuilder() { + return getMessage(); } - public static final int TRANSACTION_ID_FIELD_NUMBER = 3; + public static final int TRANSACTION_ID_FIELD_NUMBER = 2; private volatile java.lang.Object transactionId_; /** - * <code>string transaction_id = 3;</code> + * <code>string transaction_id = 2;</code> * @return The transactionId. */ @java.lang.Override @@ -185,7 +146,7 @@ private static final long serialVersionUID = 0L; } } /** - * <code>string transaction_id = 3;</code> + * <code>string transaction_id = 2;</code> * @return The bytes for transactionId. */ @java.lang.Override @@ -217,14 +178,11 @@ private static final long serialVersionUID = 0L; @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (messageQueue_ != null) { - output.writeMessage(1, getMessageQueue()); - } - if (orphanedTransactionalMessage_ != null) { - output.writeMessage(2, getOrphanedTransactionalMessage()); + if (message_ != null) { + output.writeMessage(1, getMessage()); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(transactionId_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 3, transactionId_); + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, transactionId_); } unknownFields.writeTo(output); } @@ -235,16 +193,12 @@ private static final long serialVersionUID = 0L; if (size != -1) return size; size = 0; - if (messageQueue_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getMessageQueue()); - } - if (orphanedTransactionalMessage_ != null) { + if (message_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, getOrphanedTransactionalMessage()); + .computeMessageSize(1, getMessage()); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(transactionId_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, transactionId_); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, transactionId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -261,15 +215,10 @@ private static final long serialVersionUID = 0L; } apache.rocketmq.v2.RecoverOrphanedTransactionCommand other = (apache.rocketmq.v2.RecoverOrphanedTransactionCommand) obj; - if (hasMessageQueue() != other.hasMessageQueue()) return false; - if (hasMessageQueue()) { - if (!getMessageQueue() - .equals(other.getMessageQueue())) return false; - } - if (hasOrphanedTransactionalMessage() != other.hasOrphanedTransactionalMessage()) return false; - if (hasOrphanedTransactionalMessage()) { - if (!getOrphanedTransactionalMessage() - .equals(other.getOrphanedTransactionalMessage())) return false; + if (hasMessage() != other.hasMessage()) return false; + if (hasMessage()) { + if (!getMessage() + .equals(other.getMessage())) return false; } if (!getTransactionId() .equals(other.getTransactionId())) return false; @@ -284,13 +233,9 @@ private static final long serialVersionUID = 0L; } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasMessageQueue()) { - hash = (37 * hash) + MESSAGE_QUEUE_FIELD_NUMBER; - hash = (53 * hash) + getMessageQueue().hashCode(); - } - if (hasOrphanedTransactionalMessage()) { - hash = (37 * hash) + ORPHANED_TRANSACTIONAL_MESSAGE_FIELD_NUMBER; - hash = (53 * hash) + getOrphanedTransactionalMessage().hashCode(); + if (hasMessage()) { + hash = (37 * hash) + MESSAGE_FIELD_NUMBER; + hash = (53 * hash) + getMessage().hashCode(); } hash = (37 * hash) + TRANSACTION_ID_FIELD_NUMBER; hash = (53 * hash) + getTransactionId().hashCode(); @@ -427,17 +372,11 @@ private static final long serialVersionUID = 0L; @java.lang.Override public Builder clear() { super.clear(); - if (messageQueueBuilder_ == null) { - messageQueue_ = null; - } else { - messageQueue_ = null; - messageQueueBuilder_ = null; - } - if (orphanedTransactionalMessageBuilder_ == null) { - orphanedTransactionalMessage_ = null; + if (messageBuilder_ == null) { + message_ = null; } else { - orphanedTransactionalMessage_ = null; - orphanedTransactionalMessageBuilder_ = null; + message_ = null; + messageBuilder_ = null; } transactionId_ = ""; @@ -467,15 +406,10 @@ private static final long serialVersionUID = 0L; @java.lang.Override public apache.rocketmq.v2.RecoverOrphanedTransactionCommand buildPartial() { apache.rocketmq.v2.RecoverOrphanedTransactionCommand result = new apache.rocketmq.v2.RecoverOrphanedTransactionCommand(this); - if (messageQueueBuilder_ == null) { - result.messageQueue_ = messageQueue_; - } else { - result.messageQueue_ = messageQueueBuilder_.build(); - } - if (orphanedTransactionalMessageBuilder_ == null) { - result.orphanedTransactionalMessage_ = orphanedTransactionalMessage_; + if (messageBuilder_ == null) { + result.message_ = message_; } else { - result.orphanedTransactionalMessage_ = orphanedTransactionalMessageBuilder_.build(); + result.message_ = messageBuilder_.build(); } result.transactionId_ = transactionId_; onBuilt(); @@ -526,11 +460,8 @@ private static final long serialVersionUID = 0L; public Builder mergeFrom(apache.rocketmq.v2.RecoverOrphanedTransactionCommand other) { if (other == apache.rocketmq.v2.RecoverOrphanedTransactionCommand.getDefaultInstance()) return this; - if (other.hasMessageQueue()) { - mergeMessageQueue(other.getMessageQueue()); - } - if (other.hasOrphanedTransactionalMessage()) { - mergeOrphanedTransactionalMessage(other.getOrphanedTransactionalMessage()); + if (other.hasMessage()) { + mergeMessage(other.getMessage()); } if (!other.getTransactionId().isEmpty()) { transactionId_ = other.transactionId_; @@ -565,247 +496,128 @@ private static final long serialVersionUID = 0L; return this; } - private apache.rocketmq.v2.MessageQueue messageQueue_; - private com.google.protobuf.SingleFieldBuilderV3< - apache.rocketmq.v2.MessageQueue, apache.rocketmq.v2.MessageQueue.Builder, apache.rocketmq.v2.MessageQueueOrBuilder> messageQueueBuilder_; - /** - * <code>.apache.rocketmq.v2.MessageQueue message_queue = 1;</code> - * @return Whether the messageQueue field is set. - */ - public boolean hasMessageQueue() { - return messageQueueBuilder_ != null || messageQueue_ != null; - } - /** - * <code>.apache.rocketmq.v2.MessageQueue message_queue = 1;</code> - * @return The messageQueue. - */ - public apache.rocketmq.v2.MessageQueue getMessageQueue() { - if (messageQueueBuilder_ == null) { - return messageQueue_ == null ? apache.rocketmq.v2.MessageQueue.getDefaultInstance() : messageQueue_; - } else { - return messageQueueBuilder_.getMessage(); - } - } - /** - * <code>.apache.rocketmq.v2.MessageQueue message_queue = 1;</code> - */ - public Builder setMessageQueue(apache.rocketmq.v2.MessageQueue value) { - if (messageQueueBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - messageQueue_ = value; - onChanged(); - } else { - messageQueueBuilder_.setMessage(value); - } - - return this; - } - /** - * <code>.apache.rocketmq.v2.MessageQueue message_queue = 1;</code> - */ - public Builder setMessageQueue( - apache.rocketmq.v2.MessageQueue.Builder builderForValue) { - if (messageQueueBuilder_ == null) { - messageQueue_ = builderForValue.build(); - onChanged(); - } else { - messageQueueBuilder_.setMessage(builderForValue.build()); - } - - return this; - } - /** - * <code>.apache.rocketmq.v2.MessageQueue message_queue = 1;</code> - */ - public Builder mergeMessageQueue(apache.rocketmq.v2.MessageQueue value) { - if (messageQueueBuilder_ == null) { - if (messageQueue_ != null) { - messageQueue_ = - apache.rocketmq.v2.MessageQueue.newBuilder(messageQueue_).mergeFrom(value).buildPartial(); - } else { - messageQueue_ = value; - } - onChanged(); - } else { - messageQueueBuilder_.mergeFrom(value); - } - - return this; - } - /** - * <code>.apache.rocketmq.v2.MessageQueue message_queue = 1;</code> - */ - public Builder clearMessageQueue() { - if (messageQueueBuilder_ == null) { - messageQueue_ = null; - onChanged(); - } else { - messageQueue_ = null; - messageQueueBuilder_ = null; - } - - return this; - } - /** - * <code>.apache.rocketmq.v2.MessageQueue message_queue = 1;</code> - */ - public apache.rocketmq.v2.MessageQueue.Builder getMessageQueueBuilder() { - - onChanged(); - return getMessageQueueFieldBuilder().getBuilder(); - } - /** - * <code>.apache.rocketmq.v2.MessageQueue message_queue = 1;</code> - */ - public apache.rocketmq.v2.MessageQueueOrBuilder getMessageQueueOrBuilder() { - if (messageQueueBuilder_ != null) { - return messageQueueBuilder_.getMessageOrBuilder(); - } else { - return messageQueue_ == null ? - apache.rocketmq.v2.MessageQueue.getDefaultInstance() : messageQueue_; - } - } - /** - * <code>.apache.rocketmq.v2.MessageQueue message_queue = 1;</code> - */ - private com.google.protobuf.SingleFieldBuilderV3< - apache.rocketmq.v2.MessageQueue, apache.rocketmq.v2.MessageQueue.Builder, apache.rocketmq.v2.MessageQueueOrBuilder> - getMessageQueueFieldBuilder() { - if (messageQueueBuilder_ == null) { - messageQueueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - apache.rocketmq.v2.MessageQueue, apache.rocketmq.v2.MessageQueue.Builder, apache.rocketmq.v2.MessageQueueOrBuilder>( - getMessageQueue(), - getParentForChildren(), - isClean()); - messageQueue_ = null; - } - return messageQueueBuilder_; - } - - private apache.rocketmq.v2.Message orphanedTransactionalMessage_; + private apache.rocketmq.v2.Message message_; private com.google.protobuf.SingleFieldBuilderV3< - apache.rocketmq.v2.Message, apache.rocketmq.v2.Message.Builder, apache.rocketmq.v2.MessageOrBuilder> orphanedTransactionalMessageBuilder_; + apache.rocketmq.v2.Message, apache.rocketmq.v2.Message.Builder, apache.rocketmq.v2.MessageOrBuilder> messageBuilder_; /** - * <code>.apache.rocketmq.v2.Message orphaned_transactional_message = 2;</code> - * @return Whether the orphanedTransactionalMessage field is set. + * <code>.apache.rocketmq.v2.Message message = 1;</code> + * @return Whether the message field is set. */ - public boolean hasOrphanedTransactionalMessage() { - return orphanedTransactionalMessageBuilder_ != null || orphanedTransactionalMessage_ != null; + public boolean hasMessage() { + return messageBuilder_ != null || message_ != null; } /** - * <code>.apache.rocketmq.v2.Message orphaned_transactional_message = 2;</code> - * @return The orphanedTransactionalMessage. + * <code>.apache.rocketmq.v2.Message message = 1;</code> + * @return The message. */ - public apache.rocketmq.v2.Message getOrphanedTransactionalMessage() { - if (orphanedTransactionalMessageBuilder_ == null) { - return orphanedTransactionalMessage_ == null ? apache.rocketmq.v2.Message.getDefaultInstance() : orphanedTransactionalMessage_; + public apache.rocketmq.v2.Message getMessage() { + if (messageBuilder_ == null) { + return message_ == null ? apache.rocketmq.v2.Message.getDefaultInstance() : message_; } else { - return orphanedTransactionalMessageBuilder_.getMessage(); + return messageBuilder_.getMessage(); } } /** - * <code>.apache.rocketmq.v2.Message orphaned_transactional_message = 2;</code> + * <code>.apache.rocketmq.v2.Message message = 1;</code> */ - public Builder setOrphanedTransactionalMessage(apache.rocketmq.v2.Message value) { - if (orphanedTransactionalMessageBuilder_ == null) { + public Builder setMessage(apache.rocketmq.v2.Message value) { + if (messageBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - orphanedTransactionalMessage_ = value; + message_ = value; onChanged(); } else { - orphanedTransactionalMessageBuilder_.setMessage(value); + messageBuilder_.setMessage(value); } return this; } /** - * <code>.apache.rocketmq.v2.Message orphaned_transactional_message = 2;</code> + * <code>.apache.rocketmq.v2.Message message = 1;</code> */ - public Builder setOrphanedTransactionalMessage( + public Builder setMessage( apache.rocketmq.v2.Message.Builder builderForValue) { - if (orphanedTransactionalMessageBuilder_ == null) { - orphanedTransactionalMessage_ = builderForValue.build(); + if (messageBuilder_ == null) { + message_ = builderForValue.build(); onChanged(); } else { - orphanedTransactionalMessageBuilder_.setMessage(builderForValue.build()); + messageBuilder_.setMessage(builderForValue.build()); } return this; } /** - * <code>.apache.rocketmq.v2.Message orphaned_transactional_message = 2;</code> + * <code>.apache.rocketmq.v2.Message message = 1;</code> */ - public Builder mergeOrphanedTransactionalMessage(apache.rocketmq.v2.Message value) { - if (orphanedTransactionalMessageBuilder_ == null) { - if (orphanedTransactionalMessage_ != null) { - orphanedTransactionalMessage_ = - apache.rocketmq.v2.Message.newBuilder(orphanedTransactionalMessage_).mergeFrom(value).buildPartial(); + public Builder mergeMessage(apache.rocketmq.v2.Message value) { + if (messageBuilder_ == null) { + if (message_ != null) { + message_ = + apache.rocketmq.v2.Message.newBuilder(message_).mergeFrom(value).buildPartial(); } else { - orphanedTransactionalMessage_ = value; + message_ = value; } onChanged(); } else { - orphanedTransactionalMessageBuilder_.mergeFrom(value); + messageBuilder_.mergeFrom(value); } return this; } /** - * <code>.apache.rocketmq.v2.Message orphaned_transactional_message = 2;</code> + * <code>.apache.rocketmq.v2.Message message = 1;</code> */ - public Builder clearOrphanedTransactionalMessage() { - if (orphanedTransactionalMessageBuilder_ == null) { - orphanedTransactionalMessage_ = null; + public Builder clearMessage() { + if (messageBuilder_ == null) { + message_ = null; onChanged(); } else { - orphanedTransactionalMessage_ = null; - orphanedTransactionalMessageBuilder_ = null; + message_ = null; + messageBuilder_ = null; } return this; } /** - * <code>.apache.rocketmq.v2.Message orphaned_transactional_message = 2;</code> + * <code>.apache.rocketmq.v2.Message message = 1;</code> */ - public apache.rocketmq.v2.Message.Builder getOrphanedTransactionalMessageBuilder() { + public apache.rocketmq.v2.Message.Builder getMessageBuilder() { onChanged(); - return getOrphanedTransactionalMessageFieldBuilder().getBuilder(); + return getMessageFieldBuilder().getBuilder(); } /** - * <code>.apache.rocketmq.v2.Message orphaned_transactional_message = 2;</code> + * <code>.apache.rocketmq.v2.Message message = 1;</code> */ - public apache.rocketmq.v2.MessageOrBuilder getOrphanedTransactionalMessageOrBuilder() { - if (orphanedTransactionalMessageBuilder_ != null) { - return orphanedTransactionalMessageBuilder_.getMessageOrBuilder(); + public apache.rocketmq.v2.MessageOrBuilder getMessageOrBuilder() { + if (messageBuilder_ != null) { + return messageBuilder_.getMessageOrBuilder(); } else { - return orphanedTransactionalMessage_ == null ? - apache.rocketmq.v2.Message.getDefaultInstance() : orphanedTransactionalMessage_; + return message_ == null ? + apache.rocketmq.v2.Message.getDefaultInstance() : message_; } } /** - * <code>.apache.rocketmq.v2.Message orphaned_transactional_message = 2;</code> + * <code>.apache.rocketmq.v2.Message message = 1;</code> */ private com.google.protobuf.SingleFieldBuilderV3< apache.rocketmq.v2.Message, apache.rocketmq.v2.Message.Builder, apache.rocketmq.v2.MessageOrBuilder> - getOrphanedTransactionalMessageFieldBuilder() { - if (orphanedTransactionalMessageBuilder_ == null) { - orphanedTransactionalMessageBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + getMessageFieldBuilder() { + if (messageBuilder_ == null) { + messageBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< apache.rocketmq.v2.Message, apache.rocketmq.v2.Message.Builder, apache.rocketmq.v2.MessageOrBuilder>( - getOrphanedTransactionalMessage(), + getMessage(), getParentForChildren(), isClean()); - orphanedTransactionalMessage_ = null; + message_ = null; } - return orphanedTransactionalMessageBuilder_; + return messageBuilder_; } private java.lang.Object transactionId_ = ""; /** - * <code>string transaction_id = 3;</code> + * <code>string transaction_id = 2;</code> * @return The transactionId. */ public java.lang.String getTransactionId() { @@ -821,7 +633,7 @@ private static final long serialVersionUID = 0L; } } /** - * <code>string transaction_id = 3;</code> + * <code>string transaction_id = 2;</code> * @return The bytes for transactionId. */ public com.google.protobuf.ByteString @@ -838,7 +650,7 @@ private static final long serialVersionUID = 0L; } } /** - * <code>string transaction_id = 3;</code> + * <code>string transaction_id = 2;</code> * @param value The transactionId to set. * @return This builder for chaining. */ @@ -853,7 +665,7 @@ private static final long serialVersionUID = 0L; return this; } /** - * <code>string transaction_id = 3;</code> + * <code>string transaction_id = 2;</code> * @return This builder for chaining. */ public Builder clearTransactionId() { @@ -863,7 +675,7 @@ private static final long serialVersionUID = 0L; return this; } /** - * <code>string transaction_id = 3;</code> + * <code>string transaction_id = 2;</code> * @param value The bytes for transactionId to set. * @return This builder for chaining. */ diff --git a/src/main/java/apache/rocketmq/v2/RecoverOrphanedTransactionCommandOrBuilder.java b/src/main/java/apache/rocketmq/v2/RecoverOrphanedTransactionCommandOrBuilder.java index 8af7ed1..116644f 100644 --- a/src/main/java/apache/rocketmq/v2/RecoverOrphanedTransactionCommandOrBuilder.java +++ b/src/main/java/apache/rocketmq/v2/RecoverOrphanedTransactionCommandOrBuilder.java @@ -8,42 +8,27 @@ public interface RecoverOrphanedTransactionCommandOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * <code>.apache.rocketmq.v2.MessageQueue message_queue = 1;</code> - * @return Whether the messageQueue field is set. + * <code>.apache.rocketmq.v2.Message message = 1;</code> + * @return Whether the message field is set. */ - boolean hasMessageQueue(); + boolean hasMessage(); /** - * <code>.apache.rocketmq.v2.MessageQueue message_queue = 1;</code> - * @return The messageQueue. + * <code>.apache.rocketmq.v2.Message message = 1;</code> + * @return The message. */ - apache.rocketmq.v2.MessageQueue getMessageQueue(); + apache.rocketmq.v2.Message getMessage(); /** - * <code>.apache.rocketmq.v2.MessageQueue message_queue = 1;</code> + * <code>.apache.rocketmq.v2.Message message = 1;</code> */ - apache.rocketmq.v2.MessageQueueOrBuilder getMessageQueueOrBuilder(); + apache.rocketmq.v2.MessageOrBuilder getMessageOrBuilder(); /** - * <code>.apache.rocketmq.v2.Message orphaned_transactional_message = 2;</code> - * @return Whether the orphanedTransactionalMessage field is set. - */ - boolean hasOrphanedTransactionalMessage(); - /** - * <code>.apache.rocketmq.v2.Message orphaned_transactional_message = 2;</code> - * @return The orphanedTransactionalMessage. - */ - apache.rocketmq.v2.Message getOrphanedTransactionalMessage(); - /** - * <code>.apache.rocketmq.v2.Message orphaned_transactional_message = 2;</code> - */ - apache.rocketmq.v2.MessageOrBuilder getOrphanedTransactionalMessageOrBuilder(); - - /** - * <code>string transaction_id = 3;</code> + * <code>string transaction_id = 2;</code> * @return The transactionId. */ java.lang.String getTransactionId(); /** - * <code>string transaction_id = 3;</code> + * <code>string transaction_id = 2;</code> * @return The bytes for transactionId. */ com.google.protobuf.ByteString diff --git a/src/main/resources/proto/apache/rocketmq/v2/service.proto b/src/main/resources/proto/apache/rocketmq/v2/service.proto index 598c70c..6a7456b 100644 --- a/src/main/resources/proto/apache/rocketmq/v2/service.proto +++ b/src/main/resources/proto/apache/rocketmq/v2/service.proto @@ -183,9 +183,8 @@ message VerifyMessageResult { } message RecoverOrphanedTransactionCommand { - MessageQueue message_queue = 1; - Message orphaned_transactional_message = 2; - string transaction_id = 3; + Message message = 1; + string transaction_id = 2; } message Publishing {
