[tests] Support javadoc in ecj tests

src/core/lombok/eclipse/EcjAugments.java

@@ -28,6 +28,7 @@ import java.util.concurrent.ConcurrentMap;
 import org.eclipse.jdt.internal.compiler.ast.ASTNode;
 import org.eclipse.jdt.internal.compiler.ast.Annotation;
 import org.eclipse.jdt.internal.compiler.ast.FieldDeclaration;
+import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;
 import org.eclipse.jdt.internal.core.CompilationUnit;
 import org.eclipse.jdt.internal.core.SourceMethod;
 
@@ -42,13 +43,13 @@ public final class EcjAugments {
 	public static final FieldAugment<ASTNode, Boolean> ASTNode_handled = FieldAugment.augment(ASTNode.class, boolean.class, "lombok$handled");
 	public static final FieldAugment<ASTNode, ASTNode> ASTNode_generatedBy = FieldAugment.augment(ASTNode.class, ASTNode.class, "$generatedBy");
 	public static final FieldAugment<Annotation, Boolean> Annotation_applied = FieldAugment.augment(Annotation.class, boolean.class, "lombok$applied");
+	public static final FieldAugment<ICompilationUnit, Map<String, String>> CompilationUnit_javadoc = FieldAugment.augment(ICompilationUnit.class, Map.class, "$javadoc");
 	
 	public static final class EclipseAugments {
 		private EclipseAugments() {
 			// Prevent instantiation
 		}
 		
-		public static final FieldAugment<CompilationUnit, Map<String, String>> CompilationUnit_javadoc = FieldAugment.augment(CompilationUnit.class, Map.class, "$javadoc");
 		public static final FieldAugment<CompilationUnit, ConcurrentMap<String, List<SourceMethod>>> CompilationUnit_delegateMethods = FieldAugment.augment(CompilationUnit.class, ConcurrentMap.class, "$delegateMethods");
 	}
 }

src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java

@@ -39,7 +39,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.jdt.core.Signature;
 import org.eclipse.jdt.core.compiler.CharOperation;
 import org.eclipse.jdt.internal.compiler.ast.ASTNode;
 import org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration;
@@ -106,7 +105,6 @@ import org.eclipse.jdt.internal.compiler.lookup.TypeBinding;
 import org.eclipse.jdt.internal.compiler.lookup.TypeConstants;
 import org.eclipse.jdt.internal.compiler.lookup.TypeIds;
 import org.eclipse.jdt.internal.compiler.lookup.WildcardBinding;
-import org.eclipse.jdt.internal.core.CompilationUnit;
 
 import lombok.AccessLevel;
 import lombok.ConfigurationKeys;
@@ -125,6 +123,7 @@ import lombok.core.configuration.TypeName;
 import lombok.core.debug.ProblemReporter;
 import lombok.core.handlers.HandlerUtil;
 import lombok.core.handlers.HandlerUtil.FieldAccess;
+import lombok.eclipse.EcjAugments;
 import lombok.eclipse.Eclipse;
 import lombok.eclipse.EclipseAST;
 import lombok.eclipse.EclipseNode;
@@ -2641,42 +2640,19 @@ public class EclipseHandlerUtil {
 		return null;
 	}
 	
-	private static class EclipseOnlyUtil {
-		public static void setDocComment(CompilationUnitDeclaration cud, TypeDeclaration type, ASTNode node, String doc) {
-			if (cud.compilationResult.compilationUnit instanceof CompilationUnit) {
-				CompilationUnit compilationUnit = (CompilationUnit) cud.compilationResult.compilationUnit;
-				Map<String, String> docs = EclipseAugments.CompilationUnit_javadoc.setIfAbsent(compilationUnit, new HashMap<String, String>());
-				
-				if (node instanceof AbstractMethodDeclaration) {
-					AbstractMethodDeclaration methodDeclaration = (AbstractMethodDeclaration) node;
-					String signature = getSignature(type, methodDeclaration);
-					/* Add javadoc start marker, add leading asterisks to each line, add javadoc end marker */
-					docs.put(signature, String.format("/**%n%s%n */", doc.replaceAll("(?m)^", " * ")));
-				}
-			}
-		}
-	}
-	
-	private static Boolean eclipseMode;
-	private static boolean eclipseMode() {
-		if (eclipseMode != null) return eclipseMode.booleanValue();
-		try {
-			Class.forName("org.eclipse.jdt.internal.core.CompilationUnit");
-			eclipseMode = true;
-		} catch (Throwable t) {
-			eclipseMode = false;
-		}
-		return eclipseMode;
-	}
-	
 	public static void setDocComment(CompilationUnitDeclaration cud, EclipseNode eclipseNode, String doc) {
-		if (!eclipseMode()) return;
 		setDocComment(cud, (TypeDeclaration) upToTypeNode(eclipseNode).get(), eclipseNode.get(), doc);
 	}
 	 
 	public static void setDocComment(CompilationUnitDeclaration cud, TypeDeclaration type, ASTNode node, String doc) {
-		if (!eclipseMode()) return;
-		EclipseOnlyUtil.setDocComment(cud, type, node, doc);
+		Map<String, String> docs = EcjAugments.CompilationUnit_javadoc.setIfAbsent(cud.compilationResult.compilationUnit, new HashMap<String, String>());
+		
+		if (node instanceof AbstractMethodDeclaration) {
+			AbstractMethodDeclaration methodDeclaration = (AbstractMethodDeclaration) node;
+			String signature = getSignature(type, methodDeclaration);
+			/* Add javadoc start marker, remove trailing line break, add leading asterisks to each line, add javadoc end marker */
+			docs.put(signature, String.format("/**%n%s%n */", doc.replaceAll("$\\r?\\n", "").replaceAll("(?m)^", " * ")));
+		}
 	}
 	
 	public static String getSignature(TypeDeclaration type, AbstractMethodDeclaration methodDeclaration) {
@@ -2688,8 +2664,7 @@ public class EclipseHandlerUtil {
 		Argument[] arguments = methodDeclaration.arguments;
 		if (arguments != null) {
 			for (Argument argument : arguments) {
-				String signature = Signature.createTypeSignature(argument.type.getLastToken(), false);
-				sb.append(signature);
+				sb.append(String.valueOf(argument.type));
 			}
 		}
 		sb.append(")");

src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java

@@ -916,7 +916,7 @@ public class EclipsePatcher implements AgentLauncher.AgentLaunchable {
 				.requestExtra(StackRequest.PARAM1)
 				.build());
 		
-		sm.addScriptIfWitness(OSGI_TYPES, ScriptBuilder.replaceMethodCall()
+		sm.addScript(ScriptBuilder.replaceMethodCall()
 				.target(new MethodTarget("org.eclipse.jdt.internal.compiler.ast.TypeDeclaration", "printBody", "java.lang.StringBuffer", "int", "java.lang.StringBuffer"))
 				.methodToReplace(new Hook("org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration", "print", "java.lang.StringBuffer", "int", "java.lang.StringBuffer"))
 				.replacementMethod(new Hook("lombok.launch.PatchFixesHider$Javadoc", "printMethod", "java.lang.StringBuffer", "org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration", "int", "java.lang.StringBuffer", "org.eclipse.jdt.internal.compiler.ast.TypeDeclaration"))

src/eclipseAgent/lombok/eclipse/agent/PatchJavadoc.java

@@ -21,7 +21,7 @@
  */
 package lombok.eclipse.agent;
 
-import static lombok.eclipse.EcjAugments.EclipseAugments.CompilationUnit_javadoc;
+import static lombok.eclipse.EcjAugments.CompilationUnit_javadoc;
 
 import java.lang.reflect.Method;
 import java.util.Map;
@@ -41,7 +41,7 @@ import lombok.permit.Permit;
 
 public class PatchJavadoc {
 	
-	public static String getHTMLContentFromSource(String original, IJavaElement member) {
+	public static String getHTMLContentFromSource(String original, Object member) {
 		if (original != null) {
 			return original;
 		}
@@ -51,15 +51,14 @@ public class PatchJavadoc {
 			ICompilationUnit iCompilationUnit = sourceMethod.getCompilationUnit();
 			if (iCompilationUnit instanceof CompilationUnit) {
 				CompilationUnit compilationUnit = (CompilationUnit) iCompilationUnit;
-				
 				Map<String, String> docs = CompilationUnit_javadoc.get(compilationUnit);
 				if (docs == null) return null;
 				
-				String signature = getSignature(sourceMethod);
+				String signature = Signature.getSignature(sourceMethod);
 				String rawJavadoc = docs.get(signature);
 				if (rawJavadoc == null) return null;
 				
-				return Reflection.javadoc2HTML((IMember) member, member, rawJavadoc);
+				return Reflection.javadoc2HTML((IMember) member, (IJavaElement) member, rawJavadoc);
 			}
 		}
 		
@@ -67,33 +66,33 @@ public class PatchJavadoc {
 	}
 	
 	public static StringBuffer printMethod(AbstractMethodDeclaration methodDeclaration, Integer tab, StringBuffer output, TypeDeclaration type) {
-		if (methodDeclaration.compilationResult.compilationUnit instanceof CompilationUnit) {
-			Map<String, String> docs = CompilationUnit_javadoc.get((CompilationUnit) methodDeclaration.compilationResult.compilationUnit);
-			if (docs != null) {
-				String signature = EclipseHandlerUtil.getSignature(type, methodDeclaration);
-				String rawJavadoc = docs.get(signature);
-				if (rawJavadoc != null) {
-					for (String line : rawJavadoc.split("\r?\n")) {
-						ASTNode.printIndent(tab, output).append(line).append("\n");
-					}
+		Map<String, String> docs = CompilationUnit_javadoc.get(methodDeclaration.compilationResult.compilationUnit);
+		if (docs != null) {
+			String signature = EclipseHandlerUtil.getSignature(type, methodDeclaration);
+			String rawJavadoc = docs.get(signature);
+			if (rawJavadoc != null) {
+				for (String line : rawJavadoc.split("\r?\n")) {
+					ASTNode.printIndent(tab, output).append(line).append("\n");
 				}
 			}
 		}
 		return methodDeclaration.print(tab, output);
 	}
 	
-	private static String getSignature(SourceMethod sourceMethod) {
-		StringBuilder sb = new StringBuilder();
-		sb.append(sourceMethod.getParent().getElementName());
-		sb.append(".");
-		sb.append(sourceMethod.getElementName());
-		sb.append("(");
-		for (String type : sourceMethod.getParameterTypes()) {
-			sb.append(type);
+	private static class Signature {
+		static final String getSignature(SourceMethod sourceMethod) {
+			StringBuilder sb = new StringBuilder();
+			sb.append(sourceMethod.getParent().getElementName());
+			sb.append(".");
+			sb.append(sourceMethod.getElementName());
+			sb.append("(");
+			for (String type : sourceMethod.getParameterTypes()) {
+				sb.append(org.eclipse.jdt.core.Signature.toString(type));
+			}
+			sb.append(")");
+			
+			return sb.toString();
 		}
-		sb.append(")");
-		
-		return sb.toString();
 	}
 	
 	/**

src/eclipseAgent/lombok/launch/PatchFixesHider.java

@@ -332,7 +332,7 @@ final class PatchFixesHider {
 		
 		static {
 			Class<?> shadowed = Util.shadowLoadClass("lombok.eclipse.agent.PatchJavadoc");
-			GET_HTML = Util.findMethod(shadowed, "getHTMLContentFromSource", String.class, IJavaElement.class);
+			GET_HTML = Util.findMethod(shadowed, "getHTMLContentFromSource", String.class, Object.class);
 			PRINT_METHOD = Util.findMethod(shadowed, "printMethod", AbstractMethodDeclaration.class, Integer.class, StringBuffer.class, TypeDeclaration.class);
 		}
 		

src/utils/lombok/core/FieldAugment.java

@@ -24,6 +24,7 @@ package lombok.core;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.WeakHashMap;
 
@@ -69,6 +70,10 @@ public abstract class FieldAugment<T, F> {
 		checkNotNull(fieldType, "fieldType");
 		checkNotNull(name, "name");
 		
+		if (type.isInterface()) {
+			return new InterfaceFieldAugment<T, F>(name, fieldType);
+		}
+		
 		@SuppressWarnings("unchecked")
 		F defaultValue = (F) getDefaultValue(fieldType);
 		FieldAugment<T, F> ret = tryCreateReflectionAugment(type, fieldType, name, defaultValue);
@@ -175,6 +180,54 @@ public abstract class FieldAugment<T, F> {
 	 */
 	public abstract F compareAndSet(T object, F expected, F value);
 	
+	private static final class InterfaceFieldAugment<T, F> extends FieldAugment<T, F> {
+		private final String name;
+		private final Class<? super F> fieldType;
+		
+		private Map<Class<T>, FieldAugment<T, F>> map = new HashMap<Class<T>, FieldAugment<T,F>>();
+		
+		private InterfaceFieldAugment(String name, Class<? super F> fieldType) {
+			this.name = name;
+			this.fieldType = fieldType;
+		}
+		
+		private synchronized FieldAugment<T, F> getDelegate(T object) {
+			@SuppressWarnings("unchecked")
+			Class<T> c = (Class<T>) object.getClass();
+			
+			FieldAugment<T,F> fieldAugment = map.get(c);
+			if (fieldAugment == null) {
+				fieldAugment = augment(c, fieldType, name);
+				map.put(c, fieldAugment);
+			}
+			return fieldAugment;
+		}
+		
+		@Override public F get(T object) {
+			return getDelegate(object).get(object);
+		}
+		
+		@Override public F getAndSet(T object, F value) {
+			return getDelegate(object).getAndSet(object, value);
+		}
+		
+		@Override public F clear(T object) {
+			return getDelegate(object).clear(object);
+		}
+		
+		@Override public F compareAndClear(T object, F expected) {
+			return getDelegate(object).compareAndClear(object, expected);
+		}
+		
+		@Override public F setIfAbsent(T object, F value) {
+			return getDelegate(object).setIfAbsent(object, value);
+		}
+		
+		@Override public F compareAndSet(T object, F expected, F value) {
+			return getDelegate(object).compareAndSet(object, expected, value);
+		}
+	}
+
 	private static class ReflectionFieldAugment<T, F> extends FieldAugment<T, F> {
 		private final Object lock = new Object();
 		private final Field field;

test/transform/resource/after-ecj/GetterSetterJavadocEcj.java

@@ -1,86 +0,0 @@
-@lombok.Data class GetterSetterJavadoc1 {
-  private int fieldName;
-  public @java.lang.SuppressWarnings("all") int getFieldName() {
-    return this.fieldName;
-  }
-  public @java.lang.SuppressWarnings("all") void setFieldName(final int fieldName) {
-    this.fieldName = fieldName;
-  }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
-    if ((o == this))
-        return true;
-    if ((! (o instanceof GetterSetterJavadoc1)))
-        return false;
-    final GetterSetterJavadoc1 other = (GetterSetterJavadoc1) o;
-    if ((! other.canEqual((java.lang.Object) this)))
-        return false;
-    if ((this.getFieldName() != other.getFieldName()))
-        return false;
-    return true;
-  }
-  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
-    return (other instanceof GetterSetterJavadoc1);
-  }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
-    final int PRIME = 59;
-    int result = 1;
-    result = ((result * PRIME) + this.getFieldName());
-    return result;
-  }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-    return (("GetterSetterJavadoc1(fieldName=" + this.getFieldName()) + ")");
-  }
-  public @java.lang.SuppressWarnings("all") GetterSetterJavadoc1() {
-    super();
-  }
-}
-class GetterSetterJavadoc2 {
-  private @lombok.Getter @lombok.Setter int fieldName;
-  GetterSetterJavadoc2() {
-    super();
-  }
-  public @java.lang.SuppressWarnings("all") int getFieldName() {
-    return this.fieldName;
-  }
-  public @java.lang.SuppressWarnings("all") void setFieldName(final int fieldName) {
-    this.fieldName = fieldName;
-  }
-}
-class GetterSetterJavadoc3 {
-  private @lombok.Getter @lombok.Setter int fieldName;
-  GetterSetterJavadoc3() {
-    super();
-  }
-  public @java.lang.SuppressWarnings("all") int getFieldName() {
-    return this.fieldName;
-  }
-  public @java.lang.SuppressWarnings("all") void setFieldName(final int fieldName) {
-    this.fieldName = fieldName;
-  }
-}
-@lombok.experimental.Accessors(chain = true,fluent = true) class GetterSetterJavadoc4 {
-  private @lombok.Getter @lombok.Setter int fieldName;
-  GetterSetterJavadoc4() {
-    super();
-  }
-  public @java.lang.SuppressWarnings("all") int fieldName() {
-    return this.fieldName;
-  }
-  public @java.lang.SuppressWarnings("all") GetterSetterJavadoc4 fieldName(final int fieldName) {
-    this.fieldName = fieldName;
-    return this;
-  }
-}
-@lombok.experimental.Accessors(chain = true,fluent = true) class GetterSetterJavadoc5 {
-  private @lombok.Getter @lombok.Setter int fieldName;
-  GetterSetterJavadoc5() {
-    super();
-  }
-  public @java.lang.SuppressWarnings("all") int fieldName() {
-    return this.fieldName;
-  }
-  public @java.lang.SuppressWarnings("all") GetterSetterJavadoc5 fieldName(final int fieldName) {
-    this.fieldName = fieldName;
-    return this;
-  }
-}

test/transform/resource/after-ecj/SetterDeprecatedEcj.java

@@ -1,14 +0,0 @@
-import lombok.Setter;
-class SetterDeprecated {
-  @Deprecated @Setter int annotation;
-  @Setter int javadoc;
-  SetterDeprecated() {
-    super();
-  }
-  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") void setAnnotation(final int annotation) {
-    this.annotation = annotation;
-  }
-  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") void setJavadoc(final int javadoc) {
-    this.javadoc = javadoc;
-  }
-}

test/transform/resource/before/BuilderJavadoc.java

@@ -1,4 +1,3 @@
-//platform !ecj: Javadoc copying not supported on ecj
 import java.util.List;
 
 @lombok.Builder

test/transform/resource/before/BuilderWithDeprecated.java

@@ -1,4 +1,3 @@
-//platform !ecj: Javadoc copying not supported on ecj
 import com.google.common.collect.ImmutableList;
 import lombok.Builder;
 import lombok.Singular;

test/transform/resource/before/GetterDeprecated.java

@@ -1,4 +1,3 @@
-//platform !ecj: Javadoc copying not supported on ecj
 import lombok.Getter;
 class GetterDeprecated {
 	

test/transform/resource/before/GetterSetterJavadoc.java

@@ -1,4 +1,3 @@
-//platform !ecj: Javadoc copying not supported on ecj
 @lombok.Data
 class GetterSetterJavadoc1 {
 	/**

test/transform/resource/before/GetterSetterJavadocEcj.java

@@ -1,65 +0,0 @@
-//platform ecj: Javadoc copying not supported on ecj - testing that the javadoc doesnt cause any crashes
-@lombok.Data
-class GetterSetterJavadoc1 {
-	/**
-	 * Some text
-	 *
-	 * @param fieldName Hello, World1
-	 * --- GETTER ---
-	 * Getter section
-	 *
-	 * @return Sky is blue1
-	 */
-	private int fieldName;
-}
-
-class GetterSetterJavadoc2 {
-	/**
-	 * Some text
-	 *
-	 * @param fieldName Hello, World2
-	 * @return Sky is blue2
-	 */
-	@lombok.Getter @lombok.Setter private int fieldName;
-}
-
-class GetterSetterJavadoc3 {
-	/**
-	 * Some text
-	 *
-	 * **SETTER**
-	 * Setter section
-	 * @param fieldName Hello, World3
-	 * **GETTER**
-	 * Getter section
-	 * @return Sky is blue3
-	 */
-	@lombok.Getter @lombok.Setter private int fieldName;
-}
-
-@lombok.experimental.Accessors(chain = true, fluent = true)
-class GetterSetterJavadoc4 {
-	/**
-	 * Some text
-	 *
-	 * @param fieldName Hello, World4
-	 * @return Sky is blue4
-	 */
-	@lombok.Getter @lombok.Setter private int fieldName;
-}
-
-@lombok.experimental.Accessors(chain = true, fluent = true)
-class GetterSetterJavadoc5 {
-	/**
-	 * Some text
-	 *
-	 * **SETTER**
-	 * Setter section
-	 * @param fieldName Hello, World5
-	 * @return Sky is blue5
-	 * **GETTER**
-	 * Getter section
-	 * @return Sky is blue5
-	 */
-	@lombok.Getter @lombok.Setter private int fieldName;
-}

test/transform/resource/before/SetterAndWithMethodJavadoc.java

@@ -1,4 +1,3 @@
-//platform !ecj: Javadoc copying not supported on ecj
 import lombok.With;
 class SetterAndWithMethodJavadoc {
 	/**

test/transform/resource/before/SetterDeprecated.java

@@ -1,4 +1,3 @@
-//platform !ecj: Javadoc copying not supported on ecj
 import lombok.Setter;
 class SetterDeprecated {
 	

test/transform/resource/before/SetterDeprecatedEcj.java

@@ -1,12 +0,0 @@
-//platform ecj: Javadoc copying not supported on ecj
-import lombok.Setter;
-class SetterDeprecated {
-	
-	@Deprecated
-	@Setter int annotation;
-	
-	/**
-	 * @deprecated
-	 */
-	@Setter int javadoc;
-}

test/transform/resource/before/WithMethodMarkedDeprecated.java

@@ -1,4 +1,3 @@
-//platform !ecj: Javadoc copying not supported on ecj
 import lombok.With;
 
 class WithMethodMarkedDeprecated {