From dec971274c452633584b0094d6195f27406f3f04 Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Mon, 14 Oct 2024 00:06:38 +0200 Subject: [PATCH] Added some lambda --- .../com/mergebase/log4j/Log4JDetector.java | 21 ++++++++----------- .../mergebase/log4j/VersionComparator.java | 9 +------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/mergebase/log4j/Log4JDetector.java b/src/main/java/com/mergebase/log4j/Log4JDetector.java index 3147d32..85ab836 100644 --- a/src/main/java/com/mergebase/log4j/Log4JDetector.java +++ b/src/main/java/com/mergebase/log4j/Log4JDetector.java @@ -217,20 +217,17 @@ private static boolean isZipSentinel(int[] chunk) { return chunk[0] == 0x50 && chunk[1] == 0x4B && chunk[2] == 3 && chunk[3] == 4; } - private static final Comparator FILES_ORDER_BY_NAME = new Comparator<>() { - @Override - public int compare(File f1, File f2) { - String s1 = f1 != null ? f1.getName() : ""; - String s2 = f2 != null ? f2.getName() : ""; - int c = s1.compareToIgnoreCase(s2); - if (c == 0) { - c = s1.compareTo(s2); - if (c == 0 && f1 != null) { - c = f1.compareTo(f2); - } + private static final Comparator FILES_ORDER_BY_NAME = (f1, f2) -> { + String s1 = f1 != null ? f1.getName() : ""; + String s2 = f2 != null ? f2.getName() : ""; + int c = s1.compareToIgnoreCase(s2); + if (c == 0) { + c = s1.compareTo(s2); + if (c == 0 && f1 != null) { + c = f1.compareTo(f2); } - return c; } + return c; }; /** diff --git a/src/main/java/com/mergebase/log4j/VersionComparator.java b/src/main/java/com/mergebase/log4j/VersionComparator.java index 82aec75..135727d 100644 --- a/src/main/java/com/mergebase/log4j/VersionComparator.java +++ b/src/main/java/com/mergebase/log4j/VersionComparator.java @@ -150,14 +150,7 @@ private static String[] subSplit(String s) { } public static Comparator comparatorBySimilarity(final String anchor) { - return new Comparator<>() { - @Override - public int compare(String o1, String o2) { - int i1 = similarity(anchor, o1); - int i2 = similarity(anchor, o2); - return Integer.compare(i1, i2); - } - }; + return Comparator.comparingInt(s -> similarity(anchor, s)); } public static int similarity(String s1, String s2) {