upgrading orchestrator java version to 11

kmoore-intuit · kmoore-intuit · commit a20d5c05ba49 · 2023-06-07T10:08:23.000-04:00
diff --git a/pom.xml b/pom.xml
@@ -25,15 +25,15 @@
   </developers>
   
   <properties>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
     <maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
     <jacoco.enabled>true</jacoco.enabled>
     <jacoco.version>0.8.4</jacoco.version>
     <central.repo>https://nexus.intuit.com/nexus/content/groups/public</central.repo>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <java.version>1.8</java.version>
+    <java.version>11</java.version>
     <maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
     <awssdk2.version>2.7.2</awssdk2.version>
     <graphql-sdl-version>3.0.1</graphql-sdl-version>
@@ -311,8 +311,9 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.6.1</version>
         <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
+          <source>11</source>
+          <target>11</target>
+          <release>8</release>
           <annotationProcessorPaths>
             <path>
               <groupId>com.google.dagger</groupId>
diff --git a/src/test/groovy/com/intuit/graphql/orchestrator/federation/EntityDataFetcherSpec.groovy b/src/test/groovy/com/intuit/graphql/orchestrator/federation/EntityDataFetcherSpec.groovy
@@ -13,11 +13,11 @@ import static com.intuit.graphql.orchestrator.batch.DataLoaderKeyUtil.createData
 
 class EntityDataFetcherSpec extends Specification {
 
-    private final String entityName = "MockEntity"
+    private String entityName = "MockEntity"
 
-    private final String namespace = "testNamespace"
+    private String namespace = "testNamespace"
 
-    private final ServiceProvider.ServiceType serviceType = ServiceProvider.ServiceType.FEDERATION_SUBGRAPH
+    private ServiceProvider.ServiceType serviceType = ServiceProvider.ServiceType.FEDERATION_SUBGRAPH
 
     private DataFetchingEnvironment dataFetchingEnvironmentMock
 
diff --git a/src/test/groovy/com/intuit/graphql/orchestrator/federation/EntityFetcherBatchLoaderSpec.groovy b/src/test/groovy/com/intuit/graphql/orchestrator/federation/EntityFetcherBatchLoaderSpec.groovy
@@ -33,7 +33,7 @@ class EntityFetcherBatchLoaderSpec extends Specification {
     private FederationMetadata.EntityExtensionMetadata metadataMock
     private ServiceMetadata serviceMetadata
 
-    final private String extEntityField = "requestedExtEntityField"
+    private String extEntityField = "requestedExtEntityField"
 
     private EntityFetcherBatchLoader specUnderTest
 
diff --git a/src/test/groovy/com/intuit/graphql/orchestrator/federation/EntityFetcherBatchResultTransformerSpec.groovy b/src/test/groovy/com/intuit/graphql/orchestrator/federation/EntityFetcherBatchResultTransformerSpec.groovy
@@ -12,9 +12,9 @@ import spock.lang.Specification
 import static com.intuit.graphql.orchestrator.batch.EntityFetcherBatchResultTransformer.NO_ENTITY_FIELD
 
 class EntityFetcherBatchResultTransformerSpec extends Specification {
-    private final String serviceProviderName = "MockProvider"
-    private final String entityTypeName = "MockEntity"
-    private final String requestedField = "ExtEntityField"
+    private String serviceProviderName = "MockProvider"
+    private String entityTypeName = "MockEntity"
+    private String requestedField = "ExtEntityField"
     private EntityFetcherBatchResultTransformer specUnderTest
 
     def setup() {
diff --git a/src/test/groovy/com/intuit/graphql/orchestrator/fieldresolver/FieldResolverBatchSelectionSetSupplierLiteralsSpec.groovy b/src/test/groovy/com/intuit/graphql/orchestrator/fieldresolver/FieldResolverBatchSelectionSetSupplierLiteralsSpec.groovy
@@ -35,11 +35,11 @@ class FieldResolverBatchSelectionSetSupplierLiteralsSpec extends Specification {
 
     private RenamedMetadata renamedMetadataMock
 
-    private final Map<String, Object> testDFEDataSource = new HashMap<>()
+    private Map<String, Object> testDFEDataSource = new HashMap<>()
 
     private FieldResolverContext testFieldResolverContext
 
-    private final List<DataFetchingEnvironment> dataFetchingEnvironments = new ArrayList<>()
+    private List<DataFetchingEnvironment> dataFetchingEnvironments = new ArrayList<>()
 
     private FieldResolverBatchSelectionSetSupplier subject
 
diff --git a/src/test/groovy/com/intuit/graphql/orchestrator/fieldresolver/FieldResolverBatchSelectionSetSupplierPrimitiveArgumentSpec.groovy b/src/test/groovy/com/intuit/graphql/orchestrator/fieldresolver/FieldResolverBatchSelectionSetSupplierPrimitiveArgumentSpec.groovy
@@ -23,7 +23,7 @@ import static java.util.Collections.singletonList
 
 class FieldResolverBatchSelectionSetSupplierPrimitiveArgumentSpec extends Specification {
 
-    private static final String[] RESOLVER_SELECTED_FIELDS = ["targetField"];
+    private static String[] RESOLVER_SELECTED_FIELDS = ["targetField"];
 
     private DataFetchingEnvironment dataFetchingEnvironmentMock
 
@@ -39,11 +39,11 @@ class FieldResolverBatchSelectionSetSupplierPrimitiveArgumentSpec extends Specif
 
     private RenamedMetadata renamedMetadataMock
 
-    private final Map<String, Object> testDFEDataSource = new HashMap<>()
+    private Map<String, Object> testDFEDataSource = new HashMap<>()
 
     private FieldResolverContext testFieldResolverContext
 
-    private final List<DataFetchingEnvironment> dataFetchingEnvironments = new ArrayList<>()
+    private List<DataFetchingEnvironment> dataFetchingEnvironments = new ArrayList<>()
 
     private FieldResolverBatchSelectionSetSupplier subject
 
diff --git a/src/test/groovy/com/intuit/graphql/orchestrator/fieldresolver/FieldResolverGraphQLErrorSpec.groovy b/src/test/groovy/com/intuit/graphql/orchestrator/fieldresolver/FieldResolverGraphQLErrorSpec.groovy
@@ -6,10 +6,10 @@ import spock.lang.Specification
 
 class FieldResolverGraphQLErrorSpec extends Specification {
 
-    private final String TEST_ERROR_MESSAGE = "testErrorMessage"
-    private final String TEST_SERVICE_NAME = "testServiceName"
-    private final String TEST_PARENT_TYPE_NAME = "testParentTypeName"
-    private final String TEST_FIELD_NAME = "testFieldName"
+    private String TEST_ERROR_MESSAGE = "testErrorMessage"
+    private String TEST_SERVICE_NAME = "testServiceName"
+    private String TEST_PARENT_TYPE_NAME = "testParentTypeName"
+    private String TEST_FIELD_NAME = "testFieldName"
 
     private ResolverDirectiveDefinition mockResolverDirectiveDefinition
 
diff --git a/src/test/groovy/com/intuit/graphql/orchestrator/resolverdirective/FieldResolverDirectiveUtilSpec.groovy b/src/test/groovy/com/intuit/graphql/orchestrator/resolverdirective/FieldResolverDirectiveUtilSpec.groovy
@@ -12,9 +12,9 @@ import static com.intuit.graphql.orchestrator.xtext.GraphQLFactoryDelegate.creat
 
 class FieldResolverDirectiveUtilSpec extends Specification {
 
-    private final String TEST_FIELD_REFERENCE_NAME = "testFieldReferenceName"
-    private final String TEST_PARENT_TYPE_NAME = "testParentTypeName"
-    private final String TEST_SERVICE_NAME = "testServiceName"
+    private String TEST_FIELD_REFERENCE_NAME = "testFieldReferenceName"
+    private String TEST_PARENT_TYPE_NAME = "testParentTypeName"
+    private String TEST_SERVICE_NAME = "testServiceName"
 
     def "is Reference To Field In Parent Type Success"() {
         given:
diff --git a/src/test/groovy/com/intuit/graphql/orchestrator/resolverdirective/ResolverArgumentDefinitionSpec.groovy b/src/test/groovy/com/intuit/graphql/orchestrator/resolverdirective/ResolverArgumentDefinitionSpec.groovy
@@ -5,8 +5,8 @@ import com.intuit.graphql.orchestrator.xtext.GraphQLFactoryDelegate
 import spock.lang.Specification
 
 class ResolverArgumentDefinitionSpec extends Specification {
-    private final String TEST_NAME = "testName"
-    private final String TEST_VALUE = "testValue"
+    private String TEST_NAME = "testName"
+    private String TEST_VALUE = "testValue"
 
     def "Builder with no Params is accessible"() {
         given:
diff --git a/src/test/groovy/com/intuit/graphql/orchestrator/resolverdirective/ResolverArgumentNotAFieldOfParentExceptionSpec.groovy b/src/test/groovy/com/intuit/graphql/orchestrator/resolverdirective/ResolverArgumentNotAFieldOfParentExceptionSpec.groovy
@@ -4,10 +4,10 @@ import spock.lang.Specification
 
 class ResolverArgumentNotAFieldOfParentExceptionSpec extends Specification {
 
-    private final String TEST_RESOLVER_ARG_VALUE = "testResolverArgValue"
-    private final String TEST_PARENT_TYPE_NAME = "testParentTypeName"
-    private final String TEST_REQUIRED_FIELD_NAME = "testReqdFieldName"
-    private final String TEST_SERVICE_NAME = "testServiceName"
+    private String TEST_RESOLVER_ARG_VALUE = "testResolverArgValue"
+    private String TEST_PARENT_TYPE_NAME = "testParentTypeName"
+    private String TEST_REQUIRED_FIELD_NAME = "testReqdFieldName"
+    private String TEST_SERVICE_NAME = "testServiceName"
 
     def "ResolverArgumentNotAFieldOfParentException with resolverArgValue and parentTypeName parameter forms a correct error message"() {
         given:
diff --git a/src/test/groovy/com/intuit/graphql/orchestrator/schema/transform/FederationTransformerPostMergeSpec.groovy b/src/test/groovy/com/intuit/graphql/orchestrator/schema/transform/FederationTransformerPostMergeSpec.groovy
@@ -18,11 +18,11 @@ import static java.util.Collections.singletonList
 
 class FederationTransformerPostMergeSpec extends Specification {
 
-    private final FieldDefinition BASE_FIELD_DEFINITION = buildFieldDefinition("testField1")
+    private FieldDefinition BASE_FIELD_DEFINITION = buildFieldDefinition("testField1")
 
-    private final Directive EXTERNAL_DIRECTIVE = buildDirective(buildDirectiveDefinition(FEDERATION_EXTERNAL_DIRECTIVE), null)
+    private Directive EXTERNAL_DIRECTIVE = buildDirective(buildDirectiveDefinition(FEDERATION_EXTERNAL_DIRECTIVE), null)
 
-    private final FieldDefinition EXTENSION_FIELD_DEFINITION = buildFieldDefinition("testField1", singletonList(EXTERNAL_DIRECTIVE))
+    private FieldDefinition EXTENSION_FIELD_DEFINITION = buildFieldDefinition("testField1", singletonList(EXTERNAL_DIRECTIVE))
 
     @Subject
     private FederationTransformerPostMerge subjectUnderTest
diff --git a/src/test/groovy/com/intuit/graphql/orchestrator/schema/transform/FieldResolverTransformerPostMergeSpec.groovy b/src/test/groovy/com/intuit/graphql/orchestrator/schema/transform/FieldResolverTransformerPostMergeSpec.groovy
@@ -18,18 +18,18 @@ import static java.util.Collections.singletonList
 
 class FieldResolverTransformerPostMergeSpec extends Specification {
 
-    private static final String EXTENDED_OBJECT_TYPENAME = "AObjectType"
-    private static final String EXTERNAL_OBJECT_TYPENAME = "BObjectType"
-    private static final String EXTERNAL_INTERFACE_TYPENAME = "BInterfaceType"
-    private static final String EXTERNAL_UNION_TYPENAME = "BUnionType"
-    private static final String EXTERNAL_ENUM_TYPENAME = "BEnumType"
+    private static  String EXTENDED_OBJECT_TYPENAME = "AObjectType"
+    private static  String EXTERNAL_OBJECT_TYPENAME = "BObjectType"
+    private static  String EXTERNAL_INTERFACE_TYPENAME = "BInterfaceType"
+    private static  String EXTERNAL_UNION_TYPENAME = "BUnionType"
+    private static  String EXTERNAL_ENUM_TYPENAME = "BEnumType"
 
     private static ObjectTypeDefinition externalObjectTypeDefinition
     private static InterfaceTypeDefinition externalInterfaceTypeDefinition
     private static UnionTypeDefinition externalUnionTypeDefinition
     private static EnumTypeDefinition externalEnumTypeDefinition
 
-    private final Transformer<UnifiedXtextGraph, UnifiedXtextGraph> transformer = new FieldResolverTransformerPostMerge()
+    private Transformer<UnifiedXtextGraph, UnifiedXtextGraph> transformer = new FieldResolverTransformerPostMerge()
 
     def setup() {
         List<FieldDefinition> fieldDefinitions = singletonList(buildFieldDefinition("fieldA"))
diff --git a/src/test/groovy/com/intuit/graphql/orchestrator/schema/transform/FieldResolverTransformerPreMergeSpec.groovy b/src/test/groovy/com/intuit/graphql/orchestrator/schema/transform/FieldResolverTransformerPreMergeSpec.groovy
@@ -9,7 +9,7 @@ import static com.intuit.graphql.orchestrator.schema.transform.FieldResolverTran
 
 class FieldResolverTransformerPreMergeSpec extends Specification {
 
-    private final Transformer<XtextGraph, XtextGraph> transformer = new FieldResolverTransformerPreMerge()
+    private Transformer<XtextGraph, XtextGraph> transformer = new FieldResolverTransformerPreMerge()
 
     def "transform With No Field Resolver Success No Transformation"() {
         given:
diff --git a/src/test/groovy/com/intuit/graphql/orchestrator/xtext/UnifiedXTextGraphSpec.groovy b/src/test/groovy/com/intuit/graphql/orchestrator/xtext/UnifiedXTextGraphSpec.groovy
@@ -21,8 +21,8 @@ class UnifiedXTextGraphSpec extends Specification {
     private FieldContext fieldContextMock
     private DataFetcherContext dataFetcherContextMock
 
-    private final String TYPE_NAME_1 = "TypeName1"
-    private final String TYPE_NAME_2 = "TypeName2"
+    private String TYPE_NAME_1 = "TypeName1"
+    private String TYPE_NAME_2 = "TypeName2"
 
     def setup() {
         FieldDefinition fieldDefinition = buildFieldDefinition("someOTHERFieldName")
diff --git a/src/test/groovy/com/intuit/graphql/orchestrator/xtext/XTextGraphSpec.groovy b/src/test/groovy/com/intuit/graphql/orchestrator/xtext/XTextGraphSpec.groovy
@@ -22,8 +22,8 @@ class XTextGraphSpec extends Specification {
     private FieldContext fieldContextMock
     private DataFetcherContext dataFetcherContextMock
 
-    private final String TYPE_NAME_1 = "TypeName1"
-    private final String TYPE_NAME_2 = "TypeName2"
+    private String TYPE_NAME_1 = "TypeName1"
+    private String TYPE_NAME_2 = "TypeName2"
 
     def setup() {
         FieldDefinition fieldDefinition = buildFieldDefinition("someOTHERFieldName")
