Internal Change

PiperOrigin-RevId: 782078325

Author: protobuf-github-bot

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

@@ -42,7 +42,7 @@ private TextFormat() {}
   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));
+    System.getenv().getOrDefault(ENABLE_INSERT_SILENT_MARKER_ENV_NAME, "false").equals("true");
 
   private static final String REDACTED_MARKER = "[REDACTED]";
 

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

@@ -12,6 +12,8 @@
 
 @RunWith(JUnit4.class)
 public final class ProtobufToStringOutputTest extends DebugFormatTest {
+  private static final String SILENT_MARKER = "";
+
   RedactedFields.Builder messageBuilder;
   RedactedFields message;
 
@@ -31,7 +33,7 @@ public void setupTest() {
   public void toStringFormat_defaultFormat() {
     assertThat(message.toString())
         .matches(
-            "optional_redacted_string: \"bar\"\n"
+            "optional_redacted_string: " + SILENT_MARKER + "\"bar\"\n"
                 + "optional_unredacted_string: \"foo\"\n"
                 + "optional_redacted_message \\{\n"
                 + "  optional_unredacted_nested_string: \"foobar\"\n"
@@ -107,7 +109,7 @@ public void toStringFormat_testProtoWrapperWithTextFormat() {
   public void builderToStringFormat_defaultFormat() {
     assertThat(messageBuilder.toString())
         .matches(
-            "optional_redacted_string: \"bar\"\n"
+            "optional_redacted_string: " + SILENT_MARKER + "\"bar\"\n"
                 + "optional_unredacted_string: \"foo\"\n"
                 + "optional_redacted_message \\{\n"
                 + "  optional_unredacted_nested_string: \"foobar\"\n"