Skip to content

Bump javaparser-core from 3.6.24 to 3.23.0 #57

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
Sep 24, 2021
Merged

Bump javaparser-core from 3.6.24 to 3.23.0 #57

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
bbe83aa
Bump javaparser-core from 3.6.24 to 3.23.0
dependabot[bot] Sep 24, 2021
e933467
Update JavaParser Modifier conversion to handle change to use list of…
LunNova Sep 24, 2021
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 build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ minimallyCorrectDefaults.configureProject(project)

dependencies {
testImplementation("junit:junit:4.13.2")
implementation("com.github.javaparser:javaparser-core:3.6.24")
implementation("com.github.javaparser:javaparser-core:3.23.0")
api("com.google.code.findbugs:jsr305:3.0.2")
api("org.jetbrains:annotations:22.0.0")

Expand Down
63 changes: 36 additions & 27 deletions src/main/java/dev/minco/javatransformer/api/AccessFlags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,65 +38,74 @@ public AccessFlags(@AccessFlagsConstant int access) {
this.access = access;
}

public AccessFlags(EnumSet<Modifier> modifiers) {
public AccessFlags(Iterable<Modifier> modifiers) {
this(accessFor(modifiers));
}

@AccessFlagsConstant
private static int accessFor(EnumSet<Modifier> modifiers) {
private static int accessFor(Iterable<Modifier> modifiers) {
val modifierSet = EnumSet.noneOf(Modifier.Keyword.class);
for (Modifier modifier : modifiers) {
modifierSet.add(modifier.getKeyword());
}
return accessFor(modifierSet);
}

@AccessFlagsConstant
private static int accessFor(EnumSet<Modifier.Keyword> modifiers) {
int access = 0;
if (modifiers.contains(Modifier.PUBLIC))
if (modifiers.contains(Modifier.Keyword.PUBLIC))
access |= ACC_PUBLIC;
if (modifiers.contains(Modifier.PRIVATE))
if (modifiers.contains(Modifier.Keyword.PRIVATE))
access |= ACC_PRIVATE;
if (modifiers.contains(Modifier.PROTECTED))
if (modifiers.contains(Modifier.Keyword.PROTECTED))
access |= ACC_PROTECTED;
if (modifiers.contains(Modifier.STATIC))
if (modifiers.contains(Modifier.Keyword.STATIC))
access |= ACC_STATIC;
if (modifiers.contains(Modifier.FINAL))
if (modifiers.contains(Modifier.Keyword.FINAL))
access |= ACC_FINAL;
if (modifiers.contains(Modifier.SYNCHRONIZED))
if (modifiers.contains(Modifier.Keyword.SYNCHRONIZED))
access |= ACC_SYNCHRONIZED;
if (modifiers.contains(Modifier.VOLATILE))
if (modifiers.contains(Modifier.Keyword.VOLATILE))
access |= ACC_VOLATILE;
if (modifiers.contains(Modifier.TRANSIENT))
if (modifiers.contains(Modifier.Keyword.TRANSIENT))
access |= ACC_TRANSIENT;
if (modifiers.contains(Modifier.NATIVE))
if (modifiers.contains(Modifier.Keyword.NATIVE))
access |= ACC_NATIVE;
if (modifiers.contains(Modifier.ABSTRACT))
if (modifiers.contains(Modifier.Keyword.ABSTRACT))
access |= ACC_ABSTRACT;
if (modifiers.contains(Modifier.STRICTFP))
if (modifiers.contains(Modifier.Keyword.STRICTFP))
access |= ACC_STRICT;
return access;
}

public EnumSet<Modifier> toJavaParserModifierSet() {
val modifiers = new ArrayList<Modifier>();
public Modifier.Keyword[] toJavaParserModifierSet() {
val modifiers = new ArrayList<Modifier.Keyword>();

if (has(ACC_PUBLIC))
modifiers.add(Modifier.PUBLIC);
modifiers.add(Modifier.Keyword.PUBLIC);
if (has(ACC_PRIVATE))
modifiers.add(Modifier.PRIVATE);
modifiers.add(Modifier.Keyword.PRIVATE);
if (has(ACC_PROTECTED))
modifiers.add(Modifier.PROTECTED);
modifiers.add(Modifier.Keyword.PROTECTED);
if (has(ACC_STATIC))
modifiers.add(Modifier.STATIC);
modifiers.add(Modifier.Keyword.STATIC);
if (has(ACC_FINAL))
modifiers.add(Modifier.FINAL);
modifiers.add(Modifier.Keyword.FINAL);
if (has(ACC_SYNCHRONIZED))
modifiers.add(Modifier.SYNCHRONIZED);
modifiers.add(Modifier.Keyword.SYNCHRONIZED);
if (has(ACC_VOLATILE))
modifiers.add(Modifier.VOLATILE);
modifiers.add(Modifier.Keyword.VOLATILE);
if (has(ACC_TRANSIENT))
modifiers.add(Modifier.TRANSIENT);
modifiers.add(Modifier.Keyword.TRANSIENT);
if (has(ACC_NATIVE))
modifiers.add(Modifier.NATIVE);
modifiers.add(Modifier.Keyword.NATIVE);
if (has(ACC_ABSTRACT))
modifiers.add(Modifier.ABSTRACT);
modifiers.add(Modifier.Keyword.ABSTRACT);
if (has(ACC_STRICT))
modifiers.add(Modifier.STRICTFP);
modifiers.add(Modifier.Keyword.STRICTFP);

return EnumSet.copyOf(modifiers);
return modifiers.toArray(new Modifier.Keyword[0]);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/dev/minco/javatransformer/internal/ClassPaths.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

import org.jetbrains.annotations.NotNull;

import com.github.javaparser.JavaParser;
import com.github.javaparser.StaticJavaParser;
import com.github.javaparser.ast.CompilationUnit;

import dev.minco.javatransformer.api.ClassInfo;
Expand Down Expand Up @@ -150,7 +150,7 @@ private void findPaths(String entryName, Supplier<InputStream> iss) {
}

private void findJavaPaths(InputStream is) {
val parsed = JavaParser.parse(is);
val parsed = StaticJavaParser.parse(is);
findJavaPaths(parsed);
}

Expand Down