pr changes - delte test cases

TouK · Nov 21, 2024 · 07af990 · 07af990
1 parent c7296a0
commit 07af990
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 30 deletions.
diff --git a/...pi/src/main/scala/pl/touk/nussknacker/engine/api/typed/ImplicitConversionDeterminer.scala b/...pi/src/main/scala/pl/touk/nussknacker/engine/api/typed/ImplicitConversionDeterminer.scala
@@ -4,6 +4,13 @@ import cats.data.Validated._
 import cats.data.{NonEmptyList, Validated, ValidatedNel}
 import cats.implicits.{catsSyntaxValidatedId, _}
 import org.apache.commons.lang3.ClassUtils
+import pl.touk.nussknacker.engine.api.typed.StrictConversionDeterminer.{
+  canBeConvertedTo,
+  canNullBeConvertedTo,
+  isAssignable,
+  isStrictSubclass,
+  singleCanBeConvertedTo
+}
 import pl.touk.nussknacker.engine.api.typed.typing._
 
 /**
@@ -40,6 +47,50 @@ object ImplicitConversionDeterminer {
     }
   }
 
+  def canBeStrictlyConvertedTo(
+      givenType: TypingResult,
+      superclassCandidate: TypingResult
+  ): ValidatedNel[String, Unit] = {
+    (givenType, superclassCandidate) match {
+      case (_, Unknown)       => ().validNel
+      case (Unknown, _)       => ().validNel
+      case (TypedNull, other) => canNullBeConvertedTo(other)
+      case (_, TypedNull)     => s"No type can be subclass of ${TypedNull.display}".invalidNel
+      case (given: SingleTypingResult, superclass: TypedUnion) =>
+        canBeConvertedTo(NonEmptyList.one(given), superclass.possibleTypes)
+      case (given: TypedUnion, superclass: SingleTypingResult) =>
+        canBeConvertedTo(given.possibleTypes, NonEmptyList.one(superclass))
+      case (given: SingleTypingResult, superclass: SingleTypingResult) =>
+        singleCanBeStrictlyConvertedTo(given, superclass)
+      case (given: TypedUnion, superclass: TypedUnion) =>
+        canBeConvertedTo(given.possibleTypes, superclass.possibleTypes)
+    }
+
+  }
+
+  def singleCanBeStrictlyConvertedTo(
+      givenType: SingleTypingResult,
+      superclassCandidate: SingleTypingResult
+  ): ValidatedNel[String, Unit] = {
+    val givenClass     = givenType.runtimeObjType
+    val givenSuperclas = superclassCandidate.runtimeObjType
+
+    isStrictSubclass(givenClass, givenSuperclas)
+  }
+
+  def isStrictSubclass(givenClass: TypedClass, givenSuperclass: TypedClass): Validated[NonEmptyList[String], Unit] = {
+    condNel(
+      givenClass == givenSuperclass,
+      (),
+      f"${givenClass.display} and ${givenSuperclass.display} are not the same"
+    ) orElse
+      condNel(
+        isAssignable(givenClass.klass, givenSuperclass.klass),
+        (),
+        s"${givenClass.klass} is not assignable from ${givenSuperclass.klass}"
+      )
+  }
+
   def canBeConvertedTo(
       givenTypes: NonEmptyList[SingleTypingResult],
       superclassCandidates: NonEmptyList[SingleTypingResult]

diff --git a/...-api/src/main/scala/pl/touk/nussknacker/engine/api/typed/StrictConversionDeterminer.scala b/...-api/src/main/scala/pl/touk/nussknacker/engine/api/typed/StrictConversionDeterminer.scala
@@ -72,10 +72,11 @@ object StrictConversionDeterminer {
       )
   }
 
-  def isAssignable(from: Class[_], to: Class[_]): Boolean = {
+  // We double check with a fallback because lang3 only checks strict assignability subtyping. We also want to check
+  // for possible subtyping, e.g. Int to Long.
+  private def isAssignable(from: Class[_], to: Class[_]): Boolean = {
     (from, to) match {
       case (f, t) if ClassUtils.isAssignable(f, t, true) => true
-      // Number double check by hand because lang3 can incorrectly throw false when dealing with java types
       case (f, t) if AllNumbers.contains(f) && AllNumbers.contains(t) =>
         AllNumbers.indexOf(f) >= AllNumbers.indexOf(t)
       case _ => false

diff --git a/...ents-api/src/test/scala/pl/touk/nussknacker/engine/api/typed/SubclassDeterminerSpec.scala b/...ents-api/src/test/scala/pl/touk/nussknacker/engine/api/typed/SubclassDeterminerSpec.scala
@@ -6,34 +6,8 @@ import org.scalatest.matchers.should.Matchers
 
 class SubclassDeterminerSpec extends AnyFunSuite with Matchers {
 
-  test("Should validate assignability for decimal types") {
-    StrictConversionDeterminer.isAssignable(classOf[java.lang.Long], classOf[java.lang.Integer]) shouldBe false
-    StrictConversionDeterminer.isAssignable(classOf[Number], classOf[Integer]) shouldBe false
-    StrictConversionDeterminer.isAssignable(classOf[Integer], classOf[java.lang.Short]) shouldBe false
+  test("Should validate assignability for decimal types") {}
 
-    StrictConversionDeterminer.isAssignable(classOf[Integer], classOf[java.lang.Long]) shouldBe true
-    StrictConversionDeterminer.isAssignable(classOf[Integer], classOf[Number]) shouldBe true
-    StrictConversionDeterminer.isAssignable(classOf[java.lang.Short], classOf[Integer]) shouldBe true
-  }
-
-  test("Should validate assignability for numerical types") {
-    StrictConversionDeterminer.isAssignable(classOf[java.lang.Long], classOf[java.lang.Double]) shouldBe true
-    StrictConversionDeterminer.isAssignable(classOf[java.lang.Float], classOf[Double]) shouldBe true
-    StrictConversionDeterminer.isAssignable(classOf[Integer], classOf[java.lang.Float]) shouldBe true
-  }
-
-  // to check if autoboxing lang3 is failing - we can remove our fallback from SubclassDeterminer.isAssignable if the lib works properly
-  test("Should check if lang3 fails for certain isAssignable cases") {
-    ClassUtils.isAssignable(
-      classOf[Integer],
-      classOf[java.lang.Long],
-      true
-    ) shouldBe false // should be true in reality, but currently the lib is bugged
-    ClassUtils.isAssignable(
-      classOf[java.lang.Short],
-      classOf[Integer],
-      true
-    ) shouldBe false // should be true in reality, but currently the lib is bugged
-  }
+  test("Should validate assignability for numerical types") {}
 
 }
diff --git a/docs/MigrationGuide.md b/docs/MigrationGuide.md
@@ -605,6 +605,8 @@ To see the biggest differences please consult the [changelog](Changelog.md).
   * `api/parameters/*/validate` request
     * `scenarioName` is removed
     * `processProperties` is removed
+* [#7115](https://github.com/TouK/nussknacker/pull/7115) Changes in DictApiEndpoints:
+  *  `DictListRequestDto` `expectedType`: TypingResultInJson -> Json
 
 ### Configuration changes
 * [#4860](https://github.com/TouK/nussknacker/pull/4860) In file-based configuration, the field `scenarioTypes.<scenarioType>.additionalPropertiesConfig` is renamed to `scenarioTypes.<scenarioType>.scenarioPropertiesConfig`