Skip to content

Commit f6f8afa

Browse files
author
Piotr Fałdrowicz
committed
fix for 2.12
1 parent 2f587d4 commit f6f8afa

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package pl.touk.nussknacker.engine.process.typeinformation.internal.typedobject
22

3-
import java.{util, util => jutil}
3+
import java.{util => jutil}
44
import org.apache.flink.api.common.typeinfo.TypeInformation
55
import org.apache.flink.api.common.typeutils.{TypeSerializer, TypeSerializerSnapshot}
66

@@ -24,7 +24,7 @@ case class TypedJavaMapSerializer(
2424
override def duplicate(serializers: Array[(String, TypeSerializer[_])]): TypeSerializer[jutil.Map[String, AnyRef]] =
2525
TypedJavaMapSerializer(serializers)
2626

27-
override def createInstance(): jutil.Map[String, AnyRef] = new util.LinkedHashMap(serializers.length)
27+
override def createInstance(): jutil.Map[String, AnyRef] = new jutil.LinkedHashMap(serializers.length)
2828

2929
override def snapshotConfiguration(
3030
snapshots: Array[(String, TypeSerializerSnapshot[_])]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ case class ToJsonEncoder(
6767
case a: UUID => safeString(a.toString)
6868
case a: DisplayJson => a.asJson
6969
case a: scala.collection.Map[_, _] => encodeMap(a.toMap)
70-
case a: java.util.Map[_, _] => encode(ListMap.from(a.asScala))
70+
case a: java.util.Map[_, _] => encode(ListMap(a.asScala.toList: _*))
7171
case a: Iterable[_] => fromValues(a.map(encode))
7272
case a: Enum[_] => safeString(a.toString)
7373
case a: java.util.Collection[_] => fromValues(a.asScala.map(encode))

0 commit comments

Comments
 (0)