Automated rollback of commit 1d4b6ba.

PiperOrigin-RevId: 735780482

Author: protobuf-github-bot

java/util/src/main/java/com/google/protobuf/util/JsonFormat.java

@@ -91,8 +91,7 @@ public static Printer printer() {
         /* preservingProtoFieldNames */ false,
         /* omittingInsignificantWhitespace */ false,
         /* printingEnumsAsInts */ false,
-        /* sortingMapKeys */ false,
-        /* unsafeDisableCodepointsForHtmlSymbols */ false);
+        /* sortingMapKeys */ false);
   }
 
   private enum ShouldPrintDefaults {
@@ -115,7 +114,6 @@ public static class Printer {
     private final boolean omittingInsignificantWhitespace;
     private final boolean printingEnumsAsInts;
     private final boolean sortingMapKeys;
-    private final boolean unsafeDisableCodepointsForHtmlSymbols;
 
     private Printer(
         com.google.protobuf.TypeRegistry registry,
@@ -125,8 +123,7 @@ private Printer(
         boolean preservingProtoFieldNames,
         boolean omittingInsignificantWhitespace,
         boolean printingEnumsAsInts,
-        boolean sortingMapKeys,
-        boolean unsafeDisableCodepointsForHtmlSymbols) {
+        boolean sortingMapKeys) {
       this.registry = registry;
       this.oldRegistry = oldRegistry;
       this.shouldPrintDefaults = shouldOutputDefaults;
@@ -135,7 +132,6 @@ private Printer(
       this.omittingInsignificantWhitespace = omittingInsignificantWhitespace;
       this.printingEnumsAsInts = printingEnumsAsInts;
       this.sortingMapKeys = sortingMapKeys;
-      this.unsafeDisableCodepointsForHtmlSymbols = unsafeDisableCodepointsForHtmlSymbols;
     }
 
     /**
@@ -157,8 +153,7 @@ public Printer usingTypeRegistry(TypeRegistry oldRegistry) {
           preservingProtoFieldNames,
           omittingInsignificantWhitespace,
           printingEnumsAsInts,
-          sortingMapKeys,
-          unsafeDisableCodepointsForHtmlSymbols);
+          sortingMapKeys);
     }
 
     /**
@@ -180,8 +175,7 @@ public Printer usingTypeRegistry(com.google.protobuf.TypeRegistry registry) {
           preservingProtoFieldNames,
           omittingInsignificantWhitespace,
           printingEnumsAsInts,
-          sortingMapKeys,
-          unsafeDisableCodepointsForHtmlSymbols);
+          sortingMapKeys);
     }
 
     /**
@@ -210,8 +204,7 @@ public Printer includingDefaultValueFields() {
           preservingProtoFieldNames,
           omittingInsignificantWhitespace,
           printingEnumsAsInts,
-          sortingMapKeys,
-          unsafeDisableCodepointsForHtmlSymbols);
+          sortingMapKeys);
     }
 
     /**
@@ -239,8 +232,7 @@ public Printer includingDefaultValueFields(Set<FieldDescriptor> fieldsToAlwaysOu
           preservingProtoFieldNames,
           omittingInsignificantWhitespace,
           printingEnumsAsInts,
-          sortingMapKeys,
-          unsafeDisableCodepointsForHtmlSymbols);
+          sortingMapKeys);
     }
 
     /**
@@ -261,8 +253,7 @@ public Printer alwaysPrintFieldsWithNoPresence() {
           preservingProtoFieldNames,
           omittingInsignificantWhitespace,
           printingEnumsAsInts,
-          sortingMapKeys,
-          unsafeDisableCodepointsForHtmlSymbols);
+          sortingMapKeys);
     }
 
     /**
@@ -279,8 +270,7 @@ public Printer printingEnumsAsInts() {
           preservingProtoFieldNames,
           omittingInsignificantWhitespace,
           true,
-          sortingMapKeys,
-          unsafeDisableCodepointsForHtmlSymbols);
+          sortingMapKeys);
     }
 
     private void checkUnsetPrintingEnumsAsInts() {
@@ -304,8 +294,7 @@ public Printer preservingProtoFieldNames() {
           true,
           omittingInsignificantWhitespace,
           printingEnumsAsInts,
-          sortingMapKeys,
-          unsafeDisableCodepointsForHtmlSymbols);
+          sortingMapKeys);
     }
 
 
@@ -334,8 +323,7 @@ public Printer omittingInsignificantWhitespace() {
           preservingProtoFieldNames,
           true,
           printingEnumsAsInts,
-          sortingMapKeys,
-          unsafeDisableCodepointsForHtmlSymbols);
+          sortingMapKeys);
     }
 
     /**
@@ -358,8 +346,7 @@ public Printer sortingMapKeys() {
           preservingProtoFieldNames,
           omittingInsignificantWhitespace,
           printingEnumsAsInts,
-          true,
-          unsafeDisableCodepointsForHtmlSymbols);
+          true);
     }
 
     /**
@@ -381,8 +368,7 @@ public void appendTo(MessageOrBuilder message, Appendable output) throws IOExcep
               output,
               omittingInsignificantWhitespace,
               printingEnumsAsInts,
-              sortingMapKeys,
-              unsafeDisableCodepointsForHtmlSymbols)
+              sortingMapKeys)
           .print(message);
     }
 
@@ -740,8 +726,6 @@ private static final class PrinterImpl {
 
     private static class GsonHolder {
       private static final Gson DEFAULT_GSON = new GsonBuilder().create();
-      private static final Gson GSON_WITHOUT_HTML_ESCAPING =
-          new GsonBuilder().disableHtmlEscaping().create();
     }
 
     PrinterImpl(
@@ -753,19 +737,15 @@ private static class GsonHolder {
         Appendable jsonOutput,
         boolean omittingInsignificantWhitespace,
         boolean printingEnumsAsInts,
-        boolean sortingMapKeys,
-        boolean unsafeDisableCodepointsForHtmlSymbols) {
+        boolean sortingMapKeys) {
       this.registry = registry;
       this.oldRegistry = oldRegistry;
       this.shouldPrintDefaults = shouldPrintDefaults;
       this.includingDefaultValueFields = includingDefaultValueFields;
       this.preservingProtoFieldNames = preservingProtoFieldNames;
       this.printingEnumsAsInts = printingEnumsAsInts;
       this.sortingMapKeys = sortingMapKeys;
-      this.gson =
-          unsafeDisableCodepointsForHtmlSymbols
-              ? GsonHolder.GSON_WITHOUT_HTML_ESCAPING
-              : GsonHolder.DEFAULT_GSON;
+      this.gson = GsonHolder.DEFAULT_GSON;
       // json format related properties, determined by printerType
       if (omittingInsignificantWhitespace) {
         this.generator = new CompactTextGenerator(jsonOutput);