#521: merge-fixes & update federation-graphql-java-support

smallrye · Sep 2, 2022 · 1431ba1 · 1431ba1
1 parent e1fc498
commit 1431ba1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/server/implementation/pom.xml b/server/implementation/pom.xml
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>com.apollographql.federation</groupId>
             <artifactId>federation-graphql-java-support</artifactId>
-            <version>0.7.0</version>
+            <version>2.0.5</version>
         </dependency>
         <!-- Mutiny -->
         <dependency>

diff --git a/server/implementation/src/test/java/io/smallrye/graphql/execution/TestConfig.java b/server/implementation/src/test/java/io/smallrye/graphql/execution/TestConfig.java
@@ -1,7 +1,6 @@
 package io.smallrye.graphql.execution;
 
-import static java.util.Arrays.asList;
-
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 

diff --git a/server/implementation/src/test/java/io/smallrye/graphql/schema/SchemaTest.java b/server/implementation/src/test/java/io/smallrye/graphql/schema/SchemaTest.java
@@ -32,7 +32,7 @@
 class SchemaTest {
     private static final Logger LOG = Logger.getLogger(SchemaTest.class.getName());
 
-    private TestConfig config = (TestConfig) Config.get();
+    private final TestConfig config = (TestConfig) Config.get();
 
     @AfterEach
     void tearDown() {
@@ -88,7 +88,7 @@ void testSchemaWithFederationDisabled() {
         Schema schema = SchemaBuilder
                 .build(scan(Directive.class, Key.class, TestTypeWithFederation.class, FederationTestApi.class));
         assertNotNull(schema);
-        GraphQLSchema graphQLSchema = Bootstrap.bootstrap(schema, false, true);
+        GraphQLSchema graphQLSchema = Bootstrap.bootstrap(schema, false);
         assertNotNull(graphQLSchema);
 
         String schemaString = new SchemaPrinter().print(graphQLSchema);
@@ -110,7 +110,7 @@ void testSchemaWithFederation() {
         Schema schema = SchemaBuilder
                 .build(scan(Directive.class, Key.class, TestTypeWithFederation.class, FederationTestApi.class));
         assertNotNull(schema);
-        GraphQLSchema graphQLSchema = Bootstrap.bootstrap(schema, false, true);
+        GraphQLSchema graphQLSchema = Bootstrap.bootstrap(schema, false);
         assertNotNull(graphQLSchema);
 
         String schemaString = new SchemaPrinter().print(graphQLSchema);
@@ -122,7 +122,7 @@ void testSchemaWithFederation() {
                 "\"Query root\"\n" +
                 "type Query {\n" +
                 "  _entities(representations: [_Any!]!): [_Entity]!\n" +
-                "  _service: _Service\n" +
+                "  _service: _Service!\n" +
                 "  testTypeWithFederation(arg: String): TestTypeWithFederation\n" +
                 "}\n" +
                 "\n" +