spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-23 01:39:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '2.1.x'

Browse Source 
Closes gh-17335
Closes gh-17292
This commit is contained in:
Andy Wilkinson
2019-06-27 12:00:34 +01:00
parent 867c35a2f6 91786bc712
commit 66f1344f7c
11 changed files with 74 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitCommandTests.java
+8 -6
View File
@@ -350,12 +350,14 @@ class InitCommandTests extends AbstractHttpClientMockTests {
}
private byte[] createFakeZipArchive(String fileName, String content) throws IOException {
try (ByteArrayOutputStream bos = new ByteArrayOutputStream(); ZipOutputStream zos = new ZipOutputStream(bos)) {
ZipEntry entry = new ZipEntry(fileName);
zos.putNextEntry(entry);
zos.write(content.getBytes());
zos.closeEntry();
return bos.toByteArray();
try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
try (ZipOutputStream zos = new ZipOutputStream(bos)) {
ZipEntry entry = new ZipEntry(fileName);
zos.putNextEntry(entry);
zos.write(content.getBytes());
zos.closeEntry();
return bos.toByteArray();
}
}
}