Modernise protobuf usage.

Author: davidgiven

lib/config/proto.cc

@@ -117,39 +117,31 @@ static ProtoField resolveProtoPath(
                 "config field '{}' in '{}' is not a message", item, path));
 
         const auto* reflection = message->GetReflection();
-        if ((field->label() !=
-                google::protobuf::FieldDescriptor::LABEL_REPEATED) &&
-            (index != -1))
+        if (!field->is_repeated() && (index != -1))
             throw ProtoPathNotFoundException(fmt::format(
                 "config field '{}[{}]' is indexed, but not repeated",
                 item,
                 index));
 
-        switch (field->label())
+        if (field->is_optional() || field->is_required())
         {
-            case google::protobuf::FieldDescriptor::LABEL_OPTIONAL:
-            case google::protobuf::FieldDescriptor::LABEL_REQUIRED:
-                if (!create && !reflection->HasField(*message, field))
-                    throw ProtoPathNotFoundException(fmt::format(
-                        "could not find config field '{}'", field->name()));
-                message = reflection->MutableMessage(message, field);
-                break;
-
-            case google::protobuf::FieldDescriptor::LABEL_REPEATED:
-                if (index == -1)
-                    throw ProtoPathNotFoundException(fmt::format(
-                        "config field '{}' is repeated and must be indexed",
-                        item));
-                while (reflection->FieldSize(*message, field) <= index)
-                    reflection->AddMessage(message, field);
-
-                message =
-                    reflection->MutableRepeatedMessage(message, field, index);
-                break;
+            if (!create && !reflection->HasField(*message, field))
+                throw ProtoPathNotFoundException(fmt::format(
+                    "could not find config field '{}'", field->name()));
+            message = reflection->MutableMessage(message, field);
+        }
+        else if (field->is_repeated())
+        {
+            if (index == -1)
+                throw ProtoPathNotFoundException(fmt::format(
+                    "config field '{}' is repeated and must be indexed", item));
+            while (reflection->FieldSize(*message, field) <= index)
+                reflection->AddMessage(message, field);
 
-            default:
-                error("bad proto label for field '{}' in '{}'", item, path);
+            message = reflection->MutableRepeatedMessage(message, field, index);
         }
+        else
+            error("bad proto label for field '{}' in '{}'", item, path);
 
         descriptor = message->GetDescriptor();
     }
@@ -215,7 +207,7 @@ static void updateRepeatedField(
 void ProtoField::set(const std::string& value)
 {
     const auto* reflection = _message->GetReflection();
-    if (_field->label() == google::protobuf::FieldDescriptor::LABEL_REPEATED)
+    if (_field->is_repeated())
     {
         if (_index == -1)
             error("field '{}' is repeated but no index is provided");
@@ -359,7 +351,7 @@ void ProtoField::set(const std::string& value)
 std::string ProtoField::get() const
 {
     const auto* reflection = _message->GetReflection();
-    if (_field->label() == google::protobuf::FieldDescriptor::LABEL_REPEATED)
+    if (_field->is_repeated())
     {
         if (_index == -1)
             error("field '{}' is repeated but no index is provided",
@@ -456,7 +448,7 @@ std::string ProtoField::get() const
 google::protobuf::Message* ProtoField::getMessage() const
 {
     const auto* reflection = _message->GetReflection();
-    if (_field->label() == google::protobuf::FieldDescriptor::LABEL_REPEATED)
+    if (_field->is_repeated())
     {
         if (_index == -1)
             error("field '{}' is repeated but no index is provided",
@@ -477,7 +469,7 @@ google::protobuf::Message* ProtoField::getMessage() const
 std::string ProtoField::getBytes() const
 {
     const auto* reflection = _message->GetReflection();
-    if (_field->label() == google::protobuf::FieldDescriptor::LABEL_REPEATED)
+    if (_field->is_repeated())
     {
         if (_index == -1)
             error("field '{}' is repeated but no index is provided",
@@ -536,7 +528,7 @@ findAllPossibleProtoFields(const google::protobuf::Descriptor* descriptor)
             const google::protobuf::FieldDescriptor* f = d->field(i);
             std::string n = s + (std::string)f->name();
 
-            if (f->label() == google::protobuf::FieldDescriptor::LABEL_REPEATED)
+            if (f->is_repeated())
                 n += "[]";
 
             if (shouldRecurse(f))
@@ -568,7 +560,7 @@ std::vector<ProtoField> findAllProtoFields(google::protobuf::Message* message)
                 basename += '.';
             basename += f->name();
 
-            if (f->label() == google::protobuf::FieldDescriptor::LABEL_REPEATED)
+            if (f->is_repeated())
             {
                 for (int i = 0; i < reflection->FieldSize(*message, f); i++)
                 {