Merge branch 'main' into namespace

# Conflicts: # client/model-builder/src/main/java/io/smallrye/graphql/client/model/helper/OperationModel.java
smallrye · Sep 11, 2024 · eb9df1a · eb9df1a
2 parents 10c16d2 + eb2b6db
commit eb9df1a
Show file tree

Hide file tree

Showing 37 changed files with 130 additions and 34 deletions.
diff --git a/.github/project.yml b/.github/project.yml
@@ -1,4 +1,4 @@
 name: SmallRye GraphQL
 release:
-  current-version: 2.9.2
-  next-version: 2.9.3-SNAPSHOT
+  current-version: 2.10.0
+  next-version: 2.10.1-SNAPSHOT
diff --git a/client/api/pom.xml b/client/api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-graphql-client-parent</artifactId>
-        <version>2.9.3-SNAPSHOT</version>
+        <version>2.10.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>smallrye-graphql-client-api</artifactId>

diff --git a/client/generator-test/pom.xml b/client/generator-test/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-graphql-client-parent</artifactId>
-        <version>2.9.3-SNAPSHOT</version>
+        <version>2.10.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>smallrye-graphql-client-generator-test</artifactId>

diff --git a/client/generator/pom.xml b/client/generator/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-graphql-client-parent</artifactId>
-        <version>2.9.3-SNAPSHOT</version>
+        <version>2.10.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>smallrye-graphql-client-generator</artifactId>

diff --git a/client/implementation-vertx/pom.xml b/client/implementation-vertx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-graphql-client-parent</artifactId>
-        <version>2.9.3-SNAPSHOT</version>
+        <version>2.10.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>smallrye-graphql-client-implementation-vertx</artifactId>
@@ -71,4 +71,33 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <executions>
+                    <execution>
+                         <!--This configuration separates the execution of the `TypesafeTckClientModelSuite` tests
+                         from the default test execution (TypesafeTckSuite) to avoid conflicts or issues that might
+                         arise when executing the same tests multiple times in different test suites.-->
+                        <id>default-test</id>
+                        <configuration>
+                            <excludes>TypesafeTckClientModelSuite</excludes>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>separate-execution-for-client-model-tests</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <test>TypesafeTckClientModelSuite</test>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/client/implementation-vertx/src/test/java/test/tck/TypesafeTckClientModelSuite.java b/client/implementation-vertx/src/test/java/test/tck/TypesafeTckClientModelSuite.java
@@ -45,7 +45,6 @@ class TypesafeTckClientModelSuite extends TypesafeTCK {
     static void beforeAll() {
         // These properties are for the ‘TypesafeGraphQLClientBuilder#builder’ to differentiate between the typesafe-client
         // using the client model and the one that does not.
-
         System.clearProperty("clientModelCase");
         System.setProperty("clientModelCase", "true");
     }

diff --git a/client/implementation/pom.xml b/client/implementation/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-graphql-client-parent</artifactId>
-        <version>2.9.3-SNAPSHOT</version>
+        <version>2.10.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>smallrye-graphql-client</artifactId>

diff --git a/client/model-builder/pom.xml b/client/model-builder/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-graphql-client-parent</artifactId>
-        <version>2.9.3-SNAPSHOT</version>
+        <version>2.10.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>smallrye-graphql-client-model-builder</artifactId>

diff --git a/client/model-builder/src/main/java/io/smallrye/graphql/client/model/Annotations.java b/client/model-builder/src/main/java/io/smallrye/graphql/client/model/Annotations.java
@@ -579,6 +579,7 @@ private static Map<DotName, AnnotationInstance> getAnnotationsWithFilter(Type ty
     public static final DotName JAKARTA_JSONB_TRANSIENT = DotName.createSimple(JAKARTA_JSONB + "JsonbTransient");
     public static final DotName JAKARTA_JSONB_CREATOR = DotName.createSimple(JAKARTA_JSONB + "JsonbCreator");
     public static final DotName JAKARTA_JSONB_TYPE_ADAPTER = DotName.createSimple(JAKARTA_JSONB + "JsonbTypeAdapter");
+    public static final DotName JAKARTA_JSONB_TYPE_INFO = DotName.createSimple(JAKARTA_JSONB + "JsonbTypeInfo");
 
     // Jackson Annotations
     public static final DotName JACKSON_IGNORE = DotName.createSimple("com.fasterxml.jackson.annotation.JsonIgnore");

diff --git a/client/model-builder/src/main/java/io/smallrye/graphql/client/model/Classes.java b/client/model-builder/src/main/java/io/smallrye/graphql/client/model/Classes.java
@@ -72,6 +72,14 @@ public static boolean isAsync(Type type) {
                 || isMulti(type);
     }
 
+    public static boolean isInterface(Type type) {
+        if (Classes.isClass(type)) {
+            ClassInfo clazz = getIndex().getClassByName(type.asClassType().name());
+            return clazz != null && clazz.isInterface();
+        }
+        return false;
+    }
+
     public static boolean isUni(Type type) {
         return type.name().equals(UNI);
     }

diff --git a/...t/model-builder/src/main/java/io/smallrye/graphql/client/model/helper/OperationModel.java b/...t/model-builder/src/main/java/io/smallrye/graphql/client/model/helper/OperationModel.java
@@ -11,6 +11,7 @@
 import static java.util.stream.Collectors.toList;
 
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
 import java.util.Stack;
@@ -104,6 +105,13 @@ public String recursionCheckedFields(TypeModel type) {
             String valueFields = fields(type.getMapValueType());
             return " {key" + keyFields + " value" + valueFields + "}";
         }
+        if (type.isUnion() || type.isInterface()) {
+            return "{__typename " + type.subtypes()
+                    .sorted(Comparator.comparing(TypeModel::getGraphQlTypeName)) // for deterministic order
+                    .map(this::fieldsFragment)
+                    .collect(joining(" ")) +
+                    "}";
+        }
         if (isRawParametrizedType(type)) {
             rawParametrizedTypes.push(type.getFirstRawType());
         }
@@ -445,4 +453,8 @@ public String getOperationName(boolean useNamespace) {
     private String makeFirstLetterUppercase(String value) {
         return value.substring(0, 1).toUpperCase() + value.substring(1);
     }
+
+    private String fieldsFragment(TypeModel type) {
+        return "... on " + type.getGraphQlTypeName() + fields(type);
+    }
 }
diff --git a/client/model-builder/src/main/java/io/smallrye/graphql/client/model/helper/TypeModel.java b/client/model-builder/src/main/java/io/smallrye/graphql/client/model/helper/TypeModel.java
@@ -3,6 +3,9 @@
 import static io.smallrye.graphql.client.model.Annotations.IGNORE;
 import static io.smallrye.graphql.client.model.Annotations.JACKSON_IGNORE;
 import static io.smallrye.graphql.client.model.Annotations.JAKARTA_JSONB_TRANSIENT;
+import static io.smallrye.graphql.client.model.Annotations.JAKARTA_JSONB_TYPE_INFO;
+import static io.smallrye.graphql.client.model.Annotations.TYPE;
+import static io.smallrye.graphql.client.model.Annotations.UNION;
 import static io.smallrye.graphql.client.model.Classes.ERROR_OR;
 import static io.smallrye.graphql.client.model.Classes.OBJECT;
 import static io.smallrye.graphql.client.model.Classes.OPTIONAL;
@@ -20,6 +23,7 @@
 
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.AnnotationTarget;
+import org.jboss.jandex.AnnotationValue;
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.FieldInfo;
@@ -361,6 +365,21 @@ public boolean isTypeVariable() {
         return Classes.isTypeVariable(type);
     }
 
+    /**
+     * @see <a href="https://spec.graphql.org/draft/#sec-Unions">GraphQL Union</a>
+     */
+    public boolean isUnion() {
+        return type.hasAnnotation(UNION);
+    }
+
+    /**
+     * Is this a <em>GraphQL</em> Interface, i.e. a Java interface without a <code>&#64;Union</code> annotation.
+     *
+     */
+    public boolean isInterface() {
+        return Classes.isInterface(type) && !isUnion();
+    }
+
     /**
      * Retrieves a stream of FieldModel instances representing the fields of the type.
      *
@@ -477,4 +496,32 @@ public boolean isCustomParametrizedType() {
                 && !isMap()
                 && !isCollection();
     }
+
+    public String getGraphQlTypeName() {
+        Optional<AnnotationInstance> annotationInstance = getClassAnnotation(TYPE);
+        if (annotationInstance.isPresent()) {
+            AnnotationValue value = annotationInstance.get().value();
+            if (value != null) {
+                return value.asString();
+            }
+        }
+        return getSimpleName();
+    }
+
+    /**
+     * Retrieves the subtypes of the current class based on the `JsonbTypeInfo` annotation.
+     *
+     * @return A stream of subtype models.
+     */
+    public Stream<TypeModel> subtypes() {
+        Optional<AnnotationInstance> jsonbTypeInfoAnnotation = getClassAnnotation(JAKARTA_JSONB_TYPE_INFO);
+        if (jsonbTypeInfoAnnotation.isEmpty()) {
+            return Stream.empty();
+        }
+
+        return Stream.of(jsonbTypeInfoAnnotation.get().value().asNestedArray())
+                .map(annotationInstance -> annotationInstance.value("type"))
+                .map(AnnotationValue::asClass)
+                .map(TypeModel::of);
+    }
 }
diff --git a/client/model/pom.xml b/client/model/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-graphql-client-parent</artifactId>
-        <version>2.9.3-SNAPSHOT</version>
+        <version>2.10.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>smallrye-graphql-client-model</artifactId>

diff --git a/client/pom.xml b/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-graphql-parent</artifactId>
-        <version>2.9.3-SNAPSHOT</version>
+        <version>2.10.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>smallrye-graphql-client-parent</artifactId>

diff --git a/client/tck/pom.xml b/client/tck/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-graphql-client-parent</artifactId>
-        <version>2.9.3-SNAPSHOT</version>
+        <version>2.10.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>smallrye-graphql-client-tck</artifactId>

diff --git a/common/pom.xml b/common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-graphql-parent</artifactId>
-        <version>2.9.3-SNAPSHOT</version>
+        <version>2.10.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>smallrye-graphql-common-parent</artifactId>

diff --git a/common/schema-builder/pom.xml b/common/schema-builder/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-graphql-common-parent</artifactId>
-        <version>2.9.3-SNAPSHOT</version>
+        <version>2.10.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>smallrye-graphql-schema-builder</artifactId>

diff --git a/common/schema-model/pom.xml b/common/schema-model/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-graphql-common-parent</artifactId>
-        <version>2.9.3-SNAPSHOT</version>
+        <version>2.10.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>smallrye-graphql-schema-model</artifactId>

diff --git a/docs/pom.xml b/docs/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-graphql-parent</artifactId>
-        <version>2.9.3-SNAPSHOT</version>
+        <version>2.10.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>smallrye-graphql-documentation</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
 
     <artifactId>smallrye-graphql-parent</artifactId>
-    <version>2.9.3-SNAPSHOT</version>
+    <version>2.10.1-SNAPSHOT</version>
 
     <packaging>pom</packaging>
     <name>SmallRye: GraphQL Parent</name>

diff --git a/release/pom.xml b/release/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-graphql-parent</artifactId>
-        <version>2.9.3-SNAPSHOT</version>
+        <version>2.10.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>smallrye-graphql-release</artifactId>

diff --git a/server/api/pom.xml b/server/api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-graphql-server-parent</artifactId>
-        <version>2.9.3-SNAPSHOT</version>
+        <version>2.10.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>smallrye-graphql-api</artifactId>

diff --git a/server/implementation-cdi/pom.xml b/server/implementation-cdi/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-graphql-server-parent</artifactId>
-        <version>2.9.3-SNAPSHOT</version>
+        <version>2.10.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>smallrye-graphql-cdi</artifactId>

diff --git a/server/implementation-servlet/pom.xml b/server/implementation-servlet/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-graphql-server-parent</artifactId>
-        <version>2.9.3-SNAPSHOT</version>
+        <version>2.10.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>smallrye-graphql-servlet</artifactId>

diff --git a/server/implementation/pom.xml b/server/implementation/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-graphql-server-parent</artifactId>
-        <version>2.9.3-SNAPSHOT</version>
+        <version>2.10.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>smallrye-graphql</artifactId>

diff --git a/server/integration-tests-jdk16/pom.xml b/server/integration-tests-jdk16/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>smallrye-graphql-server-parent</artifactId>
         <groupId>io.smallrye</groupId>
-        <version>2.9.3-SNAPSHOT</version>
+        <version>2.10.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/server/integration-tests/pom.xml b/server/integration-tests/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-graphql-server-parent</artifactId>
-        <version>2.9.3-SNAPSHOT</version>
+        <version>2.10.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/server/pom.xml b/server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-graphql-parent</artifactId>
-        <version>2.9.3-SNAPSHOT</version>
+        <version>2.10.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>smallrye-graphql-server-parent</artifactId>

diff --git a/server/runner/pom.xml b/server/runner/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-graphql-server-parent</artifactId>
-        <version>2.9.3-SNAPSHOT</version>
+        <version>2.10.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>smallrye-graphql-runner</artifactId>

diff --git a/server/tck/pom.xml b/server/tck/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-graphql-server-parent</artifactId>
-        <version>2.9.3-SNAPSHOT</version>
+        <version>2.10.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>smallrye-graphql-tck</artifactId>

diff --git a/tools/gradle-plugin/gradle.properties b/tools/gradle-plugin/gradle.properties
@@ -1 +1 @@
-version=2.9.2
+version=2.10.0