Skip to content

fix: issue 2043 getAccessSpecifier should return public for interface methods #4317

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

Merged
merged 2 commits into from
Feb 8, 2024
Merged

fix: issue 2043 getAccessSpecifier should return public for interface methods #4317

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
3636a05
fix: issue 2043 getAccessSpecifier should return public for interface…
jlerbsc Feb 8, 2024
199cfe8
Only one of abstract, default, or static modifier is permitted, so if…
jlerbsc Feb 8, 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
36 changes: 32 additions & 4 deletions ...rser-core-testing/src/test/java/com/github/javaparser/ast/body/MethodDeclarationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,16 @@

package com.github.javaparser.ast.body;

import static com.github.javaparser.StaticJavaParser.parse;
import static com.github.javaparser.StaticJavaParser.parseBodyDeclaration;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;

import org.junit.jupiter.api.Test;

import static com.github.javaparser.StaticJavaParser.parseBodyDeclaration;
import static org.junit.jupiter.api.Assertions.*;
import com.github.javaparser.ast.CompilationUnit;

class MethodDeclarationTest {
@Test
Expand Down Expand Up @@ -102,20 +108,42 @@ void signatureToString() {
MethodDeclaration method1 = parseBodyDeclaration("int x(int z, String q);").asMethodDeclaration();
assertEquals("x(int, String)", method1.getSignature().toString());
}

@Test
void isVariableArityMethod() {
MethodDeclaration method1 = parseBodyDeclaration("int x(int... z);").asMethodDeclaration();
assertTrue(method1.isVariableArityMethod());
MethodDeclaration method2 = parseBodyDeclaration("int x(int i, int... z);").asMethodDeclaration();
assertTrue(method2.isVariableArityMethod());
}

@Test
void isFixedArityMethod() {
MethodDeclaration method1 = parseBodyDeclaration("int x(int z);").asMethodDeclaration();
assertTrue(method1.isFixedArityMethod());
MethodDeclaration method2 = parseBodyDeclaration("int x();").asMethodDeclaration();
assertTrue(method2.isFixedArityMethod());
}

@Test
void isInterfaceImplictlyPublic() {
CompilationUnit cu = parse("interface Foo { void m(); }");
assertTrue(cu.findFirst(MethodDeclaration.class).get().isPublic());
cu = parse("interface Foo { abstract void m(); }");
assertTrue(cu.findFirst(MethodDeclaration.class).get().isPublic());
cu = parse("interface Foo { protected void m(); }");
assertFalse(cu.findFirst(MethodDeclaration.class).get().isPublic());
}

@Test
void isInterfaceImplictlyAbstract() {
CompilationUnit cu = parse("interface Foo { void m(); }");
assertTrue(cu.findFirst(MethodDeclaration.class).get().isAbstract());
cu = parse("interface Foo { abstract void m(); }");
assertTrue(cu.findFirst(MethodDeclaration.class).get().isAbstract());
cu = parse("interface Foo { protected void m(); }");
assertTrue(cu.findFirst(MethodDeclaration.class).get().isAbstract());
cu = parse("interface Foo { static void m(); }");
assertFalse(cu.findFirst(MethodDeclaration.class).get().isAbstract());
}
}
38 changes: 38 additions & 0 deletions javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,16 @@
*/
package com.github.javaparser.ast.body;

import static com.github.javaparser.ast.Modifier.Keyword.PUBLIC;
import static com.github.javaparser.utils.Utils.assertNotNull;

import java.util.Arrays;
import java.util.Optional;
import java.util.function.Consumer;

import com.github.javaparser.TokenRange;
import com.github.javaparser.ast.*;
import com.github.javaparser.ast.Modifier.Keyword;
import com.github.javaparser.ast.expr.AnnotationExpr;
import com.github.javaparser.ast.expr.SimpleName;
import com.github.javaparser.ast.nodeTypes.*;
Expand Down Expand Up @@ -251,6 +254,41 @@ public String toDescriptor() {
return sb.toString();
}

/*
* Interface methods are implicitly public
*/
@Override
public boolean isPublic() {
return hasModifier(PUBLIC) || isImplicitlyPublic();
}

private boolean isImplicitlyPublic() {
return getAccessSpecifier() == AccessSpecifier.NONE
&& hasParentNode()
&& getParentNode().get() instanceof ClassOrInterfaceDeclaration
&& ((ClassOrInterfaceDeclaration)getParentNode().get()).isInterface();
}

/*
* Every interface is implicitly abstract but
* only one of abstract, default, or static modifier is permitted
* https://docs.oracle.com/javase/specs/jls/se8/html/jls-9.html#jls-9.1.1
*/
@Override
public boolean isAbstract() {
return hasModifier(Keyword.ABSTRACT) || (isImplicitlyAbstract() && Arrays
.asList(Keyword.STATIC, Keyword.DEFAULT).stream()
.noneMatch(modifier -> hasModifier(modifier)));
}

private boolean isImplicitlyAbstract() {
return hasParentNode()
&& getParentNode().get() instanceof ClassOrInterfaceDeclaration
&& ((ClassOrInterfaceDeclaration)getParentNode().get()).isInterface();
}



public boolean isNative() {
return hasModifier(Modifier.Keyword.NATIVE);
}
Expand Down