add language property for stop, default value is Text

Author: judy0131

piflow-bundle/src/main/scala/cn/piflow/bundle/script/ExecutePython.scala

@@ -5,7 +5,7 @@ import java.util.UUID
 
 import cn.piflow.conf.bean.PropertyDescriptor
 import cn.piflow.conf.util.{ImageUtil, MapUtil}
-import cn.piflow.conf.{ConfigurableStop, Port, StopGroup}
+import cn.piflow.conf.{ConfigurableStop, Language, Port, StopGroup}
 import cn.piflow.util.FileUtil
 import cn.piflow.{JobContext, JobInputStream, JobOutputStream, ProcessContext}
 import jep.Jep
@@ -37,6 +37,7 @@ class ExecutePython extends ConfigurableStop{
       .description("The code of python")
       .defaultValue("")
       .required(true)
+      .language(Language.Python)
 
     descriptor = script :: descriptor
     descriptor

piflow-bundle/src/main/scala/cn/piflow/bundle/script/ExecutePythonWithDataFrame.scala

@@ -5,7 +5,7 @@ import java.util.UUID
 
 import cn.piflow.conf.bean.PropertyDescriptor
 import cn.piflow.conf.util.{ImageUtil, MapUtil}
-import cn.piflow.conf.{ConfigurableStop, Port, StopGroup}
+import cn.piflow.conf.{ConfigurableStop, Language, Port, StopGroup}
 import cn.piflow.util.FileUtil
 import cn.piflow.{JobContext, JobInputStream, JobOutputStream, ProcessContext}
 import jep.Jep
@@ -39,6 +39,7 @@ class ExecutePythonWithDataFrame extends ConfigurableStop{
       .description("The code of python")
       .defaultValue("")
       .required(true)
+      .language(Language.Python)
     val execFunction = new PropertyDescriptor()
       .name("execFunction")
       .displayName("execFunction")

piflow-bundle/src/main/scala/cn/piflow/bundle/script/ExecuteScala.scala

@@ -5,7 +5,7 @@ import java.net.{MalformedURLException, URL}
 
 import cn.piflow.conf.bean.PropertyDescriptor
 import cn.piflow.conf.util.{ImageUtil, MapUtil, PluginClassLoader}
-import cn.piflow.conf.{ConfigurableStop, Port, StopGroup}
+import cn.piflow.conf.{ConfigurableStop, Language, Port, StopGroup}
 import cn.piflow.{JobContext, JobInputStream, JobOutputStream, ProcessContext}
 
 import scala.language.experimental.macros
@@ -46,6 +46,7 @@ class ExecuteScala extends ConfigurableStop{
       .defaultValue("")
       .required(true)
       .example("val df = in.read() \nval df1 = df.select(\"author\").filter($\"author\".like(\"%xjzhu%\")) \ndf1.show() \ndf.createOrReplaceTempView(\"person\") \nval df2 = spark.sql(\"select * from person where author like '%xjzhu%'\") \ndf2.show() \nout.write(df2)")
+      .language(Language.Scala)
 
     descriptor = script :: descriptor
     descriptor

piflow-bundle/src/main/scala/cn/piflow/bundle/script/ExecuteShell.scala

@@ -3,7 +3,7 @@ package cn.piflow.bundle.script
 import cn.piflow.bundle.util.RemoteShellExecutor
 import cn.piflow.conf.bean.PropertyDescriptor
 import cn.piflow.conf.util.{ImageUtil, MapUtil}
-import cn.piflow.conf.{ConfigurableStop, Port, StopGroup}
+import cn.piflow.conf.{ConfigurableStop, Language, Port, StopGroup}
 import cn.piflow.{JobContext, JobInputStream, JobOutputStream, ProcessContext}
 import org.apache.spark.sql.SparkSession
 
@@ -71,6 +71,7 @@ class ExecuteShell extends ConfigurableStop{
       .defaultValue("")
       .required(true)
       .example("mkdir /work/###cp /opt/1.29.3.tar.gz /work/")
+      .language(Language.Shell)
 
 
     descriptor = IP :: descriptor

piflow-configure/src/main/scala/cn/piflow/conf/Language.scala

@@ -0,0 +1,9 @@
+package cn.piflow.conf
+
+object Language {
+
+  val Text = "Text"
+  val Scala = "Scala"
+  val Python = "Python"
+  val Shell = "Shell"
+}

piflow-configure/src/main/scala/cn/piflow/conf/bean/PropertyDescriptor.scala

@@ -1,5 +1,6 @@
 package cn.piflow.conf.bean
 
+import cn.piflow.conf.Language
 import net.liftweb.json.JsonDSL._
 import net.liftweb.json._
 
@@ -12,6 +13,7 @@ class PropertyDescriptor {
   var required : Boolean = false
   var sensitive : Boolean = false
   var example : String = _
+  var language : String = Language.Text
 
 
   def name(name:String) : PropertyDescriptor = {
@@ -46,6 +48,10 @@ class PropertyDescriptor {
     this.sensitive = sensitive
     this
   }
+  def language(language: String) : PropertyDescriptor = {
+    this.language = language
+    this
+  }
   def toJson():String = {
     val allowableValueStr = if(this.allowableValues == null)  "" else this.allowableValues.mkString(",")
     val json =

piflow-configure/src/main/scala/cn/piflow/conf/util/ClassUtil.scala

@@ -232,7 +232,8 @@ object ClassUtil {
                 ("allowableValues" -> property.allowableValues) ~
                 ("required" -> property.required.toString) ~
                 ("sensitive" -> property.sensitive.toString) ~
-                ("example" -> property.example)) }) )
+                ("example" -> property.example) ~
+                ("language" -> property.language)) }) )
     jsonValue
   }