From fb5a5530148614e8d0c423077d9043e2d58f453b Mon Sep 17 00:00:00 2001
From: Roel Spilker <r.spilker@gmail.com>
Date: Mon, 4 Jun 2018 22:32:44 +0200
Subject: Do not generate a private no-args constructor if: - The class has a
 parent class - There is an explicit XxxArgsConstructor annotation that would
 generate a no-args constructor Fixes #1703, fixes #1704, fixes #1712

---
 src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java      | 8 ++++++++
 src/core/lombok/eclipse/handlers/HandleConstructor.java       | 9 +++++++++
 src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java | 7 +------
 3 files changed, 18 insertions(+), 6 deletions(-)

(limited to 'src/core/lombok/eclipse')

diff --git a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java
index 340e233c..2dce285c 100644
--- a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java
+++ b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java
@@ -1854,4 +1854,12 @@ public class EclipseHandlerUtil {
 	private static long[] copy(long[] array) {
 		return array == null ? null : array.clone();
 	}
+	
+	public static boolean isDirectDescendantOfObject(EclipseNode typeNode) {
+		if (!(typeNode.get() instanceof TypeDeclaration)) throw new IllegalArgumentException("not a type node");
+		TypeDeclaration typeDecl = (TypeDeclaration) typeNode.get();
+		if (typeDecl.superclass == null) return true;
+		String p = typeDecl.superclass.toString();
+		return p.equals("Object") || p.equals("java.lang.Object");
+	}
 }
diff --git a/src/core/lombok/eclipse/handlers/HandleConstructor.java b/src/core/lombok/eclipse/handlers/HandleConstructor.java
index 295c89ca..f9029319 100644
--- a/src/core/lombok/eclipse/handlers/HandleConstructor.java
+++ b/src/core/lombok/eclipse/handlers/HandleConstructor.java
@@ -211,6 +211,8 @@ public class HandleConstructor {
 	}
 	
 	public void generateExtraNoArgsConstructor(EclipseNode typeNode, EclipseNode sourceNode) {
+		if (!isDirectDescendantOfObject(typeNode)) return;
+		
 		Boolean v = typeNode.getAst().readConfiguration(ConfigurationKeys.NO_ARGS_CONSTRUCTOR_EXTRA_PRIVATE);
 		if (v != null && !v) return;
 
@@ -298,6 +300,13 @@ public class HandleConstructor {
 				}
 			}
 		}
+		
+		for (EclipseNode child : node.down()) {
+			if (annotationTypeMatches(NoArgsConstructor.class, child)) return true;
+			if (annotationTypeMatches(RequiredArgsConstructor.class, child) && findRequiredFields(node).isEmpty()) return true;
+			if (annotationTypeMatches(AllArgsConstructor.class, child) && findAllFields(node).isEmpty()) return true;
+		}
+		
 		return false;
 	}
 
diff --git a/src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java b/src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java
index e30df698..c99b9b5f 100644
--- a/src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java
+++ b/src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java
@@ -157,12 +157,7 @@ public class HandleEqualsAndHashCode extends EclipseAnnotationHandler<EqualsAndH
 			}
 		}
 		
-		boolean isDirectDescendantOfObject = true;
-		
-		if (typeDecl.superclass != null) {
-			String p = typeDecl.superclass.toString();
-			isDirectDescendantOfObject = p.equals("Object") || p.equals("java.lang.Object");
-		}
+		boolean isDirectDescendantOfObject = isDirectDescendantOfObject(typeNode);
 		
 		if (isDirectDescendantOfObject && callSuper) {
 			errorNode.addError("Generating equals/hashCode with a supercall to java.lang.Object is pointless.");
-- 
cgit