Refactor instruction definitions #644
Conversation
| context(NadelValidationContext) | ||
| private fun visitElement(schemaElement: NadelServiceSchemaElement): Boolean { | ||
| // Returns true if the element was added i.e. haven't visited before | ||
| return visitedTypes.add(schemaElement.toRef()) |
There was a problem hiding this comment.
Moved visitElement into NadelValidationContext and made visitedTypes private.
| @@ -12,7 +12,7 @@ import java.util.Collections | |||
| * Alternative to [graphql.schema.idl.TypeDefinitionRegistry] but is more generic | |||
| * and tailored to Nadel specific operations to build the overall schema. | |||
| */ | |||
| class NadelDefinitionRegistry { | |||
| class NadelTypeDefinitionRegistry { | |||
There was a problem hiding this comment.
Renamed for clarity as I have also created a NadelInstructionDefinitionRegistry
There was a problem hiding this comment.
Holds the instruction definitions and utils.
This code was all moved from NadelValidationContext
Might be slightly refactored, but same otherwise.
| @@ -17,7 +17,7 @@ class NadelAssignableTypeValidation internal constructor( | |||
| requiredType = overallType, | |||
| // Compare underlying type names | |||
| suppliedTypeName = underlyingType.unwrapAll().name, | |||
| requiredTypeName = getUnderlyingTypeName(overallType.unwrapAll()), | |||
| requiredTypeName = instructionDefinitions.getUnderlyingTypeName(overallType.unwrapAll()), | |||
There was a problem hiding this comment.
Moved the util into NadelInstructionDefinitionRegistry
| @@ -20,180 +11,16 @@ data class NadelValidationContext internal constructor( | |||
| val hydrationUnions: Set<String>, | |||
| val namespaceTypeNames: Set<String>, | |||
| val combinedTypeNames: Set<String>, | |||
| val definitions: Map<NadelSchemaMemberCoordinates, List<NadelDefinition>>, | |||
| val instructionDefinitions: NadelInstructionDefinitionRegistry, | |||
There was a problem hiding this comment.
Created NadelInstructionDefinitionRegistry holder and move all the isHydrated etc methods into it
| @@ -0,0 +1,3 @@ | |||
| package graphql.nadel.definition | |||
|
|
|||
| interface NadelInstructionDefinition | |||
There was a problem hiding this comment.
Renamed from NadelDefinition
File too small for Git to pick up on the rename.
Just renaming stuff for clarity e.g.
NadelDefinitionRegistry->NadelTypeDefinitionRegistryNadelDefinition->NadelInstructionDefinitionNadelInstructionDefinitionRegistryto hold theNadelInstructionDefinitionand util functions.Pending #638