Merge pull request elastic#369 from Tom-Artale/wrap-config-type

Wrap config type
harper-carroll · Jun 29, 2015 · 937a041 · 937a041
2 parents a6cce6f + bf7b919
commit 937a041
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 25 deletions.
diff --git 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
@@ -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
@@ -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;
+   }
 }