Use latest Stork and refactor extension according to new registrars p…

…rovided in standalone way
quarkusio · Aug 29, 2024 · 5fa7ebd · 5fa7ebd
1 parent 1d60170
commit 5fa7ebd
Show file tree

Hide file tree

Showing 11 changed files with 58 additions and 152 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -64,7 +64,7 @@
         <smallrye-reactive-types-converter.version>3.0.1</smallrye-reactive-types-converter.version>
         <smallrye-mutiny-vertx-binding.version>3.14.0</smallrye-mutiny-vertx-binding.version>
         <smallrye-reactive-messaging.version>4.24.0</smallrye-reactive-messaging.version>
-        <smallrye-stork.version>2.6.1</smallrye-stork.version>
+        <smallrye-stork.version>2.7.0</smallrye-stork.version>
         <jakarta.activation.version>2.1.3</jakarta.activation.version>
         <jakarta.annotation-api.version>3.0.0</jakarta.annotation-api.version>
         <jakarta.authentication-api>3.0.0</jakarta.authentication-api>

diff --git a/extensions/smallrye-stork/runtime/src/main/java/io/quarkus/stork/ServiceConfiguration.java b/extensions/smallrye-stork/runtime/src/main/java/io/quarkus/stork/ServiceConfiguration.java
@@ -9,7 +9,7 @@ public interface ServiceConfiguration {
     /**
      * ServiceDiscovery configuration for the service
      */
-    StorkServiceDiscoveryConfiguration serviceDiscovery();
+    Optional<StorkServiceDiscoveryConfiguration> serviceDiscovery();
 
     /**
      * LoadBalancer configuration for the service

diff --git a/extensions/smallrye-stork/runtime/src/main/java/io/quarkus/stork/StorkConfigUtil.java b/extensions/smallrye-stork/runtime/src/main/java/io/quarkus/stork/StorkConfigUtil.java
@@ -16,12 +16,15 @@ public static List<ServiceConfig> toStorkServiceConfig(StorkConfiguration storkC
         for (String serviceName : servicesConfigs) {
             builder.setServiceName(serviceName);
             ServiceConfiguration serviceConfiguration = storkConfiguration.serviceConfiguration().get(serviceName);
-            SimpleServiceConfig.SimpleServiceDiscoveryConfig storkServiceDiscoveryConfig = new SimpleServiceConfig.SimpleServiceDiscoveryConfig(
-                    serviceConfiguration.serviceDiscovery().type(), serviceConfiguration.serviceDiscovery().params());
-            builder = builder.setServiceDiscovery(storkServiceDiscoveryConfig);
-            SimpleServiceConfig.SimpleLoadBalancerConfig loadBalancerConfig = new SimpleServiceConfig.SimpleLoadBalancerConfig(
-                    serviceConfiguration.loadBalancer().type(), serviceConfiguration.loadBalancer().parameters());
-            builder.setLoadBalancer(loadBalancerConfig);
+            if (serviceConfiguration.serviceDiscovery().isPresent()) {
+                SimpleServiceConfig.SimpleServiceDiscoveryConfig storkServiceDiscoveryConfig = new SimpleServiceConfig.SimpleServiceDiscoveryConfig(
+                        serviceConfiguration.serviceDiscovery().get().type(),
+                        serviceConfiguration.serviceDiscovery().get().params());
+                builder = builder.setServiceDiscovery(storkServiceDiscoveryConfig);
+                SimpleServiceConfig.SimpleLoadBalancerConfig loadBalancerConfig = new SimpleServiceConfig.SimpleLoadBalancerConfig(
+                        serviceConfiguration.loadBalancer().type(), serviceConfiguration.loadBalancer().parameters());
+                builder.setLoadBalancer(loadBalancerConfig);
+            }
             if (serviceConfiguration.serviceRegistrar().isPresent()) {
                 SimpleServiceConfig.SimpleServiceRegistrarConfig serviceRegistrarConfig = new SimpleServiceConfig.SimpleServiceRegistrarConfig(
                         serviceConfiguration.serviceRegistrar().get().type(),

diff --git a/independent-projects/resteasy-reactive/pom.xml b/independent-projects/resteasy-reactive/pom.xml
@@ -62,7 +62,7 @@
         <rest-assured.version>5.5.0</rest-assured.version>
         <commons-logging-jboss-logging.version>1.0.0.Final</commons-logging-jboss-logging.version>
         <jackson-bom.version>2.17.2</jackson-bom.version>
-        <smallrye-stork.version>2.6.1</smallrye-stork.version>
+        <smallrye-stork.version>2.7.0</smallrye-stork.version>
         <jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
         <yasson.version>3.0.4</yasson.version>
         <jakarta.json.bind-api.version>3.0.1</jakarta.json.bind-api.version>

diff --git a/integration-tests/smallrye-stork-registration/pom.xml b/integration-tests/smallrye-stork-registration/pom.xml
@@ -18,17 +18,21 @@
             <artifactId>quarkus-vertx-http</artifactId>
         </dependency>
 
+<!--        <dependency>-->
+<!--            <groupId>io.quarkus</groupId>-->
+<!--            <artifactId>quarkus-rest-client-jackson</artifactId>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>io.quarkus</groupId>-->
+<!--            <artifactId>quarkus-rest-jackson</artifactId>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-rest-client-jackson</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-rest-jackson</artifactId>
+            <artifactId>quarkus-smallrye-stork-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>io.smallrye.stork</groupId>
-            <artifactId>stork-service-discovery-static-list</artifactId>
+            <artifactId>stork-service-registration-static-list</artifactId>
         </dependency>
         <!-- Test dependencies -->
         <dependency>
@@ -52,32 +56,32 @@
         </dependency>
 
         <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-rest-jackson-deployment</artifactId>
-            <version>${project.version}</version>
-            <type>pom</type>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-rest-client-jackson-deployment</artifactId>
-            <version>${project.version}</version>
-            <type>pom</type>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>io.quarkus</groupId>-->
+<!--            <artifactId>quarkus-rest-jackson-deployment</artifactId>-->
+<!--            <version>${project.version}</version>-->
+<!--            <type>pom</type>-->
+<!--            <scope>test</scope>-->
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <groupId>*</groupId>-->
+<!--                    <artifactId>*</artifactId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>io.quarkus</groupId>-->
+<!--            <artifactId>quarkus-rest-client-jackson-deployment</artifactId>-->
+<!--            <version>${project.version}</version>-->
+<!--            <type>pom</type>-->
+<!--            <scope>test</scope>-->
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <groupId>*</groupId>-->
+<!--                    <artifactId>*</artifactId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-vertx-http-deployment</artifactId>

diff --git a/...ation-tests/smallrye-stork-registration/src/main/java/org/acme/ClientCallingResource.java b/...ation-tests/smallrye-stork-registration/src/main/java/org/acme/ClientCallingResource.java
diff --git a/integration-tests/smallrye-stork-registration/src/main/java/org/acme/MyServiceClient.java b/integration-tests/smallrye-stork-registration/src/main/java/org/acme/MyServiceClient.java
diff --git a/...ration-tests/smallrye-stork-registration/src/main/java/org/acme/services/BlueService.java b/...ration-tests/smallrye-stork-registration/src/main/java/org/acme/services/BlueService.java
diff --git a/...gration-tests/smallrye-stork-registration/src/main/java/org/acme/services/RedService.java b/...gration-tests/smallrye-stork-registration/src/main/java/org/acme/services/RedService.java
diff --git a/integration-tests/smallrye-stork-registration/src/main/resources/application.properties b/integration-tests/smallrye-stork-registration/src/main/resources/application.properties
@@ -1,3 +1,3 @@
-quarkus.stork.my-service.service-discovery.type=static
+#quarkus.stork.my-service.service-discovery.type=static
 
 quarkus.stork.my-service.service-registrar.type=static
diff --git a/...n-tests/smallrye-stork-registration/src/test/java/org/acme/ClientCallingResourceTest.java b/...n-tests/smallrye-stork-registration/src/test/java/org/acme/ClientCallingResourceTest.java
@@ -1,24 +1,25 @@
 package org.acme;
 
-import java.util.HashSet;
-import java.util.Set;
+import java.util.logging.LogManager;
+import java.util.logging.Logger;
 
+import jakarta.inject.Inject;
+
+import org.acme.services.Registration;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.test.junit.QuarkusTest;
-import io.restassured.RestAssured;
 
 @QuarkusTest
 public class ClientCallingResourceTest {
 
+    @Inject
+    Registration registration;
+
     @Test
     public void test() {
-        Set<String> bodies = new HashSet<>();
-        for (int i = 0; i < 10; i++) {
-            bodies.add(RestAssured.get("/api").then().statusCode(200).extract().body().asString());
-        }
-        Assertions.assertEquals(2, bodies.size());
+        Assertions.assertNotNull(registration);
     }
 
 }