-
Notifications
You must be signed in to change notification settings - Fork 258
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(java): implement define_class insteadof using javaassist (#1422)
This PR implements `defineClass` insteadof using javaassist to reduce the dependency
- Loading branch information
1 parent
ab8f480
commit 50058ec
Showing
8 changed files
with
244 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
76 changes: 76 additions & 0 deletions
76
java/fury-core/src/main/java/org/apache/fury/util/unsafe/DefineClass.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.fury.util.unsafe; | ||
|
|
||
| import java.lang.invoke.MethodHandle; | ||
| import java.lang.invoke.MethodHandles; | ||
| import java.lang.invoke.MethodType; | ||
| import java.security.ProtectionDomain; | ||
| import org.apache.fury.annotation.Internal; | ||
| import org.apache.fury.util.Platform; | ||
| import org.apache.fury.util.Preconditions; | ||
|
|
||
| /** A class to define bytecode as a class. */ | ||
| @Internal | ||
| public class DefineClass { | ||
| private static volatile MethodHandle classloaderDefineClassHandle; | ||
|
|
||
| public static Class<?> defineClass( | ||
| String className, | ||
| Class<?> neighbor, | ||
| ClassLoader loader, | ||
| ProtectionDomain domain, | ||
| byte[] bytecodes) { | ||
| Preconditions.checkNotNull(loader); | ||
| Preconditions.checkArgument(Platform.JAVA_VERSION >= 8); | ||
| if (neighbor != null && Platform.JAVA_VERSION >= 9) { | ||
| // classes in bytecode must be in same package as lookup class. | ||
| MethodHandles.Lookup lookup = MethodHandles.lookup(); | ||
| _JDKAccess.addReads(_JDKAccess.getModule(DefineClass.class), _JDKAccess.getModule(neighbor)); | ||
| lookup = _Lookup.privateLookupIn(neighbor, lookup); | ||
| return _Lookup.defineClass(lookup, bytecodes); | ||
| } | ||
| if (classloaderDefineClassHandle == null) { | ||
| MethodHandles.Lookup lookup = _JDKAccess._trustedLookup(ClassLoader.class); | ||
| try { | ||
| classloaderDefineClassHandle = | ||
| lookup.findVirtual( | ||
| ClassLoader.class, | ||
| "defineClass", | ||
| MethodType.methodType( | ||
| Class.class, | ||
| String.class, | ||
| byte[].class, | ||
| int.class, | ||
| int.class, | ||
| ProtectionDomain.class)); | ||
| } catch (NoSuchMethodException | IllegalAccessException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
| try { | ||
| return (Class<?>) | ||
| classloaderDefineClassHandle.invokeWithArguments( | ||
| loader, className, bytecodes, 0, bytecodes.length, domain); | ||
| } catch (Throwable e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
72 changes: 72 additions & 0 deletions
72
java/fury-core/src/test/java/org/apache/fury/util/unsafe/DefineClassTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.fury.util.unsafe; | ||
|
|
||
| import java.util.Collections; | ||
| import org.apache.fury.codegen.CompileUnit; | ||
| import org.apache.fury.codegen.JaninoUtils; | ||
| import org.apache.fury.util.ClassLoaderUtils; | ||
| import org.apache.fury.util.Platform; | ||
| import org.testng.Assert; | ||
| import org.testng.annotations.Test; | ||
|
|
||
| public class DefineClassTest { | ||
|
|
||
| @Test | ||
| public void testDefineClass() throws ClassNotFoundException { | ||
| String pkg = DefineClassTest.class.getPackage().getName(); | ||
| CompileUnit unit = | ||
| new CompileUnit( | ||
| pkg, | ||
| "A", | ||
| ("package " | ||
| + pkg | ||
| + ";\n" | ||
| + "public class A {\n" | ||
| + " public static String hello() { return \"HELLO\"; }\n" | ||
| + "}")); | ||
| byte[] bytecodes = | ||
| JaninoUtils.toBytecode(Thread.currentThread().getContextClassLoader(), unit) | ||
| .values() | ||
| .iterator() | ||
| .next(); | ||
| String className = pkg + ".A"; | ||
| ClassLoaderUtils.ByteArrayClassLoader loader = | ||
| new ClassLoaderUtils.ByteArrayClassLoader(Collections.singletonMap(className, bytecodes)); | ||
| loader.loadClass(className); | ||
|
|
||
| loader = | ||
| new ClassLoaderUtils.ByteArrayClassLoader(Collections.singletonMap(className, bytecodes)); | ||
| DefineClass.defineClass(className, DefineClassTest.class, loader, null, bytecodes); | ||
| Class<?> clz = loader.loadClass(className); | ||
| if (Platform.JAVA_VERSION >= 9) { | ||
| Assert.assertEquals(clz.getClassLoader(), DefineClassTest.class.getClassLoader()); | ||
| Assert.assertThrows( | ||
| Exception.class, | ||
| () -> | ||
| DefineClass.defineClass( | ||
| className, null, DefineClassTest.class.getClassLoader(), null, bytecodes)); | ||
| } else { | ||
| Assert.assertEquals(clz.getClassLoader(), loader); | ||
| DefineClass.defineClass( | ||
| className, null, DefineClassTest.class.getClassLoader(), null, bytecodes); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters