From 1eb22cc4a24973f52b344c3033cff394c724cbe4 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Thu, 1 Dec 2022 09:32:05 +0100 Subject: Revert "Revert "- Reduce usage of guava."" --- .../filedistribution/FileReferenceCompressor.java | 26 +++++++++------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'filedistribution') diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceCompressor.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceCompressor.java index b6f84b979f5..0c3e69141e9 100644 --- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceCompressor.java +++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceCompressor.java @@ -121,14 +121,11 @@ public class FileReferenceCompressor { switch (type) { case compressed: log.log(Level.FINE, () -> "Compressing with compression type " + compressionType); - switch (compressionType) { - case gzip: - return new GZIPOutputStream(new FileOutputStream(outputFile)); - case lz4: - return new LZ4BlockOutputStream(new FileOutputStream(outputFile)); - default: - throw new RuntimeException("Unknown compression type " + compressionType); - } + return switch (compressionType) { + case gzip -> new GZIPOutputStream(new FileOutputStream(outputFile)); + case lz4 -> new LZ4BlockOutputStream(new FileOutputStream(outputFile)); + default -> throw new RuntimeException("Unknown compression type " + compressionType); + }; case file: return new FileOutputStream(outputFile); default: @@ -140,14 +137,11 @@ public class FileReferenceCompressor { switch (type) { case compressed: log.log(Level.FINE, () -> "Decompressing with compression type " + compressionType); - switch (compressionType) { - case gzip: - return new GZIPInputStream(new FileInputStream(inputFile)); - case lz4: - return new LZ4BlockInputStream(new FileInputStream(inputFile)); - default: - throw new RuntimeException("Unknown compression type " + compressionType); - } + return switch (compressionType) { + case gzip -> new GZIPInputStream(new FileInputStream(inputFile)); + case lz4 -> new LZ4BlockInputStream(new FileInputStream(inputFile)); + default -> throw new RuntimeException("Unknown compression type " + compressionType); + }; case file: return new FileInputStream(inputFile); default: -- cgit v1.2.3