-
Notifications
You must be signed in to change notification settings - Fork 376
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add new
JvmParser as supertype to JavaParser
To allow the `JavaTemplate` mechanism to be used for other languages like Kotlin, the provided parser builder must provide a way to add a classpath entry. This is because the internal `__M__` and `__P__` types are required for the parameter substitution and rather than including them as source code in the compilation unit, the parser will load them from the classpath. To this end this PR introduces new `JvmParser` and `JvmParser.Builder` types and the `JavaParser.Builder#classpath()` methods are moved to `JvmParser.Builder`. In order to not increase the API surface area, no corresponding getter was added to `JvmParser.Builder`. Instead, there is a new `Internals` class providing a static `getClasspath(JvmParser.Builder)` method. Issue: openrewrite/rewrite-kotlin#218
- Loading branch information
1 parent
68a3cd0
commit 14f6fea
Showing
9 changed files
with
199 additions
and
48 deletions.
There are no files selected for viewing
25 changes: 25 additions & 0 deletions
25
rewrite-java/src/main/java/org/openrewrite/java/Internals.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| /* | ||
| * Copyright 2023 the original author or authors. | ||
| * <p> | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * <p> | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * <p> | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.openrewrite.java; | ||
|
|
||
| import java.nio.file.Path; | ||
| import java.util.Collection; | ||
|
|
||
| public class Internals { | ||
| public static Collection<Path> getClasspath(JvmParser.Builder<?, ?> parserBuilder) { | ||
| return parserBuilder.classpath; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
rewrite-java/src/main/java/org/openrewrite/java/JvmParser.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| /* | ||
| * Copyright 2023 the original author or authors. | ||
| * <p> | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * <p> | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * <p> | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.openrewrite.java; | ||
|
|
||
| import org.openrewrite.Parser; | ||
| import org.openrewrite.SourceFile; | ||
|
|
||
| import java.nio.file.Path; | ||
| import java.util.Collection; | ||
| import java.util.Collections; | ||
|
|
||
| public interface JvmParser extends Parser { | ||
| abstract class Builder<P extends JavaParser, B extends JavaParser.Builder<P, B>> extends Parser.Builder { | ||
| protected Collection<Path> classpath = Collections.emptyList(); | ||
|
|
||
| Builder(Class<? extends SourceFile> sourceFileType) { | ||
| super(sourceFileType); | ||
| } | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| public B classpath(Collection<Path> classpath) { | ||
| this.classpath = classpath; | ||
| return (B) this; | ||
| } | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| public B classpath(String... classpath) { | ||
| this.classpath = JavaParser.dependenciesFromClasspath(classpath); | ||
| return (B) this; | ||
| } | ||
|
|
||
| @Override | ||
| public JvmParser.Builder<?, ?> clone() { | ||
| return (JvmParser.Builder<?, ?>) super.clone(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
rewrite-java/src/main/java/org/openrewrite/java/internal/template/__M__.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| /* | ||
| * Copyright 2023 the original author or authors. | ||
| * <p> | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * <p> | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * <p> | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.openrewrite.java.internal.template; | ||
|
|
||
| public class __M__ { | ||
| public static native Object any(Object o); | ||
|
|
||
| public static native Object any(java.util.function.Predicate<Boolean> o); | ||
|
|
||
| public static native <T> Object anyT(); | ||
| } |
38 changes: 38 additions & 0 deletions
38
rewrite-java/src/main/java/org/openrewrite/java/internal/template/__P__.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /* | ||
| * Copyright 2023 the original author or authors. | ||
| * <p> | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * <p> | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * <p> | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.openrewrite.java.internal.template; | ||
|
|
||
| public class __P__ { | ||
| public static native <T> T p(); | ||
|
|
||
| public static native <T> T[] arrp(); | ||
|
|
||
| public static native boolean booleanp(); | ||
|
|
||
| public static native byte bytep(); | ||
|
|
||
| public static native char charp(); | ||
|
|
||
| public static native double doublep(); | ||
|
|
||
| public static native int intp(); | ||
|
|
||
| public static native long longp(); | ||
|
|
||
| public static native short shortp(); | ||
|
|
||
| public static native float floatp(); | ||
| } |