-
Notifications
You must be signed in to change notification settings - Fork 93
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix subtyping in dict service #7115
base: staging
Are you sure you want to change the base?
Changes from 19 commits
d7893c6
d5796f3
7f14f49
1d5ce0c
9bd74d5
28ff753
a881083
108a345
d073fd1
2e50536
50c59b5
81d10a0
43706dc
6385259
209ab0c
e4724a2
c7296a0
07af990
6716c23
6f7187c
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,249 @@ | ||||||
package pl.touk.nussknacker.engine.api.typed | ||||||
|
||||||
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.typing._ | ||||||
|
||||||
/** | ||||||
* This class determine if type can be subclass of other type. It basically based on fact that TypingResults are | ||||||
* sets of possible supertypes with some additional restrictions (like TypedObjectTypingResult). | ||||||
* | ||||||
* This class, like CommonSupertypeFinder is in spirit of "Be type safety as much as possible, but also provide some helpful | ||||||
* conversion for types not in the same jvm class hierarchy like boxed Integer to boxed Long and so on". | ||||||
* WARNING: Evaluation of SpEL expressions fit into this spirit, for other language evaluation engines you need to provide such a compatibility. | ||||||
*/ | ||||||
object AssignabilityDeterminer { | ||||||
|
||||||
private val javaMapClass = classOf[java.util.Map[_, _]] | ||||||
private val javaListClass = classOf[java.util.List[_]] | ||||||
private val arrayOfAnyRefClass = classOf[Array[AnyRef]] | ||||||
|
||||||
/** | ||||||
* This method checks if `givenType` can by subclass of `superclassCandidate` | ||||||
* It will return true if `givenType` is equals to `superclassCandidate` or `givenType` "extends" `superclassCandidate` | ||||||
*/ | ||||||
def isAssignableLoose(from: TypingResult, to: TypingResult): ValidatedNel[String, Unit] = | ||||||
isAssignable(from, to, LooseConversionChecker) | ||||||
|
||||||
def isAssignableStrict(from: TypingResult, to: TypingResult): ValidatedNel[String, Unit] = | ||||||
isAssignable(from, to, StrictConversionChecker) | ||||||
|
||||||
private def isAssignable(from: TypingResult, to: TypingResult, conversionChecker: ConversionChecker) = { | ||||||
(from, to) match { | ||||||
case (_, Unknown) => ().validNel | ||||||
case (Unknown, _) => ().validNel | ||||||
case (TypedNull, other) => isNullAsignableTo(other) | ||||||
case (_, TypedNull) => s"No type can be subclass of ${TypedNull.display}".invalidNel | ||||||
case (given: SingleTypingResult, superclass: TypedUnion) => | ||||||
isAnyOfAssignableToAnyOf(NonEmptyList.one(given), superclass.possibleTypes, conversionChecker) | ||||||
case (given: TypedUnion, superclass: SingleTypingResult) => | ||||||
isAnyOfAssignableToAnyOf(given.possibleTypes, NonEmptyList.one(superclass), conversionChecker) | ||||||
case (given: SingleTypingResult, superclass: SingleTypingResult) => | ||||||
isSingleAssignableToSingle(given, superclass, conversionChecker) | ||||||
case (given: TypedUnion, superclass: TypedUnion) => | ||||||
isAnyOfAssignableToAnyOf(given.possibleTypes, superclass.possibleTypes, conversionChecker) | ||||||
} | ||||||
} | ||||||
|
||||||
private def isNullAsignableTo(to: TypingResult): ValidatedNel[String, Unit] = to match { | ||||||
// TODO: Null should not be subclass of typed map that has all values assigned. | ||||||
case TypedObjectWithValue(_, _) => s"${TypedNull.display} cannot be subclass of type with value".invalidNel | ||||||
case _ => ().validNel | ||||||
} | ||||||
|
||||||
private def isSingleAssignableToSingle( | ||||||
from: SingleTypingResult, | ||||||
to: SingleTypingResult, | ||||||
conversionChecker: ConversionChecker | ||||||
): ValidatedNel[String, Unit] = { | ||||||
val objTypeRestriction = isSingleAssignableToTypedClass(from, to.runtimeObjType, conversionChecker) | ||||||
val typedObjectRestrictions = (_: Unit) => | ||||||
to match { | ||||||
case superclass: TypedObjectTypingResult => | ||||||
val givenTypeFields = from match { | ||||||
case given: TypedObjectTypingResult => given.fields | ||||||
case _ => Map.empty[String, TypingResult] | ||||||
} | ||||||
|
||||||
superclass.fields.toList | ||||||
.map { case (name, typ) => | ||||||
givenTypeFields.get(name) match { | ||||||
case None => | ||||||
s"Field '$name' is lacking".invalidNel | ||||||
case Some(givenFieldType) => | ||||||
condNel( | ||||||
isAssignable(givenFieldType, typ, conversionChecker).isValid, | ||||||
(), | ||||||
s"Field '$name' is of the wrong type. Expected: ${givenFieldType.display}, actual: ${typ.display}" | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Correct the order of expected and actual types in the error message. In the error message for field type mismatch, the expected and actual types are reversed. The expected type should be from Apply this diff to fix the error message: - s"Field '$name' is of the wrong type. Expected: ${givenFieldType.display}, actual: ${typ.display}"
+ s"Field '$name' is of the wrong type. Expected: ${typ.display}, actual: ${givenFieldType.display}" 📝 Committable suggestion
Suggested change
|
||||||
) | ||||||
} | ||||||
} | ||||||
.foldLeft(().validNel[String])(_.combine(_)) | ||||||
case _ => | ||||||
().validNel | ||||||
} | ||||||
val dictRestriction = (_: Unit) => { | ||||||
(from, to) match { | ||||||
case (given: TypedDict, superclass: TypedDict) => | ||||||
condNel( | ||||||
given.dictId == superclass.dictId, | ||||||
(), | ||||||
"The type and the superclass candidate are Dicts with unequal IDs" | ||||||
) | ||||||
case (_: TypedDict, _) => | ||||||
"The type is a Dict but the superclass candidate not".invalidNel | ||||||
case (_, _: TypedDict) => | ||||||
"The superclass candidate is a Dict but the type not".invalidNel | ||||||
case _ => | ||||||
().validNel | ||||||
} | ||||||
} | ||||||
val taggedValueRestriction = (_: Unit) => { | ||||||
(from, to) match { | ||||||
case (givenTaggedValue: TypedTaggedValue, superclassTaggedValue: TypedTaggedValue) => | ||||||
condNel( | ||||||
givenTaggedValue.tag == superclassTaggedValue.tag, | ||||||
(), | ||||||
s"Tagged values have unequal tags: ${givenTaggedValue.tag} and ${superclassTaggedValue.tag}" | ||||||
) | ||||||
case (_: TypedTaggedValue, _) => ().validNel | ||||||
case (_, _: TypedTaggedValue) => | ||||||
s"The type is not a tagged value".invalidNel | ||||||
case _ => ().validNel | ||||||
} | ||||||
} | ||||||
// Type like Integer can be subclass of Integer{5}, because Integer could | ||||||
// possibly have value of 5, that would make it subclass of Integer{5}. | ||||||
// This allows us to supply unknown Integer to function that requires | ||||||
// Integer{5}. | ||||||
val dataValueRestriction = (_: Unit) => { | ||||||
(from, to) match { | ||||||
case (TypedObjectWithValue(_, givenValue), TypedObjectWithValue(_, candidateValue)) | ||||||
if givenValue == candidateValue => | ||||||
().validNel | ||||||
case (TypedObjectWithValue(_, givenValue), TypedObjectWithValue(_, candidateValue)) => | ||||||
s"Types with value have different values: $givenValue and $candidateValue".invalidNel | ||||||
case _ => ().validNel | ||||||
} | ||||||
} | ||||||
objTypeRestriction andThen | ||||||
(typedObjectRestrictions combine dictRestriction combine taggedValueRestriction combine dataValueRestriction) | ||||||
} | ||||||
|
||||||
private def isSingleAssignableToTypedClass( | ||||||
from: SingleTypingResult, | ||||||
to: TypedClass, | ||||||
conversionChecker: ConversionChecker | ||||||
): ValidatedNel[String, Unit] = { | ||||||
def typeParametersMatches(givenClass: TypedClass, superclassCandidate: TypedClass) = { | ||||||
def canBeSubOrSuperclass(givenClassParam: TypingResult, superclassParam: TypingResult) = | ||||||
condNel( | ||||||
isAssignable(givenClassParam, superclassParam, conversionChecker).isValid || | ||||||
isAssignable(superclassParam, givenClassParam, conversionChecker).isValid, | ||||||
(), | ||||||
f"None of ${givenClassParam.display} and ${superclassParam.display} is a subclass of another" | ||||||
) | ||||||
|
||||||
(givenClass, superclassCandidate) match { | ||||||
case (TypedClass(_, givenElementParam :: Nil), TypedClass(superclass, superclassParam :: Nil)) | ||||||
// Array are invariant but we have built-in conversion between array types - this check should be moved outside this class when we move away canBeConvertedTo as well | ||||||
if javaListClass.isAssignableFrom(superclass) || arrayOfAnyRefClass.isAssignableFrom(superclass) => | ||||||
isAssignable(givenElementParam, superclassParam, conversionChecker) | ||||||
case ( | ||||||
TypedClass(_, givenKeyParam :: givenValueParam :: Nil), | ||||||
TypedClass(superclass, superclassKeyParam :: superclassValueParam :: Nil) | ||||||
) if javaMapClass.isAssignableFrom(superclass) => | ||||||
// Map's key generic param is invariant. We can't just check givenKeyParam == superclassKeyParam because of Unknown type which is a kind of wildcard | ||||||
condNel( | ||||||
isAssignable(givenKeyParam, superclassKeyParam, conversionChecker).isValid && | ||||||
isAssignable(superclassKeyParam, givenKeyParam, conversionChecker).isValid, | ||||||
(), | ||||||
s"Key types of Maps ${givenKeyParam.display} and ${superclassKeyParam.display} are not equals" | ||||||
) andThen (_ => isAssignable(givenValueParam, superclassValueParam, conversionChecker)) | ||||||
case _ => | ||||||
// for unknown types we are lax - the generic type may be co- contra- or in-variant - and we don't want to | ||||||
// return validation errors in this case. It's better to accept to much than too little | ||||||
condNel( | ||||||
superclassCandidate.params.zip(givenClass.params).forall { case (superclassParam, givenClassParam) => | ||||||
canBeSubOrSuperclass(givenClassParam, superclassParam).isValid | ||||||
}, | ||||||
(), | ||||||
s"Wrong type parameters" | ||||||
) | ||||||
} | ||||||
} | ||||||
val givenClass = from.runtimeObjType | ||||||
|
||||||
val equalClassesOrCanAssign = | ||||||
condNel( | ||||||
givenClass == to, | ||||||
(), | ||||||
f"${givenClass.display} and ${to.display} are not the same" | ||||||
) orElse | ||||||
isAssignable(givenClass.klass, to.klass) | ||||||
|
||||||
val canBeSubclass = equalClassesOrCanAssign andThen (_ => typeParametersMatches(givenClass, to)) | ||||||
canBeSubclass orElse conversionChecker.isConvertable(from, to) | ||||||
} | ||||||
|
||||||
private def isAnyOfAssignableToAnyOf( | ||||||
from: NonEmptyList[SingleTypingResult], | ||||||
to: NonEmptyList[SingleTypingResult], | ||||||
conversionChecker: ConversionChecker | ||||||
): ValidatedNel[String, Unit] = { | ||||||
// Would be more safety to do givenTypes.forAll(... superclassCandidates.exists ...) - we wil protect against | ||||||
// e.g. (String | Int).isAnyOfAssignableToAnyOf(String) which can fail in runtime for Int, but on the other hand we can't block user's intended action. | ||||||
// He/she could be sure that in this type, only String will appear. He/she also can't easily downcast (String | Int) to String so leaving here | ||||||
// "double exists" looks like a good tradeoff | ||||||
condNel( | ||||||
from.exists(given => to.exists(isSingleAssignableToSingle(given, _, conversionChecker).isValid)), | ||||||
(), | ||||||
s"""None of the following types: | ||||||
|${from.map(" - " + _.display).toList.mkString(",\n")} | ||||||
|can be a subclass of any of: | ||||||
|${to.map(" - " + _.display).toList.mkString(",\n")}""".stripMargin | ||||||
) | ||||||
} | ||||||
|
||||||
// we use explicit autoboxing = true flag, as ClassUtils in commons-lang3:3.3 (used in Flink) cannot handle JDK 11... | ||||||
private def isAssignable(from: Class[_], to: Class[_]): ValidatedNel[String, Unit] = | ||||||
condNel(ClassUtils.isAssignable(from, to, true), (), s"$to is not assignable from $from") | ||||||
|
||||||
// TODO: Conversions should be checked during typing, not during generic usage of TypingResult.canBeSubclassOf(...) | ||||||
private sealed trait ConversionChecker { | ||||||
|
||||||
def isConvertable( | ||||||
from: SingleTypingResult, | ||||||
to: TypedClass | ||||||
): ValidatedNel[String, Unit] | ||||||
|
||||||
} | ||||||
|
||||||
private object StrictConversionChecker extends ConversionChecker { | ||||||
|
||||||
override def isConvertable( | ||||||
from: SingleTypingResult, | ||||||
to: TypedClass | ||||||
): ValidatedNel[String, Unit] = { | ||||||
val errMsgPrefix = | ||||||
s"${from.runtimeObjType.display} cannot be strictly converted to ${to.display}" | ||||||
condNel(TypeConversionHandler.canBeStrictlyConvertedTo(from, to), (), errMsgPrefix) | ||||||
} | ||||||
|
||||||
} | ||||||
|
||||||
private object LooseConversionChecker extends ConversionChecker { | ||||||
|
||||||
override def isConvertable( | ||||||
from: SingleTypingResult, | ||||||
to: TypedClass | ||||||
): ValidatedNel[String, Unit] = { | ||||||
val errMsgPrefix = s"${from.runtimeObjType.display} cannot be converted to ${to.display}" | ||||||
condNel(TypeConversionHandler.canBeLooselyConvertedTo(from, to), (), errMsgPrefix) | ||||||
} | ||||||
|
||||||
} | ||||||
|
||||||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you correct this comment? That its determining not only if its a subclass but also if is assignable according to spel conversions.