From 65ef8fc51a1426ea24a9805f381f027741325800 Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Thu, 29 Sep 2022 10:45:02 +0200 Subject: [PATCH] Use ByteArrayOutputStream.toString where possible See gh-32534 --- .../platform/docker/transport/HttpClientTransportTests.java | 2 +- .../buildpack/platform/docker/type/ContainerConfigTests.java | 2 +- .../boot/loader/tools/DefaultLaunchScript.java | 2 +- .../springframework/boot/loader/tools/LayersIndexTests.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/transport/HttpClientTransportTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/transport/HttpClientTransportTests.java index 397aa5194c..b415e5ed4a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/transport/HttpClientTransportTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/transport/HttpClientTransportTests.java @@ -316,7 +316,7 @@ class HttpClientTransportTests { private String writeToString(HttpEntity entity) throws IOException { ByteArrayOutputStream out = new ByteArrayOutputStream(); entity.writeTo(out); - return new String(out.toByteArray(), StandardCharsets.UTF_8); + return out.toString(StandardCharsets.UTF_8); } private void givenClientWillReturnResponse() throws IOException { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ContainerConfigTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ContainerConfigTests.java index 0632602744..4f63459d82 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ContainerConfigTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ContainerConfigTests.java @@ -65,7 +65,7 @@ class ContainerConfigTests extends AbstractJsonTests { }); ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); containerConfig.writeTo(outputStream); - String actualJson = new String(outputStream.toByteArray(), StandardCharsets.UTF_8); + String actualJson = outputStream.toString(StandardCharsets.UTF_8); String expectedJson = StreamUtils.copyToString(getContent("container-config.json"), StandardCharsets.UTF_8); JSONAssert.assertEquals(expectedJson, actualJson, true); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/DefaultLaunchScript.java b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/DefaultLaunchScript.java index 55b280e7b3..aaa5b6cecc 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/DefaultLaunchScript.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/DefaultLaunchScript.java @@ -71,7 +71,7 @@ public class DefaultLaunchScript implements LaunchScript { try { ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); copy(inputStream, outputStream); - return new String(outputStream.toByteArray(), StandardCharsets.UTF_8); + return outputStream.toString(StandardCharsets.UTF_8); } finally { inputStream.close(); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/LayersIndexTests.java b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/LayersIndexTests.java index c1759b2402..e5e75daa30 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/LayersIndexTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/LayersIndexTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -144,7 +144,7 @@ class LayersIndexTests { private String getContent() throws IOException { ByteArrayOutputStream out = new ByteArrayOutputStream(); this.actual.writeTo(out); - return new String(out.toByteArray(), StandardCharsets.UTF_8); + return out.toString(StandardCharsets.UTF_8); } }