Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

do not remove try block if there are resources #161

Merged
merged 5 commits into from
Aug 24, 2023
Merged

do not remove try block if there are resources #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3fb1a08
do not remove try block if there are resources
Aug 24, 2023
764045e
undo styling
Aug 24, 2023
05ebad2
improved empty resources detection
Aug 24, 2023
abb01e0
fixed imports
Aug 24, 2023
8d16fdd
simplified use case
Aug 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/main/java/org/openrewrite/staticanalysis/EmptyBlockVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import lombok.EqualsAndHashCode;
import lombok.Value;
import org.openrewrite.internal.ListUtils;
import org.openrewrite.internal.lang.Nullable;
import org.openrewrite.java.DeleteStatement;
import org.openrewrite.java.JavaIsoVisitor;
import org.openrewrite.java.JavaTemplate;
Expand Down Expand Up @@ -97,7 +98,9 @@ public J.Block visitBlock(J.Block block, P p) {
public J.Try visitTry(J.Try tryable, P p) {
J.Try t = super.visitTry(tryable, p);

if (Boolean.TRUE.equals(emptyBlockStyle.getLiteralTry()) && isEmptyBlock(t.getBody())) {
if (Boolean.TRUE.equals(emptyBlockStyle.getLiteralTry()) &&
isEmptyBlock(t.getBody()) &&
isEmptyResources(t.getResources())) {
doAfterVisit(new DeleteStatement<>(tryable));
} else if (Boolean.TRUE.equals(emptyBlockStyle.getLiteralFinally()) && t.getFinally() != null
&& !t.getCatches().isEmpty() && isEmptyBlock(t.getFinally())) {
Expand Down Expand Up @@ -211,7 +214,7 @@ public J.Switch visitSwitch(J.Switch switch_, P p) {

private boolean isEmptyBlock(Statement blockNode) {
if (blockNode instanceof J.Block) {
J.Block block = (J.Block)blockNode;
J.Block block = (J.Block) blockNode;
if (EmptyBlockStyle.BlockPolicy.STATEMENT.equals(emptyBlockStyle.getBlockPolicy())) {
return block.getStatements().isEmpty();
} else if (EmptyBlockStyle.BlockPolicy.TEXT.equals(emptyBlockStyle.getBlockPolicy())) {
Expand All @@ -221,6 +224,10 @@ private boolean isEmptyBlock(Statement blockNode) {
return false;
}

private boolean isEmptyResources(@Nullable List<J.Try.Resource> resources) {
return resources == null || resources.isEmpty();
}

private static class ExtractSideEffectsOfIfCondition<P> extends JavaVisitor<P> {
private final J.Block enclosingBlock;
private final J.If toExtract;
Expand Down
23 changes: 22 additions & 1 deletion src/test/java/org/openrewrite/staticanalysis/EmptyBlockTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ void emptyTry() {
public class A {
{
final String fileName = "fileName";
try(FileInputStream fis = new FileInputStream(fileName)) {
try {
} catch (IOException e) {
}
}
Expand Down Expand Up @@ -414,4 +414,25 @@ public class A {
)
);
}

@Test
void emptyTryWithResources() {
rewriteRun(
//language=java
java(
"""
import java.io.*;

public class A {
{
final String fileName = "fileName";
try (FileInputStream fis = new FileInputStream(fileName)) {
} catch (IOException e) {
}
}
}
"""
)
);
}
}