fixed ordering of map fields

Author: Piotr Fałdrowicz

engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/typeinformation/internal/typedobject/TypedJavaMapBasedTypeInformation.scala

@@ -1,6 +1,6 @@
 package pl.touk.nussknacker.engine.process.typeinformation.internal.typedobject
 
-import java.{util => jutil}
+import java.{util, util => jutil}
 import org.apache.flink.api.common.typeinfo.TypeInformation
 import org.apache.flink.api.common.typeutils.{TypeSerializer, TypeSerializerSnapshot}
 
@@ -24,7 +24,7 @@ case class TypedJavaMapSerializer(
   override def duplicate(serializers: Array[(String, TypeSerializer[_])]): TypeSerializer[jutil.Map[String, AnyRef]] =
     TypedJavaMapSerializer(serializers)
 
-  override def createInstance(): jutil.Map[String, AnyRef] = new jutil.HashMap()
+  override def createInstance(): jutil.Map[String, AnyRef] = new util.LinkedHashMap(serializers.length)
 
   override def snapshotConfiguration(
       snapshots: Array[(String, TypeSerializerSnapshot[_])]

engine/flink/executor/src/main/scala/pl/touk/nussknacker/engine/process/typeinformation/internal/typedobject/TypedObjectBasedTypeInformation.scala

@@ -31,7 +31,7 @@ abstract class TypedObjectBasedTypeInformation[T: ClassTag](informations: Array[
     extends TypeInformation[T] {
 
   def this(fields: Map[String, TypeInformation[_]]) = {
-    this(fields.toArray.sortBy(_._1))
+    this(fields.toArray)
   }
 
   override def isBasicType: Boolean = false

engine/flink/executor/src/test/scala/pl/touk/nussknacker/engine/process/typeinformation/TypingResultAwareTypeInformationDetectionSpec.scala

@@ -29,6 +29,7 @@ import pl.touk.nussknacker.engine.process.typeinformation.internal.typedobject._
 import pl.touk.nussknacker.engine.process.typeinformation.testTypedObject.CustomTypedObject
 
 import java.time.{LocalDate, LocalDateTime, LocalTime}
+import scala.collection.immutable.ListMap
 import scala.jdk.CollectionConverters._
 
 @silent("deprecated")
@@ -43,7 +44,7 @@ class TypingResultAwareTypeInformationDetectionSpec
   test("test map serialization") {
     val map = Map("intF" -> 11, "strF" -> "sdfasf", "longF" -> 111L, "fixedLong" -> 12L, "taggedString" -> "1")
     val typingResult = Typed.record(
-      Map(
+      ListMap(
         "intF"         -> Typed[Int],
         "strF"         -> Typed[String],
         "longF"        -> Typed[Long],
@@ -61,10 +62,10 @@ class TypingResultAwareTypeInformationDetectionSpec
 
     assertMapSerializers(
       typeInfo.createSerializer(executionConfigWithoutKryo),
-      ("fixedLong", new LongSerializer),
       ("intF", new IntSerializer),
-      ("longF", new LongSerializer),
       ("strF", new StringSerializer),
+      ("longF", new LongSerializer),
+      ("fixedLong", new LongSerializer),
       ("taggedString", new StringSerializer)
     )
   }
@@ -87,7 +88,7 @@ class TypingResultAwareTypeInformationDetectionSpec
 
   test("test context serialization") {
     val ctx = Context("11").copy(variables =
-      Map(
+      ListMap(
         "one"            -> 11,
         "two"            -> "ala",
         "three"          -> Map("key" -> "value"),
@@ -96,7 +97,7 @@ class TypingResultAwareTypeInformationDetectionSpec
       )
     )
     val vCtx = ValidationContext(
-      Map(
+      ListMap(
         "one"            -> Typed[Int],
         "two"            -> Typed[String],
         "three"          -> Typed.record(Map("key" -> Typed[String]), Typed.typedClass[Map[String, Any]]),
@@ -117,11 +118,11 @@ class TypingResultAwareTypeInformationDetectionSpec
 
     assertSerializersInContext(
       typeInfo.createSerializer(executionConfigWithoutKryo),
-      ("arrayOfInts", _ shouldBe new GenericArraySerializer(classOf[Integer], new IntSerializer)),
-      ("arrayOfStrings", _ shouldBe new StringArraySerializer),
       ("one", _ shouldBe new IntSerializer),
+      ("two", _ shouldBe new StringSerializer),
       ("three", assertMapSerializers(_, ("key", new StringSerializer))),
-      ("two", _ shouldBe new StringSerializer)
+      ("arrayOfStrings", _ shouldBe new StringArraySerializer),
+      ("arrayOfInts", _ shouldBe new GenericArraySerializer(classOf[Integer], new IntSerializer)),
     )
   }
 

utils/utils/src/main/scala/pl/touk/nussknacker/engine/util/json/ToJsonEncoder.scala

@@ -9,6 +9,7 @@ import io.circe.Json._
 import pl.touk.nussknacker.engine.api.DisplayJson
 import java.util.ServiceLoader
 import java.util.UUID
+import scala.collection.immutable.ListMap
 import scala.jdk.CollectionConverters._
 
 object ToJsonEncoder {
@@ -66,7 +67,7 @@ case class ToJsonEncoder(
           case a: UUID           => safeString(a.toString)
           case a: DisplayJson    => a.asJson
           case a: scala.collection.Map[_, _] => encodeMap(a.toMap)
-          case a: java.util.Map[_, _]        => encodeMap(a.asScala.toMap)
+          case a: java.util.Map[_, _]        => encode(ListMap.from(a.asScala))
           case a: Iterable[_]                => fromValues(a.map(encode))
           case a: Enum[_]                    => safeString(a.toString)
           case a: java.util.Collection[_]    => fromValues(a.asScala.map(encode))