This is an automated email from the ASF dual-hosted git repository. bchapuis pushed a commit to branch workflow in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
commit e2554064a18918322e060e9086f6d4a0b050d9c8 Author: Bertil Chapuis <[email protected]> AuthorDate: Fri Nov 17 16:44:34 2023 +0100 Simplify file decompression --- .../org/apache/baremaps/cli/database/UpdateOsm.java | 2 +- .../apache/baremaps/workflow/tasks/DecompressFile.java | 18 +++--------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/baremaps-cli/src/main/java/org/apache/baremaps/cli/database/UpdateOsm.java b/baremaps-cli/src/main/java/org/apache/baremaps/cli/database/UpdateOsm.java index 832a6f72..11fb8d6c 100644 --- a/baremaps-cli/src/main/java/org/apache/baremaps/cli/database/UpdateOsm.java +++ b/baremaps-cli/src/main/java/org/apache/baremaps/cli/database/UpdateOsm.java @@ -42,7 +42,7 @@ public class UpdateOsm implements Callable<Integer> { private int srid = 3857; @Option(names = {"--replication-url"}, paramLabel = "REPLICATION_URL", - description = "The replication url of the OpenStreetMap server.") + description = "The replication url of the OpenStreetMap server.") private String replicationUrl = "https://planet.osm.org/replication/hour";; @Override diff --git a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/DecompressFile.java b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/DecompressFile.java index 272ad1a3..e5a4108b 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/DecompressFile.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/DecompressFile.java @@ -133,11 +133,7 @@ public class DecompressFile implements Task { Files.createDirectories(path.getParent()); try (BufferedOutputStream outputStream = new BufferedOutputStream(Files.newOutputStream(path))) { - int bytesRead; - byte[] buffer = new byte[4096]; - while ((bytesRead = tarInputStream.read(buffer)) != -1) { - outputStream.write(buffer, 0, bytesRead); - } + tarInputStream.transferTo(outputStream); } } } @@ -164,11 +160,7 @@ public class DecompressFile implements Task { Files.createDirectories(path.getParent()); try (BufferedOutputStream outputStream = new BufferedOutputStream(Files.newOutputStream(path))) { - int bytesRead; - byte[] buffer = new byte[4096]; - while ((bytesRead = tarInputStream.read(buffer)) != -1) { - outputStream.write(buffer, 0, bytesRead); - } + tarInputStream.transferTo(outputStream); } } } @@ -193,11 +185,7 @@ public class DecompressFile implements Task { StandardOpenOption.TRUNCATE_EXISTING); try (var input = new BufferedInputStream(zipFile.getInputStream(entry)); var output = new BufferedOutputStream(new FileOutputStream(path.toFile()))) { - int nBytes = -1; - byte[] buffer = new byte[4096]; - while ((nBytes = input.read(buffer)) > 0) { - output.write(buffer, 0, nBytes); - } + input.transferTo(output); } } }
