Skip to content

Commit b399666

Browse files
knutwannhedentimtebeek
knutwannheden
and
timtebeek
authored
Simplify code in ReloadableJavaParserVisitor#visitVariables() (#4263)
* Simplify code in `ReloadableJavaParserVisitor#visitVariables()` * Apply the same changes to the other Java parsers --------- Co-authored-by: Tim te Beek <tim@moderne.io>
1 parent 98d71ef commit b399666

5 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎rewrite-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11ParserVisitor.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1595,10 +1595,10 @@ private J.VariableDeclarations visitVariables(List<VariableTree> nodes, Space fm
15951595

15961596
Space namedVarPrefix = sourceBefore(n.getName().toString());
15971597

1598-
JavaType type = typeMapping.type(n);
1598+
JavaType.Variable type = typeMapping.variableType(n.sym);
15991599
J.Identifier name = new J.Identifier(randomId(), EMPTY, Markers.EMPTY, emptyList(), n.getName().toString(),
1600-
type instanceof JavaType.Variable ? ((JavaType.Variable) type).getType() : type,
1601-
type instanceof JavaType.Variable ? (JavaType.Variable) type : null);
1600+
type != null ? type.getType() : null,
1601+
type);
16021602
List<JLeftPadded<Space>> dimensionsAfterName = arrayDimensions();
16031603

16041604
vars.add(
@@ -1607,7 +1607,7 @@ private J.VariableDeclarations visitVariables(List<VariableTree> nodes, Space fm
16071607
name,
16081608
dimensionsAfterName,
16091609
n.init != null ? padLeft(sourceBefore("="), convert(n.init)) : null,
1610-
(JavaType.Variable) typeMapping.type(n)
1610+
type
16111611
),
16121612
i == nodes.size() - 1 ? EMPTY : sourceBefore(",")
16131613
)

‎rewrite-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17ParserVisitor.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1725,10 +1725,10 @@ private J.VariableDeclarations visitVariables(List<VariableTree> nodes, Space fm
17251725

17261726
Space namedVarPrefix = sourceBefore(n.getName().toString());
17271727

1728-
JavaType type = typeMapping.type(n);
1728+
JavaType.Variable type = typeMapping.variableType(n.sym);
17291729
J.Identifier name = new J.Identifier(randomId(), EMPTY, Markers.EMPTY, emptyList(), n.getName().toString(),
1730-
type instanceof JavaType.Variable ? ((JavaType.Variable) type).getType() : type,
1731-
type instanceof JavaType.Variable ? (JavaType.Variable) type : null);
1730+
type != null ? type.getType() : null,
1731+
type);
17321732
List<JLeftPadded<Space>> dimensionsAfterName = arrayDimensions();
17331733

17341734
vars.add(
@@ -1737,7 +1737,7 @@ private J.VariableDeclarations visitVariables(List<VariableTree> nodes, Space fm
17371737
name,
17381738
dimensionsAfterName,
17391739
n.init != null ? padLeft(sourceBefore("="), convert(n.init)) : null,
1740-
(JavaType.Variable) typeMapping.type(n)
1740+
type
17411741
),
17421742
i == nodes.size() - 1 ? EMPTY : sourceBefore(",")
17431743
)

‎rewrite-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21ParserVisitor.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1751,10 +1751,10 @@ private J.VariableDeclarations visitVariables(List<VariableTree> nodes, Space fm
17511751

17521752
Space namedVarPrefix = sourceBefore(n.getName().toString());
17531753

1754-
JavaType type = typeMapping.type(n);
1754+
JavaType.Variable type = typeMapping.variableType(n.sym);
17551755
J.Identifier name = new J.Identifier(randomId(), EMPTY, Markers.EMPTY, emptyList(), n.getName().toString(),
1756-
type instanceof JavaType.Variable ? ((JavaType.Variable) type).getType() : type,
1757-
type instanceof JavaType.Variable ? (JavaType.Variable) type : null);
1756+
type != null ? type.getType() : null,
1757+
type);
17581758
List<JLeftPadded<Space>> dimensionsAfterName = arrayDimensions();
17591759

17601760
vars.add(
@@ -1763,7 +1763,7 @@ private J.VariableDeclarations visitVariables(List<VariableTree> nodes, Space fm
17631763
name,
17641764
dimensionsAfterName,
17651765
n.init != null ? padLeft(sourceBefore("="), convert(n.init)) : null,
1766-
(JavaType.Variable) typeMapping.type(n)
1766+
type
17671767
),
17681768
i == nodes.size() - 1 ? EMPTY : sourceBefore(",")
17691769
)

‎rewrite-java-25/src/main/java/org/openrewrite/java/isolated/ReloadableJava25ParserVisitor.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1770,21 +1770,21 @@ private J.VariableDeclarations visitVariables(List<VariableTree> nodes, Space fm
17701770
String varName = n.getName().isEmpty() ? "_" : n.getName().toString();
17711771
Space namedVarPrefix = sourceBefore(varName);
17721772

1773-
JavaType type = typeMapping.type(n);
1774-
if ("_".equals(varName) && type instanceof JavaType.Variable var) {
1775-
type = var.withName("_");
1773+
JavaType.Variable type = typeMapping.variableType(n.sym);
1774+
if ("_".equals(varName) && type != null) {
1775+
type = type.withName("_");
17761776
}
17771777
List<JLeftPadded<Space>> dimensionsAfterName = arrayDimensions();
17781778

17791779
vars.add(
17801780
padRight(
17811781
new J.VariableDeclarations.NamedVariable(randomId(), namedVarPrefix, Markers.EMPTY,
17821782
new J.Identifier(randomId(), EMPTY, Markers.EMPTY, emptyList(), varName,
1783-
type instanceof JavaType.Variable ? ((JavaType.Variable) type).getType() : type,
1784-
type instanceof JavaType.Variable ? (JavaType.Variable) type : null),
1783+
type != null ? type.getType() : null,
1784+
type),
17851785
dimensionsAfterName,
17861786
n.init != null ? padLeft(sourceBefore("="), convert(n.init)) : null,
1787-
type instanceof JavaType.Variable ? (JavaType.Variable) type : null
1787+
type
17881788
),
17891789
i == nodes.size() - 1 ? EMPTY : sourceBefore(",")
17901790
)

‎rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8ParserVisitor.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1580,10 +1580,10 @@ private J.VariableDeclarations visitVariables(List<VariableTree> nodes, Space fm
15801580

15811581
Space namedVarPrefix = sourceBefore(n.getName().toString());
15821582

1583-
JavaType type = typeMapping.type(n);
1583+
JavaType.Variable type = typeMapping.variableType(n.sym);
15841584
J.Identifier name = new J.Identifier(randomId(), EMPTY, Markers.EMPTY, emptyList(), n.getName().toString(),
1585-
type instanceof JavaType.Variable ? ((JavaType.Variable) type).getType() : type,
1586-
type instanceof JavaType.Variable ? (JavaType.Variable) type : null);
1585+
type != null ? type.getType() : null,
1586+
type);
15871587
List<JLeftPadded<Space>> dimensionsAfterName = arrayDimensions();
15881588

15891589
vars.add(
@@ -1592,7 +1592,7 @@ private J.VariableDeclarations visitVariables(List<VariableTree> nodes, Space fm
15921592
name,
15931593
dimensionsAfterName,
15941594
n.init != null ? padLeft(sourceBefore("="), convert(n.init)) : null,
1595-
(JavaType.Variable) typeMapping.type(n)
1595+
type
15961596
),
15971597
i == nodes.size() - 1 ? EMPTY : sourceBefore(",")
15981598
)

0 commit comments

Comments
 (0)
⚡