Add support for Kotlin JSR223 scripts #2898
Merged
Conversation
This file contains hidden or 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
* Add required Kotlin dependencies into the `spring-integration-scripting` module * Introduce `KotlinScriptExecutor` to interact with the `KotlinJsr223JvmLocalScriptEngineFactory` directly since there is no `META-INF/services/javax.script.ScriptEngineFactory` file in the Kotlin * Also set an `idea.use.native.fs.for.win` system property to `false` in this class to disable check for native support on Windows. (Might be removed in future Kotlin versions) * Move `ScriptParser.getLanguageFromFileExtension()` logic into the `ScriptExecutorFactory.deriveLanguageFromFileExtension()` since the same one must be applied in the `DslScriptExecutingMessageProcessor`, too. * Modify tests to reflect Kotlin support * Fix some test scripts to their official extensions
garyrussell
suggested changes
Apr 19, 2019
| * @since 2.1 | ||
| */ | ||
| public abstract class ScriptExecutorFactory { | ||
| public final class ScriptExecutorFactory { |
artembilan
commented
Apr 19, 2019
| return engine.getFactory().getLanguageName(); | ||
| } | ||
|
|
||
| private ScriptExecutorFactory() { |
There was a problem hiding this comment.
Needs a private CTOR
Doesn't this work?
There was a problem hiding this comment.
But it needs super() to prevent Sonar from complaining.
There was a problem hiding this comment.
OK. Will add. Can we tweak Sonar do not complain on the matter?
There is definitely a super() in the target byte code, so it's complaining is pointless.
Or do I miss something else ?
There was a problem hiding this comment.
Adding super is a no-op - the compiler generates one anyway.
I don't think we want to disable empty block detection.
* Polishing according Sonar objections
garyrussell
approved these changes
Apr 19, 2019
Are you going to merge this? Or have you let it to me to squash and rebase? Thanks |
|
I was waiting for our friend Travis - merging now. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
spring-integration-scriptingmodule
KotlinScriptExecutorto interact with theKotlinJsr223JvmLocalScriptEngineFactorydirectly since there is noMETA-INF/services/javax.script.ScriptEngineFactoryfile in the Kotlinidea.use.native.fs.for.winsystem property tofalseinthis class to disable check for native support on Windows.
(Might be removed in future Kotlin versions)
ScriptParser.getLanguageFromFileExtension()logic into theScriptExecutorFactory.deriveLanguageFromFileExtension()since the sameone must be applied in the
DslScriptExecutingMessageProcessor, too.