aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/core/lombok/eclipse/handlers/HandleData.java27
-rw-r--r--src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java16
-rw-r--r--src/core/lombok/javac/HandlerLibrary.java1
-rw-r--r--src/core/lombok/javac/handlers/HandleData.java24
-rw-r--r--src/core/lombok/javac/handlers/HandleEqualsAndHashCode.java14
-rw-r--r--src/core/lombok/javac/handlers/HandleSneakyThrows.java7
-rw-r--r--src/delombok/lombok/delombok/DelombokApp.java2
-rw-r--r--test/delombok/resource/after/CleanupName.java12
-rw-r--r--test/delombok/resource/after/DataPlain.java76
-rw-r--r--test/delombok/resource/after/GetterAccessLevel.java25
-rw-r--r--test/delombok/resource/after/SetterAccessLevel.java6
-rw-r--r--test/delombok/resource/after/SneakyThrowsMultiple.java45
-rw-r--r--test/delombok/resource/after/SneakyThrowsPlain.java17
-rw-r--r--test/delombok/resource/after/SneakyThrowsSingle.java26
-rw-r--r--test/delombok/resource/after/SynchronizedName.java5
-rw-r--r--test/delombok/resource/before/CleanupName.java8
-rw-r--r--test/delombok/resource/before/DataPlain.java9
-rw-r--r--test/delombok/resource/before/GetterAccessLevel.java14
-rw-r--r--test/delombok/resource/before/SetterAccessLevel.java4
-rw-r--r--test/delombok/resource/before/SneakyThrowsMultiple.java28
-rw-r--r--test/delombok/resource/before/SneakyThrowsPlain.java10
-rw-r--r--test/delombok/resource/before/SneakyThrowsSingle.java21
-rw-r--r--test/delombok/resource/before/SynchronizedName.java3
23 files changed, 358 insertions, 42 deletions
diff --git a/src/core/lombok/eclipse/handlers/HandleData.java b/src/core/lombok/eclipse/handlers/HandleData.java
index 37b1e6f1..4e23bbf4 100644
--- a/src/core/lombok/eclipse/handlers/HandleData.java
+++ b/src/core/lombok/eclipse/handlers/HandleData.java
@@ -21,13 +21,21 @@
*/
package lombok.eclipse.handlers;
-import static lombok.eclipse.Eclipse.*;
-import static lombok.eclipse.handlers.EclipseHandlerUtil.*;
+import static lombok.eclipse.Eclipse.copyAnnotations;
+import static lombok.eclipse.Eclipse.copyType;
+import static lombok.eclipse.Eclipse.copyTypeParams;
+import static lombok.eclipse.handlers.EclipseHandlerUtil.constructorExists;
+import static lombok.eclipse.handlers.EclipseHandlerUtil.findAnnotations;
+import static lombok.eclipse.handlers.EclipseHandlerUtil.generateNullCheck;
+import static lombok.eclipse.handlers.EclipseHandlerUtil.injectMethod;
+import static lombok.eclipse.handlers.EclipseHandlerUtil.methodExists;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
import lombok.AccessLevel;
import lombok.Data;
@@ -84,6 +92,7 @@ public class HandleData implements EclipseAnnotationHandler<Data> {
}
List<EclipseNode> nodesForConstructor = new ArrayList<EclipseNode>();
+ Map<EclipseNode, Boolean> gettersAndSetters = new LinkedHashMap<EclipseNode, Boolean>();
for (EclipseNode child : typeNode.down()) {
if (child.getKind() != Kind.FIELD) continue;
FieldDeclaration fieldDecl = (FieldDeclaration) child.get();
@@ -94,13 +103,9 @@ public class HandleData implements EclipseAnnotationHandler<Data> {
boolean isFinal = (fieldDecl.modifiers & ClassFileConstants.AccFinal) != 0;
boolean isNonNull = findAnnotations(fieldDecl, TransformationsUtil.NON_NULL_PATTERN).length != 0;
if ((isFinal || isNonNull) && fieldDecl.initialization == null) nodesForConstructor.add(child);
- new HandleGetter().generateGetterForField(child, annotationNode.get());
- if (!isFinal) new HandleSetter().generateSetterForField(child, annotationNode.get());
+ gettersAndSetters.put(child, !isFinal);
}
- new HandleToString().generateToStringForType(typeNode, annotationNode);
- new HandleEqualsAndHashCode().generateEqualsAndHashCodeForType(typeNode, annotationNode);
-
//Careful: Generate the public static constructor (if there is one) LAST, so that any attempt to
//'find callers' on the annotation node will find callers of the constructor, which is by far the
//most useful of the many methods built by @Data. This trick won't work for the non-static constructor,
@@ -121,6 +126,14 @@ public class HandleData implements EclipseAnnotationHandler<Data> {
}
}
+ for (Map.Entry<EclipseNode, Boolean> field : gettersAndSetters.entrySet()) {
+ new HandleGetter().generateGetterForField(field.getKey(), annotationNode.get());
+ if (field.getValue()) new HandleSetter().generateSetterForField(field.getKey(), annotationNode.get());
+ }
+
+ new HandleEqualsAndHashCode().generateEqualsAndHashCodeForType(typeNode, annotationNode);
+ new HandleToString().generateToStringForType(typeNode, annotationNode);
+
return false;
}
diff --git a/src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java b/src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java
index 7c0980c8..2c636916 100644
--- a/src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java
+++ b/src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java
@@ -204,32 +204,32 @@ public class HandleEqualsAndHashCode implements EclipseAnnotationHandler<EqualsA
}
}
- switch (methodExists("hashCode", typeNode)) {
+ switch (methodExists("equals", typeNode)) {
case NOT_EXISTS:
- MethodDeclaration hashCode = createHashCode(typeNode, nodesForEquality, callSuper, errorNode.get());
- injectMethod(typeNode, hashCode);
+ MethodDeclaration equals = createEquals(typeNode, nodesForEquality, callSuper, errorNode.get());
+ injectMethod(typeNode, equals);
break;
case EXISTS_BY_LOMBOK:
break;
default:
case EXISTS_BY_USER:
if (whineIfExists) {
- errorNode.addWarning("Not generating hashCode(): A method with that name already exists");
+ errorNode.addWarning("Not generating equals(Object other): A method with that name already exists");
}
break;
}
- switch (methodExists("equals", typeNode)) {
+ switch (methodExists("hashCode", typeNode)) {
case NOT_EXISTS:
- MethodDeclaration equals = createEquals(typeNode, nodesForEquality, callSuper, errorNode.get());
- injectMethod(typeNode, equals);
+ MethodDeclaration hashCode = createHashCode(typeNode, nodesForEquality, callSuper, errorNode.get());
+ injectMethod(typeNode, hashCode);
break;
case EXISTS_BY_LOMBOK:
break;
default:
case EXISTS_BY_USER:
if (whineIfExists) {
- errorNode.addWarning("Not generating equals(Object other): A method with that name already exists");
+ errorNode.addWarning("Not generating hashCode(): A method with that name already exists");
}
break;
}
diff --git a/src/core/lombok/javac/HandlerLibrary.java b/src/core/lombok/javac/HandlerLibrary.java
index 48218513..76fbb8ab 100644
--- a/src/core/lombok/javac/HandlerLibrary.java
+++ b/src/core/lombok/javac/HandlerLibrary.java
@@ -165,7 +165,6 @@ public class HandlerLibrary {
if (container == null) continue;
try {
- System.out.println("Calling handle on: "+ container.handler.getClass().getName());
handled |= container.handle(node);
} catch (AnnotationValueDecodeFail fail) {
fail.owner.setError(fail.getMessage(), fail.idx);
diff --git a/src/core/lombok/javac/handlers/HandleData.java b/src/core/lombok/javac/handlers/HandleData.java
index 54dd8dd2..128db8b0 100644
--- a/src/core/lombok/javac/handlers/HandleData.java
+++ b/src/core/lombok/javac/handlers/HandleData.java
@@ -21,9 +21,16 @@
*/
package lombok.javac.handlers;
-import static lombok.javac.handlers.JavacHandlerUtil.*;
+import static lombok.javac.handlers.JavacHandlerUtil.constructorExists;
+import static lombok.javac.handlers.JavacHandlerUtil.findAnnotations;
+import static lombok.javac.handlers.JavacHandlerUtil.generateNullCheck;
+import static lombok.javac.handlers.JavacHandlerUtil.injectMethod;
+import static lombok.javac.handlers.JavacHandlerUtil.markAnnotationAsProcessed;
+import static lombok.javac.handlers.JavacHandlerUtil.methodExists;
import java.lang.reflect.Modifier;
+import java.util.LinkedHashMap;
+import java.util.Map;
import lombok.Data;
import lombok.core.AnnotationValues;
@@ -72,6 +79,7 @@ public class HandleData implements JavacAnnotationHandler<Data> {
}
List<JavacNode> nodesForConstructor = List.nil();
+ Map<JavacNode, Boolean> gettersAndSetters = new LinkedHashMap<JavacNode, Boolean>();
for (JavacNode child : typeNode.down()) {
if (child.getKind() != Kind.FIELD) continue;
JCVariableDecl fieldDecl = (JCVariableDecl) child.get();
@@ -83,13 +91,9 @@ public class HandleData implements JavacAnnotationHandler<Data> {
boolean isFinal = (fieldFlags & Flags.FINAL) != 0;
boolean isNonNull = !findAnnotations(child, TransformationsUtil.NON_NULL_PATTERN).isEmpty();
if ((isFinal || isNonNull) && fieldDecl.init == null) nodesForConstructor = nodesForConstructor.append(child);
- new HandleGetter().generateGetterForField(child, annotationNode.get());
- if (!isFinal) new HandleSetter().generateSetterForField(child, annotationNode.get());
+ gettersAndSetters.put(child, !isFinal);
}
- new HandleToString().generateToStringForType(typeNode, annotationNode);
- new HandleEqualsAndHashCode().generateEqualsAndHashCodeForType(typeNode, annotationNode);
-
String staticConstructorName = annotation.getInstance().staticConstructor();
if (constructorExists(typeNode) == MemberExistsResult.NOT_EXISTS) {
@@ -102,6 +106,14 @@ public class HandleData implements JavacAnnotationHandler<Data> {
injectMethod(typeNode, staticConstructor);
}
+ for (Map.Entry<JavacNode, Boolean> field : gettersAndSetters.entrySet()) {
+ new HandleGetter().generateGetterForField(field.getKey(), annotationNode.get());
+ if (field.getValue()) new HandleSetter().generateSetterForField(field.getKey(), annotationNode.get());
+ }
+
+ new HandleEqualsAndHashCode().generateEqualsAndHashCodeForType(typeNode, annotationNode);
+ new HandleToString().generateToStringForType(typeNode, annotationNode);
+
return true;
}
diff --git a/src/core/lombok/javac/handlers/HandleEqualsAndHashCode.java b/src/core/lombok/javac/handlers/HandleEqualsAndHashCode.java
index f388336d..4ee24391 100644
--- a/src/core/lombok/javac/handlers/HandleEqualsAndHashCode.java
+++ b/src/core/lombok/javac/handlers/HandleEqualsAndHashCode.java
@@ -167,9 +167,9 @@ public class HandleEqualsAndHashCode implements JavacAnnotationHandler<EqualsAnd
}
}
- switch (methodExists("hashCode", typeNode)) {
+ switch (methodExists("equals", typeNode)) {
case NOT_EXISTS:
- JCMethodDecl method = createHashCode(typeNode, nodesForEquality, callSuper);
+ JCMethodDecl method = createEquals(typeNode, nodesForEquality, callSuper);
injectMethod(typeNode, method);
break;
case EXISTS_BY_LOMBOK:
@@ -177,14 +177,14 @@ public class HandleEqualsAndHashCode implements JavacAnnotationHandler<EqualsAnd
default:
case EXISTS_BY_USER:
if (whineIfExists) {
- errorNode.addWarning("Not generating hashCode(): A method with that name already exists");
+ errorNode.addWarning("Not generating equals(Object other): A method with that name already exists");
}
break;
}
- switch (methodExists("equals", typeNode)) {
+ switch (methodExists("hashCode", typeNode)) {
case NOT_EXISTS:
- JCMethodDecl method = createEquals(typeNode, nodesForEquality, callSuper);
+ JCMethodDecl method = createHashCode(typeNode, nodesForEquality, callSuper);
injectMethod(typeNode, method);
break;
case EXISTS_BY_LOMBOK:
@@ -192,7 +192,7 @@ public class HandleEqualsAndHashCode implements JavacAnnotationHandler<EqualsAnd
default:
case EXISTS_BY_USER:
if (whineIfExists) {
- errorNode.addWarning("Not generating equals(Object other): A method with that name already exists");
+ errorNode.addWarning("Not generating hashCode(): A method with that name already exists");
}
break;
}
@@ -326,7 +326,7 @@ public class HandleEqualsAndHashCode implements JavacAnnotationHandler<EqualsAnd
JCAnnotation overrideAnnotation = maker.Annotation(chainDots(maker, typeNode, "java", "lang", "Override"), List.<JCExpression>nil());
JCModifiers mods = maker.Modifiers(Flags.PUBLIC, List.of(overrideAnnotation));
- JCExpression objectType = maker.Type(typeNode.getSymbolTable().objectType);
+ JCExpression objectType = chainDots(maker, typeNode, "java", "lang", "Object");
JCExpression returnType = maker.TypeIdent(TypeTags.BOOLEAN);
List<JCStatement> statements = List.nil();
diff --git a/src/core/lombok/javac/handlers/HandleSneakyThrows.java b/src/core/lombok/javac/handlers/HandleSneakyThrows.java
index 8a185e87..fda8805c 100644
--- a/src/core/lombok/javac/handlers/HandleSneakyThrows.java
+++ b/src/core/lombok/javac/handlers/HandleSneakyThrows.java
@@ -26,6 +26,7 @@ import static lombok.javac.handlers.JavacHandlerUtil.markAnnotationAsProcessed;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import lombok.SneakyThrows;
import lombok.core.AnnotationValues;
@@ -52,9 +53,9 @@ public class HandleSneakyThrows implements JavacAnnotationHandler<SneakyThrows>
@Override public boolean handle(AnnotationValues<SneakyThrows> annotation, JCAnnotation ast, JavacNode annotationNode) {
markAnnotationAsProcessed(annotationNode, SneakyThrows.class);
Collection<String> exceptionNames = annotation.getRawExpressions("value");
-
- List<JCExpression> memberValuePairs = ast.getArguments();
- if (memberValuePairs == null || memberValuePairs.size() == 0) return false;
+ if (exceptionNames.isEmpty()) {
+ exceptionNames = Collections.singleton("java.lang.Throwable");
+ }
java.util.List<String> exceptions = new ArrayList<String>();
for (String exception : exceptionNames) {
diff --git a/src/delombok/lombok/delombok/DelombokApp.java b/src/delombok/lombok/delombok/DelombokApp.java
index 71fda96f..76d5aed3 100644
--- a/src/delombok/lombok/delombok/DelombokApp.java
+++ b/src/delombok/lombok/delombok/DelombokApp.java
@@ -108,7 +108,7 @@ public class DelombokApp implements LombokApp {
}
};
try {
- loader.loadClass("lombok.delombok.Delombok").getMethod("main", String[].class).invoke(null, new Object[] {args});
+ loader.loadClass("lombok.delombok.Delombok").getMethod("main", String[].class).invoke(null, new Object[] {args.toArray(new String[0])});
} catch (InvocationTargetException e1) {
Throwable t = e1.getCause();
if (t instanceof Error) throw (Error)t;
diff --git a/test/delombok/resource/after/CleanupName.java b/test/delombok/resource/after/CleanupName.java
index 26997372..cd29eb68 100644
--- a/test/delombok/resource/after/CleanupName.java
+++ b/test/delombok/resource/after/CleanupName.java
@@ -1,5 +1,5 @@
-class Cleanup {
- void test() throws Exception {
+class CleanupName {
+ void test() {
Object o = "Hello World!";
try {
System.out.println(o);
@@ -7,4 +7,12 @@ class Cleanup {
o.toString();
}
}
+ void test2() {
+ Object o = "Hello World too!";
+ try {
+ System.out.println(o);
+ } finally {
+ o.toString();
+ }
+ }
}
diff --git a/test/delombok/resource/after/DataPlain.java b/test/delombok/resource/after/DataPlain.java
new file mode 100644
index 00000000..6b7aeae6
--- /dev/null
+++ b/test/delombok/resource/after/DataPlain.java
@@ -0,0 +1,76 @@
+class Data1 {
+ final int x;
+ String name;
+ public Data1(final int x) {
+ this.x = x;
+ }
+ public int getX() {
+ return x;
+ }
+ public String getName() {
+ return name;
+ }
+ public void setName(final String name) {
+ this.name = name;
+ }
+ @java.lang.Override
+ public boolean equals(final java.lang.Object o) {
+ if (o == this) return true;
+ if (o == null) return false;
+ if (o.getClass() != this.getClass()) return false;
+ final Data1 other = (Data1)o;
+ if (this.x != other.x) return false;
+ if (this.name == null ? other.name != null : !this.name.equals(other.name)) return false;
+ return true;
+ }
+ @java.lang.Override
+ public int hashCode() {
+ final int PRIME = 31;
+ int result = 1;
+ result = result * PRIME + this.x;
+ result = result * PRIME + (this.name == null ? 0 : this.name.hashCode());
+ return result;
+ }
+ @java.lang.Override
+ public java.lang.String toString() {
+ return "Data1(x=" + x + ", name=" + name + ")";
+ }
+}
+class Data2 {
+ final int x;
+ String name;
+ public Data2(final int x) {
+ this.x = x;
+ }
+ public int getX() {
+ return x;
+ }
+ public String getName() {
+ return name;
+ }
+ public void setName(final String name) {
+ this.name = name;
+ }
+ @java.lang.Override
+ public boolean equals(final java.lang.Object o) {
+ if (o == this) return true;
+ if (o == null) return false;
+ if (o.getClass() != this.getClass()) return false;
+ final Data2 other = (Data2)o;
+ if (this.x != other.x) return false;
+ if (this.name == null ? other.name != null : !this.name.equals(other.name)) return false;
+ return true;
+ }
+ @java.lang.Override
+ public int hashCode() {
+ final int PRIME = 31;
+ int result = 1;
+ result = result * PRIME + this.x;
+ result = result * PRIME + (this.name == null ? 0 : this.name.hashCode());
+ return result;
+ }
+ @java.lang.Override
+ public java.lang.String toString() {
+ return "Data2(x=" + x + ", name=" + name + ")";
+ }
+}
diff --git a/test/delombok/resource/after/GetterAccessLevel.java b/test/delombok/resource/after/GetterAccessLevel.java
index eec84e85..e117b72a 100644
--- a/test/delombok/resource/after/GetterAccessLevel.java
+++ b/test/delombok/resource/after/GetterAccessLevel.java
@@ -1,9 +1,15 @@
-class Getter {
+class GetterAccessLevel {
boolean isNone;
boolean isPrivate;
boolean isPackage;
boolean isProtected;
boolean isPublic;
+ String noneString;
+ String privateString;
+ String packageString;
+ String protectedString;
+ String publicString;
+ String value;
private boolean isPrivate() {
return isPrivate;
}
@@ -16,4 +22,19 @@ class Getter {
public boolean isPublic() {
return isPublic;
}
-}
+ private String getPrivateString() {
+ return privateString;
+ }
+ String getPackageString() {
+ return packageString;
+ }
+ protected String getProtectedString() {
+ return protectedString;
+ }
+ public String getPublicString() {
+ return publicString;
+ }
+ public String getValue() {
+ return value;
+ }
+} \ No newline at end of file
diff --git a/test/delombok/resource/after/SetterAccessLevel.java b/test/delombok/resource/after/SetterAccessLevel.java
index 95179bac..d4e7ac23 100644
--- a/test/delombok/resource/after/SetterAccessLevel.java
+++ b/test/delombok/resource/after/SetterAccessLevel.java
@@ -1,9 +1,10 @@
-class Setter {
+class SetterAccessLevel {
boolean isNone;
boolean isPrivate;
boolean isPackage;
boolean isProtected;
boolean isPublic;
+ boolean value;
private void setIsPrivate(final boolean isPrivate) {
this.isPrivate = isPrivate;
}
@@ -16,4 +17,7 @@ class Setter {
public void setIsPublic(final boolean isPublic) {
this.isPublic = isPublic;
}
+ public void setValue(final boolean value) {
+ this.value = value;
+ }
}
diff --git a/test/delombok/resource/after/SneakyThrowsMultiple.java b/test/delombok/resource/after/SneakyThrowsMultiple.java
new file mode 100644
index 00000000..bab13990
--- /dev/null
+++ b/test/delombok/resource/after/SneakyThrowsMultiple.java
@@ -0,0 +1,45 @@
+import java.awt.AWTException;
+import java.io.IOException;
+import java.util.Random;
+class SneakyThrowsMultiple {
+ public void test() {
+ try {
+ try {
+ System.out.println("test1");
+ throw new IOException();
+ } catch (IOException $ex) {
+ throw lombok.Lombok.sneakyThrow($ex);
+ }
+ } catch (Throwable $ex) {
+ throw lombok.Lombok.sneakyThrow($ex);
+ }
+ }
+ public void test2() {
+ try {
+ try {
+ System.out.println("test2");
+ if (new Random().nextBoolean()) {
+ throw new IOException();
+ } else {
+ throw new AWTException("WHAT");
+ }
+ } catch (AWTException $ex) {
+ throw lombok.Lombok.sneakyThrow($ex);
+ }
+ } catch (IOException $ex) {
+ throw lombok.Lombok.sneakyThrow($ex);
+ }
+ }
+ public void test3() {
+ try {
+ try {
+ System.out.println("test3");
+ throw new IOException();
+ } catch (IOException $ex) {
+ throw lombok.Lombok.sneakyThrow($ex);
+ }
+ } catch (Throwable $ex) {
+ throw lombok.Lombok.sneakyThrow($ex);
+ }
+ }
+} \ No newline at end of file
diff --git a/test/delombok/resource/after/SneakyThrowsPlain.java b/test/delombok/resource/after/SneakyThrowsPlain.java
new file mode 100644
index 00000000..d5abc478
--- /dev/null
+++ b/test/delombok/resource/after/SneakyThrowsPlain.java
@@ -0,0 +1,17 @@
+class SneakyThrowsPlain {
+ public void test() {
+ try {
+ System.out.println("test1");
+ } catch (java.lang.Throwable $ex) {
+ throw lombok.Lombok.sneakyThrow($ex);
+ }
+ }
+
+ public void test2() {
+ try {
+ System.out.println("test2");
+ } catch (java.lang.Throwable $ex) {
+ throw lombok.Lombok.sneakyThrow($ex);
+ }
+ }
+} \ No newline at end of file
diff --git a/test/delombok/resource/after/SneakyThrowsSingle.java b/test/delombok/resource/after/SneakyThrowsSingle.java
new file mode 100644
index 00000000..519d06a9
--- /dev/null
+++ b/test/delombok/resource/after/SneakyThrowsSingle.java
@@ -0,0 +1,26 @@
+import java.io.IOException;
+class SneakyThrowsSingle {
+ public void test() {
+ try {
+ System.out.println("test1");
+ } catch (Throwable $ex) {
+ throw lombok.Lombok.sneakyThrow($ex);
+ }
+ }
+ public void test2() {
+ try {
+ System.out.println("test2");
+ throw new IOException();
+ } catch (IOException $ex) {
+ throw lombok.Lombok.sneakyThrow($ex);
+ }
+ }
+ public void test3() {
+ try {
+ System.out.println("test3");
+ throw new IOException();
+ } catch (IOException $ex) {
+ throw lombok.Lombok.sneakyThrow($ex);
+ }
+ }
+} \ No newline at end of file
diff --git a/test/delombok/resource/after/SynchronizedName.java b/test/delombok/resource/after/SynchronizedName.java
index a3e64796..066e3bdf 100644
--- a/test/delombok/resource/after/SynchronizedName.java
+++ b/test/delombok/resource/after/SynchronizedName.java
@@ -17,4 +17,9 @@ class SynchronizedName {
System.out.println("four");
}
}
+ void test5() {
+ synchronized (read) {
+ System.out.println("five");
+ }
+ }
}
diff --git a/test/delombok/resource/before/CleanupName.java b/test/delombok/resource/before/CleanupName.java
index 0d253f1e..cbc5b447 100644
--- a/test/delombok/resource/before/CleanupName.java
+++ b/test/delombok/resource/before/CleanupName.java
@@ -1,6 +1,10 @@
-class Cleanup {
- void test() throws Exception {
+class CleanupName {
+ void test() {
@lombok.Cleanup("toString") Object o = "Hello World!";
System.out.println(o);
}
+ void test2() {
+ @lombok.Cleanup(value="toString") Object o = "Hello World too!";
+ System.out.println(o);
+ }
} \ No newline at end of file
diff --git a/test/delombok/resource/before/DataPlain.java b/test/delombok/resource/before/DataPlain.java
new file mode 100644
index 00000000..680ae46f
--- /dev/null
+++ b/test/delombok/resource/before/DataPlain.java
@@ -0,0 +1,9 @@
+import lombok.Data;
+@lombok.Data class Data1 {
+ final int x;
+ String name;
+}
+@Data class Data2 {
+ final int x;
+ String name;
+} \ No newline at end of file
diff --git a/test/delombok/resource/before/GetterAccessLevel.java b/test/delombok/resource/before/GetterAccessLevel.java
index 8fd9bcc7..413b888e 100644
--- a/test/delombok/resource/before/GetterAccessLevel.java
+++ b/test/delombok/resource/before/GetterAccessLevel.java
@@ -1,4 +1,4 @@
-class Getter {
+class GetterAccessLevel {
@lombok.Getter(lombok.AccessLevel.NONE)
boolean isNone;
@lombok.Getter(lombok.AccessLevel.PRIVATE)
@@ -9,4 +9,16 @@ class Getter {
boolean isProtected;
@lombok.Getter(lombok.AccessLevel.PUBLIC)
boolean isPublic;
+ @lombok.Getter(lombok.AccessLevel.NONE)
+ String noneString;
+ @lombok.Getter(lombok.AccessLevel.PRIVATE)
+ String privateString;
+ @lombok.Getter(lombok.AccessLevel.PACKAGE)
+ String packageString;
+ @lombok.Getter(lombok.AccessLevel.PROTECTED)
+ String protectedString;
+ @lombok.Getter(lombok.AccessLevel.PUBLIC)
+ String publicString;
+ @lombok.Getter(value=lombok.AccessLevel.PUBLIC)
+ String value;
}
diff --git a/test/delombok/resource/before/SetterAccessLevel.java b/test/delombok/resource/before/SetterAccessLevel.java
index 767341ef..8a30a7de 100644
--- a/test/delombok/resource/before/SetterAccessLevel.java
+++ b/test/delombok/resource/before/SetterAccessLevel.java
@@ -1,4 +1,4 @@
-class Setter {
+class SetterAccessLevel {
@lombok.Setter(lombok.AccessLevel.NONE)
boolean isNone;
@lombok.Setter(lombok.AccessLevel.PRIVATE)
@@ -9,4 +9,6 @@ class Setter {
boolean isProtected;
@lombok.Setter(lombok.AccessLevel.PUBLIC)
boolean isPublic;
+ @lombok.Setter(value=lombok.AccessLevel.PUBLIC)
+ boolean value;
}
diff --git a/test/delombok/resource/before/SneakyThrowsMultiple.java b/test/delombok/resource/before/SneakyThrowsMultiple.java
new file mode 100644
index 00000000..7e644f3d
--- /dev/null
+++ b/test/delombok/resource/before/SneakyThrowsMultiple.java
@@ -0,0 +1,28 @@
+import java.awt.AWTException;
+import java.io.IOException;
+import java.util.Random;
+
+class SneakyThrowsMultiple {
+ @lombok.SneakyThrows(IOException.class,Throwable.class)
+ public void test() {
+ System.out.println("test1");
+ throw new IOException();
+ }
+
+ @lombok.SneakyThrows(AWTException.class,IOException.class)
+ public void test2() {
+ System.out.println("test2");
+ if (new Random().nextBoolean()) {
+ throw new IOException();
+ }
+ else {
+ throw new AWTException("WHAT");
+ }
+ }
+
+ @lombok.SneakyThrows(value={IOException.class,Throwable.class})
+ public void test3() {
+ System.out.println("test3");
+ throw new IOException();
+ }
+} \ No newline at end of file
diff --git a/test/delombok/resource/before/SneakyThrowsPlain.java b/test/delombok/resource/before/SneakyThrowsPlain.java
new file mode 100644
index 00000000..97fecf8f
--- /dev/null
+++ b/test/delombok/resource/before/SneakyThrowsPlain.java
@@ -0,0 +1,10 @@
+import lombok.SneakyThrows;
+class SneakyThrowsPlain {
+ @lombok.SneakyThrows public void test() {
+ System.out.println("test1");
+ }
+
+ @SneakyThrows public void test2() {
+ System.out.println("test2");
+ }
+} \ No newline at end of file
diff --git a/test/delombok/resource/before/SneakyThrowsSingle.java b/test/delombok/resource/before/SneakyThrowsSingle.java
new file mode 100644
index 00000000..e7b78ec7
--- /dev/null
+++ b/test/delombok/resource/before/SneakyThrowsSingle.java
@@ -0,0 +1,21 @@
+import java.io.IOException;
+
+class SneakyThrowsSingle {
+ @lombok.SneakyThrows(Throwable.class)
+ public void test() {
+ System.out.println("test1");
+ }
+
+ @lombok.SneakyThrows(IOException.class)
+ public void test2() {
+ System.out.println("test2");
+ throw new IOException();
+ }
+
+ @lombok.SneakyThrows(value=IOException.class)
+ public void test3() {
+ System.out.println("test3");
+ throw new IOException();
+ }
+
+} \ No newline at end of file
diff --git a/test/delombok/resource/before/SynchronizedName.java b/test/delombok/resource/before/SynchronizedName.java
index 3aaec705..6d9ca5e9 100644
--- a/test/delombok/resource/before/SynchronizedName.java
+++ b/test/delombok/resource/before/SynchronizedName.java
@@ -15,4 +15,7 @@ class SynchronizedName {
@lombok.Synchronized("READ") void test4() {
System.out.println("four");
}
+ @lombok.Synchronized(value="read") void test5() {
+ System.out.println("five");
+ }
}