[NU-1862] Simplify parameters editors API

more API simplification

fixes

review fixes

removed simpleParameter

review fixes

fix openapi test

review fixes part 2

test fixes

rebase

FE adjustments

rebase and test fixes

Author: Łukasz Bigorajski

common-api/src/main/scala/pl/touk/nussknacker/engine/api/CirceUtil.scala

@@ -18,24 +18,34 @@ object CirceUtil {
     io.circe.parser.parse(json).flatMap(Decoder[T].decodeJson)
 
   def decodeJson[T: Decoder](json: Array[Byte]): Either[circe.Error, T] =
-    decodeJson(new String(json, StandardCharsets.UTF_8))
+    decodeJson(toString(json))
 
-  def decodeJsonUnsafe[T: Decoder](json: String): T = unsafe(decodeJson(json))
+  def decodeJsonUnsafe[T: Decoder](json: String): T = unsafe(decodeJson(json), json)
 
-  def decodeJsonUnsafe[T: Decoder](json: String, message: String): T = unsafe(decodeJson(json), message)
+  def decodeJsonUnsafe[T: Decoder](json: String, message: String): T = unsafe(decodeJson(json), json, message)
 
-  def decodeJsonUnsafe[T: Decoder](json: Array[Byte]): T = unsafe(decodeJson(json))
+  def decodeJsonUnsafe[T: Decoder](json: Array[Byte]): T = {
+    val jsonString = toString(json)
+    unsafe(decodeJson(jsonString), jsonString)
+  }
+
+  def decodeJsonUnsafe[T: Decoder](json: Array[Byte], message: String): T = {
+    val jsonString = toString(json)
+    unsafe(decodeJson(jsonString), jsonString, message)
+  }
 
-  def decodeJsonUnsafe[T: Decoder](json: Array[Byte], message: String): T = unsafe(decodeJson(json), message)
+  def decodeJsonUnsafe[T: Decoder](json: Json): T = unsafe(Decoder[T].decodeJson(json), json.asString.getOrElse(""))
 
-  def decodeJsonUnsafe[T: Decoder](json: Json): T = unsafe(Decoder[T].decodeJson(json))
+  def decodeJsonUnsafe[T: Decoder](json: Json, message: String): T =
+    unsafe(Decoder[T].decodeJson(json), json.asString.getOrElse(""), message)
 
-  def decodeJsonUnsafe[T: Decoder](json: Json, message: String): T = unsafe(Decoder[T].decodeJson(json), message)
+  private def toString(json: Array[Byte]): String =
+    new String(json, StandardCharsets.UTF_8)
 
-  private def unsafe[T](result: Either[circe.Error, T], message: String = "") = result match {
+  private def unsafe[T](result: Either[circe.Error, T], json: => String, message: String = "") = result match {
     case Left(error) =>
       throw DecodingError(
-        s"Failed to decode${if (message.isBlank) "" else s" - $message"}, error: ${error.getMessage}",
+        s"Failed to decode${if (message.isBlank) "" else s" - $message"}, error: ${error.getMessage}, json: $json",
         error
       )
     case Right(data) => data

common-api/src/main/scala/pl/touk/nussknacker/engine/util/Implicits.scala

@@ -83,6 +83,11 @@ object Implicits {
       accumulator(list, f, Nil)
     }
 
+    def orElseIfEmpty(default: => List[T]): List[T] = list match {
+      case Nil => default
+      case _   => list
+    }
+
   }
 
 }

components-api/src/main/java/pl/touk/nussknacker/engine/api/editor/DualEditor.java

@@ -1,29 +1,31 @@
 package pl.touk.nussknacker.engine.api.editor;
 
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.time.temporal.ChronoUnit;
 
 @Target(ElementType.PARAMETER)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface SimpleEditor {
+@Repeatable(Editors.class)
+public @interface Editor {
 
-    SimpleEditorType type();
+    EditorType type();
 
     /**
-     * This field should be used only with {@link SimpleEditorType#FIXED_VALUES_EDITOR}
+     * This field should be used only with {@link EditorType#FIXED_VALUES_EDITOR}
      */
     LabeledExpression[] possibleValues() default {};
 
     /**
-     * This field should be used only with {@link SimpleEditorType#DURATION_EDITOR} or {@link SimpleEditorType#PERIOD_EDITOR}
+     * This field should be used only with {@link EditorType#DURATION_EDITOR} or {@link EditorType#PERIOD_EDITOR}
      */
     ChronoUnit[] timeRangeComponents() default {};
 
     /**
-     * This field should be used only with {@link SimpleEditorType#DICT_EDITOR}
+     * This field should be used only with {@link EditorType#DICT_EDITOR}
      */
     String dictId() default "";
 }

components-api/src/main/java/pl/touk/nussknacker/engine/api/editor/DualEditorMode.java

@@ -1,19 +1,19 @@
 package pl.touk.nussknacker.engine.api.editor;
 
-public enum SimpleEditorType {
+public enum EditorType {
     BOOL_EDITOR,
     CRON_EDITOR,
     DATE_EDITOR,
     DATE_TIME_EDITOR,
     DURATION_EDITOR,
     FIXED_VALUES_EDITOR,
     PERIOD_EDITOR,
-    STRING_EDITOR,
     TIME_EDITOR,
     TEXTAREA_EDITOR,
     JSON_EDITOR,
     SQL_EDITOR,
     SPEL_TEMPLATE_EDITOR,
     DICT_EDITOR,
-    TYPED_TABULAR_DATA_EDITOR
+    TYPED_TABULAR_DATA_EDITOR,
+    SPEL_EDITOR,
 }

components-api/src/main/java/pl/touk/nussknacker/engine/api/editor/SimpleEditor.java renamed to components-api/src/main/java/pl/touk/nussknacker/engine/api/editor/Editor.java

@@ -7,5 +7,6 @@
 
 @Target(ElementType.PARAMETER)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface RawEditor {
+public @interface Editors {
+    Editor[] value();
 }

components-api/src/main/java/pl/touk/nussknacker/engine/api/editor/SimpleEditorType.java renamed to components-api/src/main/java/pl/touk/nussknacker/engine/api/editor/EditorType.java

@@ -3,7 +3,12 @@ package pl.touk.nussknacker.engine.api.component
 import cats.implicits.catsSyntaxSemigroup
 import cats.kernel.Semigroup
 import io.circe.generic.JsonCodec
-import pl.touk.nussknacker.engine.api.definition.{ParameterEditor, ParameterValidator, SimpleParameterEditor}
+import pl.touk.nussknacker.engine.api.definition.{
+  ParameterEditor,
+  ParameterValidator,
+  StaticParameterEditor,
+  StaticStringParameterEditor
+}
 import pl.touk.nussknacker.engine.api.parameter.ParameterName
 
 case class ComponentConfig(
@@ -61,19 +66,31 @@ object ComponentConfig {
 
 case class ParameterConfig(
     defaultValue: Option[String],
-    editor: Option[ParameterEditor],
+    editors: Option[List[ParameterEditor]],
     validators: Option[List[ParameterValidator]],
     label: Option[String],
     hintText: Option[String]
 )
 
+case class StaticParameterConfig(
+    defaultValue: Option[String],
+    editor: StaticParameterEditor = StaticStringParameterEditor,
+    validators: Option[List[ParameterValidator]],
+    label: Option[String],
+    hintText: Option[String]
+)
+
+object StaticParameterConfig {
+  val empty: StaticParameterConfig = StaticParameterConfig(None, StaticStringParameterEditor, None, None, None)
+}
+
 object ParameterConfig {
   val empty: ParameterConfig = ParameterConfig(None, None, None, None, None)
 }
 
 @JsonCodec case class ScenarioPropertyConfig(
     defaultValue: Option[String],
-    editor: Option[SimpleParameterEditor],
+    editor: Option[StaticParameterEditor],
     validators: Option[List[ParameterValidator]],
     label: Option[String],
     hintText: Option[String]

components-api/src/main/java/pl/touk/nussknacker/engine/api/editor/RawEditor.java renamed to components-api/src/main/java/pl/touk/nussknacker/engine/api/editor/Editors.java

@@ -332,7 +332,7 @@ object ProcessCompilationError {
   final case class IncompatibleParameterDefinitionModification(
       paramName: ParameterName,
       language: Language,
-      parameterEditor: Option[ParameterEditor],
+      parameterEditors: List[ParameterEditor],
       nodeId: String
   ) extends PartSubGraphCompilationError
       with InASingleNode

components-api/src/main/scala/pl/touk/nussknacker/engine/api/component/ComponentConfig.scala

@@ -70,7 +70,7 @@ object Parameter {
     Parameter(
       name,
       typ,
-      editor = None,
+      editors = Nil,
       validators = validators,
       defaultValue = None,
       additionalVariables = Map.empty,
@@ -92,7 +92,7 @@ object Parameter {
     Parameter(
       name,
       typ,
-      editor = None,
+      editors = Nil,
       validators = List.empty,
       defaultValue = None,
       additionalVariables = Map.empty,
@@ -123,7 +123,7 @@ object NotBlankParameter {
 case class Parameter(
     name: ParameterName,
     typ: TypingResult,
-    editor: Option[ParameterEditor],
+    editors: List[ParameterEditor],
     validators: List[ParameterValidator],
     defaultValue: Option[Expression],
     additionalVariables: Map[String, AdditionalVariable],
@@ -139,7 +139,7 @@ case class Parameter(
   def copy(
       name: ParameterName,
       typ: TypingResult,
-      editor: Option[ParameterEditor],
+      editors: List[ParameterEditor],
       validators: List[ParameterValidator],
       defaultValue: Option[Expression],
       additionalVariables: Map[String, AdditionalVariable],
@@ -152,7 +152,7 @@ case class Parameter(
     copy(
       name,
       typ,
-      editor,
+      editors,
       validators,
       defaultValue,
       additionalVariables,
@@ -169,7 +169,7 @@ case class Parameter(
   def copy(
       name: ParameterName = this.name,
       typ: TypingResult = this.typ,
-      editor: Option[ParameterEditor] = this.editor,
+      editors: List[ParameterEditor] = this.editors,
       validators: List[ParameterValidator] = this.validators,
       defaultValue: Option[Expression] = this.defaultValue,
       additionalVariables: Map[String, AdditionalVariable] = this.additionalVariables,
@@ -184,7 +184,7 @@ case class Parameter(
     new Parameter(
       name,
       typ,
-      editor,
+      editors,
       validators,
       defaultValue,
       additionalVariables,
@@ -201,7 +201,7 @@ case class Parameter(
   def apply(
       name: ParameterName,
       typ: TypingResult,
-      editor: Option[ParameterEditor],
+      editors: List[ParameterEditor],
       validators: List[ParameterValidator],
       defaultValue: Option[Expression],
       additionalVariables: Map[String, AdditionalVariable],
@@ -216,7 +216,7 @@ case class Parameter(
     new Parameter(
       name,
       typ,
-      editor,
+      editors,
       validators,
       defaultValue,
       additionalVariables,
@@ -233,7 +233,7 @@ case class Parameter(
   def apply(
       name: ParameterName,
       typ: TypingResult,
-      editor: Option[ParameterEditor],
+      editors: List[ParameterEditor],
       validators: List[ParameterValidator],
       defaultValue: Option[Expression],
       additionalVariables: Map[String, AdditionalVariable],
@@ -246,7 +246,7 @@ case class Parameter(
     new Parameter(
       name,
       typ,
-      editor,
+      editors,
       validators,
       defaultValue,
       additionalVariables,
@@ -275,8 +275,11 @@ case class Parameter(
 
   val isOptional: Boolean = !validators.contains(MandatoryParameterValidator)
 
-  // TODO: all three methods below could be removed when we split this class into api class and domain model class
-  def finalEditor: ParameterEditor = editor.getOrElse(RawParameterEditor)
+//  // TODO: all three methods below could be removed when we split this class into api class and domain model class
+  def editorsWithDefault: List[ParameterEditor] = editors match {
+    case Nil => List(SpelParameterEditor)
+    case nel => nel
+  }
 
   def finalDefaultValue: Expression = defaultValue.getOrElse(Expression.spel(""))