From bbe83aa7557b6240e6fb872ea4e263d0ee5de8ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 Sep 2021 16:34:20 +0000 Subject: [PATCH 1/2] Bump javaparser-core from 3.6.24 to 3.23.0 Bumps [javaparser-core](https://github.com/javaparser/javaparser) from 3.6.24 to 3.23.0. - [Release notes](https://github.com/javaparser/javaparser/releases) - [Changelog](https://github.com/javaparser/javaparser/blob/master/changelog.md) - [Commits](https://github.com/javaparser/javaparser/compare/javaparser-parent-3.6.24...javaparser-parent-3.23.0) --- updated-dependencies: - dependency-name: com.github.javaparser:javaparser-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index e74c3e2..9840a3f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -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") From e93346776328e014f95068b3254012be93a9a4df Mon Sep 17 00:00:00 2001 From: Luna Date: Fri, 24 Sep 2021 10:00:08 -0700 Subject: [PATCH 2/2] Update JavaParser Modifier conversion to handle change to use list of modifier nodes instead of an EnumSet in their API --- .../javatransformer/api/AccessFlags.java | 63 +++++++++++-------- .../javatransformer/internal/ClassPaths.java | 4 +- 2 files changed, 38 insertions(+), 29 deletions(-) diff --git a/src/main/java/dev/minco/javatransformer/api/AccessFlags.java b/src/main/java/dev/minco/javatransformer/api/AccessFlags.java index 504a1c4..215af8f 100644 --- a/src/main/java/dev/minco/javatransformer/api/AccessFlags.java +++ b/src/main/java/dev/minco/javatransformer/api/AccessFlags.java @@ -38,65 +38,74 @@ public AccessFlags(@AccessFlagsConstant int access) { this.access = access; } - public AccessFlags(EnumSet modifiers) { + public AccessFlags(Iterable modifiers) { this(accessFor(modifiers)); } @AccessFlagsConstant - private static int accessFor(EnumSet modifiers) { + private static int accessFor(Iterable 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 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 toJavaParserModifierSet() { - val modifiers = new ArrayList(); + public Modifier.Keyword[] toJavaParserModifierSet() { + val modifiers = new ArrayList(); 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 diff --git a/src/main/java/dev/minco/javatransformer/internal/ClassPaths.java b/src/main/java/dev/minco/javatransformer/internal/ClassPaths.java index 535c523..3983cc9 100644 --- a/src/main/java/dev/minco/javatransformer/internal/ClassPaths.java +++ b/src/main/java/dev/minco/javatransformer/internal/ClassPaths.java @@ -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; @@ -150,7 +150,7 @@ private void findPaths(String entryName, Supplier iss) { } private void findJavaPaths(InputStream is) { - val parsed = JavaParser.parse(is); + val parsed = StaticJavaParser.parse(is); findJavaPaths(parsed); }