20.x Backport of PR 3526 and PR 3527 #3530
Merged
Conversation
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
dondonz
commented
Mar 18, 2024
| @@ -544,8 +553,9 @@ class IntrospectionTest extends Specification { | |||
| def newIntrospectionQuery = IntrospectionQuery.INTROSPECTION_QUERY | |||
|
|
|||
| then: | |||
| oldIntrospectionQuery.replaceAll("\\s+", "") == | |||
| newIntrospectionQuery.replaceAll("\\s+", "") | |||
dondonz
commented
Mar 18, 2024
dondonz
commented
Mar 18, 2024
| public class NoIntrospectionGraphqlFieldVisibility implements GraphqlFieldVisibility { | ||
|
|
||
| @Deprecated // Deprecated since 2024-03-16 |
There was a problem hiding this comment.
Java 8 special: the deprecated annotation in Java 8 doesn't have the "since" argument
dondonz
commented
Mar 18, 2024
|
|
||
| when: | ||
| ei = ExecutionInput.newExecutionInput(IntrospectionQuery.INTROSPECTION_QUERY) | ||
| .graphQLContext(["INTROSPECTION_DISABLED": false]).build() |
There was a problem hiding this comment.
Java 8 special: Map.of is Java 9+ so I've stuck in the string as is. Groovy wants the string rather than a ref to the string as the map key.
dondonz
commented
Mar 18, 2024
| ALLOWED_FIELD_INSTANCES.put(coordinates("__Type", "inputFields"), 1); | ||
| ALLOWED_FIELD_INSTANCES.put(coordinates("__Type", "interfaces"), 1); | ||
| ALLOWED_FIELD_INSTANCES.put(coordinates("__Type", "possibleTypes"), 1); | ||
| } |
There was a problem hiding this comment.
This is different to master - in Java 8 there's no Map.of so I have to use this static block like a caveman
bbakerman
approved these changes
Mar 19, 2024
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.
Backport of PR #3526 and PR #3527 which enables introspection to be disabled
Note: version 20 takes us back to the stone age with Java 8