aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-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/handlers/HandleData.java24
-rw-r--r--test/delombok/resource/after/DataPlain.java76
-rw-r--r--test/delombok/resource/before/DataPlain.java9
5 files changed, 131 insertions, 21 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/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/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/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
generated by cgit (git 2.46.0) at 2024-11-23 22:30:07 +0000