diff --git a/.github/workflows/build_snapshot.yml b/.github/workflows/build_snapshot.yml index ab17ec7c..7731503d 100644 --- a/.github/workflows/build_snapshot.yml +++ b/.github/workflows/build_snapshot.yml @@ -1,4 +1,3 @@ - name: Build Snapshot on: diff --git a/LICENSE.md b/LICENSE.md index af045ace..d7e2a8f6 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -165,28 +165,28 @@ fee. distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: - a) The modified work must itself be a software library. + a) The modified work must itself be a software library. - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, @@ -338,14 +338,14 @@ distribute. the Library and of the other library facilities is otherwise permitted, and provided that you do these two things: - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. 8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any diff --git a/README.md b/README.md index e1c69e8c..b38c9a0e 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,13 @@ # JvmDowngrader -downgrades modern java bytecode to older versions. at either compile and/or runtime (requires runtime for certain things to work such as `MethodHandles$Lookup#defineClass`). +downgrades modern java bytecode to older versions. at either compile and/or runtime (requires runtime for certain things +to work such as `MethodHandles$Lookup#defineClass`). ## initial relesase TODO: + - [ ] finish downgrade task for gradle plugin - [ ] stub for MethodHandles$Lookup#defineClass - - ### inspired by + https://github.com/Chocohead/Not-So-New and https://github.com/luontola/retrolambda diff --git a/downgradetest/src/main/java/xyz/wagyourtail/downgradetest/TestFile.java b/downgradetest/src/main/java/xyz/wagyourtail/downgradetest/TestFile.java index 5076b83f..fdfcf555 100644 --- a/downgradetest/src/main/java/xyz/wagyourtail/downgradetest/TestFile.java +++ b/downgradetest/src/main/java/xyz/wagyourtail/downgradetest/TestFile.java @@ -4,7 +4,6 @@ import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; -import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; public class TestFile { diff --git a/java-api/src/coverage/java/xyz/wagyourtail/jvmdg/coverage/CoverageChecker.java b/java-api/src/coverage/java/xyz/wagyourtail/jvmdg/coverage/CoverageChecker.java index 9a6e8c17..e3929eb8 100644 --- a/java-api/src/coverage/java/xyz/wagyourtail/jvmdg/coverage/CoverageChecker.java +++ b/java-api/src/coverage/java/xyz/wagyourtail/jvmdg/coverage/CoverageChecker.java @@ -13,8 +13,6 @@ import java.io.IOException; import java.io.UncheckedIOException; -import java.lang.reflect.Method; -import java.net.URI; import java.net.URISyntaxException; import java.net.URL; import java.nio.file.Files; @@ -92,7 +90,8 @@ public static void main(String[] args) throws IOException, URISyntaxException { compare(versions.get(v), classes, requiredStubs); Map> stubClasses = versionProvider.classStubs; - outer:for (var staticAndStub : requiredStubs) { + outer: + for (var staticAndStub : requiredStubs) { var isStatic = staticAndStub.isStatic(); var isAbstract = staticAndStub.isAbstract(); var modName = staticAndStub.module(); @@ -205,8 +204,6 @@ public static void main(String[] args) throws IOException, URISyntaxException { } } - public record MemberInfo(String module, FullyQualifiedMemberNameAndDesc fqm, boolean isAbstract, boolean isStatic) {} - private static void writeList(List missing, Path outputFile) throws IOException { Files.createDirectories(outputFile.getParent()); Files.deleteIfExists(outputFile); @@ -282,7 +279,8 @@ public static void compare(List moduleHolders, Map(); var ct = Type.getObjectType(cn.name); - outerA:for (var m : oldCls.methods) { + outerA: + for (var m : oldCls.methods) { if ((m.access & (Opcodes.ACC_PUBLIC | Opcodes.ACC_PROTECTED)) == 0) continue; if (m.name.equals("")) continue; if (m.invisibleAnnotations != null) { @@ -297,7 +295,8 @@ public static void compare(List moduleHolders, Map moduleHolders, Map host, Class clazz) throws ClassNo @Stub public static Class[] getNestMembers(Class clazz) throws IllegalAccessException, ClassNotFoundException { if (clazz.isPrimitive() || clazz.isArray()) { - return new Class[] { clazz }; + return new Class[]{clazz}; } try { Class host = getNestHost(clazz); @@ -51,7 +50,7 @@ public static Class[] getNestMembers(Class clazz) throws IllegalAccessExce } return classes; } catch (NoSuchFieldException e) { - return new Class[] { clazz }; + return new Class[]{clazz}; } } diff --git a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_L_String.java b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_L_String.java index 5ced9683..47e817ce 100644 --- a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_L_String.java +++ b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_L_String.java @@ -1,7 +1,6 @@ package xyz.wagyourtail.jvmdg.j11.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Stub; import java.io.BufferedReader; diff --git a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_L_StringBuffer.java b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_L_StringBuffer.java index de5dfcae..5da6083c 100644 --- a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_L_StringBuffer.java +++ b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_L_StringBuffer.java @@ -1,7 +1,6 @@ package xyz.wagyourtail.jvmdg.j11.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Stub; public class J_L_StringBuffer { diff --git a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_L_StringBuilder.java b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_L_StringBuilder.java index 377c0447..fb2298bf 100644 --- a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_L_StringBuilder.java +++ b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_L_StringBuilder.java @@ -1,7 +1,6 @@ package xyz.wagyourtail.jvmdg.j11.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Stub; public class J_L_StringBuilder { diff --git a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_N_C_SelectionKey.java b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_N_C_SelectionKey.java index e35702d8..e84f95b1 100644 --- a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_N_C_SelectionKey.java +++ b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_N_C_SelectionKey.java @@ -1,7 +1,6 @@ package xyz.wagyourtail.jvmdg.j11.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Stub; import java.nio.channels.SelectionKey; diff --git a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_N_C_Selector.java b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_N_C_Selector.java index 06bffd60..92418ae9 100644 --- a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_N_C_Selector.java +++ b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_N_C_Selector.java @@ -1,7 +1,6 @@ package xyz.wagyourtail.jvmdg.j11.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Stub; import java.io.IOException; diff --git a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_N_F_Files.java b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_N_F_Files.java index 396fc900..62db170c 100644 --- a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_N_F_Files.java +++ b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_N_F_Files.java @@ -1,7 +1,6 @@ package xyz.wagyourtail.jvmdg.j11.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Ref; import xyz.wagyourtail.jvmdg.version.Stub; diff --git a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_N_F_Path.java b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_N_F_Path.java index f7b65a2e..6da47fd3 100644 --- a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_N_F_Path.java +++ b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_N_F_Path.java @@ -1,7 +1,6 @@ package xyz.wagyourtail.jvmdg.j11.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Ref; import xyz.wagyourtail.jvmdg.version.Stub; diff --git a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_C_TimeUnit.java b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_C_TimeUnit.java index f8abb21a..2777e7b7 100644 --- a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_C_TimeUnit.java +++ b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_C_TimeUnit.java @@ -1,7 +1,6 @@ package xyz.wagyourtail.jvmdg.j11.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Stub; import java.time.Duration; diff --git a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_Collection.java b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_Collection.java index 83329970..ba1b8fd1 100644 --- a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_Collection.java +++ b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_Collection.java @@ -1,7 +1,6 @@ package xyz.wagyourtail.jvmdg.j11.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Stub; import java.util.Collection; diff --git a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_F_Predicate.java b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_F_Predicate.java index ebd60da0..07f559d7 100644 --- a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_F_Predicate.java +++ b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_F_Predicate.java @@ -1,7 +1,6 @@ package xyz.wagyourtail.jvmdg.j11.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Ref; import xyz.wagyourtail.jvmdg.version.Stub; diff --git a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_Optional.java b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_Optional.java index c0d63a6c..2bb0ae96 100644 --- a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_Optional.java +++ b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_Optional.java @@ -1,6 +1,5 @@ package xyz.wagyourtail.jvmdg.j11.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Stub; import java.util.Optional; diff --git a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_OptionalDouble.java b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_OptionalDouble.java index 08ebf0ef..43ba903f 100644 --- a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_OptionalDouble.java +++ b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_OptionalDouble.java @@ -1,9 +1,7 @@ package xyz.wagyourtail.jvmdg.j11.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Stub; -import java.util.Optional; import java.util.OptionalDouble; public class J_U_OptionalDouble { diff --git a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_OptionalInt.java b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_OptionalInt.java index bf645a26..1f31ff45 100644 --- a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_OptionalInt.java +++ b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_OptionalInt.java @@ -1,9 +1,7 @@ package xyz.wagyourtail.jvmdg.j11.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Stub; -import java.util.Optional; import java.util.OptionalInt; public class J_U_OptionalInt { diff --git a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_OptionalLong.java b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_OptionalLong.java index 5990232c..28805b23 100644 --- a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_OptionalLong.java +++ b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_OptionalLong.java @@ -1,9 +1,7 @@ package xyz.wagyourtail.jvmdg.j11.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Stub; -import java.util.OptionalInt; import java.util.OptionalLong; public class J_U_OptionalLong { diff --git a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_R_Pattern.java b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_R_Pattern.java index e08718d1..32c58492 100644 --- a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_R_Pattern.java +++ b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_R_Pattern.java @@ -1,6 +1,5 @@ package xyz.wagyourtail.jvmdg.j11.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Stub; import java.util.function.Predicate; diff --git a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_Z_Deflater.java b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_Z_Deflater.java index ec179616..23240350 100644 --- a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_Z_Deflater.java +++ b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_Z_Deflater.java @@ -1,7 +1,6 @@ package xyz.wagyourtail.jvmdg.j11.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Stub; import java.nio.ByteBuffer; diff --git a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_Z_Inflater.java b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_Z_Inflater.java index 8c2df8a1..0985cabf 100644 --- a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_Z_Inflater.java +++ b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_base/J_U_Z_Inflater.java @@ -1,7 +1,6 @@ package xyz.wagyourtail.jvmdg.j11.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Stub; import java.nio.ByteBuffer; diff --git a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_net_http/J_N_H_HttpClient.java b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_net_http/J_N_H_HttpClient.java index 93af2bad..23a7a3a5 100644 --- a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_net_http/J_N_H_HttpClient.java +++ b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_net_http/J_N_H_HttpClient.java @@ -2,8 +2,6 @@ import xyz.wagyourtail.jvmdg.version.Adapter; -import xyz.wagyourtail.jvmdg.version.Ref; -import xyz.wagyourtail.jvmdg.version.Stub; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLParameters; diff --git a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_net_http/J_N_H_HttpRequest.java b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_net_http/J_N_H_HttpRequest.java index dcc716ac..99d67262 100644 --- a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_net_http/J_N_H_HttpRequest.java +++ b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_net_http/J_N_H_HttpRequest.java @@ -1,8 +1,6 @@ package xyz.wagyourtail.jvmdg.j11.stub.java_net_http; import xyz.wagyourtail.jvmdg.version.Adapter; -import xyz.wagyourtail.jvmdg.version.Ref; -import xyz.wagyourtail.jvmdg.version.Stub; import java.io.InputStream; import java.net.URI; @@ -30,8 +28,11 @@ public static Builder newBuilder() { public abstract String method(); public abstract Optional timeout(); + public abstract boolean expectContinue(); + public abstract URI uri(); + public abstract Optional version(); // public abstract HttpHeaders headers(); @@ -64,18 +65,31 @@ public interface BodyPublisher extends Flow.Publisher { @Adapter("Ljava/net/http/HttpRequest$Builder;") public interface Builder { Builder uri(URI uri); + Builder expectContinue(boolean expectContinue); + Builder version(J_N_H_HttpClient.Version version); + Builder header(String name, String value); + Builder headers(String... headers); + Builder timeout(Duration duration); + Builder setHeader(String name, String value); + Builder GET(); + Builder POST(BodyPublisher publisher); + Builder PUT(BodyPublisher publisher); + Builder DELETE(); + Builder method(String name, BodyPublisher publisher); + J_N_H_HttpRequest build(); + Builder copy(); } diff --git a/java-api/src/java13/java/xyz/wagyourtail/jvmdg/j13/stub/java_base/J_N_Buffer.java b/java-api/src/java13/java/xyz/wagyourtail/jvmdg/j13/stub/java_base/J_N_Buffer.java index 223fe150..4df2cb80 100644 --- a/java-api/src/java13/java/xyz/wagyourtail/jvmdg/j13/stub/java_base/J_N_Buffer.java +++ b/java-api/src/java13/java/xyz/wagyourtail/jvmdg/j13/stub/java_base/J_N_Buffer.java @@ -1,10 +1,9 @@ package xyz.wagyourtail.jvmdg.j13.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Stub; -import java.nio.*; +import java.nio.Buffer; public class J_N_Buffer { diff --git a/java-api/src/java13/java/xyz/wagyourtail/jvmdg/j13/stub/java_base/J_N_F_FileSystems.java b/java-api/src/java13/java/xyz/wagyourtail/jvmdg/j13/stub/java_base/J_N_F_FileSystems.java index 5a72bcbe..83ce3ce6 100644 --- a/java-api/src/java13/java/xyz/wagyourtail/jvmdg/j13/stub/java_base/J_N_F_FileSystems.java +++ b/java-api/src/java13/java/xyz/wagyourtail/jvmdg/j13/stub/java_base/J_N_F_FileSystems.java @@ -1,7 +1,6 @@ package xyz.wagyourtail.jvmdg.j13.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Ref; import xyz.wagyourtail.jvmdg.version.Stub; diff --git a/java-api/src/java14/java/xyz/wagyourtail/jvmdg/j14/stub/java_base/J_L_StrictMath.java b/java-api/src/java14/java/xyz/wagyourtail/jvmdg/j14/stub/java_base/J_L_StrictMath.java index 430ed9d4..f3953991 100644 --- a/java-api/src/java14/java/xyz/wagyourtail/jvmdg/j14/stub/java_base/J_L_StrictMath.java +++ b/java-api/src/java14/java/xyz/wagyourtail/jvmdg/j14/stub/java_base/J_L_StrictMath.java @@ -1,7 +1,6 @@ package xyz.wagyourtail.jvmdg.j14.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Ref; import xyz.wagyourtail.jvmdg.version.Stub; diff --git a/java-api/src/java14/java/xyz/wagyourtail/jvmdg/j14/stub/java_base/J_U_C_L_LockSupport.java b/java-api/src/java14/java/xyz/wagyourtail/jvmdg/j14/stub/java_base/J_U_C_L_LockSupport.java index 2daf4538..a31026e8 100644 --- a/java-api/src/java14/java/xyz/wagyourtail/jvmdg/j14/stub/java_base/J_U_C_L_LockSupport.java +++ b/java-api/src/java14/java/xyz/wagyourtail/jvmdg/j14/stub/java_base/J_U_C_L_LockSupport.java @@ -1,7 +1,6 @@ package xyz.wagyourtail.jvmdg.j14.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Ref; import xyz.wagyourtail.jvmdg.version.Stub; diff --git a/java-api/src/java15/java/xyz/wagyourtail/jvmdg/j15/stub/java_base/J_L_I_MethodHandles$Lookup$ClassOption.java b/java-api/src/java15/java/xyz/wagyourtail/jvmdg/j15/stub/java_base/J_L_I_MethodHandles$Lookup$ClassOption.java index 9ee70bc2..68d31d3d 100644 --- a/java-api/src/java15/java/xyz/wagyourtail/jvmdg/j15/stub/java_base/J_L_I_MethodHandles$Lookup$ClassOption.java +++ b/java-api/src/java15/java/xyz/wagyourtail/jvmdg/j15/stub/java_base/J_L_I_MethodHandles$Lookup$ClassOption.java @@ -1,8 +1,6 @@ package xyz.wagyourtail.jvmdg.j15.stub.java_base; import xyz.wagyourtail.jvmdg.version.Adapter; -import xyz.wagyourtail.jvmdg.version.Ref; -import xyz.wagyourtail.jvmdg.version.Stub; import java.util.Set; diff --git a/java-api/src/java15/java/xyz/wagyourtail/jvmdg/j15/stub/java_base/J_L_Math.java b/java-api/src/java15/java/xyz/wagyourtail/jvmdg/j15/stub/java_base/J_L_Math.java index 80dbbefc..e03c72af 100644 --- a/java-api/src/java15/java/xyz/wagyourtail/jvmdg/j15/stub/java_base/J_L_Math.java +++ b/java-api/src/java15/java/xyz/wagyourtail/jvmdg/j15/stub/java_base/J_L_Math.java @@ -1,7 +1,6 @@ package xyz.wagyourtail.jvmdg.j15.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Ref; import xyz.wagyourtail.jvmdg.version.Stub; diff --git a/java-api/src/java15/java/xyz/wagyourtail/jvmdg/j15/stub/java_base/J_L_String.java b/java-api/src/java15/java/xyz/wagyourtail/jvmdg/j15/stub/java_base/J_L_String.java index 9878f2e8..53d7fc68 100644 --- a/java-api/src/java15/java/xyz/wagyourtail/jvmdg/j15/stub/java_base/J_L_String.java +++ b/java-api/src/java15/java/xyz/wagyourtail/jvmdg/j15/stub/java_base/J_L_String.java @@ -1,7 +1,6 @@ package xyz.wagyourtail.jvmdg.j15.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Stub; public class J_L_String { diff --git a/java-api/src/java15/java/xyz/wagyourtail/jvmdg/j15/stub/java_base/J_N_C_S_SelectorProvider.java b/java-api/src/java15/java/xyz/wagyourtail/jvmdg/j15/stub/java_base/J_N_C_S_SelectorProvider.java index 7afca56b..cf38397b 100644 --- a/java-api/src/java15/java/xyz/wagyourtail/jvmdg/j15/stub/java_base/J_N_C_S_SelectorProvider.java +++ b/java-api/src/java15/java/xyz/wagyourtail/jvmdg/j15/stub/java_base/J_N_C_S_SelectorProvider.java @@ -1,7 +1,6 @@ package xyz.wagyourtail.jvmdg.j15.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Stub; import java.io.IOException; diff --git a/java-api/src/java15/java/xyz/wagyourtail/jvmdg/j15/stub/java_base/J_U_NoSuchElementException.java b/java-api/src/java15/java/xyz/wagyourtail/jvmdg/j15/stub/java_base/J_U_NoSuchElementException.java index 81241b69..827a46b7 100644 --- a/java-api/src/java15/java/xyz/wagyourtail/jvmdg/j15/stub/java_base/J_U_NoSuchElementException.java +++ b/java-api/src/java15/java/xyz/wagyourtail/jvmdg/j15/stub/java_base/J_U_NoSuchElementException.java @@ -1,7 +1,6 @@ package xyz.wagyourtail.jvmdg.j15.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Ref; import xyz.wagyourtail.jvmdg.version.Stub; diff --git a/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/J_U_L_LogRecord.java b/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/J_U_L_LogRecord.java index aec67cc6..002315b0 100644 --- a/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/J_U_L_LogRecord.java +++ b/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/J_U_L_LogRecord.java @@ -1,7 +1,6 @@ package xyz.wagyourtail.jvmdg.j16.stub; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Stub; import java.util.logging.LogRecord; diff --git a/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_L_IndexOutOfBoundsException.java b/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_L_IndexOutOfBoundsException.java index 00c6132c..c6bdf618 100644 --- a/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_L_IndexOutOfBoundsException.java +++ b/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_L_IndexOutOfBoundsException.java @@ -1,7 +1,6 @@ package xyz.wagyourtail.jvmdg.j16.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Ref; import xyz.wagyourtail.jvmdg.version.Stub; diff --git a/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_L_R_ObjectMethods.java b/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_L_R_ObjectMethods.java index e7611f85..3d6730cf 100644 --- a/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_L_R_ObjectMethods.java +++ b/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_L_R_ObjectMethods.java @@ -4,10 +4,13 @@ import org.objectweb.asm.Label; import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; -import org.objectweb.asm.tree.*; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.InvokeDynamicInsnNode; +import org.objectweb.asm.tree.MethodInsnNode; +import org.objectweb.asm.tree.MethodNode; import xyz.wagyourtail.jvmdg.Constants; -import xyz.wagyourtail.jvmdg.version.Ref; import xyz.wagyourtail.jvmdg.version.Modify; +import xyz.wagyourtail.jvmdg.version.Ref; import java.util.ArrayList; import java.util.Arrays; @@ -284,7 +287,7 @@ private static void makeToString(ClassNode cnode, String mname, String desc, Typ Opcodes.INVOKEVIRTUAL, "java/lang/StringBuilder", "append", - "(" +tdesc + ")Ljava/lang/StringBuilder;", + "(" + tdesc + ")Ljava/lang/StringBuilder;", false ); break; diff --git a/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_L_R_RecordComponent.java b/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_L_R_RecordComponent.java index 53b36678..6710c508 100644 --- a/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_L_R_RecordComponent.java +++ b/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_L_R_RecordComponent.java @@ -1,14 +1,10 @@ package xyz.wagyourtail.jvmdg.j16.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Adapter; -import xyz.wagyourtail.jvmdg.version.Ref; -import xyz.wagyourtail.jvmdg.version.Stub; import java.lang.annotation.Annotation; import java.lang.reflect.*; -import java.util.regex.Pattern; @Adapter("Ljava/lang/reflect/RecordComponent;") public class J_L_R_RecordComponent { diff --git a/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_L_Record.java b/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_L_Record.java index cfbe07e8..81ec8be1 100644 --- a/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_L_Record.java +++ b/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_L_Record.java @@ -1,9 +1,6 @@ package xyz.wagyourtail.jvmdg.j16.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Adapter; -import xyz.wagyourtail.jvmdg.version.Ref; -import xyz.wagyourtail.jvmdg.version.Stub; @Adapter("Ljava/lang/Record;") public abstract class J_L_Record { diff --git a/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_N_ByteBuffer.java b/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_N_ByteBuffer.java index 2feca60e..18272348 100644 --- a/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_N_ByteBuffer.java +++ b/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_N_ByteBuffer.java @@ -1,7 +1,6 @@ package xyz.wagyourtail.jvmdg.j16.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Stub; import java.nio.ByteBuffer; diff --git a/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_N_H_HttpRequest.java b/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_N_H_HttpRequest.java index 75b2a65d..37e4882c 100644 --- a/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_N_H_HttpRequest.java +++ b/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_N_H_HttpRequest.java @@ -1,7 +1,6 @@ package xyz.wagyourtail.jvmdg.j16.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Ref; import xyz.wagyourtail.jvmdg.version.Stub; @@ -69,6 +68,14 @@ public AggregatePublisher(HttpRequest.BodyPublisher... publishers) { this.publishers = publishers; } + private static long reduceLength(long a, long b) { + if (a < 0 || b < 0) { + return -1; + } else { + return a + b; + } + } + @Override public long contentLength() { long l = Arrays.stream(publishers).mapToLong(HttpRequest.BodyPublisher::contentLength).reduce( @@ -80,14 +87,6 @@ public long contentLength() { } } - private static long reduceLength(long a, long b) { - if (a < 0 || b < 0) { - return -1; - } else { - return a + b; - } - } - @Override public void subscribe(Flow.Subscriber subscriber) { throw new UnsupportedOperationException("jvmdowgrader does not support this method (yet)."); diff --git a/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_U_Objects.java b/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_U_Objects.java index 401958fd..081a67f1 100644 --- a/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_U_Objects.java +++ b/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_U_Objects.java @@ -1,7 +1,6 @@ package xyz.wagyourtail.jvmdg.j16.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Ref; import xyz.wagyourtail.jvmdg.version.Stub; diff --git a/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_U_S_DoubleStream.java b/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_U_S_DoubleStream.java index 5973891c..0e039b20 100644 --- a/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_U_S_DoubleStream.java +++ b/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_U_S_DoubleStream.java @@ -1,9 +1,7 @@ package xyz.wagyourtail.jvmdg.j16.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Adapter; -import xyz.wagyourtail.jvmdg.version.Ref; import xyz.wagyourtail.jvmdg.version.Stub; import java.util.Objects; @@ -33,7 +31,7 @@ default DoubleStream of(double d) { * values to the {@code dc} consumer. * * @param value the double value coming from upstream - * @param dc a {@code DoubleConsumer} accepting the mapped values + * @param dc a {@code DoubleConsumer} accepting the mapped values */ void accept(double value, DoubleConsumer dc); diff --git a/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_U_S_IntStream.java b/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_U_S_IntStream.java index ec8c4bfc..7dfd6e96 100644 --- a/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_U_S_IntStream.java +++ b/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_U_S_IntStream.java @@ -1,9 +1,7 @@ package xyz.wagyourtail.jvmdg.j16.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Adapter; -import xyz.wagyourtail.jvmdg.version.Ref; import xyz.wagyourtail.jvmdg.version.Stub; import java.util.function.IntConsumer; @@ -33,7 +31,7 @@ default IntStream of(int d) { * values to the {@code dc} consumer. * * @param value the double value coming from upstream - * @param dc a {@code DoubleConsumer} accepting the mapped values + * @param dc a {@code DoubleConsumer} accepting the mapped values */ void accept(int value, IntConsumer dc); diff --git a/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_U_S_LongStream.java b/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_U_S_LongStream.java index aa76d0d6..601c40dd 100644 --- a/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_U_S_LongStream.java +++ b/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_U_S_LongStream.java @@ -1,9 +1,7 @@ package xyz.wagyourtail.jvmdg.j16.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Adapter; -import xyz.wagyourtail.jvmdg.version.Ref; import xyz.wagyourtail.jvmdg.version.Stub; import java.util.function.LongConsumer; @@ -34,7 +32,7 @@ default LongStream of(long d) { * values to the {@code dc} consumer. * * @param value the double value coming from upstream - * @param dc a {@code DoubleConsumer} accepting the mapped values + * @param dc a {@code DoubleConsumer} accepting the mapped values */ void accept(long value, LongConsumer dc); diff --git a/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_U_S_Stream.java b/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_U_S_Stream.java index 115bee2c..33cbc173 100644 --- a/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_U_S_Stream.java +++ b/java-api/src/java16/java/xyz/wagyourtail/jvmdg/j16/stub/java_base/J_U_S_Stream.java @@ -1,7 +1,6 @@ package xyz.wagyourtail.jvmdg.j16.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Stub; import java.util.ArrayList; @@ -9,7 +8,10 @@ import java.util.Collections; import java.util.List; import java.util.function.*; -import java.util.stream.*; +import java.util.stream.DoubleStream; +import java.util.stream.IntStream; +import java.util.stream.LongStream; +import java.util.stream.Stream; public class J_U_S_Stream { diff --git a/java-api/src/java17/java/xyz/wagyourtail/jvmdg/j17/stub/java_base/J_I_Console.java b/java-api/src/java17/java/xyz/wagyourtail/jvmdg/j17/stub/java_base/J_I_Console.java index 4ab5af87..1bf1f933 100644 --- a/java-api/src/java17/java/xyz/wagyourtail/jvmdg/j17/stub/java_base/J_I_Console.java +++ b/java-api/src/java17/java/xyz/wagyourtail/jvmdg/j17/stub/java_base/J_I_Console.java @@ -1,7 +1,6 @@ package xyz.wagyourtail.jvmdg.j17.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Stub; import java.io.Console; diff --git a/java-api/src/java17/java/xyz/wagyourtail/jvmdg/j17/stub/java_base/J_L_Class.java b/java-api/src/java17/java/xyz/wagyourtail/jvmdg/j17/stub/java_base/J_L_Class.java index b9eab1c2..18e8d4f3 100644 --- a/java-api/src/java17/java/xyz/wagyourtail/jvmdg/j17/stub/java_base/J_L_Class.java +++ b/java-api/src/java17/java/xyz/wagyourtail/jvmdg/j17/stub/java_base/J_L_Class.java @@ -1,7 +1,6 @@ package xyz.wagyourtail.jvmdg.j17.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Stub; import java.lang.reflect.Field; diff --git a/java-api/src/java17/java/xyz/wagyourtail/jvmdg/j17/stub/java_base/J_L_Process.java b/java-api/src/java17/java/xyz/wagyourtail/jvmdg/j17/stub/java_base/J_L_Process.java index 2ae66957..4f07712b 100644 --- a/java-api/src/java17/java/xyz/wagyourtail/jvmdg/j17/stub/java_base/J_L_Process.java +++ b/java-api/src/java17/java/xyz/wagyourtail/jvmdg/j17/stub/java_base/J_L_Process.java @@ -1,10 +1,12 @@ package xyz.wagyourtail.jvmdg.j17.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Stub; -import java.io.*; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; import java.nio.charset.Charset; public class J_L_Process { diff --git a/java-api/src/java19/java/xyz/wagyourtail/jvmdg/j19/stub/java_base/J_I_InvalidObjectException.java b/java-api/src/java19/java/xyz/wagyourtail/jvmdg/j19/stub/java_base/J_I_InvalidObjectException.java index 10f00d3f..b8b98e57 100644 --- a/java-api/src/java19/java/xyz/wagyourtail/jvmdg/j19/stub/java_base/J_I_InvalidObjectException.java +++ b/java-api/src/java19/java/xyz/wagyourtail/jvmdg/j19/stub/java_base/J_I_InvalidObjectException.java @@ -4,7 +4,6 @@ import org.objectweb.asm.tree.*; import xyz.wagyourtail.jvmdg.version.Modify; import xyz.wagyourtail.jvmdg.version.Ref; -import xyz.wagyourtail.jvmdg.version.Stub; public class J_I_InvalidObjectException { diff --git a/java-api/src/java19/java/xyz/wagyourtail/jvmdg/j19/stub/java_base/J_I_ObjectStreamException.java b/java-api/src/java19/java/xyz/wagyourtail/jvmdg/j19/stub/java_base/J_I_ObjectStreamException.java index 9c3f56f6..5570d906 100644 --- a/java-api/src/java19/java/xyz/wagyourtail/jvmdg/j19/stub/java_base/J_I_ObjectStreamException.java +++ b/java-api/src/java19/java/xyz/wagyourtail/jvmdg/j19/stub/java_base/J_I_ObjectStreamException.java @@ -1,7 +1,6 @@ package xyz.wagyourtail.jvmdg.j19.stub.java_base; import org.objectweb.asm.Opcodes; -import org.objectweb.asm.Type; import org.objectweb.asm.tree.*; import xyz.wagyourtail.jvmdg.version.Modify; import xyz.wagyourtail.jvmdg.version.Ref; diff --git a/java-api/src/java19/java/xyz/wagyourtail/jvmdg/j19/stub/java_base/J_L_WrongThreadException.java b/java-api/src/java19/java/xyz/wagyourtail/jvmdg/j19/stub/java_base/J_L_WrongThreadException.java index 27e6b0bd..12ab6e52 100644 --- a/java-api/src/java19/java/xyz/wagyourtail/jvmdg/j19/stub/java_base/J_L_WrongThreadException.java +++ b/java-api/src/java19/java/xyz/wagyourtail/jvmdg/j19/stub/java_base/J_L_WrongThreadException.java @@ -1,8 +1,6 @@ package xyz.wagyourtail.jvmdg.j19.stub.java_base; import xyz.wagyourtail.jvmdg.version.Adapter; -import xyz.wagyourtail.jvmdg.version.Ref; -import xyz.wagyourtail.jvmdg.version.Stub; @Adapter("java/lang/WrongThreadException") public class J_L_WrongThreadException extends RuntimeException { diff --git a/java-api/src/java19/java/xyz/wagyourtail/jvmdg/j19/stub/java_base/J_U_C_Future.java b/java-api/src/java19/java/xyz/wagyourtail/jvmdg/j19/stub/java_base/J_U_C_Future.java index 2001fc23..6a87e9e4 100644 --- a/java-api/src/java19/java/xyz/wagyourtail/jvmdg/j19/stub/java_base/J_U_C_Future.java +++ b/java-api/src/java19/java/xyz/wagyourtail/jvmdg/j19/stub/java_base/J_U_C_Future.java @@ -1,10 +1,8 @@ package xyz.wagyourtail.jvmdg.j19.stub.java_base; import xyz.wagyourtail.jvmdg.version.Adapter; -import xyz.wagyourtail.jvmdg.version.Ref; import xyz.wagyourtail.jvmdg.version.Stub; -import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; @@ -63,15 +61,6 @@ public static Throwable exceptionNow(Future future) { } } - - @Adapter("java/util/concurrent/Future$State") - public enum State { - RUNNING, - SUCCESS, - FAILED, - CANCELLED - } - @Stub public static State state(Future future) { if (!future.isDone()) { @@ -97,6 +86,14 @@ public static State state(Future future) { Thread.currentThread().interrupt(); } } - } + } + + @Adapter("java/util/concurrent/Future$State") + public enum State { + RUNNING, + SUCCESS, + FAILED, + CANCELLED + } } diff --git a/java-api/src/java19/java/xyz/wagyourtail/jvmdg/j19/stub/java_base/J_U_LinkedHashMap.java b/java-api/src/java19/java/xyz/wagyourtail/jvmdg/j19/stub/java_base/J_U_LinkedHashMap.java index 7bb2efde..30bf0a04 100644 --- a/java-api/src/java19/java/xyz/wagyourtail/jvmdg/j19/stub/java_base/J_U_LinkedHashMap.java +++ b/java-api/src/java19/java/xyz/wagyourtail/jvmdg/j19/stub/java_base/J_U_LinkedHashMap.java @@ -3,7 +3,6 @@ import xyz.wagyourtail.jvmdg.version.Ref; import xyz.wagyourtail.jvmdg.version.Stub; -import java.util.HashMap; import java.util.LinkedHashMap; public class J_U_LinkedHashMap { diff --git a/java-api/src/java19/java/xyz/wagyourtail/jvmdg/j19/stub/java_base/J_U_LinkedHashSet.java b/java-api/src/java19/java/xyz/wagyourtail/jvmdg/j19/stub/java_base/J_U_LinkedHashSet.java index ec9cb191..ed20daf7 100644 --- a/java-api/src/java19/java/xyz/wagyourtail/jvmdg/j19/stub/java_base/J_U_LinkedHashSet.java +++ b/java-api/src/java19/java/xyz/wagyourtail/jvmdg/j19/stub/java_base/J_U_LinkedHashSet.java @@ -3,7 +3,6 @@ import xyz.wagyourtail.jvmdg.version.Ref; import xyz.wagyourtail.jvmdg.version.Stub; -import java.util.HashSet; import java.util.LinkedHashSet; public class J_U_LinkedHashSet { diff --git a/java-api/src/java20/java/xyz/wagyourtail/jvmdg/j20/stub/java_base/J_L_Float.java b/java-api/src/java20/java/xyz/wagyourtail/jvmdg/j20/stub/java_base/J_L_Float.java index 4e0e7726..a6b0bd98 100644 --- a/java-api/src/java20/java/xyz/wagyourtail/jvmdg/j20/stub/java_base/J_L_Float.java +++ b/java-api/src/java20/java/xyz/wagyourtail/jvmdg/j20/stub/java_base/J_L_Float.java @@ -7,9 +7,9 @@ public class J_L_Float { @Stub(ref = @Ref("java/lang/Float")) public static float float16ToFloat(short floatBinary16) { - int bin16SignBit = 0x8000 & (int) floatBinary16; - int bin16ExpBits = 0x7c00 & (int) floatBinary16; - int bin16SignifBits = 0x03FF & (int) floatBinary16; + int bin16SignBit = 0x8000 & (int) floatBinary16; + int bin16ExpBits = 0x7c00 & (int) floatBinary16; + int bin16SignifBits = 0x03FF & (int) floatBinary16; final int SIGNIF_SHIFT = 13; @@ -21,7 +21,7 @@ public static float float16ToFloat(short floatBinary16) { } else if (bin16Exp == 16) { return (bin16SignifBits == 0) ? sign * Float.POSITIVE_INFINITY : - Float.intBitsToFloat((bin16SignBit << 16) | 0x7f80_0000 | ( bin16SignifBits << SIGNIF_SHIFT )); + Float.intBitsToFloat((bin16SignBit << 16) | 0x7f80_0000 | (bin16SignifBits << SIGNIF_SHIFT)); } int floatExpBits = (bin16Exp + 127) << 23; @@ -31,16 +31,16 @@ public static float float16ToFloat(short floatBinary16) { @Stub(ref = @Ref("java/lang/Float")) public static short floatToFloat16(float f) { int doppel = Float.floatToRawIntBits(f); - short sign_bit = (short)((doppel & 0x8000_0000) >> 16); + short sign_bit = (short) ((doppel & 0x8000_0000) >> 16); if (Float.isNaN(f)) { - return (short)(sign_bit | 0x7c00 | (doppel & 0x007f_e000) >> 13 | (doppel & 0x0000_1ff0) >> 4 | (doppel & 0x0000_000f)); + return (short) (sign_bit | 0x7c00 | (doppel & 0x007f_e000) >> 13 | (doppel & 0x0000_1ff0) >> 4 | (doppel & 0x0000_000f)); } float abs_f = Math.abs(f); - if (abs_f >= (0x1.ffcp15f + 0x0.002p15f) ) { - return (short)(sign_bit | 0x7c00); + if (abs_f >= (0x1.ffcp15f + 0x0.002p15f)) { + return (short) (sign_bit | 0x7c00); } if (abs_f <= 0x1.0p-24f * 0.5f) { @@ -59,17 +59,17 @@ public static short floatToFloat16(float f) { } int f_signif_bits = doppel & 0x007f_ffff | msb; - short signif_bits = (short)(f_signif_bits >> (13 + expdelta)); + short signif_bits = (short) (f_signif_bits >> (13 + expdelta)); - int lsb = f_signif_bits & (1 << 13 + expdelta); - int round = f_signif_bits & (1 << 12 + expdelta); + int lsb = f_signif_bits & (1 << 13 + expdelta); + int round = f_signif_bits & (1 << 12 + expdelta); int sticky = f_signif_bits & ((1 << 12 + expdelta) - 1); - if (round != 0 && ((lsb | sticky) != 0 )) { + if (round != 0 && ((lsb | sticky) != 0)) { signif_bits++; } - return (short)(sign_bit | ( ((exp + 15) << 10) + signif_bits ) ); + return (short) (sign_bit | (((exp + 15) << 10) + signif_bits)); } } diff --git a/java-api/src/java20/java/xyz/wagyourtail/jvmdg/j20/stub/java_base/J_L_R_AccessFlag.java b/java-api/src/java20/java/xyz/wagyourtail/jvmdg/j20/stub/java_base/J_L_R_AccessFlag.java index 53f6e720..0e76681a 100644 --- a/java-api/src/java20/java/xyz/wagyourtail/jvmdg/j20/stub/java_base/J_L_R_AccessFlag.java +++ b/java-api/src/java20/java/xyz/wagyourtail/jvmdg/j20/stub/java_base/J_L_R_AccessFlag.java @@ -2,8 +2,6 @@ import xyz.wagyourtail.jvmdg.util.Function; import xyz.wagyourtail.jvmdg.version.Adapter; -import xyz.wagyourtail.jvmdg.version.Ref; -import xyz.wagyourtail.jvmdg.version.Stub; import java.lang.reflect.Modifier; import java.util.Collections; @@ -230,6 +228,21 @@ private J_L_R_AccessFlag(int mask, boolean sourceModifier, Set locatio this.locationsFunction = locationsFunction; } + public static Set maskToAccessFlags(int mask, Location location) { + Set result = EnumSet.noneOf(J_L_R_AccessFlag.class); + for (J_L_R_AccessFlag flag : values()) { + if (!flag.locations.contains(location)) continue; + if ((mask & flag.mask) != 0) { + result.add(flag); + mask &= ~flag.mask; + } + } + if (mask != 0) { + throw new IllegalArgumentException("Unmatched bit position 0x" + Integer.toHexString(mask) + " for location " + location); + } + return Collections.unmodifiableSet(result); + } + public int mask() { return mask; } @@ -250,21 +263,6 @@ public Set locations(J_L_R_ClassFileFormatVersion version) { } } - public static Set maskToAccessFlags(int mask, Location location) { - Set result = EnumSet.noneOf(J_L_R_AccessFlag.class); - for (J_L_R_AccessFlag flag : values()) { - if (!flag.locations.contains(location)) continue; - if ((mask & flag.mask) != 0) { - result.add(flag); - mask &= ~flag.mask; - } - } - if (mask != 0) { - throw new IllegalArgumentException("Unmatched bit position 0x" + Integer.toHexString(mask) + " for location " + location); - } - return Collections.unmodifiableSet(result); - } - @Adapter("java/lang/reflect/AccessFlag$Location") public enum Location { CLASS, @@ -275,8 +273,7 @@ public enum Location { MODULE, MODULE_REQUIRES, MODULE_EXPORTS, - MODULE_OPENS - ; + MODULE_OPENS; } diff --git a/java-api/src/java20/java/xyz/wagyourtail/jvmdg/j20/stub/java_base/J_L_R_ClassFileFormatVersion.java b/java-api/src/java20/java/xyz/wagyourtail/jvmdg/j20/stub/java_base/J_L_R_ClassFileFormatVersion.java index 535007f8..031c38e2 100644 --- a/java-api/src/java20/java/xyz/wagyourtail/jvmdg/j20/stub/java_base/J_L_R_ClassFileFormatVersion.java +++ b/java-api/src/java20/java/xyz/wagyourtail/jvmdg/j20/stub/java_base/J_L_R_ClassFileFormatVersion.java @@ -1,8 +1,6 @@ package xyz.wagyourtail.jvmdg.j20.stub.java_base; import xyz.wagyourtail.jvmdg.version.Adapter; -import xyz.wagyourtail.jvmdg.version.Ref; -import xyz.wagyourtail.jvmdg.version.Stub; @Adapter("java/lang/reflect/ClassFileFormatVersion") public enum J_L_R_ClassFileFormatVersion { @@ -40,14 +38,21 @@ public static J_L_R_ClassFileFormatVersion latest() { return RELEASE_22; } - public int major() { - return version; - } - public static J_L_R_ClassFileFormatVersion valueOf(Runtime.Version rv) { return valueOf("RELEASE_" + rv.feature()); } + public static J_L_R_ClassFileFormatVersion fromMajor(int major) { + if (major < 45 || major > latest().major()) { + throw new IllegalArgumentException("Out of range major class file vesion " + major); + } + return values()[major - 44]; + } + + public int major() { + return version; + } + public Runtime.Version runtimeVersion() { if (this.compareTo(RELEASE_6) >= 0) { return Runtime.Version.parse(Integer.toString(ordinal())); @@ -56,11 +61,4 @@ public Runtime.Version runtimeVersion() { } } - public static J_L_R_ClassFileFormatVersion fromMajor(int major) { - if (major < 45 || major > latest().major()) { - throw new IllegalArgumentException("Out of range major class file vesion " + major); - } - return values()[major - 44]; - } - } diff --git a/java-api/src/java20/java/xyz/wagyourtail/jvmdg/j20/stub/java_base/J_L_R_Field.java b/java-api/src/java20/java/xyz/wagyourtail/jvmdg/j20/stub/java_base/J_L_R_Field.java index c140045a..ad8f4553 100644 --- a/java-api/src/java20/java/xyz/wagyourtail/jvmdg/j20/stub/java_base/J_L_R_Field.java +++ b/java-api/src/java20/java/xyz/wagyourtail/jvmdg/j20/stub/java_base/J_L_R_Field.java @@ -5,8 +5,8 @@ public class J_L_R_Field { - public static Set accessFlags(Field field) { - return J_L_R_AccessFlag.maskToAccessFlags(field.getModifiers(), J_L_R_AccessFlag.Location.FIELD); - } + public static Set accessFlags(Field field) { + return J_L_R_AccessFlag.maskToAccessFlags(field.getModifiers(), J_L_R_AccessFlag.Location.FIELD); + } } diff --git a/java-api/src/java20/java/xyz/wagyourtail/jvmdg/j20/stub/java_base/J_N_F_S_FileSystemProvider.java b/java-api/src/java20/java/xyz/wagyourtail/jvmdg/j20/stub/java_base/J_N_F_S_FileSystemProvider.java index 143479f3..1fa43dfe 100644 --- a/java-api/src/java20/java/xyz/wagyourtail/jvmdg/j20/stub/java_base/J_N_F_S_FileSystemProvider.java +++ b/java-api/src/java20/java/xyz/wagyourtail/jvmdg/j20/stub/java_base/J_N_F_S_FileSystemProvider.java @@ -13,7 +13,7 @@ public class J_N_F_S_FileSystemProvider { private static boolean followLinks(LinkOption... options) { boolean followLinks = true; - for (LinkOption opt: options) { + for (LinkOption opt : options) { if (opt == LinkOption.NOFOLLOW_LINKS) { followLinks = false; continue; diff --git a/java-api/src/java20/java/xyz/wagyourtail/jvmdg/j20/stub/java_base/J_U_R_MatchResult.java b/java-api/src/java20/java/xyz/wagyourtail/jvmdg/j20/stub/java_base/J_U_R_MatchResult.java index 6eab5c8b..20f28042 100644 --- a/java-api/src/java20/java/xyz/wagyourtail/jvmdg/j20/stub/java_base/J_U_R_MatchResult.java +++ b/java-api/src/java20/java/xyz/wagyourtail/jvmdg/j20/stub/java_base/J_U_R_MatchResult.java @@ -1,6 +1,5 @@ package xyz.wagyourtail.jvmdg.j20.stub.java_base; -import xyz.wagyourtail.jvmdg.exc.MissingStubError; import xyz.wagyourtail.jvmdg.exc.PartialStubError; import xyz.wagyourtail.jvmdg.util.Utils; import xyz.wagyourtail.jvmdg.version.Stub; diff --git a/java-api/src/java20/java/xyz/wagyourtail/jvmdg/j20/stub/java_base/J_U_R_Matcher.java b/java-api/src/java20/java/xyz/wagyourtail/jvmdg/j20/stub/java_base/J_U_R_Matcher.java index e7922c00..ee3e2ddf 100644 --- a/java-api/src/java20/java/xyz/wagyourtail/jvmdg/j20/stub/java_base/J_U_R_Matcher.java +++ b/java-api/src/java20/java/xyz/wagyourtail/jvmdg/j20/stub/java_base/J_U_R_Matcher.java @@ -1,12 +1,10 @@ package xyz.wagyourtail.jvmdg.j20.stub.java_base; -import xyz.wagyourtail.jvmdg.exc.PartialStubError; import xyz.wagyourtail.jvmdg.util.Utils; import xyz.wagyourtail.jvmdg.version.Stub; import java.lang.invoke.MethodType; import java.util.Map; -import java.util.regex.MatchResult; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/java-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/impl/ReverseList.java b/java-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/impl/ReverseList.java index 4fae06ff..b1c12182 100644 --- a/java-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/impl/ReverseList.java +++ b/java-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/impl/ReverseList.java @@ -144,7 +144,7 @@ public boolean equals(Object o) { public int hashCode() { int hashCode = 1; for (E e : this) - hashCode = 31*hashCode + (e==null ? 0 : e.hashCode()); + hashCode = 31 * hashCode + (e == null ? 0 : e.hashCode()); return hashCode; } diff --git a/java-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/stub/java_base/J_L_Character.java b/java-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/stub/java_base/J_L_Character.java index 7e7ae216..1dbeb73f 100644 --- a/java-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/stub/java_base/J_L_Character.java +++ b/java-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/stub/java_base/J_L_Character.java @@ -3,7 +3,9 @@ import xyz.wagyourtail.jvmdg.version.Ref; import xyz.wagyourtail.jvmdg.version.Stub; -import java.io.*; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; import java.util.*; public class J_L_Character { diff --git a/java-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/stub/java_base/J_L_R_SwitchBootstraps.java b/java-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/stub/java_base/J_L_R_SwitchBootstraps.java index ba3d8886..866fdb83 100644 --- a/java-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/stub/java_base/J_L_R_SwitchBootstraps.java +++ b/java-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/stub/java_base/J_L_R_SwitchBootstraps.java @@ -5,11 +5,17 @@ import org.objectweb.asm.Label; import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; -import org.objectweb.asm.tree.*; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.InvokeDynamicInsnNode; +import org.objectweb.asm.tree.MethodInsnNode; +import org.objectweb.asm.tree.MethodNode; import xyz.wagyourtail.jvmdg.version.Modify; import xyz.wagyourtail.jvmdg.version.Ref; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.TreeSet; public class J_L_R_SwitchBootstraps { @@ -299,7 +305,8 @@ public static MethodInsnNode makeSwitchInternal(String desc, List types, } - private record EnumType(Type type, String value) {} + private record EnumType(Type type, String value) { + } private static class SwitchMethodNode extends MethodNode { private final List types; diff --git a/java-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/stub/java_base/J_L_StringBuffer.java b/java-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/stub/java_base/J_L_StringBuffer.java index b3fd5c5f..bc52ea07 100644 --- a/java-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/stub/java_base/J_L_StringBuffer.java +++ b/java-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/stub/java_base/J_L_StringBuffer.java @@ -1,10 +1,9 @@ package xyz.wagyourtail.jvmdg.j21.stub.java_base; -import xyz.wagyourtail.jvmdg.version.Ref; import xyz.wagyourtail.jvmdg.version.Stub; public class J_L_StringBuffer { - + @Stub public static StringBuffer repeat(StringBuffer self, int codepoint, int count) { return self.append(Character.toString(codepoint).repeat(count)); @@ -14,5 +13,5 @@ public static StringBuffer repeat(StringBuffer self, int codepoint, int count) { public static StringBuffer repeat(StringBuffer self, CharSequence str, int count) { return self.append(str.toString().repeat(count)); } - + } diff --git a/java-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/stub/java_base/J_L_StringBuilder.java b/java-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/stub/java_base/J_L_StringBuilder.java index b2b39052..447a797b 100644 --- a/java-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/stub/java_base/J_L_StringBuilder.java +++ b/java-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/stub/java_base/J_L_StringBuilder.java @@ -3,7 +3,7 @@ import xyz.wagyourtail.jvmdg.version.Stub; public class J_L_StringBuilder { - + @Stub public static StringBuilder repeat(StringBuilder self, int codepoint, int count) { return self.append(Character.toString(codepoint).repeat(count)); @@ -13,5 +13,5 @@ public static StringBuilder repeat(StringBuilder self, int codepoint, int count) public static StringBuilder repeat(StringBuilder self, CharSequence str, int count) { return self.append(str.toString().repeat(count)); } - + } diff --git a/java-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/stub/java_base/J_L_Thread.java b/java-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/stub/java_base/J_L_Thread.java index 4f558e4b..23c63003 100644 --- a/java-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/stub/java_base/J_L_Thread.java +++ b/java-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/stub/java_base/J_L_Thread.java @@ -6,7 +6,6 @@ import xyz.wagyourtail.jvmdg.version.Stub; import java.util.concurrent.ThreadFactory; -import java.util.function.LongFunction; import java.util.function.Supplier; public class J_L_Thread { diff --git a/java-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/stub/java_base/J_U_Deque.java b/java-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/stub/java_base/J_U_Deque.java index 8424fc41..2ec51dc8 100644 --- a/java-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/stub/java_base/J_U_Deque.java +++ b/java-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/stub/java_base/J_U_Deque.java @@ -1,11 +1,9 @@ package xyz.wagyourtail.jvmdg.j21.stub.java_base; import xyz.wagyourtail.jvmdg.j21.impl.ReverseDeque; -import xyz.wagyourtail.jvmdg.j21.impl.ReverseList; import xyz.wagyourtail.jvmdg.version.Stub; import java.util.Deque; -import java.util.List; public class J_U_Deque { diff --git a/java-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/stub/java_base/J_U_SequencedSet.java b/java-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/stub/java_base/J_U_SequencedSet.java index d7c8dab5..2255c927 100644 --- a/java-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/stub/java_base/J_U_SequencedSet.java +++ b/java-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/stub/java_base/J_U_SequencedSet.java @@ -3,7 +3,9 @@ import xyz.wagyourtail.jvmdg.j21.impl.ReverseSet; import xyz.wagyourtail.jvmdg.version.Adapter; -import java.util.*; +import java.util.LinkedHashSet; +import java.util.Set; +import java.util.SortedSet; @Adapter(value = "java/util/SequencedSet", target = "java/util/Set") public class J_U_SequencedSet { diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/collections/BackingMap.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/collections/BackingMap.java index 904cdef2..99cf40c6 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/collections/BackingMap.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/collections/BackingMap.java @@ -11,6 +11,7 @@ public class BackingMap implements Map { public BackingMap(Map backing) { this.backing = Objects.requireNonNull(backing); } + @Override public int size() { return backing.size(); diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/collections/CheckedNavigableMap.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/collections/CheckedNavigableMap.java index 6dfa0273..447d0090 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/collections/CheckedNavigableMap.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/collections/CheckedNavigableMap.java @@ -35,7 +35,7 @@ private String badValueMsg(Object value) { @Override public Entry lowerEntry(K key) { - Entry lower = backing.lowerEntry(key); + Entry lower = backing.lowerEntry(key); return (null != lower) ? new CheckedEntry<>(lower, valueType) : null; } @@ -46,7 +46,7 @@ public K lowerKey(K key) { @Override public Entry floorEntry(K key) { - Entry floor = backing.floorEntry(key); + Entry floor = backing.floorEntry(key); return (null != floor) ? new CheckedEntry<>(floor, valueType) : null; } @@ -57,7 +57,7 @@ public K floorKey(K key) { @Override public Entry ceilingEntry(K key) { - Entry ceiling = backing.ceilingEntry(key); + Entry ceiling = backing.ceilingEntry(key); return (null != ceiling) ? new CheckedEntry<>(ceiling, valueType) : null; } @@ -68,7 +68,7 @@ public K ceilingKey(K key) { @Override public Entry higherEntry(K key) { - Entry higher = backing.higherEntry(key); + Entry higher = backing.higherEntry(key); return (null != higher) ? new CheckedEntry<>(higher, valueType) : null; } @@ -79,25 +79,25 @@ public K higherKey(K key) { @Override public Entry firstEntry() { - Entry first = backing.firstEntry(); + Entry first = backing.firstEntry(); return (null != first) ? new CheckedEntry<>(first, valueType) : null; } @Override public Entry lastEntry() { - Entry last = backing.lastEntry(); + Entry last = backing.lastEntry(); return (null != last) ? new CheckedEntry<>(last, valueType) : null; } @Override public Entry pollFirstEntry() { - Entry first = backing.pollFirstEntry(); + Entry first = backing.pollFirstEntry(); return (null != first) ? new CheckedEntry<>(first, valueType) : null; } @Override public Entry pollLastEntry() { - Entry last = backing.pollLastEntry(); + Entry last = backing.pollLastEntry(); return (null != last) ? new CheckedEntry<>(last, valueType) : null; } @@ -161,7 +161,7 @@ public K lastKey() { return backing.lastKey(); } - private static class CheckedEntry implements Map.Entry { + private static class CheckedEntry implements Map.Entry { private final Map.Entry e; private final Class valueType; @@ -173,12 +173,15 @@ private static class CheckedEntry implements Map.Entry { public K getKey() { return e.getKey(); } + public V getValue() { return e.getValue(); } + public int hashCode() { return e.hashCode(); } + public String toString() { return e.toString(); } @@ -198,7 +201,7 @@ public boolean equals(Object o) { return true; if (!(o instanceof Map.Entry)) return false; - return e.equals(new AbstractMap.SimpleImmutableEntry<>((Map.Entry)o)); + return e.equals(new AbstractMap.SimpleImmutableEntry<>((Map.Entry) o)); } } } diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/collections/SynchronizedBackingCollection.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/collections/SynchronizedBackingCollection.java index 8dc0291e..629d8e49 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/collections/SynchronizedBackingCollection.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/collections/SynchronizedBackingCollection.java @@ -4,8 +4,8 @@ import java.util.Iterator; public class SynchronizedBackingCollection implements Collection { - private final Collection backing; protected final Object mutex; + private final Collection backing; public SynchronizedBackingCollection(Collection backing) { this.backing = backing; diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/collections/SynchronizedBackingMap.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/collections/SynchronizedBackingMap.java index a12a7f1d..18c2aa05 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/collections/SynchronizedBackingMap.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/collections/SynchronizedBackingMap.java @@ -5,8 +5,8 @@ import java.util.Set; public class SynchronizedBackingMap implements Map { - private final Map backing; protected final Object mutex; + private final Map backing; public SynchronizedBackingMap(Map backing) { this.backing = backing; diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/spliterator/ArraySpliterator.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/spliterator/ArraySpliterator.java index 20d51852..4d303938 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/spliterator/ArraySpliterator.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/spliterator/ArraySpliterator.java @@ -8,9 +8,9 @@ public class ArraySpliterator implements J_U_Spliterator { private final T[] array; - private int index; private final int fence; private final int characteristics; + private int index; private long estimatedSize; public ArraySpliterator(T[] array, int additionalCharacteristics) { @@ -49,7 +49,8 @@ public J_U_Spliterator trySplit() { @Override public void forEachRemaining(J_U_F_Consumer action) { - T[] a; int i, hi; + T[] a; + int i, hi; if (action == null) { throw new NullPointerException(); } diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/spliterator/DoubleArraySpliterator.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/spliterator/DoubleArraySpliterator.java index af93d595..158bd3d3 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/spliterator/DoubleArraySpliterator.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/spliterator/DoubleArraySpliterator.java @@ -9,9 +9,9 @@ public class DoubleArraySpliterator implements J_U_Spliterator.OfDouble { private final double[] array; - private int index; private final int fence; private final int characteristics; + private int index; private long estimatedSize; public DoubleArraySpliterator(double[] array, int additionalCharacteristics) { @@ -97,7 +97,8 @@ public boolean tryAdvance(J_U_F_DoubleConsumer action) { @Override public void forEachRemaining(J_U_F_DoubleConsumer action) { if (action == null) throw new NullPointerException(); - double[] a; int i, hi; // hoist accesses and checks from loop + double[] a; + int i, hi; // hoist accesses and checks from loop if ((a = array).length >= (hi = fence) && (i = index) >= 0 && i < (index = hi)) { do { action.accept(a[i]); diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/spliterator/DoubleIteratorSpliterator.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/spliterator/DoubleIteratorSpliterator.java index faa914f9..008ae2e0 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/spliterator/DoubleIteratorSpliterator.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/spliterator/DoubleIteratorSpliterator.java @@ -10,8 +10,8 @@ public class DoubleIteratorSpliterator implements J_U_Spliterator.OfDouble { static final int BATCH_UNIT = 1 << 10; static final int MAX_BATCH = 1 << 25; - private J_U_PrimitiveIterator.OfDouble it; private final int characteristics; + private J_U_PrimitiveIterator.OfDouble it; private long est; private int batch; diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/spliterator/IntArraySpliterator.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/spliterator/IntArraySpliterator.java index 1083148a..cbe75bee 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/spliterator/IntArraySpliterator.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/spliterator/IntArraySpliterator.java @@ -10,9 +10,9 @@ public class IntArraySpliterator implements J_U_Spliterator.OfInt { private final int[] array; - private int index; private final int fence; private final int characteristics; + private int index; private long estimatedSize; public IntArraySpliterator(int[] array, int additionalCharacteristics) { @@ -98,7 +98,8 @@ public boolean tryAdvance(J_U_F_IntConsumer action) { @Override public void forEachRemaining(J_U_F_IntConsumer action) { if (action == null) throw new NullPointerException(); - int[] a; int i, hi; // hoist accesses and checks from loop + int[] a; + int i, hi; // hoist accesses and checks from loop if ((a = array).length >= (hi = fence) && (i = index) >= 0 && i < (index = hi)) { do { action.accept(a[i]); diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/spliterator/IntIteratorSpliterator.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/spliterator/IntIteratorSpliterator.java index 1dd4de8d..dc7fc1ad 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/spliterator/IntIteratorSpliterator.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/spliterator/IntIteratorSpliterator.java @@ -14,8 +14,8 @@ public class IntIteratorSpliterator implements J_U_Spliterator.OfInt { static final int BATCH_UNIT = 1 << 10; static final int MAX_BATCH = 1 << 25; - private J_U_PrimitiveIterator.OfInt it; private final int characteristics; + private J_U_PrimitiveIterator.OfInt it; private long est; private int batch; diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/spliterator/IteratorSpliterator.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/spliterator/IteratorSpliterator.java index bc3ac5ee..27a680df 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/spliterator/IteratorSpliterator.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/spliterator/IteratorSpliterator.java @@ -12,8 +12,8 @@ public class IteratorSpliterator implements J_U_Spliterator { static final int BATCH_UNIT = 1 << 10; static final int MAX_BATCH = 1 << 25; private final Collection collection; - private Iterator it; private final int characteristics; + private Iterator it; private long est; private int batch; diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/spliterator/LongArraySpliterator.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/spliterator/LongArraySpliterator.java index 55afa0f6..457be035 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/spliterator/LongArraySpliterator.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/spliterator/LongArraySpliterator.java @@ -9,9 +9,9 @@ public class LongArraySpliterator implements J_U_Spliterator.OfLong { private final long[] array; - private int index; private final int fence; private final int characteristics; + private int index; private long estimatedSize; public LongArraySpliterator(long[] array, int additionalCharacteristics) { @@ -107,7 +107,8 @@ public boolean tryAdvance(J_U_F_LongConsumer action) { @Override public void forEachRemaining(J_U_F_LongConsumer action) { if (action == null) throw new NullPointerException(); - long[] a; int i, hi; // hoist accesses and checks from loop + long[] a; + int i, hi; // hoist accesses and checks from loop if ((a = array).length >= (hi = fence) && (i = index) >= 0 && i < (index = hi)) { do { action.accept(a[i]); diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/spliterator/LongIteratorSpliterator.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/spliterator/LongIteratorSpliterator.java index 19cf7763..c7db8013 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/spliterator/LongIteratorSpliterator.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/intl/spliterator/LongIteratorSpliterator.java @@ -11,8 +11,8 @@ public class LongIteratorSpliterator implements J_U_Spliterator.OfLong { static final int BATCH_UNIT = 1 << 10; static final int MAX_BATCH = 1 << 25; - private J_U_PrimitiveIterator.OfLong it; private final int characteristics; + private J_U_PrimitiveIterator.OfLong it; private long est; private int batch; diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_L_Class.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_L_Class.java index 819bb46b..da197036 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_L_Class.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_L_Class.java @@ -41,7 +41,7 @@ public static String toGenericString(Class clazz) { } else { if (clazz.isEnum()) sb.append("enum"); - //TODO: record case in java 16 + //TODO: record case in java 16 else sb.append("class"); } @@ -101,7 +101,8 @@ public static String getTypeName(Class clazz) { sb.append("[]"); } return sb.toString(); - } catch (Throwable ignored) { } + } catch (Throwable ignored) { + } } return clazz.getName(); } diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_L_Double.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_L_Double.java index 7a8db2f5..0fb568f7 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_L_Double.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_L_Double.java @@ -6,7 +6,7 @@ public class J_L_Double { - @Stub(ref = @Ref("java/lang/Double")) + @Stub(ref = @Ref("java/lang/Double")) public static final int BYTES = Double.SIZE / Byte.SIZE; @Stub(ref = @Ref("java/lang/Double")) diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_L_I_LambdaMetafactory.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_L_I_LambdaMetafactory.java index df99db06..4afbd4c6 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_L_I_LambdaMetafactory.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_L_I_LambdaMetafactory.java @@ -61,7 +61,7 @@ public static CallSite altMetafactory(MethodHandles.Lookup caller, String invoke public static ClassNode lambdaMetafactoryCreatorInternal(String parentName, Type constructor, int nextAvailableAnonymous, String mname, String mdesc, String ifName, Type bridge, Handle invokedMethod, Type invokedType) { ClassNode cn = new ClassNode(Opcodes.ASM9); // class name and metadata - cn.visit(Opcodes.V1_7, Opcodes.ACC_SUPER, parentName + "$" + nextAvailableAnonymous, null, "java/lang/Object", new String[] { constructor.getReturnType().getInternalName() }); + cn.visit(Opcodes.V1_7, Opcodes.ACC_SUPER, parentName + "$" + nextAvailableAnonymous, null, "java/lang/Object", new String[]{constructor.getReturnType().getInternalName()}); cn.visitOuterClass(parentName, mname, mdesc); cn.visitInnerClass(cn.name, parentName, "$" + nextAvailableAnonymous, 0); diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_L_Integer.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_L_Integer.java index 66d18752..e4e43129 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_L_Integer.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_L_Integer.java @@ -30,7 +30,7 @@ public static int parseUnsignedInt(String s, int radix) throws NumberFormatExcep char first = s.charAt(0); if (first == '-') { throw new NumberFormatException( - String.format("Illegal leading minus sign on unsigned string %s.", s)); + String.format("Illegal leading minus sign on unsigned string %s.", s)); } else { if (len <= 5 || (radix == 10 && len <= 9)) { return Integer.parseInt(s, radix); @@ -40,7 +40,7 @@ public static int parseUnsignedInt(String s, int radix) throws NumberFormatExcep return (int) ell; } else { throw new NumberFormatException( - String.format("String value %s exceeds range of unsigned int.", s)); + String.format("String value %s exceeds range of unsigned int.", s)); } } } diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_L_Long.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_L_Long.java index a73f96e0..2137538e 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_L_Long.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_L_Long.java @@ -45,7 +45,7 @@ private static BigInteger toUnsignedBigInteger(long i) { // return (upper << 32) + lower return (BigInteger.valueOf(J_L_Integer.toUnsignedLong(upper))).shiftLeft(32). - add(BigInteger.valueOf(J_L_Integer.toUnsignedLong(lower))); + add(BigInteger.valueOf(J_L_Integer.toUnsignedLong(lower))); } } @@ -101,7 +101,7 @@ public static long parseUnsignedLong(String s) throws NumberFormatException { @Stub(ref = @Ref("java/lang/Long")) public static int hashCode(long value) { - return (int)(value ^ (value >>> 32)); + return (int) (value ^ (value >>> 32)); } @Stub(ref = @Ref("java/lang/Long")) diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_L_ThreadLocal.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_L_ThreadLocal.java index fbe2e1a9..c9b9ec58 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_L_ThreadLocal.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_L_ThreadLocal.java @@ -5,7 +5,7 @@ public class J_L_ThreadLocal { public static ThreadLocal withInitial(J_U_F_Supplier supplier) { - ThreadLocal l = new ThreadLocal<>(); + ThreadLocal l = new ThreadLocal<>(); l.set(supplier.get()); return l; } diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Base64.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Base64.java index dbeb8380..cde6beac 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Base64.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Base64.java @@ -16,7 +16,8 @@ @Stub(ref = @Ref("java/util/Base64")) public class J_U_Base64 { - private J_U_Base64() {} + private J_U_Base64() { + } public static Encoder getEncoder() { return Encoder.RFC4648; @@ -60,11 +61,17 @@ public static Decoder getMimeDecoder() { @Stub(ref = @Ref("java/util/Base64$Encoder")) public static class Encoder { + static final Encoder RFC4648 = new Encoder(false, null, -1, true); + static final Encoder RFC4648_URLSAFE = new Encoder(true, null, -1, true); + private static final char[] toBase64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".toCharArray(); + private static final char[] toBase64URL = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_".toCharArray(); + private static final int MIMELINEMAX = 76; + private static final byte[] CRLF = new byte[]{'\r', '\n'}; + static final Encoder RFC2045 = new Encoder(false, CRLF, MIMELINEMAX, true); private final byte[] newline; private final int linemax; private final boolean isURL; private final boolean doPadding; - private Encoder(boolean isURL, byte[] newline, int linemax, boolean doPadding) { this.isURL = isURL; this.newline = newline; @@ -72,18 +79,6 @@ private Encoder(boolean isURL, byte[] newline, int linemax, boolean doPadding) { this.doPadding = doPadding; } - private static final char[] toBase64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".toCharArray(); - - private static final char[] toBase64URL = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_".toCharArray(); - - private static final int MIMELINEMAX = 76; - - private static final byte[] CRLF = new byte[] {'\r', '\n'}; - - static final Encoder RFC4648 = new Encoder(false, null, -1, true); - static final Encoder RFC4648_URLSAFE = new Encoder(true, null, -1, true); - static final Encoder RFC2045 = new Encoder(false, CRLF, MIMELINEMAX, true); - private final int encodedOutLength(int srclen, boolean throwOOME) { int len = 0; try { @@ -133,9 +128,9 @@ public ByteBuffer encode(ByteBuffer buffer) { int ret = 0; if (buffer.hasArray()) { ret = encode0(buffer.array(), - buffer.arrayOffset() + buffer.position(), - buffer.arrayOffset() + buffer.limit(), - dst); + buffer.arrayOffset() + buffer.position(), + buffer.arrayOffset() + buffer.limit(), + dst); buffer.position(buffer.limit()); } else { byte[] src = new byte[buffer.remaining()]; @@ -161,12 +156,12 @@ public Encoder withoutPadding() { private void encodeBlock(byte[] src, int sp, int sl, byte[] dst, int dp, boolean isURL) { char[] base64 = isURL ? toBase64URL : toBase64; - for (int sp0 = sp, dp0 = dp ; sp0 < sl; ) { - int bits = (src[sp0++] & 0xff) << 16 | (src[sp0++] & 0xff) << 8 | (src[sp0++] & 0xff); - dst[dp0++] = (byte)base64[(bits >>> 18) & 0x3f]; - dst[dp0++] = (byte)base64[(bits >>> 12) & 0x3f]; - dst[dp0++] = (byte)base64[(bits >>> 6) & 0x3f]; - dst[dp0++] = (byte)base64[bits & 0x3f]; + for (int sp0 = sp, dp0 = dp; sp0 < sl; ) { + int bits = (src[sp0++] & 0xff) << 16 | (src[sp0++] & 0xff) << 8 | (src[sp0++] & 0xff); + dst[dp0++] = (byte) base64[(bits >>> 18) & 0x3f]; + dst[dp0++] = (byte) base64[(bits >>> 12) & 0x3f]; + dst[dp0++] = (byte) base64[(bits >>> 6) & 0x3f]; + dst[dp0++] = (byte) base64[bits & 0x3f]; } } @@ -175,7 +170,7 @@ private int encode0(byte[] src, int off, int end, byte[] dst) { int sp = off; int slen = (end - off) / 3 * 3; int sl = off + slen; - if (linemax > 0 && slen > linemax / 4 * 3) + if (linemax > 0 && slen > linemax / 4 * 3) slen = linemax / 4 * 3; int dp = 0; while (sp < sl) { @@ -185,24 +180,24 @@ private int encode0(byte[] src, int off, int end, byte[] dst) { dp += dlen; sp = sl0; if (dlen == linemax && sp < end) { - for (byte b : newline){ + for (byte b : newline) { dst[dp++] = b; } } } if (sp < end) { // 1 or 2 leftover bytes int b0 = src[sp++] & 0xff; - dst[dp++] = (byte)base64[b0 >> 2]; + dst[dp++] = (byte) base64[b0 >> 2]; if (sp == end) { - dst[dp++] = (byte)base64[(b0 << 4) & 0x3f]; + dst[dp++] = (byte) base64[(b0 << 4) & 0x3f]; if (doPadding) { dst[dp++] = '='; dst[dp++] = '='; } } else { int b1 = src[sp++] & 0xff; - dst[dp++] = (byte)base64[(b0 << 4) & 0x3f | (b1 >> 4)]; - dst[dp++] = (byte)base64[(b1 << 2) & 0x3f]; + dst[dp++] = (byte) base64[(b0 << 4) & 0x3f | (b1 >> 4)]; + dst[dp++] = (byte) base64[(b1 << 2) & 0x3f]; if (doPadding) { dst[dp++] = '='; } @@ -215,15 +210,12 @@ private int encode0(byte[] src, int off, int end, byte[] dst) { @Stub(ref = @Ref("java/util/Base64$Decoder")) public static class Decoder { - private final boolean isURL; - private final boolean isMIME; - - private Decoder(boolean isURL, boolean isMIME) { - this.isURL = isURL; - this.isMIME = isMIME; - } - + static final Decoder RFC4648 = new Decoder(false, false); + static final Decoder RFC4648_URLSAFE = new Decoder(true, false); + static final Decoder RFC2045 = new Decoder(false, true); private static final int[] fromBase64 = new int[256]; + private static final int[] fromBase64URL = new int[256]; + static { Arrays.fill(fromBase64, -1); for (int i = 0; i < Encoder.toBase64.length; i++) @@ -231,8 +223,6 @@ private Decoder(boolean isURL, boolean isMIME) { fromBase64['='] = -2; } - private static final int[] fromBase64URL = new int[256]; - static { Arrays.fill(fromBase64URL, -1); for (int i = 0; i < Encoder.toBase64URL.length; i++) @@ -240,9 +230,12 @@ private Decoder(boolean isURL, boolean isMIME) { fromBase64URL['='] = -2; } - static final Decoder RFC4648 = new Decoder(false, false); - static final Decoder RFC4648_URLSAFE = new Decoder(true, false); - static final Decoder RFC2045 = new Decoder(false, true); + private final boolean isURL; + private final boolean isMIME; + private Decoder(boolean isURL, boolean isMIME) { + this.isURL = isURL; + this.isMIME = isMIME; + } public byte[] decode(byte[] src) { int len = decodedOutLength(src, 0, src.length); @@ -324,7 +317,7 @@ private int decodedOutLength(byte[] src, int sp, int sl) { paddings++; } } - if (paddings == 0 && (len & 0x3) != 0) + if (paddings == 0 && (len & 0x3) != 0) paddings = 4 - (len & 0x3); return 3 * (int) ((len + 3L) / 4) - paddings; } @@ -343,9 +336,9 @@ private int decodeBlock(byte[] src, int sp, int sl, byte[] dst, int dp, boolean return new_dp - dp; } int bits0 = b1 << 18 | b2 << 12 | b3 << 6 | b4; - dst[new_dp++] = (byte)(bits0 >> 16); - dst[new_dp++] = (byte)(bits0 >> 8); - dst[new_dp++] = (byte)(bits0); + dst[new_dp++] = (byte) (bits0 >> 16); + dst[new_dp++] = (byte) (bits0 >> 8); + dst[new_dp++] = (byte) (bits0); } return new_dp - dp; } @@ -387,18 +380,18 @@ private int decode0(byte[] src, int sp, int sl, byte[] dst) { bits |= (b << shiftto); shiftto -= 6; if (shiftto < 0) { - dst[dp++] = (byte)(bits >> 16); - dst[dp++] = (byte)(bits >> 8); - dst[dp++] = (byte)(bits); + dst[dp++] = (byte) (bits >> 16); + dst[dp++] = (byte) (bits >> 8); + dst[dp++] = (byte) (bits); shiftto = 18; bits = 0; } } if (shiftto == 6) { - dst[dp++] = (byte)(bits >> 16); + dst[dp++] = (byte) (bits >> 16); } else if (shiftto == 0) { - dst[dp++] = (byte)(bits >> 16); - dst[dp++] = (byte)(bits >> 8); + dst[dp++] = (byte) (bits >> 16); + dst[dp++] = (byte) (bits >> 8); } else if (shiftto == 12) { throw new IllegalArgumentException( "Last unit does not have enough valid bits"); @@ -415,14 +408,13 @@ private int decode0(byte[] src, int sp, int sl, byte[] dst) { private static class EncOutputStream extends FilterOutputStream { - private int leftover = 0; - private int b0, b1, b2; - private boolean closed = false; - private final char[] base64; // byte->base64 mapping private final byte[] newline; // line separator, if needed private final int linemax; private final boolean doPadding;// whether or not to pad + private int leftover = 0; + private int b0, b1, b2; + private boolean closed = false; private int linepos = 0; private byte[] buf; @@ -439,7 +431,7 @@ private static class EncOutputStream extends FilterOutputStream { @Override public void write(int b) throws IOException { byte[] buf = new byte[1]; - buf[0] = (byte)(b & 0xff); + buf[0] = (byte) (b & 0xff); write(buf, 0, 1); } @@ -451,10 +443,10 @@ private void checkNewline() throws IOException { } private void writeb4(char b1, char b2, char b3, char b4) throws IOException { - buf[0] = (byte)b1; - buf[1] = (byte)b2; - buf[2] = (byte)b3; - buf[3] = (byte)b4; + buf[0] = (byte) b1; + buf[1] = (byte) b2; + buf[2] = (byte) b3; + buf[3] = (byte) b4; out.write(buf, 0, 4); } @@ -492,12 +484,12 @@ public void write(byte[] b, int off, int len) throws IOException { int dp = 0; for (int sp = off; sp < sl; ) { int bits = (b[sp++] & 0xff) << 16 | - (b[sp++] & 0xff) << 8 | + (b[sp++] & 0xff) << 8 | (b[sp++] & 0xff); - buf[dp++] = (byte)base64[(bits >>> 18) & 0x3f]; - buf[dp++] = (byte)base64[(bits >>> 12) & 0x3f]; - buf[dp++] = (byte)base64[(bits >>> 6) & 0x3f]; - buf[dp++] = (byte)base64[bits & 0x3f]; + buf[dp++] = (byte) base64[(bits >>> 18) & 0x3f]; + buf[dp++] = (byte) base64[(bits >>> 12) & 0x3f]; + buf[dp++] = (byte) base64[(bits >>> 6) & 0x3f]; + buf[dp++] = (byte) base64[bits & 0x3f]; } out.write(buf, 0, dp); off = sl; @@ -553,6 +545,7 @@ private static class DecInputStream extends InputStream { private boolean eof = false; private boolean closed = false; + private byte[] sbBuf = new byte[1]; DecInputStream(InputStream is, int[] base64, boolean isMIME) { this.is = is; @@ -560,8 +553,6 @@ private static class DecInputStream extends InputStream { this.isMIME = isMIME; } - private byte[] sbBuf = new byte[1]; - @Override public int read() throws IOException { return read(sbBuf, 0, 1) == -1 ? -1 : sbBuf[0] & 0xff; diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_C_ConcurrentHashMap.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_C_ConcurrentHashMap.java index 40a0fe2a..aba1aeab 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_C_ConcurrentHashMap.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_C_ConcurrentHashMap.java @@ -64,7 +64,6 @@ public static U reduce(ConcurrentHashMap map, long parallismThre } - @Stub(ref = @Ref("java/util/concurrent/ConcurrentHashMap$KeySetView")) public static class KeySetView implements Set { private final ConcurrentHashMap map; diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Map.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Map.java index aaa64b49..068f3f99 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Map.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Map.java @@ -54,8 +54,8 @@ public int compare(Map.Entry o1, Map.Entry o2) { public V getOrDefault(Map self, Object key, V defaultValue) { V v; return (((v = self.get(key)) != null) || self.containsKey(key)) - ? v - : defaultValue; + ? v + : defaultValue; } @Stub @@ -89,7 +89,7 @@ public V putIfAbsent(Map self, K key, V value) { public boolean remove(Map self, Object key, Object value) { Object curValue = self.get(key); if (!Objects.equals(curValue, value) || - (curValue == null && !self.containsKey(key))) { + (curValue == null && !self.containsKey(key))) { return false; } self.remove(key); @@ -100,7 +100,7 @@ public boolean remove(Map self, Object key, Object value) { public boolean replace(Map self, K key, V oldValue, V newValue) { Object curValue = self.get(key); if (!Objects.equals(curValue, oldValue) || - (curValue == null && !self.containsKey(key))) { + (curValue == null && !self.containsKey(key))) { return false; } self.put(key, newValue); @@ -167,7 +167,7 @@ public V compute(Map self, K key, J_U_BiFunction V merge(Map self, K key, V value, J_U_BiFunction remappingFunction) { V oldValue = self.get(key); V newValue = (oldValue == null) ? value : - remappingFunction.apply(oldValue, value); + remappingFunction.apply(oldValue, value); if (newValue == null) { self.remove(key); } else { diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Optional.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Optional.java index a9ec42a5..0e7b53db 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Optional.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Optional.java @@ -17,14 +17,14 @@ public class J_U_Optional { private final T value; - public static J_U_Optional empty() { - return EMPTY; - } - private J_U_Optional(T value) { this.value = value; } + public static J_U_Optional empty() { + return EMPTY; + } + public static J_U_Optional of(T value) { return new J_U_Optional<>(Objects.requireNonNull(value)); } diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_OptionalDouble.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_OptionalDouble.java index bbc976b2..8afa4d2e 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_OptionalDouble.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_OptionalDouble.java @@ -21,15 +21,15 @@ private J_U_OptionalDouble() { this.value = Double.NaN; } - public static J_U_OptionalDouble empty() { - return EMPTY; - } - private J_U_OptionalDouble(double value) { this.isPresent = true; this.value = value; } + public static J_U_OptionalDouble empty() { + return EMPTY; + } + public static J_U_OptionalDouble of(double value) { return new J_U_OptionalDouble(value); } @@ -70,7 +70,7 @@ public double orElseThrow() { return value; } - public double orElseThrow(Supplier exceptionSupplier) throws X { + public double orElseThrow(Supplier exceptionSupplier) throws X { if (isPresent) { return value; } else { diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_OptionalInt.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_OptionalInt.java index 726d6d27..1c3f7a23 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_OptionalInt.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_OptionalInt.java @@ -21,15 +21,15 @@ private J_U_OptionalInt() { this.value = 0; } - public static J_U_OptionalInt empty() { - return EMPTY; - } - private J_U_OptionalInt(int value) { this.isPresent = true; this.value = value; } + public static J_U_OptionalInt empty() { + return EMPTY; + } + public static J_U_OptionalInt of(int value) { return new J_U_OptionalInt(value); } @@ -70,7 +70,7 @@ public int orElseThrow() { return value; } - public int orElseThrow(Supplier exceptionSupplier) throws X { + public int orElseThrow(Supplier exceptionSupplier) throws X { if (isPresent) { return value; } else { diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_OptionalLong.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_OptionalLong.java index a8d171b5..371a43d3 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_OptionalLong.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_OptionalLong.java @@ -21,15 +21,15 @@ private J_U_OptionalLong() { this.value = 0; } - public static J_U_OptionalLong empty() { - return EMPTY; - } - private J_U_OptionalLong(long value) { this.isPresent = true; this.value = value; } + public static J_U_OptionalLong empty() { + return EMPTY; + } + public static J_U_OptionalLong of(long value) { return new J_U_OptionalLong(value); } @@ -70,7 +70,7 @@ public long orElseThrow() { return value; } - public long orElseThrow(Supplier exceptionSupplier) throws X { + public long orElseThrow(Supplier exceptionSupplier) throws X { if (isPresent) { return value; } else { diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Spliterator.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Spliterator.java index f6ac0769..ff74748f 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Spliterator.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Spliterator.java @@ -52,7 +52,6 @@ interface OfPrimitive { diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Spliterators$AbstractDoubleSpliterator.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Spliterators$AbstractDoubleSpliterator.java index 778144cd..273f79bc 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Spliterators$AbstractDoubleSpliterator.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Spliterators$AbstractDoubleSpliterator.java @@ -26,16 +26,6 @@ public abstract class J_U_Spliterators$AbstractDoubleSpliterator implements J_U_ } } - static final class Holder implements J_U_F_DoubleConsumer { - double value; - - - @Override - public void accept(double t) { - value = t; - } - } - @Override public OfDouble trySplit() { Holder holder = new Holder(); @@ -108,4 +98,14 @@ public boolean hasCharacteristics(int characteristics) { public Comparator getComparator() { throw new IllegalStateException(); } + + static final class Holder implements J_U_F_DoubleConsumer { + double value; + + + @Override + public void accept(double t) { + value = t; + } + } } diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Spliterators$AbstractIntSpliterator.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Spliterators$AbstractIntSpliterator.java index e99bd26c..ac207d4d 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Spliterators$AbstractIntSpliterator.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Spliterators$AbstractIntSpliterator.java @@ -26,16 +26,6 @@ public abstract class J_U_Spliterators$AbstractIntSpliterator implements J_U_Spl } } - static final class Holder implements J_U_F_IntConsumer { - int value; - - - @Override - public void accept(int t) { - value = t; - } - } - @Override public OfInt trySplit() { Holder holder = new Holder(); @@ -74,7 +64,6 @@ public int characteristics() { return characteristics; } - @Override public void forEachRemaining(final J_U_F_Consumer action) { if (action instanceof J_U_F_IntConsumer) { @@ -109,4 +98,14 @@ public boolean hasCharacteristics(int characteristics) { public Comparator getComparator() { throw new IllegalStateException(); } + + static final class Holder implements J_U_F_IntConsumer { + int value; + + + @Override + public void accept(int t) { + value = t; + } + } } diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Spliterators$AbstractLongSpliterator.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Spliterators$AbstractLongSpliterator.java index 9b258649..42b9c80c 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Spliterators$AbstractLongSpliterator.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Spliterators$AbstractLongSpliterator.java @@ -26,16 +26,6 @@ public abstract class J_U_Spliterators$AbstractLongSpliterator implements J_U_Sp } } - static final class Holder implements J_U_F_LongConsumer { - long value; - - - @Override - public void accept(long t) { - value = t; - } - } - @Override public OfLong trySplit() { Holder holder = new Holder(); @@ -74,7 +64,6 @@ public int characteristics() { return characteristics; } - @Override public void forEachRemaining(final J_U_F_Consumer action) { if (action instanceof J_U_F_LongConsumer) { @@ -109,4 +98,14 @@ public boolean hasCharacteristics(int characteristics) { public Comparator getComparator() { throw new IllegalStateException(); } + + static final class Holder implements J_U_F_LongConsumer { + long value; + + + @Override + public void accept(long t) { + value = t; + } + } } diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Spliterators$AbstractSpliterator.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Spliterators$AbstractSpliterator.java index 88ef8f16..8e534635 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Spliterators$AbstractSpliterator.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Spliterators$AbstractSpliterator.java @@ -25,16 +25,6 @@ public abstract class J_U_Spliterators$AbstractSpliterator implements J_U_Spl } } - static final class Holder implements J_U_F_Consumer { - T value; - - - @Override - public void accept(T t) { - value = t; - } - } - @Override public J_U_Spliterator trySplit() { Holder holder = new Holder<>(); @@ -93,4 +83,14 @@ public boolean hasCharacteristics(int characteristics) { public Comparator getComparator() { throw new IllegalStateException(); } + + static final class Holder implements J_U_F_Consumer { + T value; + + + @Override + public void accept(T t) { + value = t; + } + } } diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Spliterators.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Spliterators.java index b849d8d2..4ec93372 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Spliterators.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_Spliterators.java @@ -17,7 +17,8 @@ public class J_U_Spliterators { private static final J_U_Spliterator.OfLong EMPTY_LONG_SPLITERATOR = new EmptySpliterator.OfLong(); private static final J_U_Spliterator.OfDouble EMPTY_DOUBLE_SPLITERATOR = new EmptySpliterator.OfDouble(); - private J_U_Spliterators() {} + private J_U_Spliterators() { + } public static J_U_Spliterator emptySpliterator() { return (J_U_Spliterator) EMPTY_SPLITERATOR; diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_StringJoiner.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_StringJoiner.java index 34ba9388..bde92384 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_StringJoiner.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/J_U_StringJoiner.java @@ -11,10 +11,8 @@ public final class J_U_StringJoiner { private final String prefix; private final String delimiter; private final String suffix; - - private String emptyValue; - StringBuilder builder = new StringBuilder(); + private String emptyValue; public J_U_StringJoiner(CharSequence delimiter) { this(delimiter, "", ""); diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_BiFunction.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_BiFunction.java index 141f8ea7..e6c936a0 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_BiFunction.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_BiFunction.java @@ -9,7 +9,7 @@ @J_L_FunctionalInterface @Stub(ref = @Ref("Ljava/util/function/BiConsumer")) - public interface J_U_F_BiFunction { +public interface J_U_F_BiFunction { R apply(T t, U u); diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_Consumer.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_Consumer.java index f191e33e..05d140b6 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_Consumer.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_Consumer.java @@ -15,7 +15,10 @@ public interface J_U_F_Consumer { default J_U_F_Consumer andThen(J_U_F_Consumer after) { Objects.requireNonNull(after); - return (T t) -> { accept(t); after.accept(t); }; + return (T t) -> { + accept(t); + after.accept(t); + }; } } diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_DoubleConsumer.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_DoubleConsumer.java index 4a42d6ee..e68cdcf2 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_DoubleConsumer.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_DoubleConsumer.java @@ -12,7 +12,10 @@ public interface J_U_F_DoubleConsumer { void accept(double value); default J_U_F_DoubleConsumer andThen(J_U_F_DoubleConsumer after) { - return (double t) -> { accept(t); after.accept(t); }; + return (double t) -> { + accept(t); + after.accept(t); + }; } } diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_DoubleUnaryOperator.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_DoubleUnaryOperator.java index 8dc5dd33..78fa6d9f 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_DoubleUnaryOperator.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_DoubleUnaryOperator.java @@ -11,6 +11,10 @@ @Stub(ref = @Ref("Ljava/util/function/DoubleUnaryOperator;")) public interface J_U_F_DoubleUnaryOperator { + static J_U_F_DoubleUnaryOperator identity() { + return t -> t; + } + double applyAsDouble(double operand); default J_U_F_DoubleUnaryOperator compose(J_U_F_DoubleUnaryOperator before) { @@ -23,8 +27,4 @@ default J_U_F_DoubleUnaryOperator andThen(J_U_F_DoubleUnaryOperator after) { return (double t) -> after.applyAsDouble(applyAsDouble(t)); } - static J_U_F_DoubleUnaryOperator identity() { - return t -> t; - } - } diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_Function.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_Function.java index ece89ff6..d8cd85b8 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_Function.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_Function.java @@ -9,6 +9,10 @@ @Stub(ref = @Ref("Ljava/util/function/Function")) public interface J_U_F_Function { + static J_U_F_Function identity() { + return t -> t; + } + R apply(T t); default J_U_F_Function compose(J_U_F_Function before) { @@ -19,8 +23,4 @@ default J_U_F_Function andThen(J_U_F_Function return (T t) -> after.apply(apply(t)); } - static J_U_F_Function identity() { - return t -> t; - } - } diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_IntConsumer.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_IntConsumer.java index 33097d2a..c045476d 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_IntConsumer.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_IntConsumer.java @@ -12,7 +12,10 @@ public interface J_U_F_IntConsumer { void accept(int value); default J_U_F_IntConsumer andThen(J_U_F_IntConsumer after) { - return (int t) -> { accept(t); after.accept(t); }; + return (int t) -> { + accept(t); + after.accept(t); + }; } } diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_IntUnaryOperator.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_IntUnaryOperator.java index e115e86c..ff15f1b7 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_IntUnaryOperator.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_IntUnaryOperator.java @@ -9,6 +9,10 @@ @Stub(ref = @Ref("Ljava/util/function/IntUnaryOperator;")) public interface J_U_F_IntUnaryOperator { + static J_U_F_IntUnaryOperator identity() { + return t -> t; + } + int applyAsInt(int operand); default J_U_F_IntUnaryOperator compose(J_U_F_IntUnaryOperator before) { @@ -19,8 +23,4 @@ default J_U_F_IntUnaryOperator andThen(J_U_F_IntUnaryOperator after) { return (int t) -> after.applyAsInt(applyAsInt(t)); } - static J_U_F_IntUnaryOperator identity() { - return t -> t; - } - } diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_LongConsumer.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_LongConsumer.java index 1cef6168..3d09a7ae 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_LongConsumer.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_LongConsumer.java @@ -13,7 +13,10 @@ public interface J_U_F_LongConsumer { void accept(long value); default J_U_F_LongConsumer andThen(J_U_F_LongConsumer after) { - return (long t) -> { accept(t); after.accept(t); }; + return (long t) -> { + accept(t); + after.accept(t); + }; } } diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_LongUnaryOperator.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_LongUnaryOperator.java index dd847adb..7f040190 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_LongUnaryOperator.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_LongUnaryOperator.java @@ -9,6 +9,10 @@ @Stub(ref = @Ref("Ljava/util/function/LongUnaryOperator;")) public interface J_U_F_LongUnaryOperator { + static J_U_F_LongUnaryOperator identity() { + return t -> t; + } + long applyAsLong(long operand); default J_U_F_LongUnaryOperator compose(J_U_F_LongUnaryOperator before) { @@ -16,11 +20,9 @@ default J_U_F_LongUnaryOperator compose(J_U_F_LongUnaryOperator before) { } default J_U_F_LongUnaryOperator andThen(J_U_F_LongUnaryOperator after) { - return (long t) -> { return after.applyAsLong(applyAsLong(t)); }; - } - - static J_U_F_LongUnaryOperator identity() { - return t -> t; + return (long t) -> { + return after.applyAsLong(applyAsLong(t)); + }; } } diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_Predicate.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_Predicate.java index cb1f6b64..1555bbd3 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_Predicate.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_Predicate.java @@ -11,6 +11,16 @@ @Stub(ref = @Ref("Ljava/util/function/Predicate")) public interface J_U_F_Predicate { + static J_U_F_Predicate isEqual(Object targetRef) { + return (null == targetRef) + ? Objects::isNull + : object -> targetRef.equals(object); + } + + static J_U_F_Predicate not(J_U_F_Predicate target) { + return target.negate(); + } + boolean test(T t); default J_U_F_Predicate and(J_U_F_Predicate other) { @@ -24,14 +34,4 @@ default J_U_F_Predicate negate() { default J_U_F_Predicate or(J_U_F_Predicate other) { return (t) -> test(t) || other.test(t); } - - static J_U_F_Predicate isEqual(Object targetRef) { - return (null == targetRef) - ? Objects::isNull - : object -> targetRef.equals(object); - } - - static J_U_F_Predicate not(J_U_F_Predicate target) { - return target.negate(); - } } diff --git a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_UnaryOperator.java b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_UnaryOperator.java index 82b832fe..a0ce0831 100644 --- a/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_UnaryOperator.java +++ b/java-api/src/java8/java/xyz/wagyourtail/jvmdg/j8/stub/function/J_U_F_UnaryOperator.java @@ -7,7 +7,7 @@ @J_L_FunctionalInterface @Stub(ref = @Ref("Ljava/util/function/UnaryOperator")) -public interface J_U_F_UnaryOperator extends J_U_F_Function { +public interface J_U_F_UnaryOperator extends J_U_F_Function { static J_U_F_UnaryOperator identity() { return t -> t; diff --git a/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_Byte.java b/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_Byte.java index 01917403..ba69c532 100644 --- a/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_Byte.java +++ b/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_Byte.java @@ -1,7 +1,6 @@ package xyz.wagyourtail.jvmdg.j9.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Ref; import xyz.wagyourtail.jvmdg.version.Stub; diff --git a/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_I_StringConcatFactory.java b/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_I_StringConcatFactory.java index 287c6622..4d1204bf 100644 --- a/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_I_StringConcatFactory.java +++ b/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_I_StringConcatFactory.java @@ -7,7 +7,9 @@ import xyz.wagyourtail.jvmdg.version.Modify; import xyz.wagyourtail.jvmdg.version.Ref; -import java.util.*; +import java.util.Arrays; +import java.util.Deque; +import java.util.LinkedList; public class J_L_I_StringConcatFactory { @@ -207,39 +209,39 @@ private static InsnList makeConcatInternal(String args, Deque types) { } /* - * This method makes the following code: - * LDC "A" - * LDC 0L - * LDC 1.0D - * INVOKEDYNAMIC makeConcatWithConstants(Ljava/lang/String;JD)Ljava/lang/String; [ - * java/lang/invoke/StringConcatFactory, - * "\u0001concat\u0001\u0001", - * ] - * ARETURN - * - * into: - * LDC "A" - * LDC 0L - * LDC 1.0D - * NEW java/lang/StringBuilder - * DUP - * INVOKESPECIAL java/lang/StringBuilder. ()V - * DUP_X2 - * POP - * INVOKEVIRTUAL java/lang/StringBuilder.append (D)Ljava/lang/StringBuilder; - * ICONST_0 - * DUP2_X2 - * POP2 - * INVOKEVIRTUAL java/lang/StringBuilder.insert (IJ)Ljava/lang/StringBuilder; - * ICONST_0 - * LDC "concat" - * INVOKEVIRTUAL java/lang/StringBuilder.insert (ILjava/lang/String;)Ljava/lang/StringBuilder; - * ICONST_0 - * DUP2_X1 - * INVOKEVIRTUAL java/lang/StringBuilder.insert (ILjava/lang/String;)Ljava/lang/StringBuilder; - * INVOKEVIRTUAL java/lang/StringBuilder.toString ()Ljava/lang/String; - * ARETURN - */ + * This method makes the following code: + * LDC "A" + * LDC 0L + * LDC 1.0D + * INVOKEDYNAMIC makeConcatWithConstants(Ljava/lang/String;JD)Ljava/lang/String; [ + * java/lang/invoke/StringConcatFactory, + * "\u0001concat\u0001\u0001", + * ] + * ARETURN + * + * into: + * LDC "A" + * LDC 0L + * LDC 1.0D + * NEW java/lang/StringBuilder + * DUP + * INVOKESPECIAL java/lang/StringBuilder. ()V + * DUP_X2 + * POP + * INVOKEVIRTUAL java/lang/StringBuilder.append (D)Ljava/lang/StringBuilder; + * ICONST_0 + * DUP2_X2 + * POP2 + * INVOKEVIRTUAL java/lang/StringBuilder.insert (IJ)Ljava/lang/StringBuilder; + * ICONST_0 + * LDC "concat" + * INVOKEVIRTUAL java/lang/StringBuilder.insert (ILjava/lang/String;)Ljava/lang/StringBuilder; + * ICONST_0 + * DUP2_X1 + * INVOKEVIRTUAL java/lang/StringBuilder.insert (ILjava/lang/String;)Ljava/lang/StringBuilder; + * INVOKEVIRTUAL java/lang/StringBuilder.toString ()Ljava/lang/String; + * ARETURN + */ private static InsnList makeConcatInternal2(String args, Deque types) { InsnList list = new InsnList(); if (types.isEmpty()) { diff --git a/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_IndexOutOfBoundsException.java b/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_IndexOutOfBoundsException.java index 4128a8e7..86c29bf3 100644 --- a/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_IndexOutOfBoundsException.java +++ b/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_IndexOutOfBoundsException.java @@ -1,7 +1,6 @@ package xyz.wagyourtail.jvmdg.j9.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Ref; import xyz.wagyourtail.jvmdg.version.Stub; diff --git a/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_Integer.java b/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_Integer.java index e6da116e..26dd1383 100644 --- a/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_Integer.java +++ b/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_Integer.java @@ -1,6 +1,5 @@ package xyz.wagyourtail.jvmdg.j9.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Ref; import xyz.wagyourtail.jvmdg.version.Stub; diff --git a/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_Long.java b/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_Long.java index c5aaf5ab..482f20cd 100644 --- a/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_Long.java +++ b/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_Long.java @@ -1,6 +1,5 @@ package xyz.wagyourtail.jvmdg.j9.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Ref; import xyz.wagyourtail.jvmdg.version.Stub; diff --git a/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_Math.java b/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_Math.java index 3815f8bb..d0c0ce6b 100644 --- a/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_Math.java +++ b/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_Math.java @@ -1,7 +1,6 @@ package xyz.wagyourtail.jvmdg.j9.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Ref; import xyz.wagyourtail.jvmdg.version.Stub; diff --git a/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_Module.java b/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_Module.java index 96c5ef71..1786707e 100644 --- a/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_Module.java +++ b/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_Module.java @@ -2,8 +2,6 @@ import xyz.wagyourtail.jvmdg.version.Adapter; -import xyz.wagyourtail.jvmdg.version.Ref; -import xyz.wagyourtail.jvmdg.version.Stub; @Adapter("Ljava/lang/Module;") public class J_L_Module { @@ -37,7 +35,7 @@ public ClassLoader getClassLoader() { return classLoader; } -// public ModuleDescriptor getDescriptor() { + // public ModuleDescriptor getDescriptor() { // // TODO // } // diff --git a/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_ModuleLayer.java b/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_ModuleLayer.java index 672830e7..eb7c05ac 100644 --- a/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_ModuleLayer.java +++ b/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_ModuleLayer.java @@ -1,8 +1,6 @@ package xyz.wagyourtail.jvmdg.j9.stub.java_base; import xyz.wagyourtail.jvmdg.version.Adapter; -import xyz.wagyourtail.jvmdg.version.Ref; -import xyz.wagyourtail.jvmdg.version.Stub; import java.util.Optional; diff --git a/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_R_AccessibleObject.java b/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_R_AccessibleObject.java index 180add95..d173fdf0 100644 --- a/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_R_AccessibleObject.java +++ b/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_R_AccessibleObject.java @@ -1,7 +1,6 @@ package xyz.wagyourtail.jvmdg.j9.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Stub; import java.lang.reflect.*; diff --git a/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_Runtime.java b/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_Runtime.java index 004c9a94..919aafe8 100644 --- a/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_Runtime.java +++ b/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_Runtime.java @@ -1,6 +1,5 @@ package xyz.wagyourtail.jvmdg.j9.stub.java_base; -import org.objectweb.asm.Opcodes; import xyz.wagyourtail.jvmdg.version.Adapter; import xyz.wagyourtail.jvmdg.version.Ref; import xyz.wagyourtail.jvmdg.version.Stub; @@ -30,10 +29,9 @@ public static final class Version implements Comparable { private final Optional optional; private Version(List unmodifiableListOfVersions, - Optional pre, - Optional build, - Optional optional) - { + Optional pre, + Optional build, + Optional optional) { this.version = unmodifiableListOfVersions; this.pre = pre; this.build = build; @@ -197,12 +195,12 @@ private int comparePre(Version obj) { String oVal = oPre.get(); if (val.matches("\\d+")) { return (oVal.matches("\\d+") - ? (new BigInteger(val)).compareTo(new BigInteger(oVal)) - : -1); + ? (new BigInteger(val)).compareTo(new BigInteger(oVal)) + : -1); } else { return (oVal.matches("\\d+") - ? 1 - : val.compareTo(oVal)); + ? 1 + : val.compareTo(oVal)); } } return 0; @@ -212,8 +210,8 @@ private int compareBuild(Version obj) { Optional oBuild = obj.build(); if (oBuild.isPresent()) { return (build.isPresent() - ? build.get().compareTo(oBuild.get()) - : -1); + ? build.get().compareTo(oBuild.get()) + : -1); } else if (build.isPresent()) { return 1; } @@ -262,7 +260,7 @@ public boolean equals(Object obj) { if (!ret) return false; - Version that = (Version)obj; + Version that = (Version) obj; return (this.optional().equals(that.optional())); } @@ -270,10 +268,10 @@ public boolean equalsIgnoreOptional(Object obj) { if (this == obj) return true; if (obj instanceof Version) { - Version that = (Version)obj; + Version that = (Version) obj; return (this.version().equals(that.version()) - && this.pre().equals(that.pre()) - && this.build().equals(that.build())); + && this.pre().equals(that.pre()) + && this.build().equals(that.build())); } return false; } @@ -296,21 +294,19 @@ private static class VersionPattern { // RE limits the format of version strings // ([1-9][0-9]*(?:(?:\.0)*\.[1-9][0-9]*)*)(?:-([a-zA-Z0-9]+))?(?:(\+)(0|[1-9][0-9]*)?)?(?:-([-a-zA-Z0-9.]+))? + static final String VNUM_GROUP = "VNUM"; + static final String PRE_GROUP = "PRE"; + static final String PLUS_GROUP = "PLUS"; + static final String BUILD_GROUP = "BUILD"; + static final String OPT_GROUP = "OPT"; private static final String VNUM = "(?:1\\.)?(?[1-9][0-9]*(?:(?:\\.0)*[._][1-9][0-9]*)*)"; - private static final String PRE = "(?:-(?
[a-zA-Z0-9]+))?";
+            private static final String PRE = "(?:-(?
[a-zA-Z0-9]+))?";
             private static final String BUILD
                 = "(?:(?\\+|-b)(?[0-9]+)?)?";
-            private static final String OPT      = "(?:-(?[-a-zA-Z0-9.]+))?";
+            private static final String OPT = "(?:-(?[-a-zA-Z0-9.]+))?";
             private static final String VSTR_FORMAT = VNUM + PRE + BUILD + OPT;
-
             static final Pattern VSTR_PATTERN = Pattern.compile(VSTR_FORMAT);
-
-            static final String VNUM_GROUP  = "VNUM";
-            static final String PRE_GROUP   = "PRE";
-            static final String PLUS_GROUP  = "PLUS";
-            static final String BUILD_GROUP = "BUILD";
-            static final String OPT_GROUP   = "OPT";
         }
     }
 }
diff --git a/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_Short.java b/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_Short.java
index 546df9ab..6a19b480 100644
--- a/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_Short.java
+++ b/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_Short.java
@@ -1,7 +1,6 @@
 package xyz.wagyourtail.jvmdg.j9.stub.java_base;
 
 
-import org.objectweb.asm.Opcodes;
 import xyz.wagyourtail.jvmdg.version.Ref;
 import xyz.wagyourtail.jvmdg.version.Stub;
 
diff --git a/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_StackWalker.java b/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_StackWalker.java
index 08fca4ca..0269d888 100644
--- a/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_StackWalker.java
+++ b/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_StackWalker.java
@@ -1,8 +1,6 @@
 package xyz.wagyourtail.jvmdg.j9.stub.java_base;
 
 import xyz.wagyourtail.jvmdg.version.Adapter;
-import xyz.wagyourtail.jvmdg.version.Ref;
-import xyz.wagyourtail.jvmdg.version.Stub;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
@@ -17,32 +15,16 @@
 @Adapter("java/lang/StackWalker")
 public class J_L_StackWalker {
 
-    @Adapter("java/lang/StackWalker$StackFrame")
-    public interface StackFrame {
-        String getClassName();
-        String getMethodName();
-        Class getDeclaringClass();
-        int getByteCodeIndex();
-        String getFileName();
-        int getLineNumber();
-        boolean isNativeMethod();
-        StackTraceElement toStackTraceElement();
-    }
-
-    @Adapter("java/lang/StackWalker$Option")
-    public enum Option {
-        RETAIN_CLASS_REFERENCE,
-        SHOW_REFLECT_FRAMES,
-        SHOW_HIDDEN_FRAMES
-    }
-
     static final EnumSet