From bf7b919937407c37d0faa73be261468f2a16c76b Mon Sep 17 00:00:00 2001 From: Tom Artale Date: Mon, 29 Jun 2015 12:10:20 -0600 Subject: [PATCH] Wrapped ConfigType in a proto message to enable gen in Go --- protofiles/configelements/ConfigReply.proto | 2 +- protofiles/configelements/ConfigRequest.proto | 2 +- protofiles/configelements/ConfigType.proto | 48 ++++++++++--------- 3 files changed, 27 insertions(+), 25 deletions(-) diff --git a/protofiles/configelements/ConfigReply.proto b/protofiles/configelements/ConfigReply.proto index 2bb6f26d58e55..9cee53144168d 100644 --- a/protofiles/configelements/ConfigReply.proto +++ b/protofiles/configelements/ConfigReply.proto @@ -15,6 +15,6 @@ message ConfigReply { optional ReplyType replyType = 1; optional string errorMessage = 2; - optional ConfigType configType = 3; + optional ConfigTypeMsg.ConfigType configType = 3; optional bytes serializedConfigMessage = 4; } diff --git a/protofiles/configelements/ConfigRequest.proto b/protofiles/configelements/ConfigRequest.proto index 59185ca1f6bcb..4d3b9c4eb143b 100644 --- a/protofiles/configelements/ConfigRequest.proto +++ b/protofiles/configelements/ConfigRequest.proto @@ -14,7 +14,7 @@ message ConfigRequest { } optional RequestType requestType = 1; - optional ConfigType configType = 2; + optional ConfigTypeMsg.ConfigType configType = 2; optional string override = 3; optional bytes serializedConfigMessage = 4; } diff --git a/protofiles/configelements/ConfigType.proto b/protofiles/configelements/ConfigType.proto index cdb09a5781f3a..b14a78b5f6dc7 100644 --- a/protofiles/configelements/ConfigType.proto +++ b/protofiles/configelements/ConfigType.proto @@ -1,28 +1,30 @@ package configelements; option java_package = "com.logrhythm.configelements"; -option java_outer_classname = "ConfigTypeMsg"; +option java_outer_classname = "ConfigTypeMessage"; -enum ConfigType { - // Intentional use of CamelCase; enum literals are - // matched up with a YAML and ProtoMessage of the - // same name (e.g. ConfigServerConfig.yaml, ConfigServerConfigMessage). - ConfigServerConfig = 0; - MetricsClientConfig = 1; - MetricsConfig = 2; - LinkConfig = 3; - HermesConfig = 4; - CassandraConfig = 5; - ElasticSearchClientConfig = 6; - DispatchConfig = 7; - DispatchClientConfig = 8; - PlaybackConfig = 9; - MaintenanceConfig = 10; - ColumboConfig = 11; - CarpenterConfig = 12; - InfluxConfig = 13; - // EventManagerClientConfig = 14; Depreciated - ColumboClientConfig = 15; - VitalsClientConfig = 16; - EnigmaConfig = 17; +message ConfigTypeMsg { + enum ConfigType { + // Intentional use of CamelCase; enum literals are + // matched up with a YAML and ProtoMessage of the + // same name (e.g. ConfigServerConfig.yaml, ConfigServerConfigMessage). + ConfigServerConfig = 0; + MetricsClientConfig = 1; + MetricsConfig = 2; + LinkConfig = 3; + HermesConfig = 4; + CassandraConfig = 5; + ElasticSearchClientConfig = 6; + DispatchConfig = 7; + DispatchClientConfig = 8; + PlaybackConfig = 9; + MaintenanceConfig = 10; + ColumboConfig = 11; + CarpenterConfig = 12; + InfluxConfig = 13; + // EventManagerClientConfig = 14; Deprecated + ColumboClientConfig = 15; + VitalsClientConfig = 16; + EnigmaConfig = 17; + } }