diff --git a/src/test/java/perf/ManualReadWithTypeResolution.java b/src/test/java/perf/ManualReadWithTypeResolution.java index 17a0981e84..36f565a643 100644 --- a/src/test/java/perf/ManualReadWithTypeResolution.java +++ b/src/test/java/perf/ManualReadWithTypeResolution.java @@ -1,6 +1,7 @@ package perf; import java.io.*; +import java.nio.charset.StandardCharsets; import java.util.*; import tools.jackson.core.type.TypeReference; @@ -38,7 +39,7 @@ private ManualReadWithTypeResolution() throws IOException { _desc2 = "Generic type"; _mapper = new JsonMapper(); - _input = "[\"value\",\"123\"]".getBytes("UTF-8"); + _input = "[\"value\",\"123\"]".getBytes(StandardCharsets.UTF_8); _inputType = List.class; _inputTypeRef = new TypeReference>() { }; diff --git a/src/test/java/tools/jackson/databind/ObjectMapperTest.java b/src/test/java/tools/jackson/databind/ObjectMapperTest.java index a1dfef74b3..2ac1fcb0d5 100644 --- a/src/test/java/tools/jackson/databind/ObjectMapperTest.java +++ b/src/test/java/tools/jackson/databind/ObjectMapperTest.java @@ -262,13 +262,13 @@ public void testDataInputViaMapper() throws Exception { DataInput input = new MockDataInput("{\"a\":1, \"b\":[1, 2, 3]}"); Map map = (Map) MAPPER.readValue(input, Map.class); - assertEquals(Integer.valueOf(1), map.get("a")); + assertEquals(1, map.get("a")); input = new MockDataInput("{\"a\":1, \"b\": [1, true]}"); // and via ObjectReader map = MAPPER.readerFor(Map.class) .readValue(input); - assertEquals(Integer.valueOf(1), map.get("a")); + assertEquals(1, map.get("a")); input = new MockDataInput("{\"a\":1, \"b\": [\"abc\"]}"); JsonNode n = MAPPER.readerFor(Map.class) @@ -399,30 +399,30 @@ public void testHasExplicitTimeZone() throws Exception @Test public void test_createParser_InputStream() throws Exception { - InputStream inputStream = new ByteArrayInputStream("\"value\"".getBytes(StandardCharsets.UTF_8)); + InputStream inputStream = new ByteArrayInputStream(utf8Bytes("\"value\"")); JsonParser jsonParser = MAPPER.createParser(inputStream); - assertEquals(jsonParser.nextStringValue(), "value"); + assertEquals("value", jsonParser.nextStringValue()); } @Test public void test_createParser_File() throws Exception { Path path = Files.createTempFile("", ""); - Files.write(path, "\"value\"".getBytes(StandardCharsets.UTF_8)); + Files.writeString(path, "\"value\""); JsonParser jsonParser = MAPPER.createParser(path.toFile()); - assertEquals(jsonParser.nextStringValue(), "value"); + assertEquals("value", jsonParser.nextStringValue()); } @Test public void test_createParser_Path() throws Exception { Path path = Files.createTempFile("", ""); - Files.write(path, "\"value\"".getBytes(StandardCharsets.UTF_8)); + Files.writeString(path, "\"value\""); JsonParser jsonParser = MAPPER.createParser(path); - assertEquals(jsonParser.nextStringValue(), "value"); + assertEquals("value", jsonParser.nextStringValue()); } @Test @@ -431,16 +431,16 @@ public void test_createParser_Reader() throws Exception Reader reader = new StringReader("\"value\""); JsonParser jsonParser = MAPPER.createParser(reader); - assertEquals(jsonParser.nextStringValue(), "value"); + assertEquals("value", jsonParser.nextStringValue()); } @Test public void test_createParser_ByteArray() throws Exception { - byte[] bytes = "\"value\"".getBytes(StandardCharsets.UTF_8); + byte[] bytes = utf8Bytes("\"value\""); JsonParser jsonParser = MAPPER.createParser(bytes); - assertEquals(jsonParser.nextStringValue(), "value"); + assertEquals("value", jsonParser.nextStringValue()); } @Test @@ -449,7 +449,7 @@ public void test_createParser_String() throws Exception String string = "\"value\""; JsonParser jsonParser = MAPPER.createParser(string); - assertEquals(jsonParser.nextStringValue(), "value"); + assertEquals("value", jsonParser.nextStringValue()); } @Test @@ -458,7 +458,7 @@ public void test_createParser_CharArray() throws Exception char[] chars = "\"value\"".toCharArray(); JsonParser jsonParser = MAPPER.createParser(chars); - assertEquals(jsonParser.nextStringValue(), "value"); + assertEquals("value", jsonParser.nextStringValue()); } @Test @@ -466,7 +466,7 @@ public void test_createParser_DataInput() throws Exception { DataInput dataInput = new MockDataInput("\"value\""); try (JsonParser jsonParser = MAPPER.createParser(dataInput)) { - assertEquals(jsonParser.nextStringValue(), "value"); + assertEquals("value", jsonParser.nextStringValue()); } } @@ -495,7 +495,7 @@ public void test_createGenerator_OutputStream() throws Exception jsonGenerator.writeString("value"); jsonGenerator.close(); - assertEquals(new String(outputStream.toByteArray(), StandardCharsets.UTF_8), "\"value\""); + assertEquals("\"value\"", outputStream.toString(StandardCharsets.UTF_8)); // the stream has not been closed by close outputStream.write(1); @@ -510,7 +510,7 @@ public void test_createGenerator_File() throws Exception jsonGenerator.writeString("value"); jsonGenerator.close(); - assertEquals(new String(Files.readAllBytes(path), StandardCharsets.UTF_8), "\"value\""); + assertEquals("\"value\"", utf8String(Files.readAllBytes(path))); } @Test @@ -522,7 +522,7 @@ public void test_createGenerator_Path() throws Exception jsonGenerator.writeString("value"); jsonGenerator.close(); - assertEquals(new String(Files.readAllBytes(path), StandardCharsets.UTF_8), "\"value\""); + assertEquals("\"value\"", utf8String(Files.readAllBytes(path))); } @Test @@ -534,7 +534,7 @@ public void test_createGenerator_Writer() throws Exception jsonGenerator.writeString("value"); jsonGenerator.close(); - assertEquals(writer.toString(), "\"value\""); + assertEquals("\"value\"", writer.toString()); // the writer has not been closed by close writer.append('1'); @@ -550,7 +550,7 @@ public void test_createGenerator_DataOutput() throws Exception jsonGenerator.writeString("value"); jsonGenerator.close(); - assertEquals(new String(outputStream.toByteArray(), StandardCharsets.UTF_8), "\"value\""); + assertEquals("\"value\"", outputStream.toString(StandardCharsets.UTF_8)); // the data output has not been closed by close dataOutput.write(1); @@ -571,30 +571,30 @@ public void test_createGenerator_failsIfArgumentIsNull() throws Exception @Test public void test_readTree_InputStream() throws Exception { - InputStream inputStream = new ByteArrayInputStream("\"value\"".getBytes(StandardCharsets.UTF_8)); + InputStream inputStream = new ByteArrayInputStream(utf8Bytes("\"value\"")); JsonNode jsonNode = MAPPER.readTree(inputStream); - assertEquals(jsonNode.stringValue(), "value"); + assertEquals("value", jsonNode.stringValue()); } @Test public void test_readTree_File() throws Exception { Path path = Files.createTempFile("", ""); - Files.write(path, "\"value\"".getBytes(StandardCharsets.UTF_8)); + Files.writeString(path, "\"value\""); JsonNode jsonNode = MAPPER.readTree(path.toFile()); - assertEquals(jsonNode.stringValue(), "value"); + assertEquals("value", jsonNode.stringValue()); } @Test public void test_readTree_Path() throws Exception { Path path = Files.createTempFile("", ""); - Files.write(path, "\"value\"".getBytes(StandardCharsets.UTF_8)); + Files.writeString(path, "\"value\""); JsonNode jsonNode = MAPPER.readTree(path); - assertEquals(jsonNode.stringValue(), "value"); + assertEquals("value", jsonNode.stringValue()); } @Test @@ -603,22 +603,22 @@ public void test_readTree_Reader() throws Exception Reader reader = new StringReader("\"value\""); JsonNode jsonNode = MAPPER.readTree(reader); - assertEquals(jsonNode.stringValue(), "value"); + assertEquals("value", jsonNode.stringValue()); } @Test public void test_readTree_ByteArray() throws Exception { // with offset and length - byte[] bytes = "\"value\"".getBytes(StandardCharsets.UTF_8); + byte[] bytes = utf8Bytes("\"value\""); JsonNode jsonNode1 = MAPPER.readTree(bytes); - assertEquals(jsonNode1.stringValue(), "value"); + assertEquals("value", jsonNode1.stringValue()); // without offset and length JsonNode jsonNode2 = MAPPER.readTree(bytes, 0, bytes.length); - assertEquals(jsonNode2.stringValue(), "value"); + assertEquals("value", jsonNode2.stringValue()); } @Test @@ -627,7 +627,7 @@ public void test_readTree_String() throws Exception String string = "\"value\""; JsonNode jsonNode = MAPPER.readTree(string); - assertEquals(jsonNode.stringValue(), "value"); + assertEquals("value", jsonNode.stringValue()); } @Test @@ -646,43 +646,43 @@ public void test_readTree_failsIfArgumentIsNull() throws Exception @Test public void test_readValue_InputStream() throws Exception { - InputStream inputStream = new ByteArrayInputStream("\"value\"".getBytes(StandardCharsets.UTF_8)); + InputStream inputStream = new ByteArrayInputStream(utf8Bytes("\"value\"")); String result1 = MAPPER.readValue(inputStream, String.class); - assertEquals(result1, "value"); + assertEquals("value", result1); inputStream.reset(); String result2 = MAPPER.readValue(inputStream, MAPPER.constructType(String.class)); - assertEquals(result2, "value"); + assertEquals("value", result2); inputStream.reset(); String result3 = MAPPER.readValue(inputStream, new TypeReference() {}); - assertEquals(result3, "value"); + assertEquals("value", result3); } @Test public void test_readValue_File() throws Exception { Path path = Files.createTempFile("", ""); - Files.write(path, "\"value\"".getBytes(StandardCharsets.UTF_8)); + Files.writeString(path, "\"value\""); String result1 = MAPPER.readValue(path.toFile(), String.class); - assertEquals(result1, "value"); + assertEquals("value", result1); String result2 = MAPPER.readValue(path.toFile(), MAPPER.constructType(String.class)); - assertEquals(result2, "value"); + assertEquals("value", result2); String result3 = MAPPER.readValue(path.toFile(), new TypeReference() {}); - assertEquals(result3, "value"); + assertEquals("value", result3); } @Test public void test_readValue_Path() throws Exception { Path path = Files.createTempFile("", ""); - Files.write(path, "\"value\"".getBytes(StandardCharsets.UTF_8)); + Files.writeString(path, "\"value\""); String result1 = MAPPER.readValue(path, String.class); - assertEquals(result1, "value"); + assertEquals("value", result1); String result2 = MAPPER.readValue(path, MAPPER.constructType(String.class)); - assertEquals(result2, "value"); + assertEquals("value", result2); String result3 = MAPPER.readValue(path, new TypeReference() {}); - assertEquals(result3, "value"); + assertEquals("value", result3); } @Test @@ -690,33 +690,33 @@ public void test_readValue_Reader() throws Exception { Reader reader1 = new StringReader("\"value\""); String result1 = MAPPER.readValue(reader1, String.class); - assertEquals(result1, "value"); + assertEquals("value", result1); Reader reader2 = new StringReader("\"value\""); String result2 = MAPPER.readValue(reader2, MAPPER.constructType(String.class)); - assertEquals(result2, "value"); + assertEquals("value", result2); Reader reader3 = new StringReader("\"value\""); String result3 = MAPPER.readValue(reader3, new TypeReference() {}); - assertEquals(result3, "value"); + assertEquals("value", result3); } @Test public void test_readValue_ByteArray() throws Exception { - byte[] bytes = "\"value\"".getBytes(StandardCharsets.UTF_8); + byte[] bytes = utf8Bytes("\"value\""); String result1 = MAPPER.readValue(bytes, String.class); - assertEquals(result1, "value"); + assertEquals("value", result1); String result2 = MAPPER.readValue(bytes, MAPPER.constructType(String.class)); - assertEquals(result2, "value"); + assertEquals("value", result2); String result3 = MAPPER.readValue(bytes, new TypeReference() {}); - assertEquals(result3, "value"); + assertEquals("value", result3); String result4 = MAPPER.readValue(bytes, 0, bytes.length, String.class); - assertEquals(result4, "value"); + assertEquals("value", result4); String result5 = MAPPER.readValue(bytes, 0, bytes.length, SimpleType.constructUnsafe(String.class)); - assertEquals(result5, "value"); + assertEquals("value", result5); String result6 = MAPPER.readValue(bytes, 0, bytes.length, new TypeReference() {}); - assertEquals(result6, "value"); + assertEquals("value", result6); } @Test @@ -724,11 +724,11 @@ public void test_readValue_String() throws Exception { String string = "\"value\""; String result1 = MAPPER.readValue(string, String.class); - assertEquals(result1, "value"); + assertEquals("value", result1); String result2 = MAPPER.readValue(string, MAPPER.constructType(String.class)); - assertEquals(result2, "value"); + assertEquals("value", result2); String result3 = MAPPER.readValue(string, new TypeReference() {}); - assertEquals(result3, "value"); + assertEquals("value", result3); } @Test @@ -737,15 +737,15 @@ public void test_readValue_DataInput() throws Exception byte[] inputBytes = utf8Bytes("\"value\""); DataInput dataInput1 = new MockDataInput(inputBytes); String result1 = MAPPER.readValue(dataInput1, String.class); - assertEquals(result1, "value"); + assertEquals("value", result1); DataInput dataInput2 = new MockDataInput(inputBytes); String result2 = MAPPER.readValue(dataInput2, MAPPER.constructType(String.class)); - assertEquals(result2, "value"); + assertEquals("value", result2); DataInput dataInput3 = new MockDataInput(inputBytes); String result3 = MAPPER.readValue(dataInput3, new TypeReference() {}); - assertEquals(result3, "value"); + assertEquals("value", result3); } @Test @@ -810,7 +810,7 @@ public void test_writeValue_OutputStream() throws Exception ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); MAPPER.writeValue(outputStream, "value"); - assertEquals(new String(outputStream.toByteArray(), StandardCharsets.UTF_8), "\"value\""); + assertEquals("\"value\"", outputStream.toString(StandardCharsets.UTF_8)); // the stream has not been closed by close outputStream.write(1); @@ -822,7 +822,7 @@ public void test_writeValue_File() throws Exception Path path = Files.createTempFile("", ""); MAPPER.writeValue(path.toFile(), "value"); - assertEquals(new String(Files.readAllBytes(path), StandardCharsets.UTF_8), "\"value\""); + assertEquals("\"value\"", utf8String(Files.readAllBytes(path))); } @Test @@ -831,7 +831,7 @@ public void test_writeValue_Path() throws Exception Path path = Files.createTempFile("", ""); MAPPER.writeValue(path, "value"); - assertEquals(new String(Files.readAllBytes(path), StandardCharsets.UTF_8), "\"value\""); + assertEquals("\"value\"", utf8String(Files.readAllBytes(path))); } @Test @@ -853,7 +853,7 @@ public void test_writeValue_DataOutput() throws Exception DataOutput dataOutput = new DataOutputStream(outputStream); MAPPER.writeValue(dataOutput, "value"); - assertEquals(new String(outputStream.toByteArray(), StandardCharsets.UTF_8), "\"value\""); + assertEquals("\"value\"", outputStream.toString(StandardCharsets.UTF_8)); // the data output has not been closed by close dataOutput.write(1); @@ -866,7 +866,7 @@ public void test_writeValue_JsonGenerator() throws Exception JsonGenerator jsonGenerator = MAPPER.createGenerator(outputStream); MAPPER.writeValue(jsonGenerator, "value"); - assertEquals(new String(outputStream.toByteArray(), StandardCharsets.UTF_8), "\"value\""); + assertEquals("\"value\"", outputStream.toString(StandardCharsets.UTF_8)); // the output stream has not been closed by close outputStream.write(1); @@ -903,7 +903,7 @@ public void test_readValue_writeValue_Path_nonDefaultFileSystem() throws IOExcep Path jsonFile = zipFs.getPath("/test.json"); mapper.writeValue(jsonFile, "value"); - String serialized = new String(Files.readAllBytes(jsonFile), StandardCharsets.UTF_8); + String serialized = Files.readString(jsonFile); assertEquals(serialized, "\"value\""); String result = mapper.readValue(jsonFile, String.class); diff --git a/src/test/java/tools/jackson/databind/ObjectReaderTest.java b/src/test/java/tools/jackson/databind/ObjectReaderTest.java index 3fee631fd9..546064a3f9 100644 --- a/src/test/java/tools/jackson/databind/ObjectReaderTest.java +++ b/src/test/java/tools/jackson/databind/ObjectReaderTest.java @@ -61,7 +61,7 @@ public void testSimpleViaParser() throws Exception public void testSimpleAltSources() throws Exception { final String JSON = "[1]"; - final byte[] BYTES = JSON.getBytes("UTF-8"); + final byte[] BYTES = utf8Bytes(JSON); final Object EXP = Arrays.asList(1); assertEquals(EXP, MAPPER .readerFor(Object.class) @@ -337,7 +337,7 @@ void createParserVariants() throws Exception f.delete(); try (JsonParser p = R.createParser( - new ByteArrayInputStream("{}".getBytes(StandardCharsets.UTF_8)))) { + new ByteArrayInputStream(utf8Bytes("{}")))) { assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.END_OBJECT, p.nextToken()); } @@ -409,7 +409,7 @@ public void testReadTreeVariants() { final ObjectReader R = MAPPER.reader(); final String JSON = "[]"; - final byte[] JSON_B = JSON.getBytes(StandardCharsets.UTF_8); + final byte[] JSON_B = utf8Bytes(JSON); final JsonNode EXP = R.createArrayNode(); assertEquals(EXP, R.readTree(JSON)); diff --git a/src/test/java/tools/jackson/databind/ObjectWriterTest.java b/src/test/java/tools/jackson/databind/ObjectWriterTest.java index e8b43392f1..9b2b4e9007 100644 --- a/src/test/java/tools/jackson/databind/ObjectWriterTest.java +++ b/src/test/java/tools/jackson/databind/ObjectWriterTest.java @@ -163,9 +163,9 @@ public void testNoPrefetch() throws Exception ObjectWriter w = MAPPER.writer() .without(SerializationFeature.EAGER_SERIALIZER_FETCH); ByteArrayOutputStream out = new ByteArrayOutputStream(); - w.writeValue(out, Integer.valueOf(3)); + w.writeValue(out, 3); out.close(); - assertEquals("3", out.toString("UTF-8")); + assertEquals("3", utf8String(out)); } @Test diff --git a/src/test/java/tools/jackson/databind/convert/BeanConversionsTest.java b/src/test/java/tools/jackson/databind/convert/BeanConversionsTest.java index 04254d1a97..d8e4b68b19 100644 --- a/src/test/java/tools/jackson/databind/convert/BeanConversionsTest.java +++ b/src/test/java/tools/jackson/databind/convert/BeanConversionsTest.java @@ -201,7 +201,7 @@ public void testWrapping() throws Exception @Test public void testConvertUsingCast() throws Exception { - String str = new String("foo"); + String str = "foo"; CharSequence seq = str; String result = MAPPER.convertValue(seq, String.class); // should just cast... diff --git a/src/test/java/tools/jackson/databind/deser/creators/TestCreators2.java b/src/test/java/tools/jackson/databind/deser/creators/TestCreators2.java index 161d6d8259..b3eeca54e0 100644 --- a/src/test/java/tools/jackson/databind/deser/creators/TestCreators2.java +++ b/src/test/java/tools/jackson/databind/deser/creators/TestCreators2.java @@ -42,11 +42,7 @@ static class BytesDeserializer extends ValueDeserializer public byte[] deserialize(JsonParser p, DeserializationContext ctxt) { String str = p.getString(); - try { - return str.getBytes("UTF-8"); - } catch (IOException e) { - throw new RuntimeException(e); - } + return utf8Bytes(str); } } @@ -257,7 +253,7 @@ public void testSimpleConstructor() throws Exception { HashTest test = MAPPER.readValue("{\"type\":\"custom\",\"bytes\":\"abc\" }", HashTest.class); assertEquals("custom", test.type); - assertEquals("abc", new String(test.bytes, "UTF-8")); + assertEquals("abc", utf8String(test.bytes)); } @Test diff --git a/src/test/java/tools/jackson/databind/deser/jdk/JDKScalarsDeserTest.java b/src/test/java/tools/jackson/databind/deser/jdk/JDKScalarsDeserTest.java index 79fdffd1fa..2ddc6007b1 100644 --- a/src/test/java/tools/jackson/databind/deser/jdk/JDKScalarsDeserTest.java +++ b/src/test/java/tools/jackson/databind/deser/jdk/JDKScalarsDeserTest.java @@ -551,7 +551,8 @@ public void testDoubleAsArray() throws Exception @Test public void testBase64Variants() throws Exception { - final byte[] INPUT = "abcdefghijklmnopqrstuvwxyz1234567890abcdefghijklmnopqrstuvwxyz1234567890X".getBytes("UTF-8"); + final byte[] INPUT = utf8Bytes( + "abcdefghijklmnopqrstuvwxyz1234567890abcdefghijklmnopqrstuvwxyz1234567890X"); // default encoding is "MIME, no linefeeds", so: assertArrayEquals(INPUT, MAPPER.readValue( diff --git a/src/test/java/tools/jackson/databind/deser/jdk/JDKStringLikeTypeDeserTest.java b/src/test/java/tools/jackson/databind/deser/jdk/JDKStringLikeTypeDeserTest.java index 8c709453dc..bce1935e9f 100644 --- a/src/test/java/tools/jackson/databind/deser/jdk/JDKStringLikeTypeDeserTest.java +++ b/src/test/java/tools/jackson/databind/deser/jdk/JDKStringLikeTypeDeserTest.java @@ -3,6 +3,7 @@ import java.io.*; import java.net.*; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.Currency; import java.util.regex.Pattern; @@ -42,10 +43,9 @@ public ParamClassBean(String name) { private final ObjectMapper MAPPER = newJsonMapper(); @Test - public void testCharset() throws Exception + public void testCharset() { - Charset UTF8 = Charset.forName("UTF-8"); - assertSame(UTF8, MAPPER.readValue(q("UTF-8"), Charset.class)); + assertSame(StandardCharsets.UTF_8, MAPPER.readValue(q("UTF-8"), Charset.class)); } @Test diff --git a/src/test/java/tools/jackson/databind/deser/jdk/MapDeserializationTest.java b/src/test/java/tools/jackson/databind/deser/jdk/MapDeserializationTest.java index 7ab49631dd..291f0513d7 100644 --- a/src/test/java/tools/jackson/databind/deser/jdk/MapDeserializationTest.java +++ b/src/test/java/tools/jackson/databind/deser/jdk/MapDeserializationTest.java @@ -482,7 +482,7 @@ public void testCalendarMap() throws Exception @Test public void testUUIDKeyMap() throws Exception { - UUID key = UUID.nameUUIDFromBytes("foobar".getBytes("UTF-8")); + UUID key = UUID.nameUUIDFromBytes(utf8Bytes("foobar")); String JSON = "{ \""+key+"\":4}"; Map result = MAPPER.readValue(JSON, new TypeReference>() { }); assertNotNull(result); diff --git a/src/test/java/tools/jackson/databind/seq/ReadValuesTest.java b/src/test/java/tools/jackson/databind/seq/ReadValuesTest.java index fc31222451..a36c228e33 100644 --- a/src/test/java/tools/jackson/databind/seq/ReadValuesTest.java +++ b/src/test/java/tools/jackson/databind/seq/ReadValuesTest.java @@ -59,14 +59,14 @@ private MappingIterator _iterator(ObjectReader r, { switch (srcType) { case BYTE_ARRAY: - return r.readValues(json.getBytes("UTF-8")); + return r.readValues(utf8Bytes(json)); case BYTE_ARRAY_OFFSET: { ByteArrayOutputStream out = new ByteArrayOutputStream(); out.write(0); out.write(0); out.write(0); - out.write(json.getBytes("UTF-8")); + out.write(utf8Bytes(json)); out.write(0); out.write(0); out.write(0); @@ -74,7 +74,7 @@ private MappingIterator _iterator(ObjectReader r, return r.readValues(b, 3, b.length-6); } case INPUT_STREAM: - return r.readValues(new ByteArrayInputStream(json.getBytes("UTF-8"))); + return r.readValues(new ByteArrayInputStream(utf8Bytes(json))); case READER: return r.readValues(new StringReader(json)); case STRING: diff --git a/src/test/java/tools/jackson/databind/ser/GeneratorInitializerTest.java b/src/test/java/tools/jackson/databind/ser/GeneratorInitializerTest.java index 1eaaa01029..8c5c3c72ee 100644 --- a/src/test/java/tools/jackson/databind/ser/GeneratorInitializerTest.java +++ b/src/test/java/tools/jackson/databind/ser/GeneratorInitializerTest.java @@ -178,7 +178,7 @@ public void testMapperWriteValueAsBytes() throws Exception final AtomicInteger count = new AtomicInteger(); ObjectMapper mapper = _mapperWith(count); byte[] bytes = mapper.writeValueAsBytes(42); - assertEquals("42", new String(bytes, "UTF-8")); + assertEquals("42", utf8String(bytes)); assertEquals(1, count.get()); } @@ -350,7 +350,7 @@ public void testWriterWriteValueAsBytes() throws Exception final AtomicInteger count = new AtomicInteger(); ObjectWriter w = _writerWith(count); byte[] bytes = w.writeValueAsBytes(42); - assertEquals("42", new String(bytes, "UTF-8")); + assertEquals("42", utf8String(bytes)); assertEquals(1, count.get()); } diff --git a/src/test/java/tools/jackson/databind/ser/SimpleTypeSerializationTest.java b/src/test/java/tools/jackson/databind/ser/SimpleTypeSerializationTest.java index 92090870f7..9223ba2bf9 100644 --- a/src/test/java/tools/jackson/databind/ser/SimpleTypeSerializationTest.java +++ b/src/test/java/tools/jackson/databind/ser/SimpleTypeSerializationTest.java @@ -338,7 +338,8 @@ public void testByteArray() throws Exception @Test public void testBase64Variants() throws Exception { - final byte[] INPUT = "abcdefghijklmnopqrstuvwxyz1234567890abcdefghijklmnopqrstuvwxyz1234567890X".getBytes("UTF-8"); + final byte[] INPUT = utf8Bytes( + "abcdefghijklmnopqrstuvwxyz1234567890abcdefghijklmnopqrstuvwxyz1234567890X"); // default encoding is "MIME, no linefeeds", so: assertEquals(q("YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoxMjM0NTY3ODkwYWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoxMjM0NTY3ODkwWA=="), MAPPER.writeValueAsString(INPUT)); diff --git a/src/test/java/tools/jackson/databind/ser/jdk/JDKTypeSerializationTest.java b/src/test/java/tools/jackson/databind/ser/jdk/JDKTypeSerializationTest.java index 4c57792772..3b7a439d98 100644 --- a/src/test/java/tools/jackson/databind/ser/jdk/JDKTypeSerializationTest.java +++ b/src/test/java/tools/jackson/databind/ser/jdk/JDKTypeSerializationTest.java @@ -11,6 +11,7 @@ import java.util.concurrent.atomic.*; import java.util.regex.Pattern; +import com.google.common.base.Charsets; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -300,6 +301,7 @@ public void testClass() throws IOException @Test public void testCharset() throws IOException { + assertEquals(q("UTF-8"), MAPPER.writeValueAsString(StandardCharsets.UTF_8)); assertEquals(q("UTF-8"), MAPPER.writeValueAsString(Charset.forName("UTF-8"))); } diff --git a/src/test/java/tools/jackson/databind/testutil/JacksonTestUtilBase.java b/src/test/java/tools/jackson/databind/testutil/JacksonTestUtilBase.java index eab1f1c98f..5f30ee69c7 100644 --- a/src/test/java/tools/jackson/databind/testutil/JacksonTestUtilBase.java +++ b/src/test/java/tools/jackson/databind/testutil/JacksonTestUtilBase.java @@ -97,7 +97,7 @@ public static void verifyException(Throwable e, String... anyMatches) String lmsg = (msg == null) ? "" : msg.toLowerCase(); for (String match : anyMatches) { String lmatch = match.toLowerCase(); - if (lmsg.indexOf(lmatch) >= 0) { + if (lmsg.contains(lmatch)) { return; } } @@ -150,7 +150,7 @@ public static byte[] utf8Bytes(String str) { } public String utf8String(ByteArrayOutputStream bytes) { - return new String(bytes.toByteArray(), StandardCharsets.UTF_8); + return bytes.toString(StandardCharsets.UTF_8); } public String utf8String(byte[] bytes) {