From 7bb1271158562fa03c26f74d4404f2a856254bd8 Mon Sep 17 00:00:00 2001 From: Honnix Date: Wed, 18 Oct 2023 17:13:24 +0200 Subject: [PATCH 1/3] Make BindingCollection and BindingMap case class Signed-off-by: Hongxin Liang --- .../src/main/scala/org/flyte/flytekit/BindingCollection.scala | 2 +- .../src/main/scala/org/flyte/flytekit/BindingMap.scala | 2 +- .../scala/org/flyte/flytekitscala/SdkBindingDataFactory.scala | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flytekit-scala_2.13/src/main/scala/org/flyte/flytekit/BindingCollection.scala b/flytekit-scala_2.13/src/main/scala/org/flyte/flytekit/BindingCollection.scala index 22f3f5a01..075f1988e 100644 --- a/flytekit-scala_2.13/src/main/scala/org/flyte/flytekit/BindingCollection.scala +++ b/flytekit-scala_2.13/src/main/scala/org/flyte/flytekit/BindingCollection.scala @@ -23,7 +23,7 @@ import org.flyte.flytekitscala.SdkLiteralTypes.collections import java.util.function import scala.collection.JavaConverters._ -private[flyte] class BindingCollection[T]( +private[flyte] case class BindingCollection[T]( elementType: SdkLiteralType[T], bindingCollection: List[SdkBindingData[T]] ) extends SdkBindingData[List[T]] { diff --git a/flytekit-scala_2.13/src/main/scala/org/flyte/flytekit/BindingMap.scala b/flytekit-scala_2.13/src/main/scala/org/flyte/flytekit/BindingMap.scala index b9fe1c1fc..031f6548c 100644 --- a/flytekit-scala_2.13/src/main/scala/org/flyte/flytekit/BindingMap.scala +++ b/flytekit-scala_2.13/src/main/scala/org/flyte/flytekit/BindingMap.scala @@ -23,7 +23,7 @@ import org.flyte.flytekitscala.SdkLiteralTypes.maps import java.util.function import scala.collection.JavaConverters._ -private[flyte] class BindingMap[T]( +private[flyte] case class BindingMap[T]( valuesType: SdkLiteralType[T], bindingMap: Map[String, SdkBindingData[T]] ) extends SdkBindingData[Map[String, T]] { diff --git a/flytekit-scala_2.13/src/main/scala/org/flyte/flytekitscala/SdkBindingDataFactory.scala b/flytekit-scala_2.13/src/main/scala/org/flyte/flytekitscala/SdkBindingDataFactory.scala index 857238ee4..c75ef8c65 100644 --- a/flytekit-scala_2.13/src/main/scala/org/flyte/flytekitscala/SdkBindingDataFactory.scala +++ b/flytekit-scala_2.13/src/main/scala/org/flyte/flytekitscala/SdkBindingDataFactory.scala @@ -353,7 +353,7 @@ object SdkBindingDataFactory { elementType: SdkLiteralType[T], elements: List[SdkBindingData[T]] ): SdkBindingData[List[T]] = { - new BindingCollection(elementType, elements) + BindingCollection(elementType, elements) } /** Creates a [[SdkBindingData]] for a flyte map given a java @@ -372,7 +372,7 @@ object SdkBindingDataFactory { valuesType: SdkLiteralType[T], valueMap: Map[String, SdkBindingData[T]] ): SdkBindingData[Map[String, T]] = - new BindingMap(valuesType, valueMap) + BindingMap(valuesType, valueMap) private def toSdkLiteralType( value: Any, From 80a90a9301e0435175603a45243f729254deacad Mon Sep 17 00:00:00 2001 From: Hongxin Liang Date: Wed, 18 Oct 2023 22:47:20 +0200 Subject: [PATCH 2/3] Minor cleanup Signed-off-by: Hongxin Liang --- .../src/main/scala/org/flyte/flytekit/BindingCollection.scala | 1 - .../src/main/scala/org/flyte/flytekit/BindingMap.scala | 1 - 2 files changed, 2 deletions(-) diff --git a/flytekit-scala_2.13/src/main/scala/org/flyte/flytekit/BindingCollection.scala b/flytekit-scala_2.13/src/main/scala/org/flyte/flytekit/BindingCollection.scala index 075f1988e..f52b2f990 100644 --- a/flytekit-scala_2.13/src/main/scala/org/flyte/flytekit/BindingCollection.scala +++ b/flytekit-scala_2.13/src/main/scala/org/flyte/flytekit/BindingCollection.scala @@ -17,7 +17,6 @@ package org.flyte.flytekit import org.flyte.api.v1.BindingData -import org.flyte.flytekit.SdkBindingData.Literal import org.flyte.flytekitscala.SdkLiteralTypes.collections import java.util.function diff --git a/flytekit-scala_2.13/src/main/scala/org/flyte/flytekit/BindingMap.scala b/flytekit-scala_2.13/src/main/scala/org/flyte/flytekit/BindingMap.scala index 031f6548c..7da1bf856 100644 --- a/flytekit-scala_2.13/src/main/scala/org/flyte/flytekit/BindingMap.scala +++ b/flytekit-scala_2.13/src/main/scala/org/flyte/flytekit/BindingMap.scala @@ -17,7 +17,6 @@ package org.flyte.flytekit import org.flyte.api.v1.BindingData -import org.flyte.flytekit.SdkBindingData.Literal import org.flyte.flytekitscala.SdkLiteralTypes.maps import java.util.function From a32679d28d657fa8db69f2c7c52c566d017bc6e0 Mon Sep 17 00:00:00 2001 From: Honnix Date: Thu, 19 Oct 2023 11:35:24 +0200 Subject: [PATCH 3/3] Revise package doc a bit Signed-off-by: Hongxin Liang --- .../src/main/scala/org/flyte/flytekit/package.scala | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/flytekit-scala_2.13/src/main/scala/org/flyte/flytekit/package.scala b/flytekit-scala_2.13/src/main/scala/org/flyte/flytekit/package.scala index b35ecde46..a4771091e 100644 --- a/flytekit-scala_2.13/src/main/scala/org/flyte/flytekit/package.scala +++ b/flytekit-scala_2.13/src/main/scala/org/flyte/flytekit/package.scala @@ -18,10 +18,9 @@ package org.flyte /** Contains subclasses for [[SdkBindingData]]. We are forced to define this * package here because [[SdkBindingData#idl()]] is package private (we don´t - * want to expose it to users). We cannot make it protected either as it would - * be good for the own object but both implementations deal with list or maps - * of [[SdkBindingData]] and therefore cannot call this method because it is in - * a different class. + * want to expose it to users). Making it protected doesn't help either because + * list or map needs to call this method of elements so that requires it to be + * public. * * This is not ideal because we are splitting the flytekit package in two maven * modules. This would create problems when we decide to add java 9 style