refactor: OpenRewrite best practices (#8)

timtebeek · TeamModerne · web-flow · commit 37bf21baed96 · 2024-09-09T10:54:01.000+02:00
Use this link to re-run the recipe: https://app.moderne.io/recipes/org.openrewrite.recipes.OpenRewriteBestPractices?organizationId=T3BlblJld3JpdGU%3D Co-authored-by: Moderne <team@moderne.io>
diff --git a/rewrite-csharp/src/main/java/org/openrewrite/csharp/CSharpIsoVisitor.java b/rewrite-csharp/src/main/java/org/openrewrite/csharp/CSharpIsoVisitor.java
@@ -15,16 +15,8 @@
  */
 package org.openrewrite.csharp;
 
-import org.jspecify.annotations.Nullable;
-import org.openrewrite.*;
-import org.openrewrite.internal.ListUtils;
-import org.openrewrite.marker.Markers;
-import org.openrewrite.tree.*;
-import org.openrewrite.java.JavaVisitor;
-import org.openrewrite.java.tree.*;
 import org.openrewrite.csharp.tree.*;
-
-import java.util.List;
+import org.openrewrite.java.tree.*;
 
 public class CSharpIsoVisitor<P> extends CSharpVisitor<P>
 {
diff --git a/rewrite-csharp/src/main/java/org/openrewrite/csharp/CSharpPrinter.java b/rewrite-csharp/src/main/java/org/openrewrite/csharp/CSharpPrinter.java
@@ -15,13 +15,13 @@
  */
 package org.openrewrite.csharp;
 
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.Cursor;
 import org.openrewrite.PrintOutputCapture;
 import org.openrewrite.Tree;
 import org.openrewrite.csharp.marker.OmitBraces;
 import org.openrewrite.csharp.marker.SingleExpressionBlock;
 import org.openrewrite.csharp.tree.*;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.java.JavaPrinter;
 import org.openrewrite.java.marker.CompactConstructor;
 import org.openrewrite.java.marker.Semicolon;
@@ -714,7 +714,7 @@ private void beforeSyntax(Cs cs, CsSpace.Location loc, PrintOutputCapture<P> p)
         beforeSyntax(cs.getPrefix(), cs.getMarkers(), loc, p);
     }
 
-    private void beforeSyntax(Space prefix, Markers markers, @Nullable CsSpace.Location loc, PrintOutputCapture<P> p) {
+    private void beforeSyntax(Space prefix, Markers markers, CsSpace.@Nullable Location loc, PrintOutputCapture<P> p) {
         for (Marker marker : markers.getMarkers()) {
             p.append(p.getMarkerPrinter().beforePrefix(marker, new Cursor(getCursor(), marker), JAVA_MARKER_WRAPPER));
         }
@@ -727,7 +727,7 @@ private void beforeSyntax(Space prefix, Markers markers, @Nullable CsSpace.Locat
         }
     }
 
-    private void beforeSyntax(Space prefix, Markers markers, @Nullable Space.Location loc, PrintOutputCapture<P> p) {
+    private void beforeSyntax(Space prefix, Markers markers, Space.@Nullable Location loc, PrintOutputCapture<P> p) {
         for (Marker marker : markers.getMarkers()) {
             p.append(p.getMarkerPrinter().beforePrefix(marker, new Cursor(getCursor(), marker), JAVA_MARKER_WRAPPER));
         }
@@ -749,4 +749,4 @@ private void afterSyntax(Markers markers, PrintOutputCapture<P> p) {
             p.append(p.getMarkerPrinter().afterSyntax(marker, new Cursor(getCursor(), marker), JAVA_MARKER_WRAPPER));
         }
     }
-}
+}
diff --git a/rewrite-csharp/src/main/java/org/openrewrite/csharp/CSharpVisitor.java b/rewrite-csharp/src/main/java/org/openrewrite/csharp/CSharpVisitor.java
@@ -17,12 +17,12 @@
 
 import org.jspecify.annotations.Nullable;
 import org.openrewrite.*;
+import org.openrewrite.csharp.tree.*;
 import org.openrewrite.internal.ListUtils;
-import org.openrewrite.marker.Markers;
-import org.openrewrite.tree.*;
 import org.openrewrite.java.JavaVisitor;
 import org.openrewrite.java.tree.*;
-import org.openrewrite.csharp.tree.*;
+import org.openrewrite.marker.Markers;
+import org.openrewrite.tree.*;
 
 import java.util.List;
 
diff --git a/rewrite-csharp/src/main/java/org/openrewrite/csharp/marker/package-info.java b/rewrite-csharp/src/main/java/org/openrewrite/csharp/marker/package-info.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@NonNullApi
+@NullMarked
 @NonNullFields
 package org.openrewrite.csharp.marker;
 
-import org.openrewrite.internal.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.internal.lang.NonNullFields;
diff --git a/rewrite-csharp/src/main/java/org/openrewrite/csharp/package-info.java b/rewrite-csharp/src/main/java/org/openrewrite/csharp/package-info.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@NonNullApi
+@NullMarked
 @NonNullFields
 package org.openrewrite.csharp;
 
-import org.openrewrite.internal.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.internal.lang.NonNullFields;
diff --git a/rewrite-csharp/src/main/java/org/openrewrite/csharp/tree/Cs.java b/rewrite-csharp/src/main/java/org/openrewrite/csharp/tree/Cs.java
@@ -18,10 +18,10 @@
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 import lombok.experimental.NonFinal;
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.*;
 import org.openrewrite.csharp.CSharpPrinter;
 import org.openrewrite.csharp.CSharpVisitor;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.java.JavaPrinter;
 import org.openrewrite.java.internal.TypesInUse;
 import org.openrewrite.java.tree.*;
@@ -54,8 +54,7 @@ default <P> boolean isAcceptable(TreeVisitor<?, P> v, P p) {
         return v.isAdaptableTo(CSharpVisitor.class);
     }
 
-    @Nullable
-    default <P> J acceptCSharp(CSharpVisitor<P> v, P p) {
+    default <P> @Nullable J acceptCSharp(CSharpVisitor<P> v, P p) {
         return v.defaultValue(this, p);
     }
 
@@ -121,11 +120,12 @@ public SourceFile withCharset(Charset charset) {
             return withCharsetName(charset.name());
         }
 
-        @Nullable
-        public Package getPackageDeclaration() {
+        @Override
+        public @Nullable Package getPackageDeclaration() {
             return null;
         }
 
+        @Override
         public Cs.CompilationUnit withPackageDeclaration(Package packageDeclaration) {
             return this;
         }
@@ -164,15 +164,18 @@ public Cs.CompilationUnit withMembers(List<Statement> members) {
             return getPadding().withMembers(JRightPadded.withElements(this.members, members));
         }
 
+        @Override
         @Transient
         public List<Import> getImports() {
             return Collections.emptyList();
         }
 
+        @Override
         public Cs.CompilationUnit withImports(List<Import> imports) {
             return this;
         }
 
+        @Override
         @Transient
         public List<ClassDeclaration> getClasses() {
             return Collections.emptyList();
@@ -213,6 +216,7 @@ public TypesInUse getTypesInUse() {
             return cache;
         }
 
+        @Override
         public Padding getPadding() {
             Padding p;
             if (this.padding == null) {
@@ -378,8 +382,7 @@ public Padding getPadding() {
         public static class Padding {
             private final ArrayRankSpecifier t;
 
-            @Nullable
-            public JContainer<Expression> getSizes() {
+            public @Nullable JContainer<Expression> getSizes() {
                 return t.sizes;
             }
 
@@ -514,12 +517,12 @@ final class AttributeList implements Cs {
         @Nullable
         JRightPadded<Identifier> target;
 
-        @Nullable
-        public J.Identifier getTarget() {
+
+        public J.@Nullable Identifier getTarget() {
             return target == null ? null : target.getElement();
         }
 
-        public AttributeList withTarget(@Nullable J.Identifier target) {
+        public AttributeList withTarget(J.@Nullable Identifier target) {
             return getPadding().withTarget(JRightPadded.withElement(this.target, target));
         }
 
@@ -1259,8 +1262,7 @@ public Interpolation withExpression(Expression expression) {
         @Nullable
         JRightPadded<Expression> alignment;
 
-        @Nullable
-        public Expression getAlignment() {
+        public @Nullable Expression getAlignment() {
             return alignment != null ? alignment.getElement() : null;
         }
 
@@ -1271,8 +1273,7 @@ public Interpolation withAlignment(@Nullable Expression alignment) {
         @Nullable
         JRightPadded<Expression> format;
 
-        @Nullable
-        public Expression getFormat() {
+        public @Nullable Expression getFormat() {
             return format != null ? format.getElement() : null;
         }
 
@@ -1328,17 +1329,15 @@ public Interpolation withExpression(JRightPadded<Expression> expression) {
                 return t.expression == expression ? t : new Interpolation(t.id, t.prefix, t.markers, expression, t.alignment, t.format);
             }
 
-            @Nullable
-            public JRightPadded<Expression> getAlignment() {
+            public @Nullable JRightPadded<Expression> getAlignment() {
                 return t.alignment;
             }
 
             public Interpolation withAlignment(@Nullable JRightPadded<Expression> alignment) {
                 return t.alignment == alignment ? t : new Interpolation(t.id, t.prefix, t.markers, t.expression, alignment, t.format);
             }
 
-            @Nullable
-            public JRightPadded<Expression> getFormat() {
+            public @Nullable JRightPadded<Expression> getFormat() {
                 return t.format;
             }
 
@@ -1525,12 +1524,12 @@ public UsingDirective withUnsafe(boolean unsafe) {
         @Nullable
         JRightPadded<Identifier> alias;
 
-        @Nullable
-        public J.Identifier getAlias() {
+
+        public J.@Nullable Identifier getAlias() {
             return alias != null ? alias.getElement() : null;
         }
 
-        public UsingDirective withAlias(@Nullable J.Identifier alias) {
+        public UsingDirective withAlias(J.@Nullable Identifier alias) {
             return getPadding().withAlias(JRightPadded.withElement(this.alias, alias));
         }
 
@@ -1591,8 +1590,7 @@ public UsingDirective withUnsafe(JLeftPadded<Boolean> unsafe) {
                 return t.unsafe == unsafe ? t : new UsingDirective(t.id, t.prefix, t.markers, t.global, t.statik, unsafe, t.alias, t.namespaceOrType);
             }
 
-            @Nullable
-            public JRightPadded<Identifier> getAlias() {
+            public @Nullable JRightPadded<Identifier> getAlias() {
                 return t.alias;
             }
 
@@ -1657,25 +1655,25 @@ public CoordinateBuilder.Statement getCoordinates() {
             return new CoordinateBuilder.Statement(this);
         }
 
+        @Override
         public JavaType getType() {
             return typeExpression.getType();
         }
 
+        @Override
         public PropertyDeclaration withType(@Nullable JavaType type) {
             return getPadding().withType(this.typeExpression.withType(type));
         }
 
-        @Nullable
-        public NameTree getInterfaceSpecifier() {
+        public @Nullable NameTree getInterfaceSpecifier() {
             return interfaceSpecifier!= null ? interfaceSpecifier.getElement() : null;
         }
 
         public PropertyDeclaration withInterfaceSpecifier(@Nullable NameTree interfaceSpecifier) {
             return getPadding().withInterfaceSpecifier(JRightPadded.withElement(this.interfaceSpecifier, interfaceSpecifier));
         }
 
-        @Nullable
-        public Expression getInitializer() {
+        public @Nullable Expression getInitializer() {
             return initializer != null ? initializer.getElement() : null;
         }
 
@@ -1711,8 +1709,7 @@ public TypeTree getType() {
                 return pd.typeExpression;
             }
 
-            @Nullable
-            public JRightPadded<NameTree> getInterfaceSpecifier() {
+            public @Nullable JRightPadded<NameTree> getInterfaceSpecifier() {
                 return pd.interfaceSpecifier;
             }
 
@@ -1742,8 +1739,7 @@ public PropertyDeclaration withType(TypeTree type) {
                         pd.initializer);
             }
 
-            @Nullable
-            public JLeftPadded<Expression> getInitializer() {
+            public @Nullable JLeftPadded<Expression> getInitializer() {
                 return pd.initializer;
             }
 
diff --git a/rewrite-csharp/src/main/java/org/openrewrite/csharp/tree/package-info.java b/rewrite-csharp/src/main/java/org/openrewrite/csharp/tree/package-info.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@NonNullApi
+@NullMarked
 @NonNullFields
 package org.openrewrite.csharp.tree;
 
-import org.openrewrite.internal.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.internal.lang.NonNullFields;

Original file line number	Diff line number	Diff line change
`@@ -15,13 +15,13 @@`
`15`	`15`	`*/`
`16`	`16`	`package org.openrewrite.csharp;`
`17`	`17`
	`18`	`+import org.jspecify.annotations.Nullable;`
`18`	`19`	`import org.openrewrite.Cursor;`
`19`	`20`	`import org.openrewrite.PrintOutputCapture;`
`20`	`21`	`import org.openrewrite.Tree;`
`21`	`22`	`import org.openrewrite.csharp.marker.OmitBraces;`
`22`	`23`	`import org.openrewrite.csharp.marker.SingleExpressionBlock;`
`23`	`24`	`import org.openrewrite.csharp.tree.*;`
`24`		`-import org.openrewrite.internal.lang.Nullable;`
`25`	`25`	`import org.openrewrite.java.JavaPrinter;`
`26`	`26`	`import org.openrewrite.java.marker.CompactConstructor;`
`27`	`27`	`import org.openrewrite.java.marker.Semicolon;`
`@@ -714,7 +714,7 @@ private void beforeSyntax(Cs cs, CsSpace.Location loc, PrintOutputCapture<P> p)`
`714`	`714`	`beforeSyntax(cs.getPrefix(), cs.getMarkers(), loc, p);`
`715`	`715`	`}`
`716`	`716`
`717`		`- private void beforeSyntax(Space prefix, Markers markers, @Nullable CsSpace.Location loc, PrintOutputCapture<P> p) {`
	`717`	`+ private void beforeSyntax(Space prefix, Markers markers, CsSpace.@Nullable Location loc, PrintOutputCapture<P> p) {`
`718`	`718`	`for (Marker marker : markers.getMarkers()) {`
`719`	`719`	`p.append(p.getMarkerPrinter().beforePrefix(marker, new Cursor(getCursor(), marker), JAVA_MARKER_WRAPPER));`
`720`	`720`	`}`
`@@ -727,7 +727,7 @@ private void beforeSyntax(Space prefix, Markers markers, @Nullable CsSpace.Locat`
`727`	`727`	`}`
`728`	`728`	`}`
`729`	`729`
`730`		`- private void beforeSyntax(Space prefix, Markers markers, @Nullable Space.Location loc, PrintOutputCapture<P> p) {`
	`730`	`+ private void beforeSyntax(Space prefix, Markers markers, Space.@Nullable Location loc, PrintOutputCapture<P> p) {`
`731`	`731`	`for (Marker marker : markers.getMarkers()) {`
`732`	`732`	`p.append(p.getMarkerPrinter().beforePrefix(marker, new Cursor(getCursor(), marker), JAVA_MARKER_WRAPPER));`
`733`	`733`	`}`
`@@ -749,4 +749,4 @@ private void afterSyntax(Markers markers, PrintOutputCapture<P> p) {`
`749`	`749`	`p.append(p.getMarkerPrinter().afterSyntax(marker, new Cursor(getCursor(), marker), JAVA_MARKER_WRAPPER));`
`750`	`750`	`}`
`751`	`751`	`}`
`752`		`-}`
	`752`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,10 @@`
`18`	`18`	`import lombok.*;`
`19`	`19`	`import lombok.experimental.FieldDefaults;`
`20`	`20`	`import lombok.experimental.NonFinal;`
	`21`	`+import org.jspecify.annotations.Nullable;`
`21`	`22`	`import org.openrewrite.*;`
`22`	`23`	`import org.openrewrite.csharp.CSharpPrinter;`
`23`	`24`	`import org.openrewrite.csharp.CSharpVisitor;`
`24`		`-import org.openrewrite.internal.lang.Nullable;`
`25`	`25`	`import org.openrewrite.java.JavaPrinter;`
`26`	`26`	`import org.openrewrite.java.internal.TypesInUse;`
`27`	`27`	`import org.openrewrite.java.tree.*;`
`@@ -54,8 +54,7 @@ default <P> boolean isAcceptable(TreeVisitor<?, P> v, P p) {`
`54`	`54`	`return v.isAdaptableTo(CSharpVisitor.class);`
`55`	`55`	`}`
`56`	`56`
`57`		`- @Nullable`
`58`		`- default <P> J acceptCSharp(CSharpVisitor<P> v, P p) {`
	`57`	`+ default <P> @Nullable J acceptCSharp(CSharpVisitor<P> v, P p) {`
`59`	`58`	`return v.defaultValue(this, p);`
`60`	`59`	`}`
`61`	`60`
`@@ -121,11 +120,12 @@ public SourceFile withCharset(Charset charset) {`
`121`	`120`	`return withCharsetName(charset.name());`
`122`	`121`	`}`
`123`	`122`
`124`		`- @Nullable`
`125`		`- public Package getPackageDeclaration() {`
	`123`	`+ @Override`
	`124`	`+ public @Nullable Package getPackageDeclaration() {`
`126`	`125`	`return null;`
`127`	`126`	`}`
`128`	`127`
	`128`	`+ @Override`
`129`	`129`	`public Cs.CompilationUnit withPackageDeclaration(Package packageDeclaration) {`
`130`	`130`	`return this;`
`131`	`131`	`}`
`@@ -164,15 +164,18 @@ public Cs.CompilationUnit withMembers(List<Statement> members) {`
`164`	`164`	`return getPadding().withMembers(JRightPadded.withElements(this.members, members));`
`165`	`165`	`}`
`166`	`166`
	`167`	`+ @Override`
`167`	`168`	`@Transient`
`168`	`169`	`public List<Import> getImports() {`
`169`	`170`	`return Collections.emptyList();`
`170`	`171`	`}`
`171`	`172`
	`173`	`+ @Override`
`172`	`174`	`public Cs.CompilationUnit withImports(List<Import> imports) {`
`173`	`175`	`return this;`
`174`	`176`	`}`
`175`	`177`
	`178`	`+ @Override`
`176`	`179`	`@Transient`
`177`	`180`	`public List<ClassDeclaration> getClasses() {`
`178`	`181`	`return Collections.emptyList();`
`@@ -213,6 +216,7 @@ public TypesInUse getTypesInUse() {`
`213`	`216`	`return cache;`
`214`	`217`	`}`
`215`	`218`
	`219`	`+ @Override`
`216`	`220`	`public Padding getPadding() {`
`217`	`221`	`Padding p;`
`218`	`222`	`if (this.padding == null) {`
`@@ -378,8 +382,7 @@ public Padding getPadding() {`
`378`	`382`	`public static class Padding {`
`379`	`383`	`private final ArrayRankSpecifier t;`
`380`	`384`
`381`		`- @Nullable`
`382`		`- public JContainer<Expression> getSizes() {`
	`385`	`+ public @Nullable JContainer<Expression> getSizes() {`
`383`	`386`	`return t.sizes;`
`384`	`387`	`}`
`385`	`388`
`@@ -514,12 +517,12 @@ final class AttributeList implements Cs {`
`514`	`517`	`@Nullable`
`515`	`518`	`JRightPadded<Identifier> target;`
`516`	`519`
`517`		`- @Nullable`
`518`		`- public J.Identifier getTarget() {`
	`520`	`+`
	`521`	`+ public J.@Nullable Identifier getTarget() {`
`519`	`522`	`return target == null ? null : target.getElement();`
`520`	`523`	`}`
`521`	`524`
`522`		`- public AttributeList withTarget(@Nullable J.Identifier target) {`
	`525`	`+ public AttributeList withTarget(J.@Nullable Identifier target) {`
`523`	`526`	`return getPadding().withTarget(JRightPadded.withElement(this.target, target));`
`524`	`527`	`}`
`525`	`528`
`@@ -1259,8 +1262,7 @@ public Interpolation withExpression(Expression expression) {`
`1259`	`1262`	`@Nullable`
`1260`	`1263`	`JRightPadded<Expression> alignment;`
`1261`	`1264`
`1262`		`- @Nullable`
`1263`		`- public Expression getAlignment() {`
	`1265`	`+ public @Nullable Expression getAlignment() {`
`1264`	`1266`	`return alignment != null ? alignment.getElement() : null;`
`1265`	`1267`	`}`
`1266`	`1268`
`@@ -1271,8 +1273,7 @@ public Interpolation withAlignment(@Nullable Expression alignment) {`
`1271`	`1273`	`@Nullable`
`1272`	`1274`	`JRightPadded<Expression> format;`
`1273`	`1275`
`1274`		`- @Nullable`
`1275`		`- public Expression getFormat() {`
	`1276`	`+ public @Nullable Expression getFormat() {`
`1276`	`1277`	`return format != null ? format.getElement() : null;`
`1277`	`1278`	`}`
`1278`	`1279`
`@@ -1328,17 +1329,15 @@ public Interpolation withExpression(JRightPadded<Expression> expression) {`
`1328`	`1329`	`return t.expression == expression ? t : new Interpolation(t.id, t.prefix, t.markers, expression, t.alignment, t.format);`
`1329`	`1330`	`}`
`1330`	`1331`
`1331`		`- @Nullable`
`1332`		`- public JRightPadded<Expression> getAlignment() {`
	`1332`	`+ public @Nullable JRightPadded<Expression> getAlignment() {`
`1333`	`1333`	`return t.alignment;`
`1334`	`1334`	`}`
`1335`	`1335`
`1336`	`1336`	`public Interpolation withAlignment(@Nullable JRightPadded<Expression> alignment) {`
`1337`	`1337`	`return t.alignment == alignment ? t : new Interpolation(t.id, t.prefix, t.markers, t.expression, alignment, t.format);`
`1338`	`1338`	`}`
`1339`	`1339`
`1340`		`- @Nullable`
`1341`		`- public JRightPadded<Expression> getFormat() {`
	`1340`	`+ public @Nullable JRightPadded<Expression> getFormat() {`
`1342`	`1341`	`return t.format;`
`1343`	`1342`	`}`
`1344`	`1343`
`@@ -1525,12 +1524,12 @@ public UsingDirective withUnsafe(boolean unsafe) {`
`1525`	`1524`	`@Nullable`
`1526`	`1525`	`JRightPadded<Identifier> alias;`
`1527`	`1526`
`1528`		`- @Nullable`
`1529`		`- public J.Identifier getAlias() {`
	`1527`	`+`
	`1528`	`+ public J.@Nullable Identifier getAlias() {`
`1530`	`1529`	`return alias != null ? alias.getElement() : null;`
`1531`	`1530`	`}`
`1532`	`1531`
`1533`		`- public UsingDirective withAlias(@Nullable J.Identifier alias) {`
	`1532`	`+ public UsingDirective withAlias(J.@Nullable Identifier alias) {`
`1534`	`1533`	`return getPadding().withAlias(JRightPadded.withElement(this.alias, alias));`
`1535`	`1534`	`}`
`1536`	`1535`
`@@ -1591,8 +1590,7 @@ public UsingDirective withUnsafe(JLeftPadded<Boolean> unsafe) {`
`1591`	`1590`	`return t.unsafe == unsafe ? t : new UsingDirective(t.id, t.prefix, t.markers, t.global, t.statik, unsafe, t.alias, t.namespaceOrType);`
`1592`	`1591`	`}`
`1593`	`1592`
`1594`		`- @Nullable`
`1595`		`- public JRightPadded<Identifier> getAlias() {`
	`1593`	`+ public @Nullable JRightPadded<Identifier> getAlias() {`
`1596`	`1594`	`return t.alias;`
`1597`	`1595`	`}`
`1598`	`1596`
`@@ -1657,25 +1655,25 @@ public CoordinateBuilder.Statement getCoordinates() {`
`1657`	`1655`	`return new CoordinateBuilder.Statement(this);`
`1658`	`1656`	`}`
`1659`	`1657`
	`1658`	`+ @Override`
`1660`	`1659`	`public JavaType getType() {`
`1661`	`1660`	`return typeExpression.getType();`
`1662`	`1661`	`}`
`1663`	`1662`
	`1663`	`+ @Override`
`1664`	`1664`	`public PropertyDeclaration withType(@Nullable JavaType type) {`
`1665`	`1665`	`return getPadding().withType(this.typeExpression.withType(type));`
`1666`	`1666`	`}`
`1667`	`1667`
`1668`		`- @Nullable`
`1669`		`- public NameTree getInterfaceSpecifier() {`
	`1668`	`+ public @Nullable NameTree getInterfaceSpecifier() {`
`1670`	`1669`	`return interfaceSpecifier!= null ? interfaceSpecifier.getElement() : null;`
`1671`	`1670`	`}`
`1672`	`1671`
`1673`	`1672`	`public PropertyDeclaration withInterfaceSpecifier(@Nullable NameTree interfaceSpecifier) {`
`1674`	`1673`	`return getPadding().withInterfaceSpecifier(JRightPadded.withElement(this.interfaceSpecifier, interfaceSpecifier));`
`1675`	`1674`	`}`
`1676`	`1675`
`1677`		`- @Nullable`
`1678`		`- public Expression getInitializer() {`
	`1676`	`+ public @Nullable Expression getInitializer() {`
`1679`	`1677`	`return initializer != null ? initializer.getElement() : null;`
`1680`	`1678`	`}`
`1681`	`1679`
`@@ -1711,8 +1709,7 @@ public TypeTree getType() {`
`1711`	`1709`	`return pd.typeExpression;`
`1712`	`1710`	`}`
`1713`	`1711`
`1714`		`- @Nullable`
`1715`		`- public JRightPadded<NameTree> getInterfaceSpecifier() {`
	`1712`	`+ public @Nullable JRightPadded<NameTree> getInterfaceSpecifier() {`
`1716`	`1713`	`return pd.interfaceSpecifier;`
`1717`	`1714`	`}`
`1718`	`1715`
`@@ -1742,8 +1739,7 @@ public PropertyDeclaration withType(TypeTree type) {`
`1742`	`1739`	`pd.initializer);`
`1743`	`1740`	`}`
`1744`	`1741`
`1745`		`- @Nullable`
`1746`		`- public JLeftPadded<Expression> getInitializer() {`
	`1742`	`+ public @Nullable JLeftPadded<Expression> getInitializer() {`
`1747`	`1743`	`return pd.initializer;`
`1748`	`1744`	`}`
`1749`	`1745`