Internal change.

PiperOrigin-RevId: 756920361

Author: tanx16

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

@@ -84,11 +84,8 @@ public FieldDescriptor getOneofFieldDescriptor(OneofDescriptor oneof) {
 
   @Override
   public final String toString() {
-    TextFormat.Printer printer =
-        ProtobufToStringOutput.shouldOutputDebugFormat()
-            ? TextFormat.debugFormatPrinter()
-            : TextFormat.printer();
-    return printer.printToString(this, TextFormat.Printer.FieldReporterLevel.ABSTRACT_TO_STRING);
+    return TextFormat.Printer.getOutputModePrinter()
+        .printToString(this, TextFormat.Printer.FieldReporterLevel.ABSTRACT_TO_STRING);
   }
 
   @Override
@@ -452,12 +449,8 @@ public Message.Builder getRepeatedFieldBuilder(final FieldDescriptor field, int
 
     @Override
     public String toString() {
-      TextFormat.Printer printer =
-          ProtobufToStringOutput.shouldOutputDebugFormat()
-              ? TextFormat.debugFormatPrinter()
-              : TextFormat.printer();
-      return printer.printToString(
-          this, TextFormat.Printer.FieldReporterLevel.ABSTRACT_BUILDER_TO_STRING);
+      return TextFormat.Printer.getOutputModePrinter()
+          .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/ProtobufToStringOutput.java

@@ -11,11 +11,12 @@
 public final class ProtobufToStringOutput {
   private enum OutputMode {
     DEBUG_FORMAT,
-    TEXT_FORMAT
+    TEXT_FORMAT,
+    DEFAULT_FORMAT
   }
 
   private static final ThreadLocal<OutputMode> outputMode =
-      ThreadLocal.withInitial(() -> OutputMode.TEXT_FORMAT);
+      ThreadLocal.withInitial(() -> OutputMode.DEFAULT_FORMAT);
 
   private ProtobufToStringOutput() {}
 
@@ -45,4 +46,8 @@ public static void callWithTextFormat(Runnable impl) {
   public static boolean shouldOutputDebugFormat() {
     return outputMode.get() == OutputMode.DEBUG_FORMAT;
   }
+
+  public static boolean isDefaultFormat() {
+    return outputMode.get() == OutputMode.DEFAULT_FORMAT;
+  }
 }

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

@@ -39,6 +39,10 @@ private TextFormat() {}
   private static final Logger logger = Logger.getLogger(TextFormat.class.getName());
 
   private static final String DEBUG_STRING_SILENT_MARKER = " \t ";
+  private static final String ENABLE_INSERT_SILENT_MARKER_ENV_NAME =
+      "SILENT_MARKER_INSERTION_ENABLED";
+  private static final boolean ENABLE_INSERT_SILENT_MARKER =
+      "true".equals(System.getenv(ENABLE_INSERT_SILENT_MARKER_ENV_NAME));
 
   private static final String REDACTED_MARKER = "[REDACTED]";
 
@@ -118,6 +122,11 @@ public static Printer debugFormatPrinter() {
     return Printer.DEFAULT_DEBUG_FORMAT;
   }
 
+  /** Printer instance which escapes non-ASCII characters and prints in the debug format. */
+  public static Printer defaultFormatPrinter() {
+    return Printer.DEFAULT_FORMAT;
+  }
+
   /** Helper class for converting protobufs to text. */
   public static final class Printer {
 
@@ -141,6 +150,27 @@ public static final class Printer {
             /* enablingSafeDebugFormat= */ true,
             /* singleLine= */ false);
 
+    // Printer instance which escapes non-ASCII characters and inserts a silent marker.
+    private static final Printer DEFAULT_FORMAT =
+        new Printer(
+                /* escapeNonAscii= */ true,
+                /* useShortRepeatedPrimitives= */ false,
+                TypeRegistry.getEmptyTypeRegistry(),
+                ExtensionRegistryLite.getEmptyRegistry(),
+                /* enablingSafeDebugFormat= */ false,
+                /* singleLine= */ false)
+            .setInsertSilentMarker(ENABLE_INSERT_SILENT_MARKER);
+
+    static Printer getOutputModePrinter() {
+      if (ProtobufToStringOutput.isDefaultFormat()) {
+        return defaultFormatPrinter();
+      } else if (ProtobufToStringOutput.shouldOutputDebugFormat()) {
+        return debugFormatPrinter();
+      } else {
+        return printer();
+      }
+    }
+
     /**
      * A list of the public APIs that output human-readable text from a message. A higher-level API
      * must be larger than any lower-level APIs it calls under the hood, e.g
@@ -186,6 +216,14 @@ static enum FieldReporterLevel {
 
     private final boolean singleLine;
 
+    private boolean insertSilentMarker;
+
+    @CanIgnoreReturnValue
+    private Printer setInsertSilentMarker(boolean insertSilentMarker) {
+      this.insertSilentMarker = insertSilentMarker;
+      return this;
+    }
+
     // Any API level equal to or greater than this level will be reported. This is set to
     // REPORT_NONE by default to prevent reporting for now.
     private static final ThreadLocal<FieldReporterLevel> sensitiveFieldReportingLevel =
@@ -209,6 +247,7 @@ private Printer(
       this.extensionRegistry = extensionRegistry;
       this.enablingSafeDebugFormat = enablingSafeDebugFormat;
       this.singleLine = singleLine;
+      this.insertSilentMarker = false;
     }
 
     /**
@@ -338,7 +377,12 @@ public void print(final MessageOrBuilder message, final Appendable output) throw
     void print(final MessageOrBuilder message, final Appendable output, FieldReporterLevel level)
         throws IOException {
       TextGenerator generator =
-          setSingleLineOutput(output, this.singleLine, message.getDescriptorForType(), level);
+          setSingleLineOutput(
+              output,
+              this.singleLine,
+              message.getDescriptorForType(),
+              level,
+              this.insertSilentMarker);
       print(message, generator);
     }
 
@@ -408,7 +452,9 @@ private boolean printAny(final MessageOrBuilder message, final TextGenerator gen
       }
       generator.print("[");
       generator.print(typeUrl);
-      generator.print("] {");
+      generator.print("]");
+      generator.maybePrintSilentMarker();
+      generator.print("{");
       generator.eol();
       generator.indent();
       print(contentBuilder, generator);
@@ -792,11 +838,13 @@ private void printSingleField(
       }
 
       if (field.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
-        generator.print(" {");
+        generator.maybePrintSilentMarker();
+        generator.print("{");
         generator.eol();
         generator.indent();
       } else {
-        generator.print(": ");
+        generator.print(":");
+        generator.maybePrintSilentMarker();
       }
 
       printFieldValue(field, value, generator);
@@ -831,7 +879,8 @@ private static void printUnknownFields(
             redact);
         for (final UnknownFieldSet value : field.getGroupList()) {
           generator.print(entry.getKey().toString());
-          generator.print(" {");
+          generator.maybePrintSilentMarker();
+          generator.print("{");
           generator.eol();
           generator.indent();
           printUnknownFields(value, generator, redact);
@@ -851,7 +900,8 @@ private static void printUnknownField(
         throws IOException {
       for (final Object value : values) {
         generator.print(String.valueOf(number));
-        generator.print(": ");
+        generator.print(":");
+        generator.maybePrintSilentMarker();
         printUnknownFieldValue(wireType, value, generator, redact);
         generator.eol();
       }
@@ -879,22 +929,26 @@ public static String unsignedToString(final long value) {
   }
 
   private static TextGenerator setSingleLineOutput(Appendable output, boolean singleLine) {
-    return new TextGenerator(output, singleLine, null, Printer.FieldReporterLevel.TEXT_GENERATOR);
+    return new TextGenerator(
+        output, singleLine, null, Printer.FieldReporterLevel.TEXT_GENERATOR, false);
   }
 
   private static TextGenerator setSingleLineOutput(
       Appendable output,
       boolean singleLine,
       Descriptor rootMessageType,
-      Printer.FieldReporterLevel fieldReporterLevel) {
-    return new TextGenerator(output, singleLine, rootMessageType, fieldReporterLevel);
+      Printer.FieldReporterLevel fieldReporterLevel,
+      boolean shouldEmitSilentMarker) {
+    return new TextGenerator(
+        output, singleLine, rootMessageType, fieldReporterLevel, shouldEmitSilentMarker);
   }
 
   /** An inner class for writing text to the output stream. */
   private static final class TextGenerator {
     private final Appendable output;
     private final StringBuilder indent = new StringBuilder();
     private final boolean singleLineMode;
+    private boolean shouldEmitSilentMarker;
     // While technically we are "at the start of a line" at the very beginning of the output, all
     // we would do in response to this is emit the (zero length) indentation, so it has no effect.
     // Setting it false here does however suppress an unwanted leading space in single-line mode.
@@ -910,11 +964,13 @@ private TextGenerator(
         final Appendable output,
         boolean singleLineMode,
         Descriptor rootMessageType,
-        Printer.FieldReporterLevel fieldReporterLevel) {
+        Printer.FieldReporterLevel fieldReporterLevel,
+        boolean shouldEmitSilentMarker) {
       this.output = output;
       this.singleLineMode = singleLineMode;
       this.rootMessageType = rootMessageType;
       this.fieldReporterLevel = fieldReporterLevel;
+      this.shouldEmitSilentMarker = shouldEmitSilentMarker;
     }
 
     /**
@@ -958,6 +1014,15 @@ public void eol() throws IOException {
       }
       atStartOfLine = true;
     }
+
+    void maybePrintSilentMarker() throws IOException {
+      if (shouldEmitSilentMarker) {
+        output.append(DEBUG_STRING_SILENT_MARKER);
+        shouldEmitSilentMarker = false;
+      } else {
+        output.append(" ");
+      }
+    }
   }
 
   // =================================================================