Skip to content

Commit 98c7a8a

Browse files
timtebeekTeamModerne
authored andcommitted
refactor: Inline local variable assignments before return/throw
Use this link to re-run the recipe: https://app.moderne.io/recipes/org.openrewrite.staticanalysis.InlineVariable?organizationId=ODQ2MGExMTUtNDg0My00N2EwLTgzMGMtNGE1NGExMTBmZDkw Co-authored-by: Moderne <team@moderne.io>
1 parent e4b2a8e commit 98c7a8a

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

src/main/java/org/openrewrite/java/migrate/UseJavaUtilBase64.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,8 @@ public J visitCompilationUnit(J.CompilationUnit cu, ExecutionContext ctx) {
8484

8585
c = (J.CompilationUnit) new ChangeType(sunPackage + ".BASE64Encoder", "java.util.Base64$Encoder", true)
8686
.getVisitor().visitNonNull(c, ctx);
87-
c = (J.CompilationUnit) new ChangeType(sunPackage + ".BASE64Decoder", "java.util.Base64$Decoder", true)
87+
return (J.CompilationUnit) new ChangeType(sunPackage + ".BASE64Decoder", "java.util.Base64$Decoder", true)
8888
.getVisitor().visitNonNull(c, ctx);
89-
return c;
9089
}
9190

9291
@Override

src/main/java/org/openrewrite/java/migrate/javax/AddJaxbRuntime.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,9 @@ private Xml.Document jaxbDependencySwap(ExecutionContext ctx, Xml.Document d, St
222222
glassfishJaxbRuntimeGroup, glassfishJaxbRuntimeArtifact,
223223
sunJaxbRuntimeGroup, sunJaxbRuntimeArtifact, "2.3.x", null
224224
).getVisitor().visitNonNull(d, ctx);
225-
d = (Xml.Document) new org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId(
225+
return (Xml.Document) new org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId(
226226
glassfishJaxbRuntimeGroup, glassfishJaxbRuntimeArtifact,
227227
sunJaxbRuntimeGroup, sunJaxbRuntimeArtifact, "2.3.x"
228228
).getVisitor().visitNonNull(d, ctx);
229-
return d;
230229
}
231230
}

src/main/java/org/openrewrite/java/migrate/javax/UseJoinColumnForMapping.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,7 @@ public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations m
7373
J.VariableDeclarations joinColumn = (J.VariableDeclarations) new ChangeType(COLUMN, JOIN_COLUMN, false).getVisitor().visit(multiVariable, ctx, getCursor().getParentOrThrow());
7474
joinColumn = (J.VariableDeclarations) new RemoveAnnotationAttribute(JOIN_COLUMN, "length").getVisitor().visit(joinColumn, ctx, getCursor().getParentOrThrow());
7575
joinColumn = (J.VariableDeclarations) new RemoveAnnotationAttribute(JOIN_COLUMN, "precision").getVisitor().visit(joinColumn, ctx, getCursor().getParentOrThrow());
76-
joinColumn = (J.VariableDeclarations) new RemoveAnnotationAttribute(JOIN_COLUMN, "scale").getVisitor().visit(joinColumn, ctx, getCursor().getParentOrThrow());
77-
78-
return joinColumn;
76+
return (J.VariableDeclarations) new RemoveAnnotationAttribute(JOIN_COLUMN, "scale").getVisitor().visit(joinColumn, ctx, getCursor().getParentOrThrow());
7977
}
8078
}
8179
);

0 commit comments

Comments
 (0)