From a685b02478d6306a60dc0e70ccde31b93df377df Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Wed, 21 Aug 2024 16:19:36 +0200 Subject: [PATCH] Rename ForJava9AndLater to ForJava10AndLater to match the actual meaning Signed-off-by: Sven Strickroth --- .../shim/{ForJava9AndLater.java => ForJava10AndLater.java} | 2 +- java8-shim/src/main/java/org/owasp/shim/Java8Shim.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename java10-shim/src/main/java/org/owasp/shim/{ForJava9AndLater.java => ForJava10AndLater.java} (96%) diff --git a/java10-shim/src/main/java/org/owasp/shim/ForJava9AndLater.java b/java10-shim/src/main/java/org/owasp/shim/ForJava10AndLater.java similarity index 96% rename from java10-shim/src/main/java/org/owasp/shim/ForJava9AndLater.java rename to java10-shim/src/main/java/org/owasp/shim/ForJava10AndLater.java index 78de9746..c373baa1 100644 --- a/java10-shim/src/main/java/org/owasp/shim/ForJava9AndLater.java +++ b/java10-shim/src/main/java/org/owasp/shim/ForJava10AndLater.java @@ -3,7 +3,7 @@ import java.util.*; @SuppressWarnings("Since15") // We're compiling two versions to handle @since problems. -final class ForJava9AndLater extends Java8Shim { +final class ForJava10AndLater extends Java8Shim { @Override public List listOf() { return List.of(); diff --git a/java8-shim/src/main/java/org/owasp/shim/Java8Shim.java b/java8-shim/src/main/java/org/owasp/shim/Java8Shim.java index abc5c1c5..f0ed8254 100644 --- a/java8-shim/src/main/java/org/owasp/shim/Java8Shim.java +++ b/java8-shim/src/main/java/org/owasp/shim/Java8Shim.java @@ -17,8 +17,8 @@ public abstract class Java8Shim { Object _instance; try { try { - // This is compiled with -release 1.9 in a separate project. - _instance = Class.forName("org.owasp.shim.ForJava9AndLater").newInstance(); + // This is compiled with -release 1.10 in a separate project. + _instance = Class.forName("org.owasp.shim.ForJava10AndLater").newInstance(); } catch (Error e) { // This is co-located with this project and is a fall-back. _instance = Class.forName("org.owasp.shim.ForJava8").newInstance();