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/15 03:28:01 UTC

[rocketmq-apis] 28/38: Apply IDL update

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 898d5d73659a3a5eeb0572969bbe30476e4dd553
Author: 凌楚 <ya...@alibaba-inc.com>
AuthorDate: Tue Jun 28 14:31:31 2022 +0800

    Apply IDL update
---
 pom.xml                                            |  10 +-
 src/main/java/apache/rocketmq/v2/Code.java         | 185 ++++++++-------------
 src/main/java/apache/rocketmq/v2/MQDomain.java     |  38 ++---
 .../proto/apache/rocketmq/v2/definition.proto      |  37 ++---
 4 files changed, 104 insertions(+), 166 deletions(-)

diff --git a/pom.xml b/pom.xml
index 556a464..2cac10c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,8 +9,7 @@
     <version>2.0.0-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.release>8</maven.compiler.release>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -18,6 +17,8 @@
         <grpc.version>1.45.0</grpc.version>
         <protobuf.version>3.19.4</protobuf.version>
         <annotation-api.version>1.3.2</annotation-api.version>
+
+        <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
         <protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
         <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
         <os-maven-plugin.version>1.6.2</os-maven-plugin.version>
@@ -78,6 +79,11 @@
             </activation>
             <build>
                 <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <version>${maven-compiler-plugin.version}</version>
+                    </plugin>
                     <plugin>
                         <groupId>org.xolstice.maven.plugins</groupId>
                         <artifactId>protobuf-maven-plugin</artifactId>
diff --git a/src/main/java/apache/rocketmq/v2/Code.java b/src/main/java/apache/rocketmq/v2/Code.java
index b72db85..198bc79 100644
--- a/src/main/java/apache/rocketmq/v2/Code.java
+++ b/src/main/java/apache/rocketmq/v2/Code.java
@@ -166,128 +166,102 @@ public enum Code
    * <code>TOO_MANY_REQUESTS = 18;</code>
    */
   TOO_MANY_REQUESTS(18),
-  /**
-   * <pre>
-   * Expired receipt-handle is used when trying to acknowledge or change
-   * invisible duration of a message
-   * </pre>
-   *
-   * <code>RECEIPT_HANDLE_EXPIRED = 19;</code>
-   */
-  RECEIPT_HANDLE_EXPIRED(19),
   /**
    * <pre>
    * Message property is not match the message type.
    * </pre>
    *
-   * <code>MESSAGE_PROPERTY_DOES_NOT_MATCH_MESSAGE_TYPE = 20;</code>
+   * <code>MESSAGE_PROPERTY_DOES_NOT_MATCH_MESSAGE_TYPE = 19;</code>
    */
-  MESSAGE_PROPERTY_DOES_NOT_MATCH_MESSAGE_TYPE(20),
+  MESSAGE_PROPERTY_DOES_NOT_MATCH_MESSAGE_TYPE(19),
   /**
    * <pre>
    * Format of message id is illegal.
    * </pre>
    *
-   * <code>ILLEGAL_MESSAGE_ID = 21;</code>
+   * <code>ILLEGAL_MESSAGE_ID = 20;</code>
    */
-  ILLEGAL_MESSAGE_ID(21),
+  ILLEGAL_MESSAGE_ID(20),
   /**
    * <pre>
    * Transaction id is invalid.
    * </pre>
    *
-   * <code>INVALID_TRANSACTION_ID = 22;</code>
+   * <code>INVALID_TRANSACTION_ID = 21;</code>
    */
-  INVALID_TRANSACTION_ID(22),
+  INVALID_TRANSACTION_ID(21),
   /**
    * <pre>
    * Format of filter expression is illegal.
    * </pre>
    *
-   * <code>ILLEGAL_FILTER_EXPRESSION = 23;</code>
+   * <code>ILLEGAL_FILTER_EXPRESSION = 22;</code>
    */
-  ILLEGAL_FILTER_EXPRESSION(23),
+  ILLEGAL_FILTER_EXPRESSION(22),
   /**
    * <pre>
    * Receipt handle of message is invalid.
    * </pre>
    *
-   * <code>INVALID_RECEIPT_HANDLE = 24;</code>
+   * <code>INVALID_RECEIPT_HANDLE = 23;</code>
    */
-  INVALID_RECEIPT_HANDLE(24),
+  INVALID_RECEIPT_HANDLE(23),
   /**
    * <pre>
    * Message persistence timeout.
    * </pre>
    *
-   * <code>MASTER_PERSISTENCE_TIMEOUT = 25;</code>
+   * <code>MASTER_PERSISTENCE_TIMEOUT = 24;</code>
    */
-  MASTER_PERSISTENCE_TIMEOUT(25),
+  MASTER_PERSISTENCE_TIMEOUT(24),
   /**
    * <pre>
    * Slave persistence timeout.
    * </pre>
    *
-   * <code>SLAVE_PERSISTENCE_TIMEOUT = 26;</code>
+   * <code>SLAVE_PERSISTENCE_TIMEOUT = 25;</code>
    */
-  SLAVE_PERSISTENCE_TIMEOUT(26),
+  SLAVE_PERSISTENCE_TIMEOUT(25),
   /**
    * <pre>
    * The HA-mechanism is not working now.
    * </pre>
    *
-   * <code>HA_NOT_AVAILABLE = 27;</code>
+   * <code>HA_NOT_AVAILABLE = 26;</code>
    */
-  HA_NOT_AVAILABLE(27),
+  HA_NOT_AVAILABLE(26),
   /**
    * <pre>
    * Operation is not allowed in current version.
    * </pre>
    *
-   * <code>VERSION_UNSUPPORTED = 28;</code>
+   * <code>VERSION_UNSUPPORTED = 27;</code>
    */
-  VERSION_UNSUPPORTED(28),
+  VERSION_UNSUPPORTED(27),
   /**
    * <pre>
    * Message not found from server.
    * </pre>
    *
-   * <code>MESSAGE_NOT_FOUND = 29;</code>
-   */
-  MESSAGE_NOT_FOUND(29),
-  /**
-   * <pre>
-   * Message offset is illegal.
-   * </pre>
-   *
-   * <code>ILLEGAL_MESSAGE_OFFSET = 30;</code>
-   */
-  ILLEGAL_MESSAGE_OFFSET(30),
-  /**
-   * <pre>
-   * Illegal message is for the sake of backward compatibility. In most case,
-   * more definitive code is better, e.g. `ILLEGAL_MESSAGE_TAG`.
-   * </pre>
-   *
-   * <code>ILLEGAL_MESSAGE = 31;</code>
+   * <code>MESSAGE_NOT_FOUND = 28;</code>
    */
-  ILLEGAL_MESSAGE(31),
+  MESSAGE_NOT_FOUND(28),
   /**
    * <pre>
    * Client type could not be recognized.
    * </pre>
    *
-   * <code>UNRECOGNIZED_CLIENT_TYPE = 32;</code>
+   * <code>UNRECOGNIZED_CLIENT_TYPE = 29;</code>
    */
-  UNRECOGNIZED_CLIENT_TYPE(32),
+  UNRECOGNIZED_CLIENT_TYPE(29),
   /**
    * <pre>
    * Return different results for entries in composite request.
    * </pre>
    *
-   * <code>MULTIPLE_RESULTS = 33;</code>
+   * <code>MULTIPLE_RESULTS = 30;</code>
    */
-  MULTIPLE_RESULTS(33),
+  MULTIPLE_RESULTS(30),
   /**
    * <pre>
    * Generic code for bad request, indicating that required fields or headers are missing.
@@ -336,9 +310,9 @@ public enum Code
    * See https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/504
    * </pre>
    *
-   * <code>GATEWAY_TIMEOUT = 504;</code>
+   * <code>PROXY_TIMEOUT = 504;</code>
    */
-  GATEWAY_TIMEOUT(504),
+  PROXY_TIMEOUT(504),
   UNRECOGNIZED(-1),
   ;
 
@@ -500,128 +474,102 @@ public enum Code
    * <code>TOO_MANY_REQUESTS = 18;</code>
    */
   public static final int TOO_MANY_REQUESTS_VALUE = 18;
-  /**
-   * <pre>
-   * Expired receipt-handle is used when trying to acknowledge or change
-   * invisible duration of a message
-   * </pre>
-   *
-   * <code>RECEIPT_HANDLE_EXPIRED = 19;</code>
-   */
-  public static final int RECEIPT_HANDLE_EXPIRED_VALUE = 19;
   /**
    * <pre>
    * Message property is not match the message type.
    * </pre>
    *
-   * <code>MESSAGE_PROPERTY_DOES_NOT_MATCH_MESSAGE_TYPE = 20;</code>
+   * <code>MESSAGE_PROPERTY_DOES_NOT_MATCH_MESSAGE_TYPE = 19;</code>
    */
-  public static final int MESSAGE_PROPERTY_DOES_NOT_MATCH_MESSAGE_TYPE_VALUE = 20;
+  public static final int MESSAGE_PROPERTY_DOES_NOT_MATCH_MESSAGE_TYPE_VALUE = 19;
   /**
    * <pre>
    * Format of message id is illegal.
    * </pre>
    *
-   * <code>ILLEGAL_MESSAGE_ID = 21;</code>
+   * <code>ILLEGAL_MESSAGE_ID = 20;</code>
    */
-  public static final int ILLEGAL_MESSAGE_ID_VALUE = 21;
+  public static final int ILLEGAL_MESSAGE_ID_VALUE = 20;
   /**
    * <pre>
    * Transaction id is invalid.
    * </pre>
    *
-   * <code>INVALID_TRANSACTION_ID = 22;</code>
+   * <code>INVALID_TRANSACTION_ID = 21;</code>
    */
-  public static final int INVALID_TRANSACTION_ID_VALUE = 22;
+  public static final int INVALID_TRANSACTION_ID_VALUE = 21;
   /**
    * <pre>
    * Format of filter expression is illegal.
    * </pre>
    *
-   * <code>ILLEGAL_FILTER_EXPRESSION = 23;</code>
+   * <code>ILLEGAL_FILTER_EXPRESSION = 22;</code>
    */
-  public static final int ILLEGAL_FILTER_EXPRESSION_VALUE = 23;
+  public static final int ILLEGAL_FILTER_EXPRESSION_VALUE = 22;
   /**
    * <pre>
    * Receipt handle of message is invalid.
    * </pre>
    *
-   * <code>INVALID_RECEIPT_HANDLE = 24;</code>
+   * <code>INVALID_RECEIPT_HANDLE = 23;</code>
    */
-  public static final int INVALID_RECEIPT_HANDLE_VALUE = 24;
+  public static final int INVALID_RECEIPT_HANDLE_VALUE = 23;
   /**
    * <pre>
    * Message persistence timeout.
    * </pre>
    *
-   * <code>MASTER_PERSISTENCE_TIMEOUT = 25;</code>
+   * <code>MASTER_PERSISTENCE_TIMEOUT = 24;</code>
    */
-  public static final int MASTER_PERSISTENCE_TIMEOUT_VALUE = 25;
+  public static final int MASTER_PERSISTENCE_TIMEOUT_VALUE = 24;
   /**
    * <pre>
    * Slave persistence timeout.
    * </pre>
    *
-   * <code>SLAVE_PERSISTENCE_TIMEOUT = 26;</code>
+   * <code>SLAVE_PERSISTENCE_TIMEOUT = 25;</code>
    */
-  public static final int SLAVE_PERSISTENCE_TIMEOUT_VALUE = 26;
+  public static final int SLAVE_PERSISTENCE_TIMEOUT_VALUE = 25;
   /**
    * <pre>
    * The HA-mechanism is not working now.
    * </pre>
    *
-   * <code>HA_NOT_AVAILABLE = 27;</code>
+   * <code>HA_NOT_AVAILABLE = 26;</code>
    */
-  public static final int HA_NOT_AVAILABLE_VALUE = 27;
+  public static final int HA_NOT_AVAILABLE_VALUE = 26;
   /**
    * <pre>
    * Operation is not allowed in current version.
    * </pre>
    *
-   * <code>VERSION_UNSUPPORTED = 28;</code>
+   * <code>VERSION_UNSUPPORTED = 27;</code>
    */
-  public static final int VERSION_UNSUPPORTED_VALUE = 28;
+  public static final int VERSION_UNSUPPORTED_VALUE = 27;
   /**
    * <pre>
    * Message not found from server.
    * </pre>
    *
-   * <code>MESSAGE_NOT_FOUND = 29;</code>
-   */
-  public static final int MESSAGE_NOT_FOUND_VALUE = 29;
-  /**
-   * <pre>
-   * Message offset is illegal.
-   * </pre>
-   *
-   * <code>ILLEGAL_MESSAGE_OFFSET = 30;</code>
-   */
-  public static final int ILLEGAL_MESSAGE_OFFSET_VALUE = 30;
-  /**
-   * <pre>
-   * Illegal message is for the sake of backward compatibility. In most case,
-   * more definitive code is better, e.g. `ILLEGAL_MESSAGE_TAG`.
-   * </pre>
-   *
-   * <code>ILLEGAL_MESSAGE = 31;</code>
+   * <code>MESSAGE_NOT_FOUND = 28;</code>
    */
-  public static final int ILLEGAL_MESSAGE_VALUE = 31;
+  public static final int MESSAGE_NOT_FOUND_VALUE = 28;
   /**
    * <pre>
    * Client type could not be recognized.
    * </pre>
    *
-   * <code>UNRECOGNIZED_CLIENT_TYPE = 32;</code>
+   * <code>UNRECOGNIZED_CLIENT_TYPE = 29;</code>
    */
-  public static final int UNRECOGNIZED_CLIENT_TYPE_VALUE = 32;
+  public static final int UNRECOGNIZED_CLIENT_TYPE_VALUE = 29;
   /**
    * <pre>
    * Return different results for entries in composite request.
    * </pre>
    *
-   * <code>MULTIPLE_RESULTS = 33;</code>
+   * <code>MULTIPLE_RESULTS = 30;</code>
    */
-  public static final int MULTIPLE_RESULTS_VALUE = 33;
+  public static final int MULTIPLE_RESULTS_VALUE = 30;
   /**
    * <pre>
    * Generic code for bad request, indicating that required fields or headers are missing.
@@ -670,9 +618,9 @@ public enum Code
    * See https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/504
    * </pre>
    *
-   * <code>GATEWAY_TIMEOUT = 504;</code>
+   * <code>PROXY_TIMEOUT = 504;</code>
    */
-  public static final int GATEWAY_TIMEOUT_VALUE = 504;
+  public static final int PROXY_TIMEOUT_VALUE = 504;
 
 
   public final int getNumber() {
@@ -718,26 +666,23 @@ public enum Code
       case 16: return FAILED_TO_CONSUME_MESSAGE;
       case 17: return MESSAGE_CORRUPTED;
       case 18: return TOO_MANY_REQUESTS;
-      case 19: return RECEIPT_HANDLE_EXPIRED;
-      case 20: return MESSAGE_PROPERTY_DOES_NOT_MATCH_MESSAGE_TYPE;
-      case 21: return ILLEGAL_MESSAGE_ID;
-      case 22: return INVALID_TRANSACTION_ID;
-      case 23: return ILLEGAL_FILTER_EXPRESSION;
-      case 24: return INVALID_RECEIPT_HANDLE;
-      case 25: return MASTER_PERSISTENCE_TIMEOUT;
-      case 26: return SLAVE_PERSISTENCE_TIMEOUT;
-      case 27: return HA_NOT_AVAILABLE;
-      case 28: return VERSION_UNSUPPORTED;
-      case 29: return MESSAGE_NOT_FOUND;
-      case 30: return ILLEGAL_MESSAGE_OFFSET;
-      case 31: return ILLEGAL_MESSAGE;
-      case 32: return UNRECOGNIZED_CLIENT_TYPE;
-      case 33: return MULTIPLE_RESULTS;
+      case 19: return MESSAGE_PROPERTY_DOES_NOT_MATCH_MESSAGE_TYPE;
+      case 20: return ILLEGAL_MESSAGE_ID;
+      case 21: return INVALID_TRANSACTION_ID;
+      case 22: return ILLEGAL_FILTER_EXPRESSION;
+      case 23: return INVALID_RECEIPT_HANDLE;
+      case 24: return MASTER_PERSISTENCE_TIMEOUT;
+      case 25: return SLAVE_PERSISTENCE_TIMEOUT;
+      case 26: return HA_NOT_AVAILABLE;
+      case 27: return VERSION_UNSUPPORTED;
+      case 28: return MESSAGE_NOT_FOUND;
+      case 29: return UNRECOGNIZED_CLIENT_TYPE;
+      case 30: return MULTIPLE_RESULTS;
       case 400: return BAD_REQUEST;
       case 400001: return BAD_REQUEST_CLIENT_ID;
       case 500: return INTERNAL_SERVER_ERROR;
       case 501: return NOT_IMPLEMENTED;
-      case 504: return GATEWAY_TIMEOUT;
+      case 504: return PROXY_TIMEOUT;
       default: return null;
     }
   }
diff --git a/src/main/java/apache/rocketmq/v2/MQDomain.java b/src/main/java/apache/rocketmq/v2/MQDomain.java
index 7752414..4d185b8 100644
--- a/src/main/java/apache/rocketmq/v2/MQDomain.java
+++ b/src/main/java/apache/rocketmq/v2/MQDomain.java
@@ -195,7 +195,7 @@ public final class MQDomain {
       "entType\022\033\n\027CLIENT_TYPE_UNSPECIFIED\020\000\022\014\n\010" +
       "PRODUCER\020\001\022\021\n\rPUSH_CONSUMER\020\002\022\023\n\017SIMPLE_" +
       "CONSUMER\020\003*<\n\010Encoding\022\030\n\024ENCODING_UNSPE" +
-      "CIFIED\020\000\022\014\n\010IDENTITY\020\001\022\010\n\004GZIP\020\002*\377\007\n\004Cod" +
+      "CIFIED\020\000\022\014\n\010IDENTITY\020\001\022\010\n\004GZIP\020\002*\260\007\n\004Cod" +
       "e\022\006\n\002OK\020\000\022\030\n\024ILLEGAL_ACCESS_POINT\020\001\022\021\n\rI" +
       "LLEGAL_TOPIC\020\002\022\032\n\026ILLEGAL_CONSUMER_GROUP" +
       "\020\003\022\027\n\023ILLEGAL_MESSAGE_TAG\020\004\022\027\n\023ILLEGAL_M" +
@@ -207,25 +207,23 @@ public final class MQDomain {
       "\n\017TOPIC_NOT_FOUND\020\r\022\034\n\030CONSUMER_GROUP_NO" +
       "T_FOUND\020\016\022\034\n\030VERIFY_MESSAGE_FORBIDDEN\020\017\022" +
       "\035\n\031FAILED_TO_CONSUME_MESSAGE\020\020\022\025\n\021MESSAG" +
-      "E_CORRUPTED\020\021\022\025\n\021TOO_MANY_REQUESTS\020\022\022\032\n\026" +
-      "RECEIPT_HANDLE_EXPIRED\020\023\0220\n,MESSAGE_PROP" +
-      "ERTY_DOES_NOT_MATCH_MESSAGE_TYPE\020\024\022\026\n\022IL" +
-      "LEGAL_MESSAGE_ID\020\025\022\032\n\026INVALID_TRANSACTIO" +
-      "N_ID\020\026\022\035\n\031ILLEGAL_FILTER_EXPRESSION\020\027\022\032\n" +
-      "\026INVALID_RECEIPT_HANDLE\020\030\022\036\n\032MASTER_PERS" +
-      "ISTENCE_TIMEOUT\020\031\022\035\n\031SLAVE_PERSISTENCE_T" +
-      "IMEOUT\020\032\022\024\n\020HA_NOT_AVAILABLE\020\033\022\027\n\023VERSIO" +
-      "N_UNSUPPORTED\020\034\022\025\n\021MESSAGE_NOT_FOUND\020\035\022\032" +
-      "\n\026ILLEGAL_MESSAGE_OFFSET\020\036\022\023\n\017ILLEGAL_ME" +
-      "SSAGE\020\037\022\034\n\030UNRECOGNIZED_CLIENT_TYPE\020 \022\024\n" +
-      "\020MULTIPLE_RESULTS\020!\022\020\n\013BAD_REQUEST\020\220\003\022\033\n" +
-      "\025BAD_REQUEST_CLIENT_ID\020\201\265\030\022\032\n\025INTERNAL_S" +
-      "ERVER_ERROR\020\364\003\022\024\n\017NOT_IMPLEMENTED\020\365\003\022\024\n\017" +
-      "GATEWAY_TIMEOUT\020\370\003*Z\n\010Language\022\030\n\024LANGUA" +
-      "GE_UNSPECIFIED\020\000\022\010\n\004JAVA\020\001\022\007\n\003CPP\020\002\022\013\n\007D" +
-      "OT_NET\020\003\022\n\n\006GOLANG\020\004\022\010\n\004RUST\020\005B;\n\022apache" +
-      ".rocketmq.v2B\010MQDomainP\001\240\001\001\330\001\001\252\002\022Apache." +
-      "Rocketmq.V2b\006proto3"
+      "E_CORRUPTED\020\021\022\025\n\021TOO_MANY_REQUESTS\020\022\0220\n," +
+      "MESSAGE_PROPERTY_DOES_NOT_MATCH_MESSAGE_" +
+      "TYPE\020\023\022\026\n\022ILLEGAL_MESSAGE_ID\020\024\022\032\n\026INVALI" +
+      "D_TRANSACTION_ID\020\025\022\035\n\031ILLEGAL_FILTER_EXP" +
+      "RESSION\020\026\022\032\n\026INVALID_RECEIPT_HANDLE\020\027\022\036\n" +
+      "\032MASTER_PERSISTENCE_TIMEOUT\020\030\022\035\n\031SLAVE_P" +
+      "ERSISTENCE_TIMEOUT\020\031\022\024\n\020HA_NOT_AVAILABLE" +
+      "\020\032\022\027\n\023VERSION_UNSUPPORTED\020\033\022\025\n\021MESSAGE_N" +
+      "OT_FOUND\020\034\022\034\n\030UNRECOGNIZED_CLIENT_TYPE\020\035" +
+      "\022\024\n\020MULTIPLE_RESULTS\020\036\022\020\n\013BAD_REQUEST\020\220\003" +
+      "\022\033\n\025BAD_REQUEST_CLIENT_ID\020\201\265\030\022\032\n\025INTERNA" +
+      "L_SERVER_ERROR\020\364\003\022\024\n\017NOT_IMPLEMENTED\020\365\003\022" +
+      "\022\n\rPROXY_TIMEOUT\020\370\003*Z\n\010Language\022\030\n\024LANGU" +
+      "AGE_UNSPECIFIED\020\000\022\010\n\004JAVA\020\001\022\007\n\003CPP\020\002\022\013\n\007" +
+      "DOT_NET\020\003\022\n\n\006GOLANG\020\004\022\010\n\004RUST\020\005B;\n\022apach" +
+      "e.rocketmq.v2B\010MQDomainP\001\240\001\001\330\001\001\252\002\022Apache" +
+      ".Rocketmq.V2b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
diff --git a/src/main/resources/proto/apache/rocketmq/v2/definition.proto b/src/main/resources/proto/apache/rocketmq/v2/definition.proto
index 8ccbff2..705d4ee 100644
--- a/src/main/resources/proto/apache/rocketmq/v2/definition.proto
+++ b/src/main/resources/proto/apache/rocketmq/v2/definition.proto
@@ -344,52 +344,41 @@ enum Code {
   // Requests are throttled.
   TOO_MANY_REQUESTS = 18;
 
-  // Expired receipt-handle is used when trying to acknowledge or change
-  // invisible duration of a message
-  RECEIPT_HANDLE_EXPIRED = 19;
-
   // Message property is not match the message type.
-  MESSAGE_PROPERTY_DOES_NOT_MATCH_MESSAGE_TYPE = 20;
+  MESSAGE_PROPERTY_DOES_NOT_MATCH_MESSAGE_TYPE = 19;
 
   // Format of message id is illegal.
-  ILLEGAL_MESSAGE_ID = 21;
+  ILLEGAL_MESSAGE_ID = 20;
 
   // Transaction id is invalid.
-  INVALID_TRANSACTION_ID = 22;
+  INVALID_TRANSACTION_ID = 21;
 
   // Format of filter expression is illegal.
-  ILLEGAL_FILTER_EXPRESSION = 23;
+  ILLEGAL_FILTER_EXPRESSION = 22;
 
   // Receipt handle of message is invalid.
-  INVALID_RECEIPT_HANDLE = 24;
+  INVALID_RECEIPT_HANDLE = 23;
 
   // Message persistence timeout.
-  MASTER_PERSISTENCE_TIMEOUT = 25;
+  MASTER_PERSISTENCE_TIMEOUT = 24;
 
   // Slave persistence timeout.
-  SLAVE_PERSISTENCE_TIMEOUT = 26;
+  SLAVE_PERSISTENCE_TIMEOUT = 25;
 
   // The HA-mechanism is not working now.
-  HA_NOT_AVAILABLE = 27;
+  HA_NOT_AVAILABLE = 26;
 
   // Operation is not allowed in current version.
-  VERSION_UNSUPPORTED = 28;
+  VERSION_UNSUPPORTED = 27;
 
   // Message not found from server.
-  MESSAGE_NOT_FOUND = 29;
-
-  // Message offset is illegal.
-  ILLEGAL_MESSAGE_OFFSET = 30;
-
-  // Illegal message is for the sake of backward compatibility. In most case,
-  // more definitive code is better, e.g. `ILLEGAL_MESSAGE_TAG`.
-  ILLEGAL_MESSAGE = 31;
+  MESSAGE_NOT_FOUND = 28;
 
   // Client type could not be recognized.
-  UNRECOGNIZED_CLIENT_TYPE = 32;
+  UNRECOGNIZED_CLIENT_TYPE = 29;
 
   // Return different results for entries in composite request.
-  MULTIPLE_RESULTS = 33;
+  MULTIPLE_RESULTS = 30;
 
   // Generic code for bad request, indicating that required fields or headers are missing.
   BAD_REQUEST = 400;
@@ -416,7 +405,7 @@ enum Code {
   // did not get a response in time from the upstream server that
   // it needed in order to complete the request.
   // See https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/504
-  GATEWAY_TIMEOUT = 504;
+  PROXY_TIMEOUT = 504;
 }
 
 message Status {