The bulk of the effort for a new pretty printer.

29 files changed, 90 insertions, 93 deletions

diff --git a/test/transform/resource/after-delombok/Accessors.java b/test/transform/resource/after-delombok/Accessors.java
index 3f4698e0..a04ea171 100644
--- a/test/transform/resource/after-delombok/Accessors.java
+++ b/test/transform/resource/after-delombok/Accessors.java
@@ -81,8 +81,8 @@ class AccessorsPrefix3 {
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof AccessorsPrefix3)) return false;
-		final AccessorsPrefix3 other = (AccessorsPrefix3)o;
-		if (!other.canEqual((java.lang.Object)this)) return false;
+		final AccessorsPrefix3 other = (AccessorsPrefix3) o;
+		if (!other.canEqual((java.lang.Object) this)) return false;
 		final java.lang.Object this$fName = this.getName();
 		final java.lang.Object other$fName = other.getName();
 		if (this$fName == null ? other$fName != null : !this$fName.equals(other$fName)) return false;
diff --git a/test/transform/resource/after-delombok/ConflictingStaticConstructorNames.java b/test/transform/resource/after-delombok/ConflictingStaticConstructorNames.java
index a47fa244..ff5278ff 100644
--- a/test/transform/resource/after-delombok/ConflictingStaticConstructorNames.java
+++ b/test/transform/resource/after-delombok/ConflictingStaticConstructorNames.java
@@ -5,8 +5,8 @@ class ConflictingStaticConstructorNames {
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof ConflictingStaticConstructorNames)) return false;
-		final ConflictingStaticConstructorNames other = (ConflictingStaticConstructorNames)o;
-		if (!other.canEqual((java.lang.Object)this)) return false;
+		final ConflictingStaticConstructorNames other = (ConflictingStaticConstructorNames) o;
+		if (!other.canEqual((java.lang.Object) this)) return false;
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
diff --git a/test/transform/resource/after-delombok/DataConfiguration.java b/test/transform/resource/after-delombok/DataConfiguration.java
index b83204b8..aadb35b6 100644
--- a/test/transform/resource/after-delombok/DataConfiguration.java
+++ b/test/transform/resource/after-delombok/DataConfiguration.java
@@ -16,8 +16,8 @@ class DataConfiguration {
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof DataConfiguration)) return false;
-		final DataConfiguration other = (DataConfiguration)o;
-		if (!other.canEqual((java.lang.Object)this)) return false;
+		final DataConfiguration other = (DataConfiguration) o;
+		if (!other.canEqual((java.lang.Object) this)) return false;
 		if (this.getX() != other.getX()) return false;
 		return true;
 	}
diff --git a/test/transform/resource/after-delombok/DataExtended.java b/test/transform/resource/after-delombok/DataExtended.java
index 25180429..175738ad 100644
--- a/test/transform/resource/after-delombok/DataExtended.java
+++ b/test/transform/resource/after-delombok/DataExtended.java
@@ -20,8 +20,8 @@ class DataExtended {
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof DataExtended)) return false;
-		final DataExtended other = (DataExtended)o;
-		if (!other.canEqual((java.lang.Object)this)) return false;
+		final DataExtended other = (DataExtended) o;
+		if (!other.canEqual((java.lang.Object) this)) return false;
 		if (this.getX() != other.getX()) return false;
 		return true;
 	}
diff --git a/test/transform/resource/after-delombok/DataIgnore.java b/test/transform/resource/after-delombok/DataIgnore.java
index 0d40a5a8..d5a3d81e 100644
--- a/test/transform/resource/after-delombok/DataIgnore.java
+++ b/test/transform/resource/after-delombok/DataIgnore.java
@@ -18,8 +18,8 @@ class DataIgnore {
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof DataIgnore)) return false;
-		final DataIgnore other = (DataIgnore)o;
-		if (!other.canEqual((java.lang.Object)this)) return false;
+		final DataIgnore other = (DataIgnore) o;
+		if (!other.canEqual((java.lang.Object) this)) return false;
 		if (this.getX() != other.getX()) return false;
 		return true;
 	}
diff --git a/test/transform/resource/after-delombok/DataOnLocalClass.java b/test/transform/resource/after-delombok/DataOnLocalClass.java
index 44b069fd..0e15ab4c 100644
--- a/test/transform/resource/after-delombok/DataOnLocalClass.java
+++ b/test/transform/resource/after-delombok/DataOnLocalClass.java
@@ -29,8 +29,8 @@ class DataOnLocalClass1 {
 			public boolean equals(final java.lang.Object o) {
 				if (o == this) return true;
 				if (!(o instanceof Local)) return false;
-				final Local other = (Local)o;
-				if (!other.canEqual((java.lang.Object)this)) return false;
+				final Local other = (Local) o;
+				if (!other.canEqual((java.lang.Object) this)) return false;
 				if (this.getX() != other.getX()) return false;
 				final java.lang.Object this$name = this.getName();
 				final java.lang.Object other$name = other.getName();
@@ -97,8 +97,8 @@ class DataOnLocalClass2 {
 				public boolean equals(final java.lang.Object o) {
 					if (o == this) return true;
 					if (!(o instanceof Local.InnerLocal)) return false;
-					final InnerLocal other = (InnerLocal)o;
-					if (!other.canEqual((java.lang.Object)this)) return false;
+					final InnerLocal other = (InnerLocal) o;
+					if (!other.canEqual((java.lang.Object) this)) return false;
 					final java.lang.Object this$name = this.getName();
 					final java.lang.Object other$name = other.getName();
 					if (this$name == null ? other$name != null : !this$name.equals(other$name)) return false;
@@ -142,8 +142,8 @@ class DataOnLocalClass2 {
 			public boolean equals(final java.lang.Object o) {
 				if (o == this) return true;
 				if (!(o instanceof Local)) return false;
-				final Local other = (Local)o;
-				if (!other.canEqual((java.lang.Object)this)) return false;
+				final Local other = (Local) o;
+				if (!other.canEqual((java.lang.Object) this)) return false;
 				if (this.getX() != other.getX()) return false;
 				return true;
 			}
diff --git a/test/transform/resource/after-delombok/DataPlain.java b/test/transform/resource/after-delombok/DataPlain.java
index cfb72656..ccebc55e 100644
--- a/test/transform/resource/after-delombok/DataPlain.java
+++ b/test/transform/resource/after-delombok/DataPlain.java
@@ -28,8 +28,8 @@ class Data1 {
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof Data1)) return false;
-		final Data1 other = (Data1)o;
-		if (!other.canEqual((java.lang.Object)this)) return false;
+		final Data1 other = (Data1) o;
+		if (!other.canEqual((java.lang.Object) this)) return false;
 		if (this.getX() != other.getX()) return false;
 		final java.lang.Object this$name = this.getName();
 		final java.lang.Object other$name = other.getName();
@@ -89,8 +89,8 @@ class Data2 {
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof Data2)) return false;
-		final Data2 other = (Data2)o;
-		if (!other.canEqual((java.lang.Object)this)) return false;
+		final Data2 other = (Data2) o;
+		if (!other.canEqual((java.lang.Object) this)) return false;
 		if (this.getX() != other.getX()) return false;
 		final java.lang.Object this$name = this.getName();
 		final java.lang.Object other$name = other.getName();
@@ -150,7 +150,7 @@ final class Data3 {
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof Data3)) return false;
-		final Data3 other = (Data3)o;
+		final Data3 other = (Data3) o;
 		if (this.getX() != other.getX()) return false;
 		final java.lang.Object this$name = this.getName();
 		final java.lang.Object other$name = other.getName();
@@ -201,8 +201,8 @@ final class Data4 extends java.util.Timer {
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof Data4)) return false;
-		final Data4 other = (Data4)o;
-		if (!other.canEqual((java.lang.Object)this)) return false;
+		final Data4 other = (Data4) o;
+		if (!other.canEqual((java.lang.Object) this)) return false;
 		if (!super.equals(o)) return false;
 		if (this.getX() != other.getX()) return false;
 		return true;
@@ -234,8 +234,8 @@ class Data5 {
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof Data5)) return false;
-		final Data5 other = (Data5)o;
-		if (!other.canEqual((java.lang.Object)this)) return false;
+		final Data5 other = (Data5) o;
+		if (!other.canEqual((java.lang.Object) this)) return false;
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
diff --git a/test/transform/resource/after-delombok/DataWithGetter.java b/test/transform/resource/after-delombok/DataWithGetter.java
index f849e0f8..fb51e262 100644
--- a/test/transform/resource/after-delombok/DataWithGetter.java
+++ b/test/transform/resource/after-delombok/DataWithGetter.java
@@ -24,8 +24,8 @@ class DataWithGetter {
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof DataWithGetter)) return false;
-		final DataWithGetter other = (DataWithGetter)o;
-		if (!other.canEqual((java.lang.Object)this)) return false;
+		final DataWithGetter other = (DataWithGetter) o;
+		if (!other.canEqual((java.lang.Object) this)) return false;
 		if (this.getX() != other.getX()) return false;
 		if (this.getY() != other.getY()) return false;
 		final java.lang.Object this$z = this.getZ();
diff --git a/test/transform/resource/after-delombok/DataWithGetterNone.java b/test/transform/resource/after-delombok/DataWithGetterNone.java
index c46be723..e332db02 100644
--- a/test/transform/resource/after-delombok/DataWithGetterNone.java
+++ b/test/transform/resource/after-delombok/DataWithGetterNone.java
@@ -24,8 +24,8 @@ class DataWithGetterNone {
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof DataWithGetterNone)) return false;
-		final DataWithGetterNone other = (DataWithGetterNone)o;
-		if (!other.canEqual((java.lang.Object)this)) return false;
+		final DataWithGetterNone other = (DataWithGetterNone) o;
+		if (!other.canEqual((java.lang.Object) this)) return false;
 		if (this.x != other.x) return false;
 		if (this.y != other.y) return false;
 		final java.lang.Object this$z = this.z;
diff --git a/test/transform/resource/after-delombok/DelegateOnGetter.java b/test/transform/resource/after-delombok/DelegateOnGetter.java
index 5b5090e9..1d25dcc0 100644
--- a/test/transform/resource/after-delombok/DelegateOnGetter.java
+++ b/test/transform/resource/after-delombok/DelegateOnGetter.java
@@ -12,7 +12,7 @@ class DelegateOnGetter {
 			synchronized (this.bar) {
 				value = this.bar.get();
 				if (value == null) {
-					final Bar actualValue = new Bar(){
+					final Bar actualValue = new Bar() {
 						public void setList(java.util.ArrayList<String> list) {
 						}
 						public int getInt() {
@@ -24,7 +24,7 @@ class DelegateOnGetter {
 				}
 			}
 		}
-		return (Bar)(value == this.bar ? null : value);
+		return (Bar) (value == this.bar ? null : value);
 	}
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
diff --git a/test/transform/resource/after-delombok/EqualsAndHashCode.java b/test/transform/resource/after-delombok/EqualsAndHashCode.java
index d0ed4067..7ade594a 100644
--- a/test/transform/resource/after-delombok/EqualsAndHashCode.java
+++ b/test/transform/resource/after-delombok/EqualsAndHashCode.java
@@ -10,8 +10,8 @@ class EqualsAndHashCode {
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof EqualsAndHashCode)) return false;
-		final EqualsAndHashCode other = (EqualsAndHashCode)o;
-		if (!other.canEqual((java.lang.Object)this)) return false;
+		final EqualsAndHashCode other = (EqualsAndHashCode) o;
+		if (!other.canEqual((java.lang.Object) this)) return false;
 		if (this.x != other.x) return false;
 		if (!java.util.Arrays.equals(this.y, other.y)) return false;
 		if (!java.util.Arrays.deepEquals(this.z, other.z)) return false;
@@ -56,7 +56,7 @@ final class EqualsAndHashCode2 {
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof EqualsAndHashCode2)) return false;
-		final EqualsAndHashCode2 other = (EqualsAndHashCode2)o;
+		final EqualsAndHashCode2 other = (EqualsAndHashCode2) o;
 		if (this.x != other.x) return false;
 		if (this.y != other.y) return false;
 		if (java.lang.Float.compare(this.f, other.f) != 0) return false;
@@ -72,10 +72,10 @@ final class EqualsAndHashCode2 {
 		int result = 1;
 		result = result * PRIME + this.x;
 		final long $y = this.y;
-		result = result * PRIME + (int)($y >>> 32 ^ $y);
+		result = result * PRIME + (int) ($y >>> 32 ^ $y);
 		result = result * PRIME + java.lang.Float.floatToIntBits(this.f);
 		final long $d = java.lang.Double.doubleToLongBits(this.d);
-		result = result * PRIME + (int)($d >>> 32 ^ $d);
+		result = result * PRIME + (int) ($d >>> 32 ^ $d);
 		result = result * PRIME + (this.b ? 79 : 97);
 		return result;
 	}
@@ -87,8 +87,8 @@ final class EqualsAndHashCode3 extends EqualsAndHashCode {
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof EqualsAndHashCode3)) return false;
-		final EqualsAndHashCode3 other = (EqualsAndHashCode3)o;
-		if (!other.canEqual((java.lang.Object)this)) return false;
+		final EqualsAndHashCode3 other = (EqualsAndHashCode3) o;
+		if (!other.canEqual((java.lang.Object) this)) return false;
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
@@ -111,8 +111,8 @@ class EqualsAndHashCode4 extends EqualsAndHashCode {
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof EqualsAndHashCode4)) return false;
-		final EqualsAndHashCode4 other = (EqualsAndHashCode4)o;
-		if (!other.canEqual((java.lang.Object)this)) return false;
+		final EqualsAndHashCode4 other = (EqualsAndHashCode4) o;
+		if (!other.canEqual((java.lang.Object) this)) return false;
 		if (!super.equals(o)) return false;
 		return true;
 	}
diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java b/test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java
index 5c9316b4..6978bf00 100644
--- a/test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java
+++ b/test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java
@@ -21,8 +21,8 @@ final class EqualsAndHashCodeWithExistingMethods3 extends EqualsAndHashCodeWithE
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof EqualsAndHashCodeWithExistingMethods3)) return false;
-		final EqualsAndHashCodeWithExistingMethods3 other = (EqualsAndHashCodeWithExistingMethods3)o;
-		if (!other.canEqual((java.lang.Object)this)) return false;
+		final EqualsAndHashCodeWithExistingMethods3 other = (EqualsAndHashCodeWithExistingMethods3) o;
+		if (!other.canEqual((java.lang.Object) this)) return false;
 		if (!super.equals(o)) return false;
 		if (this.x != other.x) return false;
 		return true;
diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeWithOnParam.java b/test/transform/resource/after-delombok/EqualsAndHashCodeWithOnParam.java
index 69b69d29..4cf00601 100644
--- a/test/transform/resource/after-delombok/EqualsAndHashCodeWithOnParam.java
+++ b/test/transform/resource/after-delombok/EqualsAndHashCodeWithOnParam.java
@@ -13,8 +13,8 @@ class EqualsAndHashCodeWithOnParam {
 	public boolean equals(@Nullable final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof EqualsAndHashCodeWithOnParam)) return false;
-		final EqualsAndHashCodeWithOnParam other = (EqualsAndHashCodeWithOnParam)o;
-		if (!other.canEqual((java.lang.Object)this)) return false;
+		final EqualsAndHashCodeWithOnParam other = (EqualsAndHashCodeWithOnParam) o;
+		if (!other.canEqual((java.lang.Object) this)) return false;
 		if (this.x != other.x) return false;
 		if (!java.util.Arrays.equals(this.y, other.y)) return false;
 		if (!java.util.Arrays.deepEquals(this.z, other.z)) return false;
diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeWithSomeExistingMethods.java b/test/transform/resource/after-delombok/EqualsAndHashCodeWithSomeExistingMethods.java
index 37eeb8df..b3a1fb0d 100644
--- a/test/transform/resource/after-delombok/EqualsAndHashCodeWithSomeExistingMethods.java
+++ b/test/transform/resource/after-delombok/EqualsAndHashCodeWithSomeExistingMethods.java
@@ -28,8 +28,8 @@ class EqualsAndHashCodeWithSomeExistingMethods2 {
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof EqualsAndHashCodeWithSomeExistingMethods2)) return false;
-		final EqualsAndHashCodeWithSomeExistingMethods2 other = (EqualsAndHashCodeWithSomeExistingMethods2)o;
-		if (!other.canEqual((java.lang.Object)this)) return false;
+		final EqualsAndHashCodeWithSomeExistingMethods2 other = (EqualsAndHashCodeWithSomeExistingMethods2) o;
+		if (!other.canEqual((java.lang.Object) this)) return false;
 		if (this.x != other.x) return false;
 		return true;
 	}
@@ -75,8 +75,8 @@ class EqualsAndHashCodeWithNoExistingMethods {
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof EqualsAndHashCodeWithNoExistingMethods)) return false;
-		final EqualsAndHashCodeWithNoExistingMethods other = (EqualsAndHashCodeWithNoExistingMethods)o;
-		if (!other.canEqual((java.lang.Object)this)) return false;
+		final EqualsAndHashCodeWithNoExistingMethods other = (EqualsAndHashCodeWithNoExistingMethods) o;
+		if (!other.canEqual((java.lang.Object) this)) return false;
 		if (this.x != other.x) return false;
 		return true;
 	}
diff --git a/test/transform/resource/after-delombok/GetterLazy.java b/test/transform/resource/after-delombok/GetterLazy.java
index 9c7db37b..2ea3cbf2 100644
--- a/test/transform/resource/after-delombok/GetterLazy.java
+++ b/test/transform/resource/after-delombok/GetterLazy.java
@@ -16,6 +16,6 @@ class GetterLazy {
 				}
 			}
 		}
-		return (ValueType)(value == this.fieldName ? null : value);
+		return (ValueType) (value == this.fieldName ? null : value);
 	}
 }
diff --git a/test/transform/resource/after-delombok/GetterLazyBoolean.java b/test/transform/resource/after-delombok/GetterLazyBoolean.java
index f9a42e66..41349447 100644
--- a/test/transform/resource/after-delombok/GetterLazyBoolean.java
+++ b/test/transform/resource/after-delombok/GetterLazyBoolean.java
@@ -10,8 +10,8 @@ class GetterLazyBoolean {
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof GetterLazyBoolean)) return false;
-		final GetterLazyBoolean other = (GetterLazyBoolean)o;
-		if (!other.canEqual((java.lang.Object)this)) return false;
+		final GetterLazyBoolean other = (GetterLazyBoolean) o;
+		if (!other.canEqual((java.lang.Object) this)) return false;
 		if (this.isBooleanValue() != other.isBooleanValue()) return false;
 		return true;
 	}
@@ -49,7 +49,7 @@ class GetterLazyBoolean {
 				}
 			}
 		}
-		return (java.lang.Boolean)value;
+		return (java.lang.Boolean) value;
 	}
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
@@ -65,6 +65,6 @@ class GetterLazyBoolean {
 				}
 			}
 		}
-		return (java.lang.Boolean)value;
+		return (java.lang.Boolean) value;
 	}
 }
diff --git a/test/transform/resource/after-delombok/GetterLazyEahcToString.java b/test/transform/resource/after-delombok/GetterLazyEahcToString.java
index db075cde..973eb6f1 100644
--- a/test/transform/resource/after-delombok/GetterLazyEahcToString.java
+++ b/test/transform/resource/after-delombok/GetterLazyEahcToString.java
@@ -9,8 +9,8 @@ class GetterLazyEahcToString {
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof GetterLazyEahcToString)) return false;
-		final GetterLazyEahcToString other = (GetterLazyEahcToString)o;
-		if (!other.canEqual((java.lang.Object)this)) return false;
+		final GetterLazyEahcToString other = (GetterLazyEahcToString) o;
+		if (!other.canEqual((java.lang.Object) this)) return false;
 		final java.lang.Object this$value = this.getValue();
 		final java.lang.Object other$value = other.getValue();
 		if (this$value == null ? other$value != null : !this$value.equals(other$value)) return false;
@@ -62,11 +62,10 @@ class GetterLazyEahcToString {
 				}
 			}
 		}
-		return (String)(value == this.value ? null : value);
+		return (String) (value == this.value ? null : value);
 	}
 	
 	@java.lang.SuppressWarnings("all")
-	
 	@javax.annotation.Generated("lombok")
 	public String getValue2() {
 		return this.value2;
diff --git a/test/transform/resource/after-delombok/GetterLazyNative.java b/test/transform/resource/after-delombok/GetterLazyNative.java
index 50e3ff2b..0d88558d 100644
--- a/test/transform/resource/after-delombok/GetterLazyNative.java
+++ b/test/transform/resource/after-delombok/GetterLazyNative.java
@@ -22,7 +22,7 @@ class GetterLazyNative {
 				}
 			}
 		}
-		return (java.lang.Boolean)value;
+		return (java.lang.Boolean) value;
 	}
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
@@ -38,7 +38,7 @@ class GetterLazyNative {
 				}
 			}
 		}
-		return (java.lang.Byte)value;
+		return (java.lang.Byte) value;
 	}
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
@@ -54,7 +54,7 @@ class GetterLazyNative {
 				}
 			}
 		}
-		return (java.lang.Short)value;
+		return (java.lang.Short) value;
 	}
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
@@ -70,7 +70,7 @@ class GetterLazyNative {
 				}
 			}
 		}
-		return (java.lang.Integer)value;
+		return (java.lang.Integer) value;
 	}
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
@@ -86,7 +86,7 @@ class GetterLazyNative {
 				}
 			}
 		}
-		return (java.lang.Long)value;
+		return (java.lang.Long) value;
 	}
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
@@ -102,7 +102,7 @@ class GetterLazyNative {
 				}
 			}
 		}
-		return (java.lang.Float)value;
+		return (java.lang.Float) value;
 	}
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
@@ -118,7 +118,7 @@ class GetterLazyNative {
 				}
 			}
 		}
-		return (java.lang.Double)value;
+		return (java.lang.Double) value;
 	}
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
@@ -134,7 +134,7 @@ class GetterLazyNative {
 				}
 			}
 		}
-		return (java.lang.Character)value;
+		return (java.lang.Character) value;
 	}
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
@@ -144,12 +144,12 @@ class GetterLazyNative {
 			synchronized (this.intArrayField) {
 				value = this.intArrayField.get();
 				if (value == null) {
-					final int[] actualValue = new int[]{1};
+					final int[] actualValue = new int[] {1};
 					value = actualValue == null ? this.intArrayField : actualValue;
 					this.intArrayField.set(value);
 				}
 			}
 		}
-		return (int[])(value == this.intArrayField ? null : value);
+		return (int[]) (value == this.intArrayField ? null : value);
 	}
 }
diff --git a/test/transform/resource/after-delombok/GetterSetterJavadoc.java b/test/transform/resource/after-delombok/GetterSetterJavadoc.java
index 45a99c9d..f156de92 100644
--- a/test/transform/resource/after-delombok/GetterSetterJavadoc.java
+++ b/test/transform/resource/after-delombok/GetterSetterJavadoc.java
@@ -33,8 +33,8 @@ class GetterSetterJavadoc1 {
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof GetterSetterJavadoc1)) return false;
-		final GetterSetterJavadoc1 other = (GetterSetterJavadoc1)o;
-		if (!other.canEqual((java.lang.Object)this)) return false;
+		final GetterSetterJavadoc1 other = (GetterSetterJavadoc1) o;
+		if (!other.canEqual((java.lang.Object) this)) return false;
 		if (this.getFieldName() != other.getFieldName()) return false;
 		return true;
 	}
diff --git a/test/transform/resource/after-delombok/InjectField.java b/test/transform/resource/after-delombok/InjectField.java
index 55390a60..8215f8d0 100644
--- a/test/transform/resource/after-delombok/InjectField.java
+++ b/test/transform/resource/after-delombok/InjectField.java
@@ -1,8 +1,7 @@
 import java.util.logging.Level;
 
 enum InjectField1 {
-	A,
-	B;
+	A, B;
 
 	@java.lang.SuppressWarnings("all")
 
diff --git a/test/transform/resource/after-delombok/LoggerSlf4jTypes.java b/test/transform/resource/after-delombok/LoggerSlf4jTypes.java
index e987d807..a4e13afc 100644
--- a/test/transform/resource/after-delombok/LoggerSlf4jTypes.java
+++ b/test/transform/resource/after-delombok/LoggerSlf4jTypes.java
@@ -3,7 +3,7 @@ interface LoggerSlf4jTypesInterface {
 @interface LoggerSlf4jTypesAnnotation {
 }
 enum LoggerSlf4jTypesEnum {
-;
+	;
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
 	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnum.class);
diff --git a/test/transform/resource/after-delombok/UtilityClass.java b/test/transform/resource/after-delombok/UtilityClass.java
index 7731b49c..6b3c1761 100644
--- a/test/transform/resource/after-delombok/UtilityClass.java
+++ b/test/transform/resource/after-delombok/UtilityClass.java
@@ -24,8 +24,7 @@ class UtilityInner {
 		}
 	}
 	enum UtilityInsideEnum {
-		FOO,
-		BAR;
+		FOO, BAR;
 		static final class InsideEnum {
 			static int member;
 			@java.lang.SuppressWarnings("all")
diff --git a/test/transform/resource/after-delombok/UtilityClassErrors.java b/test/transform/resource/after-delombok/UtilityClassErrors.java
index 9626461a..072edf91 100644
--- a/test/transform/resource/after-delombok/UtilityClassErrors.java
+++ b/test/transform/resource/after-delombok/UtilityClassErrors.java
@@ -8,7 +8,7 @@ final class UtilityClassErrors1 {
 	}
 }
 enum UtilityClassErrors2 {
-;
+	;
 }
 class UtilityClassErrors3 {
 	class NonStaticInner {
diff --git a/test/transform/resource/after-delombok/ValAnonymousSubclassWithGenerics.java b/test/transform/resource/after-delombok/ValAnonymousSubclassWithGenerics.java
index 25a9e0ce..07093e5a 100644
--- a/test/transform/resource/after-delombok/ValAnonymousSubclassWithGenerics.java
+++ b/test/transform/resource/after-delombok/ValAnonymousSubclassWithGenerics.java
@@ -1,6 +1,6 @@
 import java.util.*;
 public class ValAnonymousSubclassWithGenerics {
-	Object object = new Object(){
+	Object object = new Object() {
 		void foo() {
 			final int j = 1;
 		}
@@ -9,7 +9,7 @@ public class ValAnonymousSubclassWithGenerics {
 		final int k = super.hashCode();
 		int x = k;
 	}
-	java.util.List<String> names = new java.util.ArrayList<String>(){
+	java.util.List<String> names = new java.util.ArrayList<String>() {
 		public String get(int i) {
 			final java.lang.String result = super.get(i);
 			return result;
diff --git a/test/transform/resource/after-delombok/ValLambda.java b/test/transform/resource/after-delombok/ValLambda.java
index 0b13b5a1..40b056f3 100644
--- a/test/transform/resource/after-delombok/ValLambda.java
+++ b/test/transform/resource/after-delombok/ValLambda.java
@@ -1,21 +1,21 @@
 // version 8:
 class ValLambda {
 	public void easyLambda() {
-		final java.lang.Runnable foo = (Runnable)() -> {
+		final java.lang.Runnable foo = (Runnable) () -> {
 		};
 	}
 	public void easyIntersectionLambda() {
-		final java.lang.Object foo = (Runnable & java.io.Serializable)() -> {
+		final java.lang.Object foo = (Runnable & java.io.Serializable) () -> {
 		};
-		final java.lang.Object bar = (java.io.Serializable & Runnable)() -> {
+		final java.lang.Object bar = (java.io.Serializable & Runnable) () -> {
 		};
 	}
 	public void easyLubLambda() {
-		final java.lang.Runnable foo = (System.currentTimeMillis() > 0) ? (Runnable)() -> {
-		} : (Runnable)System.out::println;
+		final java.lang.Runnable foo = (System.currentTimeMillis() > 0) ? (Runnable) () -> {
+		} : (Runnable) System.out::println;
 	}
 //	public void castLubLambda() {
-//		Runnable foo = (Runnable)((System.currentTimeMillis() > 0) ? ()-> {} : System.out::println);
-//		lombok.val foo = (Runnable)((System.currentTimeMillis() > 0) ? ()-> {} : System.out::println);
+//		Runnable foo = (Runnable) ((System.currentTimeMillis() > 0) ? () -> {} : System.out::println);
+//		lombok.val foo = (Runnable) ((System.currentTimeMillis() > 0) ? () -> {} : System.out::println);
 //	}
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/ValRawType.java b/test/transform/resource/after-delombok/ValRawType.java
index dc297046..122eabda 100644
--- a/test/transform/resource/after-delombok/ValRawType.java
+++ b/test/transform/resource/after-delombok/ValRawType.java
@@ -5,7 +5,7 @@ public class ValRawType {
 	public void test() {
 		Element propElement = new Element();
 		for (final java.lang.Object attribute : propElement.attributes()) {
-			final ValRawType.Attribute attr = (Attribute)attribute;
+			final ValRawType.Attribute attr = (Attribute) attribute;
 		}
 	}
 
diff --git a/test/transform/resource/after-delombok/ValWeirdTypes.java b/test/transform/resource/after-delombok/ValWeirdTypes.java
index 2c2905ed..996ce662 100644
--- a/test/transform/resource/after-delombok/ValWeirdTypes.java
+++ b/test/transform/resource/after-delombok/ValWeirdTypes.java
@@ -18,7 +18,7 @@ public class ValWeirdTypes<Z> {
 		final long y = 5 + 3L;
 	}
 	public void testAnonymousInnerClass() {
-		final java.lang.Runnable y = new Runnable(){
+		final java.lang.Runnable y = new Runnable() {
 			public void run() {
 			}
 		};
@@ -48,8 +48,8 @@ public class ValWeirdTypes<Z> {
 		final java.lang.Object nully = null;
 	}
 	public void testArrays() {
-		final int[] intArray = new int[]{1, 2, 3};
-		final java.lang.Object[][] multiDimArray = new Object[][]{{}};
+		final int[] intArray = new int[] {1, 2, 3};
+		final java.lang.Object[][] multiDimArray = new Object[][] {{}};
 		final int[] copy = intArray;
 		final java.lang.Object[] single = multiDimArray[0];
 		final int singleInt = copy[0];
diff --git a/test/transform/resource/after-delombok/ValWithLocalClasses.java b/test/transform/resource/after-delombok/ValWithLocalClasses.java
index b739b10e..6487eb82 100644
--- a/test/transform/resource/after-delombok/ValWithLocalClasses.java
+++ b/test/transform/resource/after-delombok/ValWithLocalClasses.java
@@ -1,6 +1,6 @@
 class ValWithLocalClasses1 {
 	{
-		final ValWithLocalClasses2 f2 = new ValWithLocalClasses2(){
+		final ValWithLocalClasses2 f2 = new ValWithLocalClasses2() {
 		};
 	}
 }
diff --git a/test/transform/resource/after-delombok/ValuePlain.java b/test/transform/resource/after-delombok/ValuePlain.java
index 8cc19c1e..056cdacf 100644
--- a/test/transform/resource/after-delombok/ValuePlain.java
+++ b/test/transform/resource/after-delombok/ValuePlain.java
@@ -24,7 +24,7 @@ final class Value1 {
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof Value1)) return false;
-		final Value1 other = (Value1)o;
+		final Value1 other = (Value1) o;
 		if (this.getX() != other.getX()) return false;
 		final java.lang.Object this$name = this.getName();
 		final java.lang.Object other$name = other.getName();
@@ -75,8 +75,8 @@ class Value2 {
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof Value2)) return false;
-		final Value2 other = (Value2)o;
-		if (!other.canEqual((java.lang.Object)this)) return false;
+		final Value2 other = (Value2) o;
+		if (!other.canEqual((java.lang.Object) this)) return false;
 		if (this.getX() != other.getX()) return false;
 		final java.lang.Object this$name = this.getName();
 		final java.lang.Object other$name = other.getName();
@@ -132,7 +132,7 @@ final class Value3 {
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof Value3)) return false;
-		final Value3 other = (Value3)o;
+		final Value3 other = (Value3) o;
 		if (this.getX() != other.getX()) return false;
 		if (this.getY() != other.getY()) return false;
 		return true;