From 94722eeea64850519f0da18a46e1ad04c9864fde Mon Sep 17 00:00:00 2001
From: Hongxin Liang <honnix@users.noreply.github.com>
Date: Mon, 23 Oct 2023 20:56:52 +0200
Subject: [PATCH 1/2] Better way to get product elements

Signed-off-by: Hongxin Liang <honnix@users.noreply.github.com>
---
 .../flyte/flytekitscala/SdkLiteralTypes.scala |  6 +---
 .../flyte/flytekitscala/SdkScalaType.scala    |  3 +-
 .../org/flyte/flytekitscala/package.scala     | 36 +++++++++++++++++++
 3 files changed, 38 insertions(+), 7 deletions(-)
 create mode 100644 flytekit-scala_2.13/src/main/scala/org/flyte/flytekitscala/package.scala

diff --git a/flytekit-scala_2.13/src/main/scala/org/flyte/flytekitscala/SdkLiteralTypes.scala b/flytekit-scala_2.13/src/main/scala/org/flyte/flytekitscala/SdkLiteralTypes.scala
index 6d53bceae..21fd1597a 100644
--- a/flytekit-scala_2.13/src/main/scala/org/flyte/flytekitscala/SdkLiteralTypes.scala
+++ b/flytekit-scala_2.13/src/main/scala/org/flyte/flytekitscala/SdkLiteralTypes.scala
@@ -229,11 +229,7 @@ object SdkLiteralTypes {
 
   private def toStruct(product: Product): Struct = {
     def productToMap(product: Product): Map[String, Any] = {
-      // by spec getDeclaredFields is not ordered but in practice it works fine
-      // it's a lot better since Scala 2.13 because productElementNames was introduced
-      //   (product.productElementNames zip product.productIterator).toMap
-      product.getClass.getDeclaredFields
-        .map(_.getName)
+      productElementNames(product)
         .zip(product.productIterator.toList)
         .toMap
     }
diff --git a/flytekit-scala_2.13/src/main/scala/org/flyte/flytekitscala/SdkScalaType.scala b/flytekit-scala_2.13/src/main/scala/org/flyte/flytekitscala/SdkScalaType.scala
index b94f3718e..4dd706f5e 100644
--- a/flytekit-scala_2.13/src/main/scala/org/flyte/flytekitscala/SdkScalaType.scala
+++ b/flytekit-scala_2.13/src/main/scala/org/flyte/flytekitscala/SdkScalaType.scala
@@ -165,8 +165,7 @@ object SdkScalaType {
       ): ju.Map[String, SdkBindingData[_]] = {
         value match {
           case product: Product =>
-            value.getClass.getDeclaredFields
-              .map(_.getName)
+            productElementNames(product)
               .zip(product.productIterator.toSeq)
               .toMap
               .mapValues {
diff --git a/flytekit-scala_2.13/src/main/scala/org/flyte/flytekitscala/package.scala b/flytekit-scala_2.13/src/main/scala/org/flyte/flytekitscala/package.scala
new file mode 100644
index 000000000..000842d79
--- /dev/null
+++ b/flytekit-scala_2.13/src/main/scala/org/flyte/flytekitscala/package.scala
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2023 Flyte Authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.flyte
+
+package object flytekitscala {
+  private[flytekitscala] def productElementNames(
+      product: Product
+  ): List[String] = {
+    try {
+      // scala 2.13
+      product.getClass
+        .getMethod("productElementNames")
+        .invoke(product)
+        .asInstanceOf[Iterator[String]]
+        .toList
+    } catch {
+      case _: Throwable =>
+        // fall back to java's way but less reliable
+        product.getClass.getDeclaredFields.map(_.getName).toList
+    }
+  }
+}

From b77dcfb3f4a6ee085c948bc7f7a31fa093fc72c3 Mon Sep 17 00:00:00 2001
From: Hongxin Liang <honnix@users.noreply.github.com>
Date: Mon, 23 Oct 2023 21:17:16 +0200
Subject: [PATCH 2/2] More comment

Signed-off-by: Hongxin Liang <honnix@users.noreply.github.com>
---
 .../src/main/scala/org/flyte/flytekitscala/package.scala        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flytekit-scala_2.13/src/main/scala/org/flyte/flytekitscala/package.scala b/flytekit-scala_2.13/src/main/scala/org/flyte/flytekitscala/package.scala
index 000842d79..47c6332b3 100644
--- a/flytekit-scala_2.13/src/main/scala/org/flyte/flytekitscala/package.scala
+++ b/flytekit-scala_2.13/src/main/scala/org/flyte/flytekitscala/package.scala
@@ -29,7 +29,7 @@ package object flytekitscala {
         .toList
     } catch {
       case _: Throwable =>
-        // fall back to java's way but less reliable
+        // fall back to java's way, less reliable and with limitations
         product.getClass.getDeclaredFields.map(_.getName).toList
     }
   }