From 792ecacdd9eac0a0c7bbe05f28d598f6e0f8f70a Mon Sep 17 00:00:00 2001 From: Valerij Fredriksen Date: Fri, 10 Sep 2021 12:36:20 +0200 Subject: Handle right side being binary while left is not --- .../hosted/controller/application/pkg/ApplicationPackageDiff.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'controller-server/src/main/java') diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageDiff.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageDiff.java index aa55326f7b7..302c7863d92 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageDiff.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageDiff.java @@ -60,11 +60,11 @@ public class ApplicationPackageDiff { if (leftContent.isPresent() && rightContent.isPresent() && Arrays.equals(leftContent.get(), rightContent.get())) return Optional.empty(); - if (left.map(entry -> entry.content().isEmpty()).orElse(false) || right.map(entry -> entry.content().isEmpty()).orElse(false)) + if (Stream.of(left, right).flatMap(Optional::stream).anyMatch(entry -> entry.content().isEmpty())) return Optional.of(String.format("Diff skipped: File too large (%s -> %s)\n", left.map(e -> e.size() + "B").orElse("new file"), right.map(e -> e.size() + "B").orElse("file deleted"))); - if (leftContent.map(c -> isBinary(c)).or(() -> rightContent.map(c -> isBinary(c))).orElse(false)) + if (Stream.of(leftContent, rightContent).flatMap(Optional::stream).anyMatch(c -> isBinary(c))) return Optional.of(String.format("Diff skipped: File is binary (%s -> %s)\n", left.map(e -> e.size() + "B").orElse("new file"), right.map(e -> e.size() + "B").orElse("file deleted"))); -- cgit v1.2.3