Merge "blueprint scripting module"

5 files changed, 5 insertions, 327 deletions

diff --git a/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/script/BluePrintScriptConfiguration.kt b/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/script/BluePrintScriptConfiguration.kt
deleted file mode 100644
index f7bfb857..00000000
--- a/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/script/BluePrintScriptConfiguration.kt
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- *
- * 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.onap.ccsdk.apps.controllerblueprints.core.script
-
-import org.jetbrains.kotlin.script.util.LocalFilesResolver
-import java.io.File
-import kotlin.script.dependencies.ScriptContents
-import kotlin.script.dependencies.ScriptDependenciesResolver
-import kotlin.script.experimental.annotations.KotlinScript
-import kotlin.script.experimental.api.*
-import kotlin.script.experimental.jvm.JvmDependency
-import kotlin.script.experimental.jvm.dependenciesFromCurrentContext
-import kotlin.script.experimental.jvm.jvm
-
-
-@KotlinScript(fileExtension = "kts",
-        compilationConfiguration = ComponentScriptConfiguration::class)
-abstract class ComponentScript {
-
-}
-
-object ComponentScriptConfiguration : ScriptCompilationConfiguration(
-        {
-           // defaultImports(DependsOn::class, Repository::class)
-            jvm {
-                dependenciesFromCurrentContext(
-                        wholeClasspath = true
-                )
-            }
-//            refineConfiguration {
-//                onAnnotations(DependsOn::class, Repository::class, handler = ::configureLocalFileDepsOnAnnotations)
-//            }
-        }
-)
-
-
-private val resolver = LocalFilesResolver()
-
-fun configureLocalFileDepsOnAnnotations(context: ScriptConfigurationRefinementContext):
-        ResultWithDiagnostics<ScriptCompilationConfiguration> {
-
-    val annotations = context.collectedData?.get(ScriptCollectedData.foundAnnotations)?.takeIf { it.isNotEmpty() }
-            ?: return context.compilationConfiguration.asSuccess()
-
-    val scriptContents = object : ScriptContents {
-        override val annotations: Iterable<Annotation> = annotations
-        override val file: File? = null
-        override val text: CharSequence? = null
-    }
-
-    val diagnostics = arrayListOf<ScriptDiagnostic>()
-
-    fun report(severity: ScriptDependenciesResolver.ReportSeverity, message: String, position: ScriptContents.Position?) {
-        //TODO
-    }
-
-    return try {
-        val newDepsFromResolver = resolver.resolve(scriptContents, emptyMap(), ::report, null).get()
-                ?: return context.compilationConfiguration.asSuccess(diagnostics)
-
-        val resolvedClasspath = newDepsFromResolver.classpath.toList().takeIf { it.isNotEmpty() }
-                ?: return context.compilationConfiguration.asSuccess(diagnostics)
-
-        ScriptCompilationConfiguration(context.compilationConfiguration) {
-            dependencies.append(JvmDependency(resolvedClasspath))
-
-        }.asSuccess(diagnostics)
-
-    } catch (e: Throwable) {
-        ResultWithDiagnostics.Failure(*diagnostics.toTypedArray(), e.asDiagnostics())
-    }
-}
\ No newline at end of file
diff --git a/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/script/BluePrintScriptService.kt b/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/script/BluePrintScriptService.kt
deleted file mode 100644
index 8ae09151..00000000
--- a/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/script/BluePrintScriptService.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- *
- * 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.onap.ccsdk.apps.controllerblueprints.core.script
-
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintProcessorException
-import java.io.File
-import java.io.InputStream
-import java.io.Reader
-import javax.script.ScriptEngineManager
-import kotlin.script.experimental.api.ResultValue
-import kotlin.script.experimental.api.ResultWithDiagnostics
-import kotlin.script.experimental.api.resultOrNull
-import kotlin.script.experimental.host.toScriptSource
-import kotlin.script.experimental.jvmhost.createJvmCompilationConfigurationFromTemplate
-
-
-open class BluePrintScriptService(classLoader: ClassLoader? = Thread.currentThread().contextClassLoader) {
-
-    /**
-     * Get the Script Class instance
-     */
-    inline fun <reified T> scriptClassNewInstance(scriptFile: File, scriptClassName: String): T {
-
-        val compilationConfiguration = createJvmCompilationConfigurationFromTemplate<ComponentScript>()
-
-        val scriptEvaluator = BluePrintScriptEvaluator(scriptClassName)
-
-        val evalResponse = BlueprintScriptingHost(scriptEvaluator).eval(scriptFile.toScriptSource(), compilationConfiguration,
-                null)
-
-        when (evalResponse) {
-            is ResultWithDiagnostics.Success -> {
-                val returnValue = evalResponse.resultOrNull()?.returnValue as ResultValue.Value
-                return returnValue.value.castOrError()
-            }
-            is ResultWithDiagnostics.Failure -> {
-                throw BluePrintProcessorException(evalResponse.reports.joinToString("\n"))
-            }
-            else -> {
-                throw BluePrintProcessorException("Failed to process script ${scriptFile.absolutePath}")
-            }
-        }
-
-    }
-
-    val engine = ScriptEngineManager(classLoader).getEngineByExtension("kts")
-
-    inline fun <R> safeEval(evaluation: () -> R?) = try {
-        evaluation()
-    } catch (e: Exception) {
-        throw BluePrintProcessorException("Cannot load script", e)
-    }
-
-    inline fun <reified T> Any?.castOrError() = takeIf { it is T }?.let { it as T }
-            ?: throw IllegalArgumentException("Cannot cast $this to expected type ${T::class}")
-
-    inline fun <reified T> load(script: String): T = safeEval { engine.eval(script) }.castOrError()
-
-    inline fun <reified T> load(reader: Reader): T = safeEval { engine.eval(reader) }.castOrError()
-
-    inline fun <reified T> load(inputStream: InputStream): T = load(inputStream.reader())
-
-    inline fun <reified T> loadAll(vararg inputStream: InputStream): List<T> = inputStream.map(::load)
-}
diff --git a/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/script/BlueprintScriptingHost.kt b/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/script/BlueprintScriptingHost.kt
deleted file mode 100644
index bda20a44..00000000
--- a/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/script/BlueprintScriptingHost.kt
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- *
- * 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.onap.ccsdk.apps.controllerblueprints.core.script
-
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintProcessorException
-import org.slf4j.LoggerFactory
-import kotlin.script.experimental.api.*
-import kotlin.script.experimental.host.BasicScriptingHost
-import kotlin.script.experimental.jvm.defaultJvmScriptingHostConfiguration
-import kotlin.script.experimental.jvmhost.JvmScriptCompiler
-
-val defaultBlueprintScriptCompiler = JvmScriptCompiler(defaultJvmScriptingHostConfiguration)
-
-open class BlueprintScriptingHost(evaluator: ScriptEvaluator
-) : BasicScriptingHost(defaultBlueprintScriptCompiler, evaluator) {
-
-    override fun eval(
-            script: SourceCode,
-            scriptCompilationConfiguration: ScriptCompilationConfiguration,
-            configuration: ScriptEvaluationConfiguration?
-    ): ResultWithDiagnostics<EvaluationResult> =
-
-            runInCoroutineContext {
-
-                compiler(script, scriptCompilationConfiguration)
-                        .onSuccess {
-                            evaluator(it, configuration)
-                        }
-            }
-}
-
-
-open class BluePrintScriptEvaluator(private val scriptClassName: String) : ScriptEvaluator {
-
-    val log = LoggerFactory.getLogger(BluePrintScriptEvaluator::class.java)!!
-
-    override suspend operator fun invoke(
-            compiledScript: CompiledScript<*>,
-            scriptEvaluationConfiguration: ScriptEvaluationConfiguration?
-    ): ResultWithDiagnostics<EvaluationResult> =
-            try {
-                val res = compiledScript.getClass(scriptEvaluationConfiguration)
-                when (res) {
-                    is ResultWithDiagnostics.Failure -> res
-                    is ResultWithDiagnostics.Success -> {
-                        val scriptClass = res.value
-                        val args = ArrayList<Any?>()
-                        scriptEvaluationConfiguration?.get(ScriptEvaluationConfiguration.providedProperties)?.forEach {
-                            args.add(it.value)
-                        }
-                        scriptEvaluationConfiguration?.get(ScriptEvaluationConfiguration.implicitReceivers)?.let {
-                            args.addAll(it)
-                        }
-                        scriptEvaluationConfiguration?.get(ScriptEvaluationConfiguration.constructorArgs)?.let {
-                            args.addAll(it)
-                        }
-
-                        val completeScriptClass = "Script\$$scriptClassName"
-                        log.info("Searching for class type($completeScriptClass)")
-                        /**
-                         * Search for Class Name
-                         */
-                        val instanceClass = scriptClass.java.classes
-                                .single { it.name == completeScriptClass }
-                                //.single { it.name == "Script\$SampleBlueprintsFunctionNode" }
-
-
-                        val instance = instanceClass.newInstance()
-                                ?: throw BluePrintProcessorException("failed to create instance from the script")
-
-                        ResultWithDiagnostics.Success(EvaluationResult(ResultValue.Value(completeScriptClass,
-                                instance, instance.javaClass.typeName),
-                                scriptEvaluationConfiguration))
-                    }
-                }
-            } catch (e: Throwable) {
-                ResultWithDiagnostics.Failure(e.asDiagnostics("Error evaluating script"))
-            }
-}
\ No newline at end of file
diff --git a/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/script/BluePrintScriptServiceTest.kt b/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/script/BluePrintScriptServiceTest.kt
deleted file mode 100644
index 5c5ad3ba..00000000
--- a/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/script/BluePrintScriptServiceTest.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- *
- * 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.onap.ccsdk.apps.controllerblueprints.core.script
-
-import org.junit.Ignore
-import org.junit.Test
-import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BlueprintFunctionNode
-import java.io.File
-import kotlin.test.assertEquals
-import kotlin.test.assertNotNull
-
-class BluePrintScriptServiceTest {
-
-    @Test
-    fun `invoke script`() {
-        val scriptContent = "11 + 11"
-        val value = BluePrintScriptService()
-                .load<Int>(scriptContent)
-        assertEquals(22, value, "failed to execute command")
-    }
-
-    @Test
-    @Ignore
-    fun `invoke script component node`() {
-
-        //println(classpathFromClasspathProperty()?.joinToString("\n"))
-
-        val scriptFile = File("src/test/resources/scripts/SampleBlueprintFunctionNode.kts")
-
-        val functionNode = BluePrintScriptService()
-                .scriptClassNewInstance<BlueprintFunctionNode<String, String>>(scriptFile,
-                        "SampleBlueprintFunctionNode")
-        assertNotNull(functionNode, "failed to get instance from script")
-    }
-}
\ No newline at end of file
diff --git a/components/parent/pom.xml b/components/parent/pom.xml
index b53f9f11..6d5c2c14 100644
--- a/components/parent/pom.xml
+++ b/components/parent/pom.xml
@@ -29,11 +29,11 @@
     <name>Components Parent</name>
     <packaging>pom</packaging>
     <properties>
-        <spring.boot.version>2.1.1.RELEASE</spring.boot.version>
-        <spring.version>5.1.3.RELEASE</spring.version>
-        <kotlin.version>1.3.11</kotlin.version>
-        <kotlin.maven.version>1.3.11</kotlin.maven.version>
-        <kotlin.couroutines.version>1.1.0</kotlin.couroutines.version>
+        <spring.boot.version>2.1.2.RELEASE</spring.boot.version>
+        <spring.version>5.1.4.RELEASE</spring.version>
+        <kotlin.version>1.3.20</kotlin.version>
+        <kotlin.maven.version>1.3.20</kotlin.maven.version>
+        <kotlin.couroutines.version>1.1.1</kotlin.couroutines.version>
         <grpc.version>1.18.0</grpc.version>
         <protobuff.java.utils.version>3.6.1</protobuff.java.utils.version>
         <eelf.version>1.0.0</eelf.version>
@@ -307,22 +307,6 @@
             <groupId>com.fasterxml.jackson.module</groupId>
             <artifactId>jackson-module-kotlin</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-compiler-embeddable</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-scripting-jvm-host</artifactId>
-            <!--Use kotlin-compiler-embeddable as koltin-compiler wrap-->
-            <!--guava dependency creating classpath issues at runtime-->
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jetbrains.kotlin</groupId>
-                    <artifactId>kotlin-compiler</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <!-- GRPC Dependencies -->
         <dependency>
             <groupId>io.grpc</groupId>