Merge pull request #5 from jmartisk/srgql2.8.0-federation-annotations…

…-change Updates to scalars and directives
mskacelik · Feb 9, 2024 · 2e024f7 · 2e024f7
2 parents 4738314 + fb6b525
commit 2e024f7
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 5 deletions.
diff --git a/extensions/smallrye-graphql/deployment/pom.xml b/extensions/smallrye-graphql/deployment/pom.xml
@@ -105,6 +105,16 @@
                     </annotationProcessorPaths>
                 </configuration>
             </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <!-- this is needed because we use a static initializer in io.smallrye.graphql.schema.model.Scalars
+                        that acts upon the value of `smallrye.graphql.federation.enabled` during build, but some tests have that as
+                        true, some as false, so we need to create a separate JVM per test to run the initializer each time separately.
+                        This is reported as https://github.com/smallrye/smallrye-graphql/issues/2039 -->
+                    <reuseForks>false</reuseForks>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/.../deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/federation/base/Foo.java b/.../deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/federation/base/Foo.java
@@ -2,9 +2,10 @@
 
 import io.smallrye.graphql.api.federation.Extends;
 import io.smallrye.graphql.api.federation.External;
+import io.smallrye.graphql.api.federation.FieldSet;
 import io.smallrye.graphql.api.federation.Key;
 
-@Key(fields = "id")
+@Key(fields = @FieldSet("id"))
 @Extends
 public class Foo {
 

diff --git a/...deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/federation/batch/Foo.java b/...deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/federation/batch/Foo.java
@@ -2,9 +2,10 @@
 
 import io.smallrye.graphql.api.federation.Extends;
 import io.smallrye.graphql.api.federation.External;
+import io.smallrye.graphql.api.federation.FieldSet;
 import io.smallrye.graphql.api.federation.Key;
 
-@Key(fields = "id")
+@Key(fields = @FieldSet("id"))
 @Extends
 public class Foo {
 

diff --git a/...ployment/src/test/java/io/quarkus/smallrye/graphql/deployment/federation/complex/Bar.java b/...ployment/src/test/java/io/quarkus/smallrye/graphql/deployment/federation/complex/Bar.java
@@ -2,10 +2,11 @@
 
 import io.smallrye.graphql.api.federation.Extends;
 import io.smallrye.graphql.api.federation.External;
+import io.smallrye.graphql.api.federation.FieldSet;
 import io.smallrye.graphql.api.federation.Key;
 
-@Key(fields = "id")
-@Key(fields = "otherId")
+@Key(fields = @FieldSet("id"))
+@Key(fields = @FieldSet("otherId"))
 @Extends
 public class Bar {
 

diff --git a/...ployment/src/test/java/io/quarkus/smallrye/graphql/deployment/federation/complex/Foo.java b/...ployment/src/test/java/io/quarkus/smallrye/graphql/deployment/federation/complex/Foo.java
@@ -2,9 +2,10 @@
 
 import io.smallrye.graphql.api.federation.Extends;
 import io.smallrye.graphql.api.federation.External;
+import io.smallrye.graphql.api.federation.FieldSet;
 import io.smallrye.graphql.api.federation.Key;
 
-@Key(fields = "id")
+@Key(fields = @FieldSet("id"))
 @Extends
 public class Foo {
 

diff --git a/tcks/microprofile-graphql/src/main/resources/overrides/schemaTests.csv b/tcks/microprofile-graphql/src/main/resources/overrides/schemaTests.csv
@@ -0,0 +1,2 @@
+# testJsonDefault
+60|type Mutation       |   id : "1000"                                                | Expecting an id in the default value for item for provisionHero
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# testJsonDefault
		60\|type Mutation \| id : "1000" \| Expecting an id in the default value for item for provisionHero