refactor

Author: aureamunoz

stork-registration-quickstart/pom.xml

@@ -47,20 +47,6 @@
             <groupId>io.smallrye.stork</groupId>
             <artifactId>stork-service-registration-consul</artifactId>
         </dependency>
-<!--        -&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;-->
-
-<!--        <dependency>-->
-<!--            <groupId>io.quarkus</groupId>-->
-<!--            <artifactId>quarkus-smallrye-stork</artifactId>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>io.smallrye.stork</groupId>-->
-<!--            <artifactId>stork-service-discovery-consul</artifactId>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>io.smallrye.reactive</groupId>-->
-<!--            <artifactId>smallrye-mutiny-vertx-consul-client</artifactId>-->
-<!--        </dependency>-->
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-arc</artifactId>

stork-registration-quickstart/src/main/java/org/acme/services/Registration.java

@@ -7,6 +7,10 @@
 import jakarta.enterprise.event.Observes;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
+import java.util.concurrent.CountDownLatch;
+
+import static io.smallrye.mutiny.helpers.Subscriptions.fail;
+
 @ApplicationScoped
 public class Registration {
 
@@ -19,7 +23,9 @@ public class Registration {
      * Note: this method is called on a worker thread, and so it is allowed to block.
      */
     public void init(@Observes StartupEvent ev, Vertx vertx) {
-        Stork.getInstance().getService("my-service").getServiceRegistrar().registerServiceInstance("my-service", "localhost",
-                red);
+        CountDownLatch registrationLatch = new CountDownLatch(1);
+        Stork.getInstance().getService("my-service").getServiceRegistrar().registerServiceInstance("red", "localhost",
+                red).subscribe()
+                .with(success -> registrationLatch.countDown(), failure -> System.out.println("Registration failed"));;
     }
 }

stork-registration-quickstart/src/test/java/org/acme/RegistrationTest.java

@@ -3,19 +3,9 @@
 import io.quarkus.test.common.WithTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
-import io.restassured.http.ContentType;
-import io.smallrye.stork.Stork;
-import io.vertx.core.Vertx;
-import io.vertx.ext.consul.ConsulClient;
-import io.vertx.ext.consul.ConsulClientOptions;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
+import jakarta.inject.Inject;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.junit.jupiter.api.Test;
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.utility.DockerImageName;
-
-import java.util.HashSet;
-import java.util.Set;
 
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.CoreMatchers.containsString;
@@ -25,11 +15,20 @@
 @WithTestResource(ConsulTestResource.class)
 public class RegistrationTest {
 
+    @Inject
+    @ConfigProperty(name = "consul.host")
+    String consulHost;
+
+    @Inject
+    @ConfigProperty(name = "consul.port")
+    String consulPort;
+
 
-       @Test
+    @Test
     public void test() {
+           String consulUrl = "http://" + consulHost + ":" + consulPort;
            // curl -X GET http://127.0.0.1:8500/v1/agent/service/red
-           RestAssured.get("http://127.0.0.1:8500/v1/agent/service/red").then().statusCode(200).body(containsString("red"), containsString("my-service"));
+           RestAssured.get(consulUrl+"/v1/agent/service/red").then().statusCode(200).body(containsString("red"), containsString("\"Service\": \"red\""));
 
     }