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

Remove unused local variables despite potential side effects after removing feature flag #35

Merged
merged 4 commits into from
Oct 23, 2024
Merged

Remove unused local variables despite potential side effects after removing feature flag #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
57a6ecf
feat(test): added failing test for RemoveUnusedLocalVariables
shanman190 Oct 20, 2024
188116e
Merge branch 'main' into feat/removeunusedLocalVariable
timtebeek Oct 23, 2024
f2b3d42
Enable removal of local variables with side effects
timtebeek Oct 23, 2024
61dd27c
Repeat removal of unused local variables if needed
timtebeek Oct 23, 2024
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
2 changes: 1 addition & 1 deletion src/main/java/org/openrewrite/featureflags/RemoveBooleanFlag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx)
J.MethodInvocation mi = (J.MethodInvocation) super.visitMethodInvocation(method, ctx);
if (methodMatcher.matches(mi) && isFeatureKey(mi.getArguments().get(0))) {
doAfterVisit(new SimplifyConstantIfBranchExecution().getVisitor());
doAfterVisit(new RemoveUnusedLocalVariables(null, null).getVisitor());
doAfterVisit(Repeat.repeatUntilStable(new RemoveUnusedLocalVariables(null, true).getVisitor(), 3));
doAfterVisit(new RemoveUnusedPrivateFields().getVisitor());
J.Literal literal = new J.Literal(Tree.randomId(), Space.SINGLE_SPACE, Markers.EMPTY, replacementValue, String.valueOf(replacementValue), null, JavaType.Primitive.Boolean);
return literal.withPrefix(mi.getPrefix());
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/openrewrite/featureflags/RemoveStringFlag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx)
J.MethodInvocation mi = (J.MethodInvocation) super.visitMethodInvocation(method, ctx);
if (methodMatcher.matches(mi) && isFeatureKey(mi.getArguments().get(0))) {
doAfterVisit(new SimplifyConstantIfBranchExecution().getVisitor());
doAfterVisit(new RemoveUnusedLocalVariables(null, null).getVisitor());
doAfterVisit(Repeat.repeatUntilStable(new RemoveUnusedLocalVariables(null, true).getVisitor(), 3));
doAfterVisit(new RemoveUnusedPrivateFields().getVisitor());
J.Literal literal = new J.Literal(Tree.randomId(), Space.SINGLE_SPACE, Markers.EMPTY, replacementValue, '"' + replacementValue + '"', null, JavaType.Primitive.String);
return literal.withPrefix(mi.getPrefix());
Expand Down
81 changes: 81 additions & 0 deletions src/test/java/org/openrewrite/featureflags/launchdarkly/RemoveBoolVariationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,87 @@ void bar() {
);
}

@Test
void removeUnusedLDContextWithBuilder() {
rewriteRun(
// language=java
java(
"""
import com.launchdarkly.sdk.*;
import com.launchdarkly.sdk.server.*;
class Foo {
LDClient client = new LDClient("sdk-key-123abc");
void bar() {
LDContext context = LDContext.builder("context-key-123abc")
.name("Sandy")
.build();
if (client.boolVariation("flag-key-123abc", context, false)) {
// Application code to show the feature
System.out.println("Feature is on");
}
else {
// The code to run if the feature is off
System.out.println("Feature is off");
}
}
}
""",
"""
import com.launchdarkly.sdk.server.*;
class Foo {
LDClient client = new LDClient("sdk-key-123abc");
void bar() {
// Application code to show the feature
System.out.println("Feature is on");
}
}
"""
)
);
}

@Test
void removeUnusedLDContextWithBuilderContext() {
rewriteRun(
// language=java
java(
"""
import com.launchdarkly.sdk.*;
import com.launchdarkly.sdk.server.*;
class Foo {
LDClient client = new LDClient("sdk-key-123abc");
void bar() {
LDContext ldContext = LDContext.create("newValue");
LDContext context = LDContext.builderFromContext(ldContext)
.anonymous(false)
.name("name")
.set("email", "[email protected]")
.build();
if (client.boolVariation("flag-key-123abc", context, false)) {
// Application code to show the feature
System.out.println("Feature is on");
}
else {
// The code to run if the feature is off
System.out.println("Feature is off");
}
}
}
""",
"""
import com.launchdarkly.sdk.server.*;
class Foo {
LDClient client = new LDClient("sdk-key-123abc");
void bar() {
// Application code to show the feature
System.out.println("Feature is on");
}
}
"""
)
);
}

@Test
void enablePermanentlyWithParameters() {
rewriteRun(
Expand Down