@UtilityClass handlers now more intelligent about inner types of implicitly static contexts (enums, interfaces, and annotation declarations). Also added tests to test for these.

8 files changed, 98 insertions, 1 deletions

diff --git a/test/transform/resource/after-delombok/UtilityClass.java b/test/transform/resource/after-delombok/UtilityClass.java
index f9fe02a0..eb7eef09 100644
--- a/test/transform/resource/after-delombok/UtilityClass.java
+++ b/test/transform/resource/after-delombok/UtilityClass.java
@@ -23,4 +23,26 @@ class UtilityInner {
 			}
 		}
 	}
+	enum UtilityInsideEnum {
+		FOO,
+		BAR;
+		static final class InsideEnum {
+			static int member;
+			@java.lang.SuppressWarnings("all")
+			@javax.annotation.Generated("lombok")
+			private InsideEnum() {
+				throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated");
+			}
+		}
+	}
+	interface UtilityInsideInterface {
+		final class InsideInterface {
+			static int member;
+			@java.lang.SuppressWarnings("all")
+			@javax.annotation.Generated("lombok")
+			private InsideInterface() {
+				throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated");
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/UtilityClassErrors.java b/test/transform/resource/after-delombok/UtilityClassErrors.java
index b19b4e72..9626461a 100644
--- a/test/transform/resource/after-delombok/UtilityClassErrors.java
+++ b/test/transform/resource/after-delombok/UtilityClassErrors.java
@@ -9,4 +9,11 @@ final class UtilityClassErrors1 {
 }
 enum UtilityClassErrors2 {
 ;
+}
+class UtilityClassErrors3 {
+	class NonStaticInner {
+		class ThisShouldFail {
+			private String member;
+		}
+	}
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/UtilityClass.java b/test/transform/resource/after-ecj/UtilityClass.java
index c3e06fbc..e8db6a21 100644
--- a/test/transform/resource/after-ecj/UtilityClass.java
+++ b/test/transform/resource/after-ecj/UtilityClass.java
@@ -27,6 +27,31 @@ class UtilityInner {
       super();
     }
   }
+  enum UtilityInsideEnum {
+    static final @lombok.experimental.UtilityClass class InsideEnum {
+      static int member;
+      private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") InsideEnum() {
+        super();
+        throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated");
+      }
+    }
+    FOO(),
+    BAR(),
+    <clinit>() {
+    }
+    UtilityInsideEnum() {
+      super();
+    }
+  }
+  interface UtilityInsideInterface {
+    final @lombok.experimental.UtilityClass class InsideInterface {
+      static int member;
+      private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") InsideInterface() {
+        super();
+        throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated");
+      }
+    }
+  }
   UtilityInner() {
     super();
   }
diff --git a/test/transform/resource/after-ecj/UtilityClassErrors.java b/test/transform/resource/after-ecj/UtilityClassErrors.java
index 03206592..26b331a1 100644
--- a/test/transform/resource/after-ecj/UtilityClassErrors.java
+++ b/test/transform/resource/after-ecj/UtilityClassErrors.java
@@ -18,3 +18,19 @@ final @lombok.experimental.UtilityClass class UtilityClassErrors1 {
     super();
   }
 }
+class UtilityClassErrors3 {
+  class NonStaticInner {
+    @lombok.experimental.UtilityClass class ThisShouldFail {
+      private String member;
+      ThisShouldFail() {
+        super();
+      }
+    }
+    NonStaticInner() {
+      super();
+    }
+  }
+  UtilityClassErrors3() {
+    super();
+  }
+}
diff --git a/test/transform/resource/before/UtilityClass.java b/test/transform/resource/before/UtilityClass.java
index ccfa43e1..0f9875f0 100644
--- a/test/transform/resource/before/UtilityClass.java
+++ b/test/transform/resource/before/UtilityClass.java
@@ -10,6 +10,7 @@ class UtilityClass {
 		private String innerInnerMember;
 	}
 }
+
 class UtilityInner {
 	static class InnerInner {
 		@lombok.experimental.UtilityClass
@@ -17,4 +18,20 @@ class UtilityInner {
 			int member;
 		}
 	}
+	
+	enum UtilityInsideEnum {
+		FOO, BAR;
+		
+		@lombok.experimental.UtilityClass
+		class InsideEnum {
+			int member;
+		}
+	}
+	
+	interface UtilityInsideInterface {
+		@lombok.experimental.UtilityClass
+		class InsideInterface {
+			int member;
+		}
+	}
 }
diff --git a/test/transform/resource/before/UtilityClassErrors.java b/test/transform/resource/before/UtilityClassErrors.java
index 5f72274b..d750e2bd 100644
--- a/test/transform/resource/before/UtilityClassErrors.java
+++ b/test/transform/resource/before/UtilityClassErrors.java
@@ -11,4 +11,12 @@ class UtilityClassErrors1 {
 }
 @lombok.experimental.UtilityClass
 enum UtilityClassErrors2 {
+}
+class UtilityClassErrors3 {
+	class NonStaticInner {
+		@lombok.experimental.UtilityClass
+		class ThisShouldFail {
+			private String member;
+		}
+	}
 }
\ No newline at end of file
diff --git a/test/transform/resource/messages-delombok/UtilityClassErrors.java.messages b/test/transform/resource/messages-delombok/UtilityClassErrors.java.messages
index 230ba04f..4afa12ec 100644
--- a/test/transform/resource/messages-delombok/UtilityClassErrors.java.messages
+++ b/test/transform/resource/messages-delombok/UtilityClassErrors.java.messages
@@ -1,3 +1,4 @@
 4 @UtilityClasses cannot have declared constructors.
 7 @UtilityClass cannot be placed on a method local or anonymous inner class, or any class nested in such a class.
 12 @UtilityClass is only supported on a class (can't be an interface, enum, or annotation).
+17 @UtilityClass automatically makes the class static, however, this class cannot be made static.
\ No newline at end of file
diff --git a/test/transform/resource/messages-ecj/UtilityClassErrors.java.messages b/test/transform/resource/messages-ecj/UtilityClassErrors.java.messages
index c80a18dc..15c9b10f 100644
--- a/test/transform/resource/messages-ecj/UtilityClassErrors.java.messages
+++ b/test/transform/resource/messages-ecj/UtilityClassErrors.java.messages
@@ -1,3 +1,4 @@
 4 @UtilityClasses cannot have declared constructors.
 7 @UtilityClass cannot be placed on a method local or anonymous inner class, or any class nested in such a class.
-12 @UtilityClass is only supported on a class (can't be an interface, enum, or annotation)
\ No newline at end of file
+12 @UtilityClass is only supported on a class (can't be an interface, enum, or annotation)
+17 @UtilityClass automatically makes the class static, however, this class cannot be made static.
\ No newline at end of file