[#2693] Review and updates for javabeans-style capitalization lombok.config

6 files changed, 18 insertions, 36 deletions

diff --git a/test/transform/resource/before/BuilderWithJavaBeansSpecCapitalization.java b/test/transform/resource/before/BuilderWithJavaBeansSpecCapitalization.java
new file mode 100644
index 00000000..db1fe15f
--- /dev/null
+++ b/test/transform/resource/before/BuilderWithJavaBeansSpecCapitalization.java
@@ -0,0 +1,7 @@
+//CONF: lombok.accessors.capitalization = beanspec
+@lombok.Builder(setterPrefix = "set")
+class BuilderWithJavaBeansSpecCapitalization {
+	@lombok.Singular("z") java.util.List<String> a;
+	@lombok.Singular("yField") java.util.List<String> aField;
+	String bField;
+}
diff --git a/test/transform/resource/before/GetterWithJavaBeansSpecCapitalization.java b/test/transform/resource/before/GetterWithJavaBeansSpecCapitalization.java
index 3c27317c..68f41e3d 100644
--- a/test/transform/resource/before/GetterWithJavaBeansSpecCapitalization.java
+++ b/test/transform/resource/before/GetterWithJavaBeansSpecCapitalization.java
@@ -1,11 +1,5 @@
-class GetterWithoutJavaBeansSpecCapitalization {
-	@lombok.Getter int a;
-	@lombok.Getter int aField;
-}
-
-@lombok.experimental.Accessors(javaBeansSpecCapitalization=true)
+//CONF: lombok.accessors.capitalization = beanspec
 class GetterWithJavaBeansSpecCapitalization {
 	@lombok.Getter int a;
 	@lombok.Getter int aField;
 }
-
diff --git a/test/transform/resource/before/SetterWithJavaBeansSpecCapitalization.java b/test/transform/resource/before/SetterWithJavaBeansSpecCapitalization.java
index 80a1b4ee..b5e34ba7 100644
--- a/test/transform/resource/before/SetterWithJavaBeansSpecCapitalization.java
+++ b/test/transform/resource/before/SetterWithJavaBeansSpecCapitalization.java
@@ -1,11 +1,5 @@
-class SetterWithoutJavaBeansSpecCapitalization {
-	@lombok.Setter int a;
-	@lombok.Setter int aField;
-}
-
-@lombok.experimental.Accessors(javaBeansSpecCapitalization=true)
+//CONF: lombok.accessors.capitalization = beanspec
 class SetterWithJavaBeansSpecCapitalization {
 	@lombok.Setter int a;
 	@lombok.Setter int aField;
 }
-
diff --git a/test/transform/resource/before/ValueWithJavaBeansSpecCapitalization.java b/test/transform/resource/before/ValueWithJavaBeansSpecCapitalization.java
index f0044ed9..7c001f6e 100644
--- a/test/transform/resource/before/ValueWithJavaBeansSpecCapitalization.java
+++ b/test/transform/resource/before/ValueWithJavaBeansSpecCapitalization.java
@@ -1,10 +1,5 @@
+//CONF: lombok.accessors.capitalization = beanspec
 @lombok.Value
-@lombok.experimental.Accessors(javaBeansSpecCapitalization = true)
 class ValueWithJavaBeansSpecCapitalization {
 	final int aField;
 }
-
-@lombok.Value
-class ValueWithoutJavaBeansSpecCapitalization {
-	final int aField;
-}
diff --git a/test/transform/resource/before/WithOnJavaBeansSpecCapitalization.java b/test/transform/resource/before/WithOnJavaBeansSpecCapitalization.java
deleted file mode 100644
index 476fb5a4..00000000
--- a/test/transform/resource/before/WithOnJavaBeansSpecCapitalization.java
+++ /dev/null
@@ -1,16 +0,0 @@
-@lombok.With
-@lombok.experimental.Accessors(javaBeansSpecCapitalization = true)
-class WithOnJavaBeansSpecCapitalization {
-	int aField;
-	
-	WithOnJavaBeansSpecCapitalization(int aField) {
-	}
-}
-
-@lombok.With
-class WithOffJavaBeansSpecCapitalization {
-	int aField;
-	
-	WithOffJavaBeansSpecCapitalization(int aField) {
-	}
-}
diff --git a/test/transform/resource/before/WithWithJavaBeansSpecCapitalization.java b/test/transform/resource/before/WithWithJavaBeansSpecCapitalization.java
new file mode 100644
index 00000000..ef4a78ad
--- /dev/null
+++ b/test/transform/resource/before/WithWithJavaBeansSpecCapitalization.java
@@ -0,0 +1,8 @@
+//CONF: lombok.accessors.capitalization = beanspec
+@lombok.With
+class WithWithJavaBeansSpecCapitalization {
+	int aField;
+	
+	WithWithJavaBeansSpecCapitalization(int aField) {
+	}
+}