Add Amazon as vendor (Adoptium disappeared) and Java 8 fixes

dondonz · dondonz · commit bdff76f61b7d · 2024-03-18T17:07:50.000+11:00
diff --git a/build.gradle b/build.gradle
@@ -17,6 +17,7 @@ plugins {
 java {
     toolchain {
         languageVersion = JavaLanguageVersion.of(8)
+        vendor = JvmVendorSpec.AMAZON
     }
 }
 
diff --git a/src/main/java/graphql/schema/visibility/NoIntrospectionGraphqlFieldVisibility.java b/src/main/java/graphql/schema/visibility/NoIntrospectionGraphqlFieldVisibility.java
@@ -17,10 +17,10 @@
  * can be used instead
  */
 @PublicApi
-@Deprecated(since = "2024-03-16")
+@Deprecated // Deprecated since 2024-03-16
 public class NoIntrospectionGraphqlFieldVisibility implements GraphqlFieldVisibility {
 
-    @Deprecated(since = "2024-03-16")
+    @Deprecated // Deprecated since 2024-03-16
     public static NoIntrospectionGraphqlFieldVisibility NO_INTROSPECTION_FIELD_VISIBILITY = new NoIntrospectionGraphqlFieldVisibility();
 
 
diff --git a/src/test/groovy/graphql/introspection/IntrospectionTest.groovy b/src/test/groovy/graphql/introspection/IntrospectionTest.groovy
@@ -694,15 +694,15 @@ class IntrospectionTest extends Specification {
 
         when:
         ei = ExecutionInput.newExecutionInput(IntrospectionQuery.INTROSPECTION_QUERY)
-                .graphQLContext(Map.of(Introspection.INTROSPECTION_DISABLED, false)).build()
+                .graphQLContext(["INTROSPECTION_DISABLED": false]).build()
         er = graphQL.execute(ei)
 
         then:
         er.errors.isEmpty()
 
         when:
         ei = ExecutionInput.newExecutionInput(IntrospectionQuery.INTROSPECTION_QUERY)
-                .graphQLContext(Map.of(Introspection.INTROSPECTION_DISABLED, true)).build()
+                .graphQLContext(["INTROSPECTION_DISABLED": true]).build()
         er = graphQL.execute(ei)
 
         then:

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ plugins {`
`17`	`17`	`java {`
`18`	`18`	`toolchain {`
`19`	`19`	`languageVersion = JavaLanguageVersion.of(8)`
	`20`	`+ vendor = JvmVendorSpec.AMAZON`
`20`	`21`	`}`
`21`	`22`	`}`
`22`	`23`