aboutsummaryrefslogtreecommitdiff
path: root/src_eclipseagent
diff options
context:
space:
mode:
Diffstat (limited to 'src_eclipseagent')
-rw-r--r--src_eclipseagent/java/lombok/eclipse/ClassLoaderWorkaround.java134
-rw-r--r--src_eclipseagent/java/lombok/eclipse/package-info.java27
-rw-r--r--src_eclipseagent/lombok/eclipse/agent/EclipsePatcher.java186
-rw-r--r--src_eclipseagent/lombok/eclipse/agent/PatchFixes.java (renamed from src_eclipseagent/java/lombok/eclipse/PatchFixes.java)2
4 files changed, 57 insertions, 292 deletions
diff --git a/src_eclipseagent/java/lombok/eclipse/ClassLoaderWorkaround.java b/src_eclipseagent/java/lombok/eclipse/ClassLoaderWorkaround.java
deleted file mode 100644
index 3d8e9ec9..00000000
--- a/src_eclipseagent/java/lombok/eclipse/ClassLoaderWorkaround.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package java.lombok.eclipse;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-
-
-/**
- * Allows you to inject the lombok classes into any classloader, even if that classloader does not
- * know how to find the lombok classes.
- *
- * Example: Injecting lombok's Eclipse Parser patching code into eclipse's OSGi BundleLoader.
- *
- * @author rzwitserloot
- */
-public class ClassLoaderWorkaround {
- static RuntimeException sneakyThrow(Throwable t) {
- if ( t == null ) throw new NullPointerException("t");
- ClassLoaderWorkaround.<RuntimeException>sneakyThrow0(t);
- return null;
- }
-
- @SuppressWarnings("unchecked")
- private static <T extends Throwable> void sneakyThrow0(Throwable t) throws T {
- throw (T)t;
- }
-
- private static final Map<ClassLoader, Method> transform = new HashMap<ClassLoader, Method>();
-
- public static void transformCompilationUnitDeclarationSwapped(Object cud, Object parser) throws Exception {
- transformCompilationUnitDeclaration(parser, cud);
- }
-
- public static void transformCompilationUnitDeclaration(Object parser, Object cud) throws Exception {
- Method transformMethod = getTransformMethod(cud);
- try {
- transformMethod.invoke(null, parser, cud);
- } catch ( InvocationTargetException e ) {
- throw sneakyThrow(e.getCause());
- }
- }
-
- private static Method getTransformMethod(Object cud) throws ClassNotFoundException {
- ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
-
- synchronized ( transform ) {
- if ( !transform.containsKey(contextLoader)) {
- transform.put(contextLoader, findTransformMethod(cud));
- }
-
- Method m = transform.get(contextLoader);
- if ( m == null ) throw new ClassNotFoundException("lombok.eclipse.TransformEclipseAST");
- return m;
-
- }
- }
-
- private static Method findTransformMethod(Object cud) throws ClassNotFoundException {
- final ClassLoader parent = cud.getClass().getClassLoader();
- ClassLoader loader = new ClassLoader() {
- @Override public Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
- if ( name.startsWith("lombok.") ) {
- InputStream in = ClassLoader.getSystemClassLoader().getResourceAsStream(name.replace(".", "/") + ".class");
- ByteArrayOutputStream out = new ByteArrayOutputStream();
-
- byte[] b = new byte[65536];
- try {
- while ( true ) {
- int r = in.read(b);
- if ( r == -1 ) break;
- if ( r > 0 ) out.write(b, 0, r);
- }
-
- in.close();
- byte[] data = out.toByteArray();
- Class<?> result = defineClass(name, data, 0, data.length);
- if ( resolve ) resolveClass(result);
- return result;
- } catch ( IOException e ) {
- throw new ClassNotFoundException();
- }
- } else {
- try {
- Class<?> result = ClassLoader.getSystemClassLoader().loadClass(name);
- if ( resolve ) resolveClass(result);
- return result;
- } catch ( ClassNotFoundException e ) {
- Class<?> result = parent.loadClass(name);
- if ( resolve ) resolveClass(result);
- return result;
- }
- }
- }
- };
-
- Class<?> c = loader.loadClass("lombok.eclipse.TransformEclipseAST");
- for ( Method method : c.getMethods() ) {
- if ( method.getName().equals("transform") ) {
- Class<?>[] types = method.getParameterTypes();
- if ( types.length != 2 ) continue;
- if ( !types[0].getName().equals("org.eclipse.jdt.internal.compiler.parser.Parser") ) continue;
- if ( !types[1].getName().equals("org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration") ) continue;
- return method;
- }
- }
-
- throw new ClassNotFoundException("lombok.eclipse.TransformEclipseAST");
- }
-}
diff --git a/src_eclipseagent/java/lombok/eclipse/package-info.java b/src_eclipseagent/java/lombok/eclipse/package-info.java
deleted file mode 100644
index 2ec8031f..00000000
--- a/src_eclipseagent/java/lombok/eclipse/package-info.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/**
- * Workaround package to avoid the OSGi class loader system, which will always refer to the system class loader for any classes in a package
- * that starts with <code>java.</code>
- */
-package java.lombok.eclipse;
diff --git a/src_eclipseagent/lombok/eclipse/agent/EclipsePatcher.java b/src_eclipseagent/lombok/eclipse/agent/EclipsePatcher.java
index c7aa48ff..83b6ec94 100644
--- a/src_eclipseagent/lombok/eclipse/agent/EclipsePatcher.java
+++ b/src_eclipseagent/lombok/eclipse/agent/EclipsePatcher.java
@@ -21,33 +21,14 @@
*/
package lombok.eclipse.agent;
-import java.io.File;
-import java.io.IOException;
-import java.lang.instrument.ClassFileTransformer;
-import java.lang.instrument.IllegalClassFormatException;
import java.lang.instrument.Instrumentation;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URI;
-import java.net.URLDecoder;
-import java.nio.charset.Charset;
-import java.security.ProtectionDomain;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.jar.JarFile;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.objectweb.asm.Opcodes;
-
-import lombok.Lombok;
-import lombok.core.SpiLoadUtil;
import lombok.patcher.Hook;
import lombok.patcher.MethodTarget;
import lombok.patcher.ScriptManager;
import lombok.patcher.StackRequest;
-import lombok.patcher.scripts.AddFieldScript;
-import lombok.patcher.scripts.ExitFromMethodEarlyScript;
-import lombok.patcher.scripts.WrapReturnValuesScript;
+import lombok.patcher.equinox.EquinoxClassLoader;
+import lombok.patcher.scripts.ScriptBuilder;
/**
* This is a java-agent that patches some of eclipse's classes so AST Nodes are handed off to Lombok
@@ -59,135 +40,80 @@ import lombok.patcher.scripts.WrapReturnValuesScript;
public class EclipsePatcher {
private EclipsePatcher() {}
- private static Map<String, EclipseTransformer> transformers = new HashMap<String, EclipseTransformer>();
- static {
- try {
- for ( EclipseTransformer transformer : SpiLoadUtil.findServices(EclipseTransformer.class) ) {
- String targetClassName = transformer.getTargetClassName();
- transformers.put(targetClassName, transformer);
- }
- } catch ( Throwable t ) {
- throw Lombok.sneakyThrow(t);
- }
- }
-
- private static class Patcher implements ClassFileTransformer {
- public byte[] transform(ClassLoader loader, String className,
- Class<?> classBeingRedefined,
- ProtectionDomain protectionDomain, byte[] classfileBuffer)
- throws IllegalClassFormatException {
-
-// ClassLoader classLoader = Patcher.class.getClassLoader();
-// if ( classLoader == null ) classLoader = ClassLoader.getSystemClassLoader();
-
- EclipseTransformer transformer = transformers.get(className);
- if ( transformer != null ) return transformer.transform(classfileBuffer);
-
- return null;
- }
- }
-
public static void agentmain(String agentArgs, Instrumentation instrumentation) throws Exception {
- registerPatcher(instrumentation, true);
- addLombokToSearchPaths(instrumentation);
- }
-
- private static void addLombokToSearchPaths(Instrumentation instrumentation) throws Exception {
- String path = findPathOfOurClassloader();
- //On java 1.5, you don't have these methods, so you'll be forced to manually -Xbootclasspath/a them in.
- tryCallMethod(instrumentation, "appendToSystemClassLoaderSearch", path + "/lombok.jar");
- tryCallMethod(instrumentation, "appendToBootstrapClassLoaderSearch", path + "/lombok.eclipse.agent.jar");
+ registerPatchScripts(instrumentation, true);
}
- private static void tryCallMethod(Object o, String methodName, String path) {
- try {
- Instrumentation.class.getMethod(methodName, JarFile.class).invoke(o, new JarFile(path));
- } catch ( Throwable ignore ) {}
- }
-
- private static String findPathOfOurClassloader() throws Exception {
- URI uri = EclipsePatcher.class.getResource("/" + EclipsePatcher.class.getName().replace('.', '/') + ".class").toURI();
- Pattern p = Pattern.compile("^jar:file:([^\\!]+)\\!.*\\.class$");
- Matcher m = p.matcher(uri.toString());
- if ( !m.matches() ) return ".";
- String rawUri = m.group(1);
- return new File(URLDecoder.decode(rawUri, Charset.defaultCharset().name())).getParent();
+ public static void premain(String agentArgs, Instrumentation instrumentation) throws Exception {
+ registerPatchScripts(instrumentation, false);
}
- public static void premain(String agentArgs, Instrumentation instrumentation) throws Exception {
- registerPatcher(instrumentation, false);
- addLombokToSearchPaths(instrumentation);
+ private static void registerPatchScripts(Instrumentation instrumentation, boolean reloadExistingClasses) {
ScriptManager sm = new ScriptManager();
sm.registerTransformer(instrumentation);
+ EquinoxClassLoader.getInstance().addPrefix("lombok.");
+ EquinoxClassLoader.getInstance().registerScripts(sm);
- sm.addScript(new WrapReturnValuesScript(
- new MethodTarget("org.eclipse.jdt.core.dom.ASTConverter", "retrieveStartingCatchPosition"),
- new Hook("java/lombok/eclipse/PatchFixes", "fixRetrieveStartingCatchPosition", "(I)I"),
- StackRequest.PARAM1));
+ sm.addScript(ScriptBuilder.wrapReturnValue()
+ .target(new MethodTarget("org.eclipse.jdt.core.dom.ASTConverter", "retrieveStartingCatchPosition"))
+ .wrapMethod(new Hook("lombok/eclipse/agent/PatchFixes", "fixRetrieveStartingCatchPosition", "(I)I"))
+ .transplant().request(StackRequest.PARAM1).build());
- sm.addScript(new AddFieldScript("org.eclipse.jdt.internal.compiler.ast.ASTNode",
- Opcodes.ACC_PUBLIC | Opcodes.ACC_TRANSIENT, "$generatedBy", "Lorg/eclipse/jdt/internal/compiler/ast/ASTNode;"));
+ sm.addScript(ScriptBuilder.addField()
+ .targetClass("org.eclipse.jdt.internal.compiler.ast.ASTNode")
+ .fieldName("$generatedBy")
+ .fieldType("Lorg/eclipse/jdt/internal/compiler/ast/ASTNode;")
+ .setPublic().setTransient().build());
- sm.addScript(new AddFieldScript("org.eclipse.jdt.core.dom.ASTNode",
- Opcodes.ACC_PUBLIC | Opcodes.ACC_TRANSIENT, "$isGenerated", "Z"));
+ sm.addScript(ScriptBuilder.addField()
+ .targetClass("org.eclipse.jdt.core.dom.ASTNode")
+ .fieldName("$isGenerated").fieldType("Z")
+ .setPublic().setTransient().build());
- sm.addScript(new AddFieldScript("org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration",
- Opcodes.ACC_PUBLIC | Opcodes.ACC_TRANSIENT, "$lombokAST", "Ljava/lang/Object;"));
+ sm.addScript(ScriptBuilder.addField()
+ .targetClass("org.eclipse.jdt.internal.compiler.CompilationUnitDeclaration")
+ .fieldName("$lombokAST").fieldType("Ljava/lang/Object;")
+ .setPublic().setTransient().build());
- sm.addScript(new WrapReturnValuesScript(
- new MethodTarget("org.eclipse.jdt.internal.compiler.parser.Parser", "getMethodBodies", "void",
- "org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration"),
- new Hook("java/lombok/eclipse/ClassLoaderWorkaround", "transformCompilationUnitDeclaration",
- "(Ljava/lang/Object;Ljava/lang/Object;)V"), StackRequest.THIS, StackRequest.PARAM1));
+ final String PARSER_SIG1 = "org.eclipse.jdt.internal.compiler.parser.Parser";
+ final String PARSER_SIG2 = "Lorg/eclipse/jdt/internal/compiler/parser/Parser;";
+ final String CUD_SIG1 = "org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration";
+ final String CUD_SIG2 = "Lorg/eclipse/jdt/internal/compiler/ast/CompilationUnitDeclaration;";
- sm.addScript(new WrapReturnValuesScript(
- new MethodTarget("org.eclipse.jdt.internal.compiler.parser.Parser", "endParse",
- "org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration", "int"),
- new Hook("java/lombok/eclipse/ClassLoaderWorkaround", "transformCompilationUnitDeclarationSwapped",
- "(Ljava/lang/Object;Ljava/lang/Object;)V"), StackRequest.THIS, StackRequest.RETURN_VALUE));
+ sm.addScript(ScriptBuilder.wrapReturnValue()
+ .target(new MethodTarget(PARSER_SIG1, "getMethodBodies", "void", CUD_SIG1))
+ .wrapMethod(new Hook("lombok/eclipse/TransformEclipseAST", "transform",
+ "(" + PARSER_SIG2 + CUD_SIG2 + ")V"))
+ .request(StackRequest.THIS, StackRequest.PARAM1).build());
- sm.addScript(new ExitFromMethodEarlyScript(
- new MethodTarget("org.eclipse.jdt.internal.compiler.parser.Parser", "parse", "void",
+ sm.addScript(ScriptBuilder.wrapReturnValue()
+ .target(new MethodTarget(PARSER_SIG1, "endParse", CUD_SIG1, "int"))
+ .wrapMethod(new Hook("lombok/eclipse/TransformEclipseAST", "transform_swapped",
+ "(" + CUD_SIG2 + PARSER_SIG2 + ")V"))
+ .request(StackRequest.THIS, StackRequest.RETURN_VALUE).build());
+
+ sm.addScript(ScriptBuilder.exitEarly()
+ .target(new MethodTarget(PARSER_SIG1, "parse", "void",
"org.eclipse.jdt.internal.compiler.ast.MethodDeclaration",
- "org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration"),
- new Hook("java/lombok/eclipse/PatchFixes", "checkBit24",
- "(Ljava/lang/Object;)Z"), null, StackRequest.PARAM1));
+ "org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration"))
+ .decisionMethod(new Hook("lombok/eclipse/agent/PatchFixes", "checkBit24", "(Ljava/lang/Object;)Z"))
+ .transplant().request(StackRequest.PARAM1).build());
- sm.addScript(new ExitFromMethodEarlyScript(
- new MethodTarget("org.eclipse.jdt.internal.compiler.parser.Parser", "parse", "void",
+ sm.addScript(ScriptBuilder.exitEarly()
+ .target(new MethodTarget(PARSER_SIG1, "parse", "void",
"org.eclipse.jdt.internal.compiler.ast.ConstructorDeclaration",
- "org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration", "boolean"),
- new Hook("java/lombok/eclipse/PatchFixes", "checkBit24",
- "(Ljava/lang/Object;)Z"), null, StackRequest.PARAM1));
+ "org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration", "boolean"))
+ .decisionMethod(new Hook("lombok/eclipse/agent/PatchFixes", "checkBit24", "(Ljava/lang/Object;)Z"))
+ .transplant().request(StackRequest.PARAM1).build());
- sm.addScript(new ExitFromMethodEarlyScript(
- new MethodTarget("org.eclipse.jdt.internal.compiler.parser.Parser", "parse", "void",
+ sm.addScript(ScriptBuilder.exitEarly()
+ .target(new MethodTarget(PARSER_SIG1, "parse", "void",
"org.eclipse.jdt.internal.compiler.ast.Initializer",
"org.eclipse.jdt.internal.compiler.ast.TypeDeclaration",
- "org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration"),
- new Hook("java/lombok/eclipse/PatchFixes", "checkBit24",
- "(Ljava/lang/Object;)Z"), null, StackRequest.PARAM1));
- }
-
- private static void registerPatcher(Instrumentation instrumentation, boolean transformExisting) throws IOException {
- instrumentation.addTransformer(new Patcher()/*, true*/);
+ "org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration"))
+ .decisionMethod(new Hook("lombok/eclipse/agent/PatchFixes", "checkBit24", "(Ljava/lang/Object;)Z"))
+ .transplant().request(StackRequest.PARAM1).build());
- if ( transformExisting ) for ( Class<?> c : instrumentation.getAllLoadedClasses() ) {
- if ( transformers.containsKey(c.getName()) ) {
- try {
- //instrumentation.retransformClasses(c); - //not in java 1.5.
- Instrumentation.class.getMethod("retransformClasses", Class[].class).invoke(instrumentation,
- new Object[] { new Class[] {c }});
- } catch ( InvocationTargetException e ) {
- throw new UnsupportedOperationException(
- "The eclipse parser class is already loaded and cannot be modified. " +
- "You'll have to restart eclipse in order to use Lombok in eclipse.");
- } catch ( Throwable t ) {
- throw new UnsupportedOperationException(
- "This appears to be a java 1.5 instance, which cannot reload already loaded classes. " +
- "You'll have to restart eclipse in order to use Lombok in eclipse.");
- }
- }
- }
+ if (reloadExistingClasses) sm.reloadClasses(instrumentation);
}
}
diff --git a/src_eclipseagent/java/lombok/eclipse/PatchFixes.java b/src_eclipseagent/lombok/eclipse/agent/PatchFixes.java
index 23c60d32..e36823b2 100644
--- a/src_eclipseagent/java/lombok/eclipse/PatchFixes.java
+++ b/src_eclipseagent/lombok/eclipse/agent/PatchFixes.java
@@ -1,4 +1,4 @@
-package java.lombok.eclipse;
+package lombok.eclipse.agent;
public class PatchFixes {
public static int fixRetrieveStartingCatchPosition(int in) {
generated by cgit (git 2.46.0) at 2024-11-24 14:04:35 +0000