manual changes + update

Author: larshp

test/generated/input.proto

@@ -22,6 +22,11 @@
  option java_package = "org.apache.pulsar.common.api.proto";
  option optimize_for = LITE_RUNTIME;
 
+ message KeyValue {
+  required string key = 1;
+  required string value = 2;
+}
+
  message Schema {
      enum Type {
          None = 0;
@@ -64,12 +69,7 @@
      optional int32 batch_size = 6;
 
      // For the chunk message id, we need to specify the first chunk message id.
-     optional MessageIdData first_chunk_message_id = 7;
- }
-
- message KeyValue {
-     required string key = 1;
-     required string value = 2;
+//     optional MessageIdData first_chunk_message_id = 7;
  }
 
  message KeyLongValue {
@@ -267,6 +267,15 @@
      v21 = 21; // Carry the AUTO_CONSUME schema to the Broker after this version
  }
 
+ // Please also add a new enum for the class "PulsarClientException.FailedFeatureCheck" when adding a new feature flag.
+ message FeatureFlags {
+  optional bool supports_auth_refresh = 1 [default = false];
+  optional bool supports_broker_entry_metadata = 2 [default = false];
+  optional bool supports_partial_producer = 3 [default = false];
+  optional bool supports_topic_watchers = 4 [default = false];
+  optional bool supports_get_partitioned_metadata_without_auto_creation = 5 [default = false];
+}
+
  message CommandConnect {
      required string client_version = 1; // The version of the client. Proxy should forward client's client_version.
      optional AuthMethod auth_method = 2; // Deprecated. Use "auth_method_name" instead.
@@ -295,22 +304,19 @@
      optional string proxy_version = 11; // Version of the proxy. Should only be forwarded by a proxy.
  }
 
- // Please also add a new enum for the class "PulsarClientException.FailedFeatureCheck" when adding a new feature flag.
- message FeatureFlags {
-   optional bool supports_auth_refresh = 1 [default = false];
-   optional bool supports_broker_entry_metadata = 2 [default = false];
-   optional bool supports_partial_producer = 3 [default = false];
-   optional bool supports_topic_watchers = 4 [default = false];
-   optional bool supports_get_partitioned_metadata_without_auto_creation = 5 [default = false];
- }
-
  message CommandConnected {
      required string server_version = 1;
      optional int32 protocol_version = 2 [default = 0];
      optional int32 max_message_size = 3;
      optional FeatureFlags feature_flags = 4;
  }
 
+ // To support mutual authentication type, such as Sasl, reuse this command to mutual auth.
+ message AuthData {
+  optional string auth_method_name = 1;
+  optional bytes auth_data = 2;
+}
+
  message CommandAuthResponse {
      optional string client_version = 1; // The version of the client. Proxy should forward client's client_version.
      optional AuthData response = 2;
@@ -323,12 +329,6 @@
      optional int32 protocol_version = 3 [default = 0];
  }
 
- // To support mutual authentication type, such as Sasl, reuse this command to mutual auth.
- message AuthData {
-     optional string auth_method_name = 1;
-     optional bytes auth_data = 2;
- }
-
  enum KeySharedMode {
      AUTO_SPLIT = 0;
      STICKY = 1;
@@ -419,13 +419,13 @@
  }
 
  message CommandPartitionedTopicMetadataResponse {
-     enum LookupType {
+     enum CLookupType {
          Success  = 0;
          Failed   = 1;
      }
      optional uint32 partitions            = 1;  // Optional in case of error
      required uint64 request_id            = 2;
-     optional LookupType response          = 3;
+     optional CLookupType response          = 3;
      optional ServerError error            = 4;
      optional string message               = 5;
  }
@@ -962,7 +962,7 @@
  }
 
  message BaseCommand {
-     enum Type {
+     enum BaseCommandType {
          CONNECT     = 2;
          CONNECTED   = 3;
          SUBSCRIBE   = 4;
@@ -1055,7 +1055,7 @@
      }
 
 
-     required Type type = 1;
+     required BaseCommandType type = 1;
 
      optional CommandConnect connect          = 2;
      optional CommandConnected connected      = 3;

test/generated/output.proto

@@ -1,4 +1,8 @@
 syntax = "proto2";
+message KeyValue {
+  required string key = 1;
+  required string value = 2;
+}
 message Schema {
   enum Type {
     None = 0;
@@ -36,11 +40,6 @@ message MessageIdData {
   optional int32 batch_index = 4 [default = -1];
   repeated int64 ack_set = 5;
   optional int32 batch_size = 6;
-  optional MessageIdData first_chunk_message_id = 7;
-}
-message KeyValue {
-  required string key = 1;
-  required string value = 2;
 }
 message KeyLongValue {
   required string key = 1;
@@ -171,6 +170,13 @@ enum ProtocolVersion {
   v20 = 20;
   v21 = 21;
 }
+message FeatureFlags {
+  optional bool supports_auth_refresh = 1 [default = false];
+  optional bool supports_broker_entry_metadata = 2 [default = false];
+  optional bool supports_partial_producer = 3 [default = false];
+  optional bool supports_topic_watchers = 4 [default = false];
+  optional bool supports_get_partitioned_metadata_without_auto_creation = 5 [default = false];
+}
 message CommandConnect {
   required string client_version = 1;
   optional AuthMethod auth_method = 2;
@@ -184,19 +190,16 @@ message CommandConnect {
   optional FeatureFlags feature_flags = 10;
   optional string proxy_version = 11;
 }
-message FeatureFlags {
-  optional bool supports_auth_refresh = 1 [default = false];
-  optional bool supports_broker_entry_metadata = 2 [default = false];
-  optional bool supports_partial_producer = 3 [default = false];
-  optional bool supports_topic_watchers = 4 [default = false];
-  optional bool supports_get_partitioned_metadata_without_auto_creation = 5 [default = false];
-}
 message CommandConnected {
   required string server_version = 1;
   optional int32 protocol_version = 2 [default = 0];
   optional int32 max_message_size = 3;
   optional FeatureFlags feature_flags = 4;
 }
+message AuthData {
+  optional string auth_method_name = 1;
+  optional bytes auth_data = 2;
+}
 message CommandAuthResponse {
   optional string client_version = 1;
   optional AuthData response = 2;
@@ -207,10 +210,6 @@ message CommandAuthChallenge {
   optional AuthData challenge = 2;
   optional int32 protocol_version = 3 [default = 0];
 }
-message AuthData {
-  optional string auth_method_name = 1;
-  optional bytes auth_data = 2;
-}
 enum KeySharedMode {
   AUTO_SPLIT = 0;
   STICKY = 1;
@@ -260,13 +259,13 @@ message CommandPartitionedTopicMetadata {
   optional bool metadata_auto_creation_enabled = 6 [default = true];
 }
 message CommandPartitionedTopicMetadataResponse {
-  enum LookupType {
+  enum CLookupType {
     Success = 0;
     Failed = 1;
   }
   optional uint32 partitions = 1;
   required uint64 request_id = 2;
-  optional LookupType response = 3;
+  optional CLookupType response = 3;
   optional ServerError error = 4;
   optional string message = 5;
 }
@@ -633,7 +632,7 @@ message CommandEndTxnOnSubscriptionResponse {
   optional string message = 5;
 }
 message BaseCommand {
-  enum Type {
+  enum BaseCommandType {
     CONNECT = 2;
     CONNECTED = 3;
     SUBSCRIBE = 4;
@@ -693,7 +692,7 @@ message BaseCommand {
     WATCH_TOPIC_LIST_CLOSE = 67;
     TOPIC_MIGRATED = 68;
   }
-  required Type type = 1;
+  required BaseCommandType type = 1;
   optional CommandConnect connect = 2;
   optional CommandConnected connected = 3;
   optional CommandSubscribe subscribe = 4;