Use ProtobufToStringOutput to control the output format of AbstractMessage.Builder.toString.

PiperOrigin-RevId: 744743041

Author: protobuf-github-bot

java/core/src/main/java/com/google/protobuf/AbstractMessage.java

@@ -452,7 +452,12 @@ public Message.Builder getRepeatedFieldBuilder(final FieldDescriptor field, int
 
     @Override
     public String toString() {
-      return TextFormat.printer().printToString(this);
+      TextFormat.Printer printer =
+          ProtobufToStringOutput.shouldOutputDebugFormat()
+              ? TextFormat.debugFormatPrinter()
+              : TextFormat.printer();
+      return printer.printToString(
+          this, TextFormat.Printer.FieldReporterLevel.ABSTRACT_BUILDER_TO_STRING);
     }
 
     /** Construct an UninitializedMessageException reporting missing fields in the given message. */

java/core/src/main/java/com/google/protobuf/TextFormat.java

@@ -159,8 +159,9 @@ static enum FieldReporterLevel {
       DEBUG_MULTILINE(9),
       DEBUG_SINGLE_LINE(10),
       ABSTRACT_TO_STRING(11),
-      ABSTRACT_MUTABLE_TO_STRING(12),
-      REPORT_NONE(13);
+      ABSTRACT_BUILDER_TO_STRING(12),
+      ABSTRACT_MUTABLE_TO_STRING(13),
+      REPORT_NONE(14);
       private final int index;
 
       FieldReporterLevel(int index) {

java/core/src/test/java/com/google/protobuf/ProtobufToStringOutputTest.java

@@ -12,17 +12,19 @@
 
 @RunWith(JUnit4.class)
 public final class ProtobufToStringOutputTest extends DebugFormatTest {
+  RedactedFields.Builder messageBuilder;
   RedactedFields message;
 
   @Before
   public void setupTest() {
-    message =
+    messageBuilder =
         RedactedFields.newBuilder()
             .setOptionalUnredactedString("foo")
             .setOptionalRedactedString("bar")
             .setOptionalRedactedMessage(
-                TestNestedMessageRedaction.newBuilder().setOptionalUnredactedNestedString("foobar"))
-            .build();
+                TestNestedMessageRedaction.newBuilder()
+                    .setOptionalUnredactedNestedString("foobar"));
+    message = messageBuilder.build();
   }
 
   @Test
@@ -100,4 +102,44 @@ public void toStringFormat_testProtoWrapperWithTextFormat() {
                       + "\\]");
         });
   }
+
+  @Test
+  public void builderToStringFormat_defaultFormat() {
+    assertThat(messageBuilder.toString())
+        .matches(
+            "optional_redacted_string: \"bar\"\n"
+                + "optional_unredacted_string: \"foo\"\n"
+                + "optional_redacted_message \\{\n"
+                + "  optional_unredacted_nested_string: \"foobar\"\n"
+                + "\\}\n");
+  }
+
+  @Test
+  public void builderToStringFormat_testDebugFormat() {
+    ProtobufToStringOutput.callWithDebugFormat(
+        () ->
+            assertThat(messageBuilder.toString())
+                .matches(
+                    String.format(
+                        "%soptional_redacted_string: %s\n"
+                            + "optional_unredacted_string: \"foo\"\n"
+                            + "optional_redacted_message \\{\n"
+                            + "  %s\n"
+                            + "\\}\n",
+                        UNSTABLE_PREFIX_MULTILINE, REDACTED_REGEX, REDACTED_REGEX)));
+  }
+
+  @Test
+  public void builderToStringFormat_testTextFormat() {
+    ProtobufToStringOutput.callWithTextFormat(
+        () -> {
+          assertThat(messageBuilder.toString())
+              .matches(
+                  "optional_redacted_string: \"bar\"\n"
+                      + "optional_unredacted_string: \"foo\"\n"
+                      + "optional_redacted_message \\{\n"
+                      + "  optional_unredacted_nested_string: \"foobar\"\n"
+                      + "\\}\n");
+        });
+  }
 }