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 67ae9279cebcaadb18d382c117b5371b3bf5b66b Author: 凌楚 <[email protected]> AuthorDate: Mon Jul 4 17:50:56 2022 +0800 Apply IDL update --- src/main/java/apache/rocketmq/v2/Code.java | 2 + src/main/java/apache/rocketmq/v2/MQService.java | 195 +++++++++--------- .../apache/rocketmq/v2/VerifyMessageCommand.java | 218 ++------------------- .../rocketmq/v2/VerifyMessageCommandOrBuilder.java | 21 +- .../proto/apache/rocketmq/v2/definition.proto | 2 +- .../proto/apache/rocketmq/v2/service.proto | 3 +- 6 files changed, 119 insertions(+), 322 deletions(-) diff --git a/src/main/java/apache/rocketmq/v2/Code.java b/src/main/java/apache/rocketmq/v2/Code.java index d0b14c6..14fa654 100644 --- a/src/main/java/apache/rocketmq/v2/Code.java +++ b/src/main/java/apache/rocketmq/v2/Code.java @@ -318,6 +318,7 @@ public enum Code * <pre> * Generic code represents that the server, which acts as a gateway or proxy, * does not get an satisfied response in time from its upstream servers. + * See https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/504 * </pre> * * <code>PROXY_TIMEOUT = 50400;</code> @@ -685,6 +686,7 @@ public enum Code * <pre> * Generic code represents that the server, which acts as a gateway or proxy, * does not get an satisfied response in time from its upstream servers. + * See https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/504 * </pre> * * <code>PROXY_TIMEOUT = 50400;</code> diff --git a/src/main/java/apache/rocketmq/v2/MQService.java b/src/main/java/apache/rocketmq/v2/MQService.java index abf5f08..9434d98 100644 --- a/src/main/java/apache/rocketmq/v2/MQService.java +++ b/src/main/java/apache/rocketmq/v2/MQService.java @@ -261,103 +261,102 @@ public final class MQService { "e.rocketmq.v2.Status\"-\n\034PrintThreadStack" + "TraceCommand\022\r\n\005nonce\030\001 \001(\t\"Y\n\020ThreadSta" + "ckTrace\022\r\n\005nonce\030\001 \001(\t\022\037\n\022thread_stack_t" + - "race\030\002 \001(\tH\000\210\001\001B\025\n\023_thread_stack_trace\"\214" + - "\001\n\024VerifyMessageCommand\022\r\n\005nonce\030\001 \001(\t\0227" + - "\n\rmessage_queue\030\002 \001(\0132 .apache.rocketmq." + - "v2.MessageQueue\022,\n\007message\030\003 \001(\0132\033.apach" + - "e.rocketmq.v2.Message\"$\n\023VerifyMessageRe" + - "sult\022\r\n\005nonce\030\001 \001(\t\"\271\001\n!RecoverOrphanedT" + - "ransactionCommand\0227\n\rmessage_queue\030\001 \001(\013" + - "2 .apache.rocketmq.v2.MessageQueue\022C\n\036or" + - "phaned_transactional_message\030\002 \001(\0132\033.apa" + - "che.rocketmq.v2.Message\022\026\n\016transaction_i" + - "d\030\003 \001(\t\"\221\001\n\nPublishing\022,\n\006topics\030\001 \003(\0132\034" + - ".apache.rocketmq.v2.Resource\022\037\n\027compress" + - "_body_threshold\030\002 \001(\005\022\025\n\rmax_body_size\030\003" + - " \001(\005\022\035\n\025validate_message_type\030\004 \001(\010\"\263\002\n\014" + - "Subscription\0220\n\005group\030\001 \001(\0132\034.apache.roc" + - "ketmq.v2.ResourceH\000\210\001\001\022<\n\rsubscriptions\030" + - "\002 \003(\0132%.apache.rocketmq.v2.SubscriptionE" + - "ntry\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.google.protobuf.DurationH\003\210\001\001B\010" + - "\n\006_groupB\007\n\005_fifoB\025\n\023_receive_batch_size" + - "B\027\n\025_long_polling_timeout\"Y\n\006Metric\022\n\n\002o" + - "n\030\001 \001(\010\0225\n\tendpoints\030\002 \001(\0132\035.apache.rock" + - "etmq.v2.EndpointsH\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_po" + - "int\030\002 \001(\0132\035.apache.rocketmq.v2.Endpoints" + - "H\002\210\001\001\022<\n\016backoff_policy\030\003 \001(\0132\037.apache.r" + - "ocketmq.v2.RetryPolicyH\003\210\001\001\0227\n\017request_t" + - "imeout\030\004 \001(\0132\031.google.protobuf.DurationH" + - "\004\210\001\001\0224\n\npublishing\030\005 \001(\0132\036.apache.rocket" + - "mq.v2.PublishingH\000\0228\n\014subscription\030\006 \001(\013" + - "2 .apache.rocketmq.v2.SubscriptionH\000\022*\n\n" + - "user_agent\030\007 \001(\0132\026.apache.rocketmq.v2.UA" + - "\022*\n\006metric\030\010 \001(\0132\032.apache.rocketmq.v2.Me" + - "tricB\t\n\007pub_subB\016\n\014_client_typeB\017\n\r_acce" + - "ss_pointB\021\n\017_backoff_policyB\022\n\020_request_" + - "timeout\"\252\004\n\020TelemetryCommand\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.Set" + - "tingsH\000\022B\n\022thread_stack_trace\030\003 \001(\0132$.ap" + - "ache.rocketmq.v2.ThreadStackTraceH\000\022H\n\025v" + - "erify_message_result\030\004 \001(\0132\'.apache.rock" + - "etmq.v2.VerifyMessageResultH\000\022e\n$recover" + - "_orphaned_transaction_command\030\005 \001(\01325.ap" + - "ache.rocketmq.v2.RecoverOrphanedTransact" + - "ionCommandH\000\022\\\n print_thread_stack_trace" + - "_command\030\006 \001(\01320.apache.rocketmq.v2.Prin" + - "tThreadStackTraceCommandH\000\022J\n\026verify_mes" + - "sage_command\030\007 \001(\0132(.apache.rocketmq.v2." + - "VerifyMessageCommandH\000B\t\n\007commandB\t\n\007_st" + - "atus\"\\\n\036NotifyClientTerminationRequest\0220" + - "\n\005group\030\001 \001(\0132\034.apache.rocketmq.v2.Resou" + - "rceH\000\210\001\001B\010\n\006_group\"M\n\037NotifyClientTermin" + - "ationResponse\022*\n\006status\030\001 \001(\0132\032.apache.r" + - "ocketmq.v2.Status\"\335\001\n\036ChangeInvisibleDur" + - "ationRequest\022+\n\005group\030\001 \001(\0132\034.apache.roc" + - "ketmq.v2.Resource\022+\n\005topic\030\002 \001(\0132\034.apach" + - "e.rocketmq.v2.Resource\022\026\n\016receipt_handle" + - "\030\003 \001(\t\0225\n\022invisible_duration\030\004 \001(\0132\031.goo" + - "gle.protobuf.Duration\022\022\n\nmessage_id\030\005 \001(" + - "\t\"e\n\037ChangeInvisibleDurationResponse\022*\n\006" + - "status\030\001 \001(\0132\032.apache.rocketmq.v2.Status" + - "\022\026\n\016receipt_handle\030\002 \001(\t2\340\t\n\020MessagingSe" + - "rvice\022]\n\nQueryRoute\022%.apache.rocketmq.v2" + - ".QueryRouteRequest\032&.apache.rocketmq.v2." + - "QueryRouteResponse\"\000\022Z\n\tHeartbeat\022$.apac" + - "he.rocketmq.v2.HeartbeatRequest\032%.apache" + - ".rocketmq.v2.HeartbeatResponse\"\000\022`\n\013Send" + - "Message\022&.apache.rocketmq.v2.SendMessage" + - "Request\032\'.apache.rocketmq.v2.SendMessage" + - "Response\"\000\022l\n\017QueryAssignment\022*.apache.r" + - "ocketmq.v2.QueryAssignmentRequest\032+.apac" + - "he.rocketmq.v2.QueryAssignmentResponse\"\000" + - "\022k\n\016ReceiveMessage\022).apache.rocketmq.v2." + - "ReceiveMessageRequest\032*.apache.rocketmq." + - "v2.ReceiveMessageResponse\"\0000\001\022]\n\nAckMess" + - "age\022%.apache.rocketmq.v2.AckMessageReque" + - "st\032&.apache.rocketmq.v2.AckMessageRespon" + - "se\"\000\022\234\001\n\037ForwardMessageToDeadLetterQueue" + - "\022:.apache.rocketmq.v2.ForwardMessageToDe" + - "adLetterQueueRequest\032;.apache.rocketmq.v" + - "2.ForwardMessageToDeadLetterQueueRespons" + - "e\"\000\022i\n\016EndTransaction\022).apache.rocketmq." + - "v2.EndTransactionRequest\032*.apache.rocket" + - "mq.v2.EndTransactionResponse\"\000\022]\n\tTeleme" + - "try\022$.apache.rocketmq.v2.TelemetryComman" + - "d\032$.apache.rocketmq.v2.TelemetryCommand\"" + - "\000(\0010\001\022\204\001\n\027NotifyClientTermination\0222.apac" + - "he.rocketmq.v2.NotifyClientTerminationRe" + - "quest\0323.apache.rocketmq.v2.NotifyClientT" + - "erminationResponse\"\000\022\204\001\n\027ChangeInvisible" + - "Duration\0222.apache.rocketmq.v2.ChangeInvi" + - "sibleDurationRequest\0323.apache.rocketmq.v" + - "2.ChangeInvisibleDurationResponse\"\000B<\n\022a" + - "pache.rocketmq.v2B\tMQServiceP\001\240\001\001\330\001\001\252\002\022A" + - "pache.Rocketmq.V2b\006proto3" + "race\030\002 \001(\tH\000\210\001\001B\025\n\023_thread_stack_trace\"S" + + "\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\"\221\001\n\nPublis" + + "hing\022,\n\006topics\030\001 \003(\0132\034.apache.rocketmq.v" + + "2.Resource\022\037\n\027compress_body_threshold\030\002 " + + "\001(\005\022\025\n\rmax_body_size\030\003 \001(\005\022\035\n\025validate_m" + + "essage_type\030\004 \001(\010\"\263\002\n\014Subscription\0220\n\005gr" + + "oup\030\001 \001(\0132\034.apache.rocketmq.v2.ResourceH" + + "\000\210\001\001\022<\n\rsubscriptions\030\002 \003(\0132%.apache.roc" + + "ketmq.v2.SubscriptionEntry\022\021\n\004fifo\030\003 \001(\010" + + "H\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.google.pr" + + "otobuf.DurationH\003\210\001\001B\010\n\006_groupB\007\n\005_fifoB" + + "\025\n\023_receive_batch_sizeB\027\n\025_long_polling_" + + "timeout\"Y\n\006Metric\022\n\n\002on\030\001 \001(\010\0225\n\tendpoin" + + "ts\030\002 \001(\0132\035.apache.rocketmq.v2.EndpointsH" + + "\000\210\001\001B\014\n\n_endpoints\"\220\004\n\010Settings\0228\n\013clien" + + "t_type\030\001 \001(\0162\036.apache.rocketmq.v2.Client" + + "TypeH\001\210\001\001\0228\n\014access_point\030\002 \001(\0132\035.apache" + + ".rocketmq.v2.EndpointsH\002\210\001\001\022<\n\016backoff_p" + + "olicy\030\003 \001(\0132\037.apache.rocketmq.v2.RetryPo" + + "licyH\003\210\001\001\0227\n\017request_timeout\030\004 \001(\0132\031.goo" + + "gle.protobuf.DurationH\004\210\001\001\0224\n\npublishing" + + "\030\005 \001(\0132\036.apache.rocketmq.v2.PublishingH\000" + + "\0228\n\014subscription\030\006 \001(\0132 .apache.rocketmq" + + ".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_backo" + + "ff_policyB\022\n\020_request_timeout\"\252\004\n\020Teleme" + + "tryCommand\022/\n\006status\030\001 \001(\0132\032.apache.rock" + + "etmq.v2.StatusH\001\210\001\001\0220\n\010settings\030\002 \001(\0132\034." + + "apache.rocketmq.v2.SettingsH\000\022B\n\022thread_" + + "stack_trace\030\003 \001(\0132$.apache.rocketmq.v2.T" + + "hreadStackTraceH\000\022H\n\025verify_message_resu" + + "lt\030\004 \001(\0132\'.apache.rocketmq.v2.VerifyMess" + + "ageResultH\000\022e\n$recover_orphaned_transact" + + "ion_command\030\005 \001(\01325.apache.rocketmq.v2.R" + + "ecoverOrphanedTransactionCommandH\000\022\\\n pr" + + "int_thread_stack_trace_command\030\006 \001(\01320.a" + + "pache.rocketmq.v2.PrintThreadStackTraceC" + + "ommandH\000\022J\n\026verify_message_command\030\007 \001(\013" + + "2(.apache.rocketmq.v2.VerifyMessageComma" + + "ndH\000B\t\n\007commandB\t\n\007_status\"\\\n\036NotifyClie" + + "ntTerminationRequest\0220\n\005group\030\001 \001(\0132\034.ap" + + "ache.rocketmq.v2.ResourceH\000\210\001\001B\010\n\006_group" + + "\"M\n\037NotifyClientTerminationResponse\022*\n\006s" + + "tatus\030\001 \001(\0132\032.apache.rocketmq.v2.Status\"" + + "\335\001\n\036ChangeInvisibleDurationRequest\022+\n\005gr" + + "oup\030\001 \001(\0132\034.apache.rocketmq.v2.Resource\022" + + "+\n\005topic\030\002 \001(\0132\034.apache.rocketmq.v2.Reso" + + "urce\022\026\n\016receipt_handle\030\003 \001(\t\0225\n\022invisibl" + + "e_duration\030\004 \001(\0132\031.google.protobuf.Durat" + + "ion\022\022\n\nmessage_id\030\005 \001(\t\"e\n\037ChangeInvisib" + + "leDurationResponse\022*\n\006status\030\001 \001(\0132\032.apa" + + "che.rocketmq.v2.Status\022\026\n\016receipt_handle" + + "\030\002 \001(\t2\340\t\n\020MessagingService\022]\n\nQueryRout" + + "e\022%.apache.rocketmq.v2.QueryRouteRequest" + + "\032&.apache.rocketmq.v2.QueryRouteResponse" + + "\"\000\022Z\n\tHeartbeat\022$.apache.rocketmq.v2.Hea" + + "rtbeatRequest\032%.apache.rocketmq.v2.Heart" + + "beatResponse\"\000\022`\n\013SendMessage\022&.apache.r" + + "ocketmq.v2.SendMessageRequest\032\'.apache.r" + + "ocketmq.v2.SendMessageResponse\"\000\022l\n\017Quer" + + "yAssignment\022*.apache.rocketmq.v2.QueryAs" + + "signmentRequest\032+.apache.rocketmq.v2.Que" + + "ryAssignmentResponse\"\000\022k\n\016ReceiveMessage" + + "\022).apache.rocketmq.v2.ReceiveMessageRequ" + + "est\032*.apache.rocketmq.v2.ReceiveMessageR" + + "esponse\"\0000\001\022]\n\nAckMessage\022%.apache.rocke" + + "tmq.v2.AckMessageRequest\032&.apache.rocket" + + "mq.v2.AckMessageResponse\"\000\022\234\001\n\037ForwardMe" + + "ssageToDeadLetterQueue\022:.apache.rocketmq" + + ".v2.ForwardMessageToDeadLetterQueueReque" + + "st\032;.apache.rocketmq.v2.ForwardMessageTo" + + "DeadLetterQueueResponse\"\000\022i\n\016EndTransact" + + "ion\022).apache.rocketmq.v2.EndTransactionR" + + "equest\032*.apache.rocketmq.v2.EndTransacti" + + "onResponse\"\000\022]\n\tTelemetry\022$.apache.rocke" + + "tmq.v2.TelemetryCommand\032$.apache.rocketm" + + "q.v2.TelemetryCommand\"\000(\0010\001\022\204\001\n\027NotifyCl" + + "ientTermination\0222.apache.rocketmq.v2.Not" + + "ifyClientTerminationRequest\0323.apache.roc" + + "ketmq.v2.NotifyClientTerminationResponse" + + "\"\000\022\204\001\n\027ChangeInvisibleDuration\0222.apache." + + "rocketmq.v2.ChangeInvisibleDurationReque" + + "st\0323.apache.rocketmq.v2.ChangeInvisibleD" + + "urationResponse\"\000B<\n\022apache.rocketmq.v2B" + + "\tMQServiceP\001\240\001\001\330\001\001\252\002\022Apache.Rocketmq.V2b" + + "\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -497,7 +496,7 @@ public final class MQService { internal_static_apache_rocketmq_v2_VerifyMessageCommand_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_apache_rocketmq_v2_VerifyMessageCommand_descriptor, - new java.lang.String[] { "Nonce", "MessageQueue", "Message", }); + new java.lang.String[] { "Nonce", "Message", }); internal_static_apache_rocketmq_v2_VerifyMessageResult_descriptor = getDescriptor().getMessageTypes().get(22); internal_static_apache_rocketmq_v2_VerifyMessageResult_fieldAccessorTable = new diff --git a/src/main/java/apache/rocketmq/v2/VerifyMessageCommand.java b/src/main/java/apache/rocketmq/v2/VerifyMessageCommand.java index 0154aa6..2fece70 100644 --- a/src/main/java/apache/rocketmq/v2/VerifyMessageCommand.java +++ b/src/main/java/apache/rocketmq/v2/VerifyMessageCommand.java @@ -56,19 +56,6 @@ private static final long serialVersionUID = 0L; break; } case 18: { - 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 26: { apache.rocketmq.v2.Message.Builder subBuilder = null; if (message_ != null) { subBuilder = message_.toBuilder(); @@ -151,36 +138,10 @@ private static final long serialVersionUID = 0L; } } - public static final int MESSAGE_QUEUE_FIELD_NUMBER = 2; - private apache.rocketmq.v2.MessageQueue messageQueue_; - /** - * <code>.apache.rocketmq.v2.MessageQueue message_queue = 2;</code> - * @return Whether the messageQueue field is set. - */ - @java.lang.Override - public boolean hasMessageQueue() { - return messageQueue_ != null; - } - /** - * <code>.apache.rocketmq.v2.MessageQueue message_queue = 2;</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 = 2;</code> - */ - @java.lang.Override - public apache.rocketmq.v2.MessageQueueOrBuilder getMessageQueueOrBuilder() { - return getMessageQueue(); - } - - public static final int MESSAGE_FIELD_NUMBER = 3; + public static final int MESSAGE_FIELD_NUMBER = 2; private apache.rocketmq.v2.Message message_; /** - * <code>.apache.rocketmq.v2.Message message = 3;</code> + * <code>.apache.rocketmq.v2.Message message = 2;</code> * @return Whether the message field is set. */ @java.lang.Override @@ -188,7 +149,7 @@ private static final long serialVersionUID = 0L; return message_ != null; } /** - * <code>.apache.rocketmq.v2.Message message = 3;</code> + * <code>.apache.rocketmq.v2.Message message = 2;</code> * @return The message. */ @java.lang.Override @@ -196,7 +157,7 @@ private static final long serialVersionUID = 0L; return message_ == null ? apache.rocketmq.v2.Message.getDefaultInstance() : message_; } /** - * <code>.apache.rocketmq.v2.Message message = 3;</code> + * <code>.apache.rocketmq.v2.Message message = 2;</code> */ @java.lang.Override public apache.rocketmq.v2.MessageOrBuilder getMessageOrBuilder() { @@ -220,11 +181,8 @@ private static final long serialVersionUID = 0L; if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nonce_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, nonce_); } - if (messageQueue_ != null) { - output.writeMessage(2, getMessageQueue()); - } if (message_ != null) { - output.writeMessage(3, getMessage()); + output.writeMessage(2, getMessage()); } unknownFields.writeTo(output); } @@ -238,13 +196,9 @@ private static final long serialVersionUID = 0L; if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nonce_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, nonce_); } - if (messageQueue_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, getMessageQueue()); - } if (message_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, getMessage()); + .computeMessageSize(2, getMessage()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -263,11 +217,6 @@ private static final long serialVersionUID = 0L; if (!getNonce() .equals(other.getNonce())) return false; - if (hasMessageQueue() != other.hasMessageQueue()) return false; - if (hasMessageQueue()) { - if (!getMessageQueue() - .equals(other.getMessageQueue())) return false; - } if (hasMessage() != other.hasMessage()) return false; if (hasMessage()) { if (!getMessage() @@ -286,10 +235,6 @@ private static final long serialVersionUID = 0L; hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + NONCE_FIELD_NUMBER; hash = (53 * hash) + getNonce().hashCode(); - if (hasMessageQueue()) { - hash = (37 * hash) + MESSAGE_QUEUE_FIELD_NUMBER; - hash = (53 * hash) + getMessageQueue().hashCode(); - } if (hasMessage()) { hash = (37 * hash) + MESSAGE_FIELD_NUMBER; hash = (53 * hash) + getMessage().hashCode(); @@ -429,12 +374,6 @@ private static final long serialVersionUID = 0L; super.clear(); nonce_ = ""; - if (messageQueueBuilder_ == null) { - messageQueue_ = null; - } else { - messageQueue_ = null; - messageQueueBuilder_ = null; - } if (messageBuilder_ == null) { message_ = null; } else { @@ -468,11 +407,6 @@ private static final long serialVersionUID = 0L; public apache.rocketmq.v2.VerifyMessageCommand buildPartial() { apache.rocketmq.v2.VerifyMessageCommand result = new apache.rocketmq.v2.VerifyMessageCommand(this); result.nonce_ = nonce_; - if (messageQueueBuilder_ == null) { - result.messageQueue_ = messageQueue_; - } else { - result.messageQueue_ = messageQueueBuilder_.build(); - } if (messageBuilder_ == null) { result.message_ = message_; } else { @@ -530,9 +464,6 @@ private static final long serialVersionUID = 0L; nonce_ = other.nonce_; onChanged(); } - if (other.hasMessageQueue()) { - mergeMessageQueue(other.getMessageQueue()); - } if (other.hasMessage()) { mergeMessage(other.getMessage()); } @@ -641,137 +572,18 @@ 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 = 2;</code> - * @return Whether the messageQueue field is set. - */ - public boolean hasMessageQueue() { - return messageQueueBuilder_ != null || messageQueue_ != null; - } - /** - * <code>.apache.rocketmq.v2.MessageQueue message_queue = 2;</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 = 2;</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 = 2;</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 = 2;</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 = 2;</code> - */ - public Builder clearMessageQueue() { - if (messageQueueBuilder_ == null) { - messageQueue_ = null; - onChanged(); - } else { - messageQueue_ = null; - messageQueueBuilder_ = null; - } - - return this; - } - /** - * <code>.apache.rocketmq.v2.MessageQueue message_queue = 2;</code> - */ - public apache.rocketmq.v2.MessageQueue.Builder getMessageQueueBuilder() { - - onChanged(); - return getMessageQueueFieldBuilder().getBuilder(); - } - /** - * <code>.apache.rocketmq.v2.MessageQueue message_queue = 2;</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 = 2;</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 message_; private com.google.protobuf.SingleFieldBuilderV3< apache.rocketmq.v2.Message, apache.rocketmq.v2.Message.Builder, apache.rocketmq.v2.MessageOrBuilder> messageBuilder_; /** - * <code>.apache.rocketmq.v2.Message message = 3;</code> + * <code>.apache.rocketmq.v2.Message message = 2;</code> * @return Whether the message field is set. */ public boolean hasMessage() { return messageBuilder_ != null || message_ != null; } /** - * <code>.apache.rocketmq.v2.Message message = 3;</code> + * <code>.apache.rocketmq.v2.Message message = 2;</code> * @return The message. */ public apache.rocketmq.v2.Message getMessage() { @@ -782,7 +594,7 @@ private static final long serialVersionUID = 0L; } } /** - * <code>.apache.rocketmq.v2.Message message = 3;</code> + * <code>.apache.rocketmq.v2.Message message = 2;</code> */ public Builder setMessage(apache.rocketmq.v2.Message value) { if (messageBuilder_ == null) { @@ -798,7 +610,7 @@ private static final long serialVersionUID = 0L; return this; } /** - * <code>.apache.rocketmq.v2.Message message = 3;</code> + * <code>.apache.rocketmq.v2.Message message = 2;</code> */ public Builder setMessage( apache.rocketmq.v2.Message.Builder builderForValue) { @@ -812,7 +624,7 @@ private static final long serialVersionUID = 0L; return this; } /** - * <code>.apache.rocketmq.v2.Message message = 3;</code> + * <code>.apache.rocketmq.v2.Message message = 2;</code> */ public Builder mergeMessage(apache.rocketmq.v2.Message value) { if (messageBuilder_ == null) { @@ -830,7 +642,7 @@ private static final long serialVersionUID = 0L; return this; } /** - * <code>.apache.rocketmq.v2.Message message = 3;</code> + * <code>.apache.rocketmq.v2.Message message = 2;</code> */ public Builder clearMessage() { if (messageBuilder_ == null) { @@ -844,7 +656,7 @@ private static final long serialVersionUID = 0L; return this; } /** - * <code>.apache.rocketmq.v2.Message message = 3;</code> + * <code>.apache.rocketmq.v2.Message message = 2;</code> */ public apache.rocketmq.v2.Message.Builder getMessageBuilder() { @@ -852,7 +664,7 @@ private static final long serialVersionUID = 0L; return getMessageFieldBuilder().getBuilder(); } /** - * <code>.apache.rocketmq.v2.Message message = 3;</code> + * <code>.apache.rocketmq.v2.Message message = 2;</code> */ public apache.rocketmq.v2.MessageOrBuilder getMessageOrBuilder() { if (messageBuilder_ != null) { @@ -863,7 +675,7 @@ private static final long serialVersionUID = 0L; } } /** - * <code>.apache.rocketmq.v2.Message message = 3;</code> + * <code>.apache.rocketmq.v2.Message message = 2;</code> */ private com.google.protobuf.SingleFieldBuilderV3< apache.rocketmq.v2.Message, apache.rocketmq.v2.Message.Builder, apache.rocketmq.v2.MessageOrBuilder> diff --git a/src/main/java/apache/rocketmq/v2/VerifyMessageCommandOrBuilder.java b/src/main/java/apache/rocketmq/v2/VerifyMessageCommandOrBuilder.java index 3cc3f30..2188f8f 100644 --- a/src/main/java/apache/rocketmq/v2/VerifyMessageCommandOrBuilder.java +++ b/src/main/java/apache/rocketmq/v2/VerifyMessageCommandOrBuilder.java @@ -20,32 +20,17 @@ public interface VerifyMessageCommandOrBuilder extends getNonceBytes(); /** - * <code>.apache.rocketmq.v2.MessageQueue message_queue = 2;</code> - * @return Whether the messageQueue field is set. - */ - boolean hasMessageQueue(); - /** - * <code>.apache.rocketmq.v2.MessageQueue message_queue = 2;</code> - * @return The messageQueue. - */ - apache.rocketmq.v2.MessageQueue getMessageQueue(); - /** - * <code>.apache.rocketmq.v2.MessageQueue message_queue = 2;</code> - */ - apache.rocketmq.v2.MessageQueueOrBuilder getMessageQueueOrBuilder(); - - /** - * <code>.apache.rocketmq.v2.Message message = 3;</code> + * <code>.apache.rocketmq.v2.Message message = 2;</code> * @return Whether the message field is set. */ boolean hasMessage(); /** - * <code>.apache.rocketmq.v2.Message message = 3;</code> + * <code>.apache.rocketmq.v2.Message message = 2;</code> * @return The message. */ apache.rocketmq.v2.Message getMessage(); /** - * <code>.apache.rocketmq.v2.Message message = 3;</code> + * <code>.apache.rocketmq.v2.Message message = 2;</code> */ apache.rocketmq.v2.MessageOrBuilder getMessageOrBuilder(); } diff --git a/src/main/resources/proto/apache/rocketmq/v2/definition.proto b/src/main/resources/proto/apache/rocketmq/v2/definition.proto index eb15edf..5fac48f 100644 --- a/src/main/resources/proto/apache/rocketmq/v2/definition.proto +++ b/src/main/resources/proto/apache/rocketmq/v2/definition.proto @@ -358,7 +358,6 @@ enum Code { // Generic code represents that the request entity is larger than limits defined by server. PAYLOAD_TOO_LARGE = 41300; - // Message body size exceeds the threshold. MESSAGE_BODY_TOO_LARGE = 41301; @@ -399,6 +398,7 @@ enum Code { // Generic code represents that the server, which acts as a gateway or proxy, // does not get an satisfied response in time from its upstream servers. + // See https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/504 PROXY_TIMEOUT = 50400; // Message persistence timeout. MASTER_PERSISTENCE_TIMEOUT = 50401; diff --git a/src/main/resources/proto/apache/rocketmq/v2/service.proto b/src/main/resources/proto/apache/rocketmq/v2/service.proto index 3014c93..1624654 100644 --- a/src/main/resources/proto/apache/rocketmq/v2/service.proto +++ b/src/main/resources/proto/apache/rocketmq/v2/service.proto @@ -175,8 +175,7 @@ message ThreadStackTrace { message VerifyMessageCommand { string nonce = 1; - MessageQueue message_queue = 2; - Message message = 3; + Message message = 2; } message VerifyMessageResult {
