Fix validation of kotlin collection type for enums and lists of complex types. #32
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
srinivasankavitha
force-pushed
the
input-argument-fixes
branch
from
1b4b1c3
to
5d394f0
Compare
srinivasankavitha
force-pushed
the
input-argument-fixes
branch
from
5d394f0
to
c9c4279
Compare
srinivasankavitha
requested review from
paulbakker and
berngp
and removed request for
paulbakker
paulbakker
requested changes
Apr 6, 2022
| @@ -103,7 +103,7 @@ object InputArgumentUtils { | |||
| if (isListType(input.type!!) || isEnumType(input.type!!, typeRegistry)) { | |||
| val collectionType = getCollectionType(input.type!!, false) | |||
| if (! isSimpleType(collectionType)) { | |||
| inputArgumentHint.append("(collectionType=$collectionType) ") | |||
| inputArgumentHint.append("(collectionType=$collectionType::class) ") | |||
| @@ -124,7 +124,7 @@ class DgsInputArgumentValidationInspector : AbstractBaseUastLocalInspectionTool( | |||
| val expectedInputArgumentHint = InputArgumentUtils.getHintForInputArgument(graphQLInput, typeDefinitionRegistry, isJavaFile) | |||
| if (expectedInputArgumentHint.contains("collectionType")) { | |||
| val expectedCollectionType = InputArgumentUtils.getCollectionType(graphQLInput.type!!, isJavaFile) | |||
| val inputCollectionType = inputArgumentAnnotation.findAttributeValue("collectionType")?.text?.removeSuffixIfPresent(".class") | |||
| val inputCollectionType = inputArgumentAnnotation.findAttributeValue("collectionType")?.text?.removeSuffixIfPresent(".class")?.removeSuffixIfPresent("::class") | |||
There was a problem hiding this comment.
::class shouldn't be there in the first place, so this should probably be fixed elsewhere.
paulbakker
approved these changes
Apr 6, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Collection types in kotlin need
::classfor enums and lists of complex types.Fixes the following issues:
#29
Netflix/dgs-framework#936