KOGITO-480 - Upgrade to Quarkus 0.27.0 (apache#209)

kiegroup · Oct 31, 2019 · b1e469c · b1e469c
1 parent 9e18419
commit b1e469c
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 42 deletions.
diff --git a/data-index/data-index-service/pom.xml b/data-index/data-index-service/pom.xml
@@ -10,18 +10,6 @@
   <artifactId>data-index-service</artifactId>
   <name>Kogito :: Data Index Service</name>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bom</artifactId>
-        <version>${version.io.quarkus}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <dependencies>
     <dependency>
       <groupId>org.kie.kogito</groupId>

diff --git a/data-index/data-index-service/src/main/java/org/kie/kogito/index/vertx/VertxRouterSetup.java b/data-index/data-index-service/src/main/java/org/kie/kogito/index/vertx/VertxRouterSetup.java
@@ -16,8 +16,6 @@
 
 package org.kie.kogito.index.vertx;
 
-import java.util.concurrent.atomic.AtomicBoolean;
-
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.event.Observes;
 import javax.inject.Inject;
@@ -39,17 +37,13 @@ public class VertxRouterSetup {
     @Inject
     GraphQL graphQL;
 
-    private AtomicBoolean routesAdded = new AtomicBoolean(false);
-
     void setupRouter(@Observes Router router) {
-        if (!routesAdded.get()) {
-            router.route("/graphql").handler(ApolloWSHandler.create(graphQL));
-            router.route("/graphql").handler(GraphQLHandler.create(graphQL, new GraphQLHandlerOptions()));
-            router.route("/graphiql/*").handler(GraphiQLHandler.create(new GraphiQLHandlerOptions().setEnabled(true)));
-            router.route("/").handler(ctx -> ctx.reroute("/graphiql"));
-            router.route().handler(LoggerHandler.create());
-            router.route().handler(StaticHandler.create());
-            router.route().handler(FaviconHandler.create());
-        }
+        router.route("/graphql").handler(ApolloWSHandler.create(graphQL));
+        router.route("/graphql").handler(GraphQLHandler.create(graphQL, new GraphQLHandlerOptions()));
+        router.route("/graphiql/*").handler(GraphiQLHandler.create(new GraphiQLHandlerOptions().setEnabled(true)));
+        router.route("/").handler(ctx -> ctx.reroute("/graphiql"));
+        router.route().handler(LoggerHandler.create());
+        router.route().handler(StaticHandler.create());
+        router.route().handler(FaviconHandler.create());
     }
 }
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/pom.xml b/data-index/data-index-storage/data-index-storage-infinispan/pom.xml
@@ -12,18 +12,6 @@
   <artifactId>data-index-storage-infinispan</artifactId>
   <name>Kogito :: Data Index Storage Infinispan</name>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bom</artifactId>
-        <version>${version.io.quarkus}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <dependencies>
     <dependency>
       <groupId>org.kie.kogito</groupId>

diff --git a/drools/drools-core/src/test/java/org/drools/core/common/ClassAwareObjectStoreTest.java b/drools/drools-core/src/test/java/org/drools/core/common/ClassAwareObjectStoreTest.java
@@ -111,7 +111,7 @@ public void isOkayToReinsertSameTypeThenQuery(final ClassAwareObjectStore underT
 
     @ClassAwareObjectStoreParameterizedTest
     public void onceSuperClassIsSetUpForReadingItCanBecomeSetUpForWritingWithoutGettingDuplicateQueryReturns(final ClassAwareObjectStore underTest) throws Exception {
-        assertThat(underTest.iterateObjects(SuperClass.class)).isEmpty();
+        assertThat(collect(underTest.iterateObjects(SuperClass.class))).isEmpty();
 
         insertObjectWithFactHandle(underTest, new SubClass());
         insertObjectWithFactHandle(underTest, new SuperClass());
@@ -127,11 +127,11 @@ public void onceSuperClassIsSetUpForReadingItCanBecomeSetUpForWritingWithoutGett
     @ClassAwareObjectStoreParameterizedTest
     public void clearRemovesInsertedObjects(final ClassAwareObjectStore underTest) throws Exception {
         insertObjectWithFactHandle(underTest, new SimpleClass());
-        assertThat(underTest.iterateObjects()).hasSize(1);
+        assertThat(collect(underTest.iterateObjects())).hasSize(1);
 
         underTest.clear();
 
-        assertThat(underTest.iterateObjects()).isEmpty();
+        assertThat(collect(underTest.iterateObjects())).isEmpty();
     }
 
     @ClassAwareObjectStoreParameterizedTest
@@ -150,8 +150,8 @@ public void iteratingOverFactHandlesHasSameNumberOfResultsAsIteratingOverObjects
         insertObjectWithFactHandle(underTest, new SuperClass());
         insertObjectWithFactHandle(underTest, new SubClass());
 
-        assertThat(underTest.iterateFactHandles(SubClass.class)).hasSize(1);
-        assertThat(underTest.iterateFactHandles(SuperClass.class)).hasSize(2);
+        assertThat(collect(underTest.iterateFactHandles(SubClass.class))).hasSize(1);
+        assertThat(collect(underTest.iterateFactHandles(SuperClass.class))).hasSize(2);
     }
 
 

diff --git a/pom.xml b/pom.xml
@@ -76,6 +76,13 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-bom</artifactId>
+        <version>${version.io.quarkus}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>