smallrye#521: fix suggestions from phillip

jmartisk · Oct 3, 2022 · 1611bcf · 1611bcf
1 parent 5e9c581
commit 1611bcf
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -33,6 +33,7 @@
         <version.jakarta-validation>2.0.2</version.jakarta-validation>
         <version.jakarta-annotation>1.3.5</version.jakarta-annotation>
         <version.graphql-java>19.1</version.graphql-java>
+        <version.graphql-java-federation>2.0.8</version.graphql-java-federation>
         <verison.io.micrometer>1.9.3</verison.io.micrometer>
         <version.vertx>4.3.3</version.vertx>
 
@@ -231,6 +232,11 @@
                 <artifactId>graphql-java</artifactId>
                 <version>${version.graphql-java}</version>
             </dependency>
+            <dependency>
+                <groupId>com.apollographql.federation</groupId>
+                <artifactId>federation-graphql-java-support</artifactId>
+                <version>${version.graphql-java-federation}</version>
+            </dependency>
 
             <dependency>
                 <groupId>io.vertx</groupId>

diff --git a/...r/implementation-cdi/src/main/java/io/smallrye/graphql/cdi/config/MicroProfileConfig.java b/...r/implementation-cdi/src/main/java/io/smallrye/graphql/cdi/config/MicroProfileConfig.java
@@ -137,7 +137,7 @@ public boolean isEventsEnabled() {
     @Override
     public boolean isFederationEnabled() {
         if (federationEnabled == null) {
-            federationEnabled = getBooleanConfigValue(ConfigKey.ENABLE_FEDERATION);
+            federationEnabled = getBooleanConfigValue(ConfigKey.ENABLE_FEDERATION, true);
         }
         return federationEnabled;
     }

diff --git a/server/implementation/pom.xml b/server/implementation/pom.xml
@@ -55,7 +55,6 @@
         <dependency>
             <groupId>com.apollographql.federation</groupId>
             <artifactId>federation-graphql-java-support</artifactId>
-            <version>2.0.6</version>
         </dependency>
         <!-- Mutiny -->
         <dependency>

diff --git a/server/runner/src/main/resources/META-INF/microprofile-config.properties b/server/runner/src/main/resources/META-INF/microprofile-config.properties
@@ -5,4 +5,3 @@ smallrye.graphql.logPayload=true
 mp.graphql.showErrorMessage=java.security.AccessControlException,io.smallrye.graphql.test.apps.exceptionlist.*
 mp.graphql.hideErrorMessage=java.io.IOException,io.smallrye.graphql.test.apps.exceptionlist.*
 smallrye.graphql.errorExtensionFields=exception,classification,code,description,validationErrorType,queryPath
-smallrye.graphql.federation.enabled=true
diff --git a/server/tck/src/test/resources/META-INF/microprofile-config.properties b/server/tck/src/test/resources/META-INF/microprofile-config.properties
@@ -7,4 +7,3 @@ mp.graphql.showErrorMessage=java.security.AccessControlException,io.smallrye.gra
 mp.graphql.hideErrorMessage=java.io.IOException,io.smallrye.graphql.test.apps.exceptionlist.*
 smallrye.graphql.errorExtensionFields=exception,classification,code,description,validationErrorType,queryPath
 smallrye.graphql.parser.capture.sourceLocation=false
-smallrye.graphql.federation.enabled=true