Merge "Updated validation tool code from g3 Import generated by Copybara."

am: 7cfd4883b4

Change-Id: I3ce8d7c9794ed007e8fcaeb5f18f9a41cf646bb5

1 files changed, 4 insertions, 2 deletions

diff --git a/src/tuningfork/tools/validation/src/main/java/com/google/tuningfork/validation/ValidationUtil.java b/src/tuningfork/tools/validation/src/main/java/com/google/tuningfork/validation/ValidationUtil.java
index 4af81de5..e2f5ce9b 100644
--- a/src/tuningfork/tools/validation/src/main/java/com/google/tuningfork/validation/ValidationUtil.java
+++ b/src/tuningfork/tools/validation/src/main/java/com/google/tuningfork/validation/ValidationUtil.java
@@ -31,7 +31,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 
-/** Utility methods for validating Tuning Fork protos and settings.*/
+/** Utility methods for validating Tuning Fork protos and settings. */
 final class ValidationUtil {
 
   private ValidationUtil() {}
@@ -46,7 +46,9 @@ final class ValidationUtil {
   public static Optional<Settings> validateSettings(
       List<Integer> enumSizes, String settingsTextProto, ErrorCollector errors) {
     try {
-      Settings settings = TextFormat.parse(settingsTextProto, Settings.class);
+      Settings.Builder builder = Settings.newBuilder();
+      TextFormat.merge(settingsTextProto, builder);
+      Settings settings = builder.build();
       validateSettingsAggregation(settings, enumSizes, errors);
       validateSettingsHistograms(settings, errors);
       return Optional.of(settings);