Kaqqao 122 type resolver#395
Merged
Merged
Conversation
Allow richer resolution logic
Merge branch '122TypeResolver' of git://github.com/kaqqao/graphql-java into kaqqao-122TypeResolver # Conflicts: # src/main/java/graphql/execution/ExecutionStrategy.java # src/test/groovy/graphql/RelaySchema.java # src/test/groovy/graphql/validation/SpecValidationSchema.java # src/test/groovy/graphql/validation/rules/Harness.java This addresses graphql-java#122 and graphql-java#205. We had clashing parameters in place. I fix this up and removed one set of them from the original PR
Damn you IDEA - you often miss changed files Merge branch '122TypeResolver' of git://github.com/kaqqao/graphql-java into kaqqao-122TypeResolver # Conflicts: # src/main/java/graphql/execution/ExecutionStrategy.java # src/test/groovy/graphql/RelaySchema.java # src/test/groovy/graphql/validation/SpecValidationSchema.java # src/test/groovy/graphql/validation/rules/Harness.java This addresses graphql-java#122 and graphql-java#205. We had clashing parameters in place. I fix this up and removed one set of them from the original PR
Member
Author
|
This is a re-implementation of #369 |
…olver # Conflicts: # src/test/groovy/readme/ReadmeExamples.java
…olver Also fixed some problems
…olver # Conflicts: # src/test/groovy/graphql/validation/SpecValidationSchema.java
Member
|
@bbakerman @kaqqao This is a breaking change, right? Thanks! |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Merge branch '122TypeResolver' of git://github.com/kaqqao/graphql-java into kaqqao-122TypeResolver
Conflicts:
src/main/java/graphql/execution/ExecutionStrategy.java
src/test/groovy/graphql/RelaySchema.java
src/test/groovy/graphql/validation/SpecValidationSchema.java
src/test/groovy/graphql/validation/rules/Harness.java
This addresses #122 and #205.
We had clashing parameters in place. I fix this up and removed one set of them from the original PR
@kaqqao - this is a revamp of your PR