Skip to content

Fix NPE in NestedEnumsAreNotStatic (issue #796) #802

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

Closed
Gautam-aman wants to merge 2 commits into from
Closed

Fix NPE in NestedEnumsAreNotStatic (issue #796) #802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbca1bf
Fix NPE in NestedEnumsAreNotStatic when class body is null
Gautam-aman Jan 4, 2026
78324d1
Minimize unrelated changes
timtebeek Jan 5, 2026
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
36 changes: 25 additions & 11 deletions src/main/java/org/openrewrite/staticanalysis/NestedEnumsAreNotStatic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import static java.util.Collections.singleton;

public class NestedEnumsAreNotStatic extends Recipe {

@Override
public String getDisplayName() {
return "Nested enums are not static";
Expand Down Expand Up @@ -58,27 +59,40 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
@Override
public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, ExecutionContext ctx) {
J.ClassDeclaration cd = super.visitClassDeclaration(classDecl, ctx);
if (cd.getKind() == J.ClassDeclaration.Kind.Type.Enum && cd.getType() != null && cd.getType().getOwningClass() != null) {
if (J.Modifier.hasModifier(cd.getModifiers(), J.Modifier.Type.Static)) {
cd = maybeAutoFormat(cd,
cd.withModifiers(ListUtils.map(cd.getModifiers(), mod ->
mod.getType() == J.Modifier.Type.Static ? null : mod)),
cd.getName(),
ctx,
getCursor().getParent());
}
if (cd.getBody() != null &&
cd.getKind() == J.ClassDeclaration.Kind.Type.Enum &&
cd.getType() != null &&
cd.getType().getOwningClass() != null &&
J.Modifier.hasModifier(cd.getModifiers(), J.Modifier.Type.Static)) {

cd = maybeAutoFormat(
cd,
cd.withModifiers(ListUtils.map(cd.getModifiers(), mod ->
mod.getType() == J.Modifier.Type.Static ? null : mod)),
cd.getName(),
ctx,
getCursor().getParent()
);
}
return cd;
}
});
}


// Preconditions visitor: detects presence of nested enums.
// Must not mutate AST.

private static class HasNestedEnum extends JavaIsoVisitor<ExecutionContext> {

@Override
public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, ExecutionContext ctx) {
J.ClassDeclaration cd = super.visitClassDeclaration(classDecl, ctx);
if (cd.getKind() == J.ClassDeclaration.Kind.Type.Enum && cd.getType() != null && cd.getType().getOwningClass() != null) {
cd = SearchResult.found(cd);
if (cd.getBody() != null &&
cd.getKind() == J.ClassDeclaration.Kind.Type.Enum &&
cd.getType() != null &&
cd.getType().getOwningClass() != null) {
return SearchResult.found(cd);
}
return cd;
}
Expand Down
15 changes: 15 additions & 0 deletions src/test/java/org/openrewrite/staticanalysis/NestedEnumsAreNotStaticTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,21 @@ static enum ABC {
);
}

@Test
void issue796_nullClassBodyDoesNotThrow() {
rewriteRun(
//language=java
java(
"""
class Outer {
enum Inner {}
}
"""
)
);
}
Comment on lines +81 to +93
Copy link
Member

@timtebeek timtebeek Jan 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test also passes on main without any recipe changes, so I don't think it accurately reflects the issue we're intending to fix here. I also don't see the outer or inner class body parsed as null, so I'm not sure the conditionals added here would do anything in practice. What lead you to these changes?

Copy link
Member

@timtebeek timtebeek Jan 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also since the nested inner enum isn't static, we wouldn't expect any action from the recipe either.



@Test
void nestedEnumIsNotStatic() {
rewriteRun(
Expand Down