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

2 files changed, 25 insertions, 0 deletions

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