fix merge problems

FasterXML · Feb 5, 2025 · d83012a · d83012a
1 parent 579c394
commit d83012a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/main/java/tools/jackson/core/json/UTF8JsonGenerator.java b/src/main/java/tools/jackson/core/json/UTF8JsonGenerator.java
@@ -1772,7 +1772,7 @@ private final void _writeCustomStringSegment2(final char[] cbuf, int offset, fin
             } else {
                 // 3- or 4-byte character
                 if (_isStartOfSurrogatePair(ch)) {
-                    final boolean combineSurrogates = Feature.COMBINE_UNICODE_SURROGATES_IN_UTF8.enabledIn(_features);
+                    final boolean combineSurrogates = JsonWriteFeature.COMBINE_UNICODE_SURROGATES_IN_UTF8.enabledIn(_formatWriteFeatures);
                     if (combineSurrogates && offset < end) {
                         char highSurrogate = (char) ch;
                         char lowSurrogate = cbuf[offset++];
@@ -1839,7 +1839,7 @@ private final void _writeCustomStringSegment2(final String text, int offset, fin
             } else {
                 // 3- or 4-byte character
                 if (_isStartOfSurrogatePair(ch)) {
-                    final boolean combineSurrogates = Feature.COMBINE_UNICODE_SURROGATES_IN_UTF8.enabledIn(_features);
+                    final boolean combineSurrogates = JsonWriteFeature.COMBINE_UNICODE_SURROGATES_IN_UTF8.enabledIn(_formatWriteFeatures);
                     if (combineSurrogates && offset < end) {
                         char highSurrogate = (char) ch;
                         char lowSurrogate = text.charAt(offset++);

diff --git a/src/test/java/tools/jackson/core/unittest/write/SurrogateWrite223Test.java b/src/test/java/tools/jackson/core/unittest/write/SurrogateWrite223Test.java
@@ -14,6 +14,7 @@
 import tools.jackson.core.json.JsonFactory;
 import tools.jackson.core.json.JsonWriteFeature;
 import tools.jackson.core.unittest.*;
+import tools.jackson.core.util.JsonpCharacterEscapes;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -131,13 +132,13 @@ void checkNonSurrogates() throws Exception {
     void checkSurrogateWithCharacterEscapes() throws Exception {
         JsonFactory f = JsonFactory.builder()
                 .enable(JsonWriteFeature.COMBINE_UNICODE_SURROGATES_IN_UTF8)
+                .characterEscapes(JsonpCharacterEscapes.instance())
                 .build();
-        f.setCharacterEscapes(JsonpCharacterEscapes.instance());
         ByteArrayOutputStream out = new ByteArrayOutputStream();
-        try (JsonGenerator gen = f.createGenerator(out)) {
+        try (JsonGenerator gen = f.createGenerator(ObjectWriteContext.empty(), out)) {
             gen.writeStartObject();
             // Outside the BMP; 0x1F60A - emoji
-            gen.writeStringField("test_emoji", new String(Character.toChars(0x1F60A)));
+            gen.writeStringProperty("test_emoji", new String(Character.toChars(0x1F60A)));
             gen.writeEndObject();
         }
         String json = out.toString("UTF-8");