From 52a5c4bfacf1d7905d267ea28694269919a854a2 Mon Sep 17 00:00:00 2001 From: Alex Stockinger Date: Thu, 7 Apr 2022 15:22:12 +0200 Subject: [PATCH] Apply review feedback --- .../containers/GenericContainer.java | 14 ++++++-------- .../images/builder/Transferable.java | 1 - 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java index ffcbda70339..94d299c4967 100644 --- a/core/src/main/java/org/testcontainers/containers/GenericContainer.java +++ b/core/src/main/java/org/testcontainers/containers/GenericContainer.java @@ -543,14 +543,12 @@ Checksum hashCopiedFiles() { byte[] bytes = string.getBytes(); checksum.update(bytes, 0, bytes.length); }; - copyToFileContainerPathMap.entrySet().stream().sorted(Entry.comparingByValue()).forEach(entry -> { - updateFromString.accept(entry.getValue()); - entry.getKey().updateChecksum(checksum); - }); - copyToTransferableContainerPathMap.entrySet().stream().sorted(Entry.comparingByValue()).forEach(entry -> { - updateFromString.accept(entry.getValue()); - entry.getKey().updateChecksum(checksum); - }); + Stream.of(copyToFileContainerPathMap, copyToTransferableContainerPathMap) + .flatMap(it -> it.entrySet().stream()) + .sorted(Entry.comparingByValue()).forEach(entry -> { + updateFromString.accept(entry.getValue()); + entry.getKey().updateChecksum(checksum); + }); return checksum; } diff --git a/core/src/main/java/org/testcontainers/images/builder/Transferable.java b/core/src/main/java/org/testcontainers/images/builder/Transferable.java index 1b67ef2c5f9..8ec26c8c3da 100644 --- a/core/src/main/java/org/testcontainers/images/builder/Transferable.java +++ b/core/src/main/java/org/testcontainers/images/builder/Transferable.java @@ -35,7 +35,6 @@ public byte[] getBytes() { @Override public void updateChecksum(Checksum checksum) { - byte[] bytes = getBytes(); checksum.update(bytes, 0, bytes.length); }