summaryrefslogtreecommitdiffstats
path: root/ms/controllerblueprints/modules
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2019-07-30 12:33:22 +0000
committerGerrit Code Review <gerrit@onap.org>2019-07-30 12:33:22 +0000
commit96b36c57a2f74f0b8305cf55714d942dd6dabc21 (patch)
treeabcfadbefb9fa8c2d27e4f310be1dccfa9b08e33 /ms/controllerblueprints/modules
parent7ba485b7e3a7c6f3b5603c4bebed50111f503c66 (diff)
parent72fed8f256ca2298f2d22dd70595803911a0b2b8 (diff)
Merge "Upgrade cds spring and kotlin versions."
Diffstat (limited to 'ms/controllerblueprints/modules')
-rw-r--r--ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/scripts/BluePrintScriptingHost.kt22
1 files changed, 10 insertions, 12 deletions
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/scripts/BluePrintScriptingHost.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/scripts/BluePrintScriptingHost.kt
index 05a147171..d35f2b49b 100644
--- a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/scripts/BluePrintScriptingHost.kt
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/scripts/BluePrintScriptingHost.kt
@@ -31,14 +31,13 @@ val blueprintScriptCompiler = JvmScriptCompiler(defaultJvmScriptingHostConfigura
open class BlueprintScriptingHost(evaluator: ScriptEvaluator) : BasicScriptingHost(blueprintScriptCompiler, evaluator) {
- override fun eval(script: SourceCode, scriptCompilationConfiguration: ScriptCompilationConfiguration,
- configuration: ScriptEvaluationConfiguration?): ResultWithDiagnostics<EvaluationResult> =
+ override fun eval(script: SourceCode, compilationConfiguration: ScriptCompilationConfiguration,
+ evaluationConfiguration: ScriptEvaluationConfiguration?): ResultWithDiagnostics<EvaluationResult> =
runInCoroutineContext {
-
- blueprintScriptCompiler(script, scriptCompilationConfiguration)
- .onSuccess {
- evaluator(it, configuration)
+ blueprintScriptCompiler(script, compilationConfiguration)
+ .onSuccess { compiledScript ->
+ evaluator(compiledScript, evaluationConfiguration ?: ScriptEvaluationConfiguration.Default)
}.onFailure { failedResult ->
val messages = failedResult.reports.joinToString("\n")
throw BluePrintProcessorException(messages)
@@ -51,7 +50,7 @@ open class BluePrintScriptEvaluator(private val scriptClassName: String) : Scrip
private val log = LoggerFactory.getLogger(BluePrintScriptEvaluator::class.java)!!
override suspend operator fun invoke(compiledScript: CompiledScript<*>,
- scriptEvaluationConfiguration: ScriptEvaluationConfiguration?
+ scriptEvaluationConfiguration: ScriptEvaluationConfiguration
): ResultWithDiagnostics<EvaluationResult> =
try {
log.debug("Getting script class name($scriptClassName) from the compiled sources ")
@@ -59,20 +58,19 @@ open class BluePrintScriptEvaluator(private val scriptClassName: String) : Scrip
val bluePrintCompiledScript = compiledScript as BluePrintCompiledScript
bluePrintCompiledScript.scriptClassFQName = scriptClassName
- val classResult = compiledScript.getClass(scriptEvaluationConfiguration)
- when (classResult) {
+ when (val classResult = compiledScript.getClass(scriptEvaluationConfiguration)) {
is ResultWithDiagnostics.Failure -> classResult
is ResultWithDiagnostics.Success -> {
val scriptClass = classResult.value
val args = ArrayList<Any?>()
- scriptEvaluationConfiguration?.get(ScriptEvaluationConfiguration.providedProperties)?.forEach {
+ scriptEvaluationConfiguration.get(ScriptEvaluationConfiguration.providedProperties)?.forEach {
args.add(it.value)
}
- scriptEvaluationConfiguration?.get(ScriptEvaluationConfiguration.implicitReceivers)?.let {
+ scriptEvaluationConfiguration.get(ScriptEvaluationConfiguration.implicitReceivers)?.let {
args.addAll(it)
}
- scriptEvaluationConfiguration?.get(ScriptEvaluationConfiguration.constructorArgs)?.let {
+ scriptEvaluationConfiguration.get(ScriptEvaluationConfiguration.constructorArgs)?.let {
args.addAll(it)
}