diff --git a/src/main/java/eu/mikroskeem/uurimustoo/algoritmidetest/Main.java b/src/main/java/eu/mikroskeem/uurimustoo/algoritmidetest/Main.java index 57eab91..978abee 100644 --- a/src/main/java/eu/mikroskeem/uurimustoo/algoritmidetest/Main.java +++ b/src/main/java/eu/mikroskeem/uurimustoo/algoritmidetest/Main.java @@ -11,7 +11,7 @@ public class Main { byte[] classFile = ByteArrays.fromInputStream(Main.class.getResourceAsStream("/Test.class")); Utils.generateReport(classFile); - System.out.println("=== Suure class faili pakkimise test (100x)"); + System.out.println("==== Suure class faili pakkimise test (100x)"); byte[] classFile2 = ByteArrays.fromInputStream(Main.class.getResourceAsStream("/TestBig.class")); Utils.generateReport(classFile2); } diff --git a/src/main/java/eu/mikroskeem/uurimustoo/algoritmidetest/Utils.java b/src/main/java/eu/mikroskeem/uurimustoo/algoritmidetest/Utils.java index 1da5371..a4d7406 100644 --- a/src/main/java/eu/mikroskeem/uurimustoo/algoritmidetest/Utils.java +++ b/src/main/java/eu/mikroskeem/uurimustoo/algoritmidetest/Utils.java @@ -21,14 +21,13 @@ import static eu.mikroskeem.uurimustoo.algoritmidetest.Utils.DummyCompressor.of; * @author Mark Vainomaa */ public class Utils { - public static List getAllCompressors(){ + public static List getAllCompressors() { return new FastClasspathScanner(AbstractAlgorithm.class.getPackage().getName()) .scan().getNamesOfSubclassesOf(AbstractAlgorithm.class) .stream() .map(className -> { try { - return (AbstractAlgorithm)Reflect.getClass(className) - .get().construct().getClassInstance(); + return (AbstractAlgorithm) Reflect.getClass(className).get().construct().getClassInstance(); } catch (Exception e){ return null; } @@ -38,7 +37,7 @@ public class Utils { } - public static CompressorResult executeCompressor(byte[] input, AbstractAlgorithm compressor){ + public static CompressorResult executeCompressor(byte[] input, AbstractAlgorithm compressor) { String compressorName = compressor.getName(); boolean decompressFailed = false; @@ -56,17 +55,17 @@ public class Utils { end2 = Instant.now(); Validate.checkGeneratedClass(decompressed); assert decompressed.length == input.length; - } catch (Throwable e){ + } catch (Throwable e) { System.out.println(String.format("Tekkis viga %s algoritmi lahtipakkimisel! %s", compressorName, e.toString())); decompressFailed = true; } float sizeDiff = (float)input.length / (float)compressed.length; int compressTime = Duration.between(start, end).getNano(); - int decompressTime = start2!=null&&end2!=null?Duration.between(start2, end2).getNano():-1; + int decompressTime = (start2 != null && end2 != null) ? Duration.between(start2, end2).getNano() : -1; return new CompressorResult(compressor, decompressFailed, compressed.length, sizeDiff, compressTime, decompressTime); } - public static List executeAllNTimes(byte[] input, int n){ + public static List executeAllNTimes(byte[] input, int n) { int i = 0; List lastExecuted = executeAll(input, getAllCompressors()); while(i < n-1){ @@ -82,11 +81,11 @@ public class Utils { return lastExecuted; } - public static List executeAll(byte[] input, List compressors){ + public static List executeAll(byte[] input, List compressors) { return compressors.stream().map(c -> executeCompressor(input, c)).collect(Collectors.toList()); } - public static void generateReport(byte[] input){ + public static void generateReport(byte[] input) { System.out.println("----------------------------------------------------------------------------"); System.out.println("| Algoritm | Suurus | Väiksem | Aeg (kokku) | Aeg (lahti) |"); @@ -97,8 +96,8 @@ public class Utils { compressorResult.getCompressor().getName(), compressorResult.getSize(), compressorResult.getDifference(), - (compressorResult.getTimeInNS() / 1000000)+"ms", - (compressorResult.getDecompressTimeInNS() / 1000000)+"ms" + (compressorResult.getTimeInNS() / 1000000) + "ms", + (compressorResult.getDecompressTimeInNS() / 1000000) + "ms" ); }); System.out.println("|--------------------------------------------------------------------------|"); @@ -116,7 +115,7 @@ public class Utils { @Override public int compareTo(@NotNull Utils.CompressorResult o) { - return new Integer(size).compareTo(o.getSize()); + return Integer.compare(size, o.getSize()); } } diff --git a/src/main/java/eu/mikroskeem/uurimustoo/algoritmidetest/algoritmid/AbstractAlgorithm.java b/src/main/java/eu/mikroskeem/uurimustoo/algoritmidetest/algoritmid/AbstractAlgorithm.java index e7fbc48..5477bd3 100644 --- a/src/main/java/eu/mikroskeem/uurimustoo/algoritmidetest/algoritmid/AbstractAlgorithm.java +++ b/src/main/java/eu/mikroskeem/uurimustoo/algoritmidetest/algoritmid/AbstractAlgorithm.java @@ -2,7 +2,11 @@ package eu.mikroskeem.uurimustoo.algoritmidetest.algoritmid; import eu.mikroskeem.shuriken.common.SneakyThrow; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; /** * @author Mark Vainomaa @@ -10,25 +14,25 @@ import java.io.*; public abstract class AbstractAlgorithm { public abstract String getName(); - public byte[] compress(byte[] input){ + public byte[] compress(byte[] input) { try { ByteArrayInputStream bais = new ByteArrayInputStream(input); ByteArrayOutputStream baos = new ByteArrayOutputStream(); compress(bais, baos); return baos.toByteArray(); - } catch (IOException e){ + } catch (IOException e) { SneakyThrow.throwException(e); } return new byte[0]; // Never reaches here anyway } - public byte[] decompress(byte[] input){ + public byte[] decompress(byte[] input) { try { ByteArrayInputStream bais = new ByteArrayInputStream(input); ByteArrayOutputStream baos = new ByteArrayOutputStream(); decompress(bais, baos); return baos.toByteArray(); - } catch (IOException e){ + } catch (IOException e) { SneakyThrow.throwException(e); } return new byte[0]; // Never reaches here anyway diff --git a/src/main/java/eu/mikroskeem/uurimustoo/algoritmidetest/algoritmid/LZO.java b/src/main/java/eu/mikroskeem/uurimustoo/algoritmidetest/algoritmid/LZO.java index 3d8f0f8..4458fc3 100644 --- a/src/main/java/eu/mikroskeem/uurimustoo/algoritmidetest/algoritmid/LZO.java +++ b/src/main/java/eu/mikroskeem/uurimustoo/algoritmidetest/algoritmid/LZO.java @@ -1,7 +1,12 @@ package eu.mikroskeem.uurimustoo.algoritmidetest.algoritmid; import lombok.Getter; -import org.anarres.lzo.*; +import org.anarres.lzo.LzoAlgorithm; +import org.anarres.lzo.LzoCompressor; +import org.anarres.lzo.LzoDecompressor; +import org.anarres.lzo.LzoInputStream; +import org.anarres.lzo.LzoLibrary; +import org.anarres.lzo.LzoOutputStream; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/eu/mikroskeem/uurimustoo/algoritmidetest/algoritmid/Zip.java b/src/main/java/eu/mikroskeem/uurimustoo/algoritmidetest/algoritmid/Zip.java index 5951f21..be8fe7a 100644 --- a/src/main/java/eu/mikroskeem/uurimustoo/algoritmidetest/algoritmid/Zip.java +++ b/src/main/java/eu/mikroskeem/uurimustoo/algoritmidetest/algoritmid/Zip.java @@ -17,7 +17,7 @@ public class Zip extends AbstractAlgorithm { @Override public void compress(InputStream inputStream, OutputStream outputStream) throws IOException { - try(ZipOutputStream out = new ZipOutputStream(outputStream)){ + try(ZipOutputStream out = new ZipOutputStream(outputStream)) { ZipEntry ze = new ZipEntry("Test.class"); out.putNextEntry(ze); byte[] buf = new byte[8192]; @@ -32,7 +32,7 @@ public class Zip extends AbstractAlgorithm { @Override public void decompress(InputStream inputStream, OutputStream outputStream) throws IOException { - try(ZipInputStream in = new ZipInputStream(inputStream)){ + try(ZipInputStream in = new ZipInputStream(inputStream)) { ZipEntry ze = in.getNextEntry(); assert ze.getName().equals("Test.class"); byte[] buf = new byte[8192];