Upgrade to wildfly 28

Author: jmartisk

.github/workflows/build.yml

@@ -49,7 +49,7 @@ jobs:
           mvn -B install
 
   older-wildfly:
-    if: false # Currently only WF 27 is supported by this feature pack branch
+    if: false # Currently only WF 28 is supported by this feature pack branch
     runs-on: ubuntu-latest
     strategy:
       matrix:

build/pom.xml

@@ -98,6 +98,7 @@
                                     <layers>
                                         <layer>cloud-profile</layer>
                                         <layer>core-tools</layer>
+                                        <layer>logging</layer>
                                         <!-- Layers from this FP -->
                                         <layer>microprofile-graphql</layer>
                                     </layers>

feature-pack/src/main/resources/modules/system/layers/base/io/smallrye/graphql/main/module.xml

@@ -42,6 +42,7 @@
         <module name="io.smallrye.context-propagation"/>
         <module name="org.eclipse.microprofile.context-propagation.api"/>
         <module name="io.smallrye.reactive.mutiny" export="true"/>
+        <module name="io.smallrye.reactive.mutiny.zero-flow-adapters" export="true"/>
         <module name="org.reactivestreams" export="true"/>
 
         <module name="org.jboss.weld.api"/>

pom.xml

@@ -39,7 +39,7 @@
 
     <properties>
 	    <!-- Target WildFly version, and other parts needed for the Galleon maven plugin -->
-        <version.org.wildfly>27.0.1.Final</version.org.wildfly>
+        <version.org.wildfly>28.0.0.Final</version.org.wildfly>
         <version.org.wildfly.core>20.0.1.Final</version.org.wildfly.core>
         <version.org.wildfly.common>1.6.0.Final</version.org.wildfly.common>
         <version.org.jboss.galleon>5.1.0.Final</version.org.jboss.galleon>
@@ -49,9 +49,9 @@
 
         <!-- Libraries provided by this feature pack. These variables directly affect what will be in
              the built feature pack. -->
-        <version.io.smallrye.graphql>2.0.1</version.io.smallrye.graphql>
+        <version.io.smallrye.graphql>2.1.3</version.io.smallrye.graphql>
         <version.org.eclipse.microprofile.graphql>2.0</version.org.eclipse.microprofile.graphql>
-        <version.com.graphql-java>19.0</version.com.graphql-java>
+        <version.com.graphql-java>20.1</version.com.graphql-java>
         <version.com.graphql-java.dataloader>3.2.0</version.com.graphql-java.dataloader>
         <!-- WF contains vert.x, but we need to add the vertx-web-client artifact. This version should be the same
             as the vert.x version in WildFly -->
@@ -60,12 +60,11 @@
 
         <!-- Dependencies which are not included directly in the built feature pack but are dragged from WildFly,
              so they are here mostly just for compilation and testing purposes -->
-        <version.io.smallrye.reactive.mutiny>0.14.0</version.io.smallrye.reactive.mutiny>
+        <version.io.smallrye.reactive.mutiny>2.1.0</version.io.smallrye.reactive.mutiny>
         <version.io.smallrye.config>3.2.1</version.io.smallrye.config>
         <version.org.reactivestreams>1.0.4</version.org.reactivestreams>
         <version.elytron>2.1.0.Final</version.elytron>
         <version.resteasy.client>6.2.3.Final</version.resteasy.client>
-        <version.microprofile-metrics-api>4.0.1</version.microprofile-metrics-api>
         <version.jakarta-validation>3.0.2</version.jakarta-validation>
         <version.jakarta-jaxrs>3.1.0</version.jakarta-jaxrs>
         <version.jakarta-cdi>4.0.0</version.jakarta-cdi>
@@ -74,6 +73,9 @@
         <version.shrinkwrap>2.2.4</version.shrinkwrap>
         <version.commons-logging>1.1.3</version.commons-logging>
         <version.tyrus>1.1</version.tyrus>
+        <version.junit>4.13.1</version.junit>
+        <version.rest-assured>5.3.0</version.rest-assured>
+        <version.arquillian-junit>1.7.0.Alpha12</version.arquillian-junit>
 
         <!-- Plugin versions and their dependency versions -->
         <version.org.wildfly.checkstyle-config>1.0.8.Final</version.org.wildfly.checkstyle-config>
@@ -464,6 +466,11 @@
             </dependency>
 
             <!-- Stuff used for testing only -->
+            <dependency>
+                <groupId>org.jboss.arquillian.junit</groupId>
+                <artifactId>arquillian-junit-container</artifactId>
+                <version>${version.arquillian-junit}</version>
+            </dependency>
             <dependency>
                 <groupId>org.wildfly.security</groupId>
                 <artifactId>wildfly-elytron</artifactId>
@@ -514,6 +521,16 @@
                 <artifactId>tyrus-container-grizzly</artifactId>
                 <version>${version.tyrus}</version>
             </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>${version.junit}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.rest-assured</groupId>
+                <artifactId>rest-assured</artifactId>
+                <version>${version.rest-assured}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <build>

quickstart/src/main/resources/META-INF/microprofile-config.properties

@@ -1,8 +1,5 @@
 # Example configuration file for a GraphQL application for WildFly
 # for all config options, see SmallRye GraphQL documentation
 
-# this enables MP Metrics integration
-smallrye.graphql.metrics.enabled=true
-
 # print exceptions that occurred during data fetching
 smallrye.graphql.printDataFetcherException=true

testsuite/client-vertx/src/test/config/arq/arquillian.xml

@@ -32,4 +32,9 @@
             <property name="waitForPortsTimeoutInSeconds">8</property>
         </configuration>
     </container>
+
+    <engine>
+        <property name="deploymentExportPath">target/exports</property>
+    </engine>
+
 </arquillian>

testsuite/client-vertx/src/test/java/org/wildfly/extras/graphql/test/client/vertx/dynamic/DynamicClientOutsideVMTestCase.java

@@ -8,6 +8,7 @@
 import io.smallrye.graphql.client.dynamic.api.DynamicGraphQLClientBuilder;
 import io.smallrye.graphql.client.vertx.dynamic.VertxDynamicGraphQLClient;
 import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.helpers.test.AssertSubscriber;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.junit.Arquillian;
@@ -26,7 +27,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
 
 import static io.smallrye.graphql.client.core.Argument.arg;
 import static io.smallrye.graphql.client.core.Argument.args;
@@ -152,8 +152,12 @@ public void testSubscription() {
                         OperationType.SUBSCRIPTION,
                         field("dummies",
                                 field("integer"))));
-        Multi<Response> multi = client.subscription(document);
-        List<Response> responses = multi.subscribe().asStream().collect(Collectors.toList());
+        Multi<Response> multi = client.subscription(document).onItem().invoke(r -> System.out.println("Received " + r));
+        AssertSubscriber<Response> subscriber = new AssertSubscriber<>(20);
+        multi.subscribe(subscriber);
+        subscriber.awaitCompletion(Duration.ofSeconds(10));
+        subscriber.assertCompleted();
+        List<Response> responses = subscriber.getItems();
         for(int i = 10; i < 20; i++) {
             assertEquals(i, responses.get(i-10)
                     .getData()

testsuite/client-vertx/src/test/java/org/wildfly/extras/graphql/test/client/vertx/typesafe/TypesafeClientOutsideVMTestCase.java

@@ -47,7 +47,7 @@ public void testSubscription_graphqlWSProtocol() throws IOException {
             .build(FunnyApi.class)) {
             AssertSubscriber<Integer> subscriber = new AssertSubscriber<>(5);
             funnyApi.count(0, 5).subscribe(subscriber);
-            subscriber.await(Duration.ofSeconds(10));
+            subscriber.awaitCompletion(Duration.ofSeconds(10));
             subscriber.assertCompleted();
             subscriber.assertItems(0, 1, 2, 3, 4);
         }
@@ -61,7 +61,7 @@ public void testSubscription_graphqlTransportWSProtocol() throws IOException {
             .build(FunnyApi.class)) {
             AssertSubscriber<Integer> subscriber = new AssertSubscriber<>(5);
             funnyApi.count(0, 5).subscribe(subscriber);
-            subscriber.await(Duration.ofSeconds(10));
+            subscriber.awaitCompletion(Duration.ofSeconds(10));
             subscriber.assertCompleted();
             subscriber.assertItems(0, 1, 2, 3, 4);
         }

testsuite/integration/pom.xml

@@ -75,11 +75,6 @@
             <artifactId>microprofile-graphql-api</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.microprofile.metrics</groupId>
-            <artifactId>microprofile-metrics-api</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.wildfly.arquillian</groupId>
             <artifactId>wildfly-arquillian-container-managed</artifactId>