tiennm99/lombok
1
0
Fork 0
mirror of https://github.com/tiennm99/lombok.git synced 2026-09-04 00:17:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed the order of the generated methods in for @Data

Browse Source 
- Constructor(s)
- Getters/Setters per field
- equals
- hashCode
- toString
Added first test for @Data
This commit is contained in:
Roel Spilker
2009-12-02 04:21:31 +01:00
parent e3d9e116af
commit 9f69893ce2
5 changed files with 138 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/lombok/eclipse/handlers/HandleData.java
+20 -7
View File
@@ -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;
}
src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java
+15 -15
View File
@@ -204,21 +204,6 @@ public class HandleEqualsAndHashCode implements EclipseAnnotationHandler<EqualsA
}
}
switch (methodExists("hashCode", typeNode)) {
case NOT_EXISTS:
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 hashCode(): A method with that name already exists");
}
break;
}
switch (methodExists("equals", typeNode)) {
case NOT_EXISTS:
MethodDeclaration equals = createEquals(typeNode, nodesForEquality, callSuper, errorNode.get());
@@ -234,6 +219,21 @@ public class HandleEqualsAndHashCode implements EclipseAnnotationHandler<EqualsA
break;
}
switch (methodExists("hashCode", typeNode)) {
case NOT_EXISTS:
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 hashCode(): A method with that name already exists");
}
break;
}
return true;
}
src/core/lombok/javac/handlers/HandleData.java
+18 -6
View File
@@ -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;
}
test/delombok/resource/after/DataPlain.java
+76
View File
@@ -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 + ")";
}
}
test/delombok/resource/before/DataPlain.java
+9
View File
@@ -0,0 +1,9 @@
import lombok.Data;
@lombok.Data class Data1 {
final int x;
String name;
}
@Data class Data2 {
final int x;
String name;
}