test: use HttpClient::toBlocking (#207)

micronaut-projects · Mar 17, 2022 · 6cd7907 · 6cd7907
1 parent 9efb413
commit 6cd7907
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 52 deletions.
diff --git a/acme/src/test/groovy/io/micronaut/acme/AcmeCertRefresherMultiDomainsTaskSpec.groovy b/acme/src/test/groovy/io/micronaut/acme/AcmeCertRefresherMultiDomainsTaskSpec.groovy
@@ -1,12 +1,10 @@
 package io.micronaut.acme
 
-
 import io.micronaut.http.HttpRequest
 import io.micronaut.http.HttpResponse
 import io.micronaut.http.annotation.Controller
 import io.micronaut.http.annotation.Get
 import io.netty.handler.ssl.util.InsecureTrustManagerFactory
-import io.reactivex.Flowable
 import spock.lang.Stepwise
 import spock.util.concurrent.PollingConditions
 
@@ -73,13 +71,10 @@ class AcmeCertRefresherMultiDomainsTaskSpec extends AcmeBaseSpec {
 
     void "test send https request when the cert is in place"() {
         when:
-            Flowable<HttpResponse<String>> flowable = Flowable.fromPublisher(client.exchange(
-                    HttpRequest.GET("/ssl-multidomains"), String
-            ))
-            HttpResponse<String> response = flowable.blockingFirst()
+        HttpResponse<String> response = client.toBlocking().exchange(HttpRequest.GET("/ssl-multidomains"), String)
 
         then:
-            response.body() == "Hello There"
+        response.body() == "Hello There"
     }
 
     @Controller('/')

diff --git a/acme/src/test/groovy/io/micronaut/acme/AcmeCertRefresherTaskSpec.groovy b/acme/src/test/groovy/io/micronaut/acme/AcmeCertRefresherTaskSpec.groovy
@@ -1,12 +1,10 @@
 package io.micronaut.acme
 
-
 import io.micronaut.http.HttpRequest
 import io.micronaut.http.HttpResponse
 import io.micronaut.http.annotation.Controller
 import io.micronaut.http.annotation.Get
 import io.netty.handler.ssl.util.InsecureTrustManagerFactory
-import io.reactivex.Flowable
 import spock.lang.Stepwise
 import spock.util.concurrent.PollingConditions
 
@@ -71,13 +69,10 @@ class AcmeCertRefresherTaskSpec extends AcmeBaseSpec {
 
     void "test send https request when the cert is in place"() {
         when:
-            Flowable<HttpResponse<String>> flowable = Flowable.fromPublisher(client.exchange(
-                    HttpRequest.GET("/ssl"), String
-            ))
-            HttpResponse<String> response = flowable.blockingFirst()
+        HttpResponse<String> response = client.toBlocking().exchange(HttpRequest.GET("/ssl"), String)
 
         then:
-            response.body() == "Hello SSL"
+        response.body() == "Hello SSL"
     }
 
     @Controller('/')

diff --git a/acme/src/test/groovy/io/micronaut/acme/AcmeCertRefresherTaskWithClasspathKeysSpec.groovy b/acme/src/test/groovy/io/micronaut/acme/AcmeCertRefresherTaskWithClasspathKeysSpec.groovy
@@ -1,12 +1,10 @@
 package io.micronaut.acme
 
-
 import io.micronaut.http.HttpRequest
 import io.micronaut.http.HttpResponse
 import io.micronaut.http.annotation.Controller
 import io.micronaut.http.annotation.Get
 import io.netty.handler.ssl.util.InsecureTrustManagerFactory
-import io.reactivex.Flowable
 import org.shredzone.acme4j.util.KeyPairUtils
 import spock.lang.Stepwise
 import spock.util.concurrent.PollingConditions
@@ -86,13 +84,10 @@ class AcmeCertRefresherTaskWithClasspathKeysSpec extends AcmeBaseSpec {
 
     void "test send https request when the cert is in place"() {
         when:
-            Flowable<HttpResponse<String>> flowable = Flowable.fromPublisher(client.exchange(
-                    HttpRequest.GET("/ssl-using-classpath-keys"), String
-            ))
-            HttpResponse<String> response = flowable.blockingFirst()
+        HttpResponse<String> response = client.toBlocking().exchange(HttpRequest.GET("/ssl-using-classpath-keys"), String)
 
         then:
-            response.body() == "Hello Classpath"
+        response.body() == "Hello Classpath"
     }
 
     @Controller('/')

diff --git a/acme/src/test/groovy/io/micronaut/acme/AcmeCertRefresherTaskWithFileKeysSpec.groovy b/acme/src/test/groovy/io/micronaut/acme/AcmeCertRefresherTaskWithFileKeysSpec.groovy
@@ -1,12 +1,10 @@
 package io.micronaut.acme
 
-
 import io.micronaut.http.HttpRequest
 import io.micronaut.http.HttpResponse
 import io.micronaut.http.annotation.Controller
 import io.micronaut.http.annotation.Get
 import io.netty.handler.ssl.util.InsecureTrustManagerFactory
-import io.reactivex.Flowable
 import spock.lang.Stepwise
 import spock.util.concurrent.PollingConditions
 
@@ -80,13 +78,10 @@ class AcmeCertRefresherTaskWithFileKeysSpec extends AcmeBaseSpec {
 
     void "test send https request when the cert is in place"() {
         when:
-            Flowable<HttpResponse<String>> flowable = Flowable.fromPublisher(client.exchange(
-                    HttpRequest.GET("/ssl-using-file-keys"), String
-            ))
-            HttpResponse<String> response = flowable.blockingFirst()
+        HttpResponse<String> response = client.toBlocking().exchange(HttpRequest.GET("/ssl-using-file-keys"), String)
 
         then:
-            response.body() == "Hello File"
+        response.body() == "Hello File"
     }
 
     @Controller('/')

diff --git a/acme/src/test/groovy/io/micronaut/acme/AcmeCertWildcardRefresherTaskSpec.groovy b/acme/src/test/groovy/io/micronaut/acme/AcmeCertWildcardRefresherTaskSpec.groovy
@@ -1,12 +1,10 @@
 package io.micronaut.acme
 
-
 import io.micronaut.http.HttpRequest
 import io.micronaut.http.HttpResponse
 import io.micronaut.http.annotation.Controller
 import io.micronaut.http.annotation.Get
 import io.netty.handler.ssl.util.InsecureTrustManagerFactory
-import io.reactivex.Flowable
 import spock.lang.Stepwise
 import spock.util.concurrent.PollingConditions
 
@@ -78,13 +76,10 @@ class AcmeCertWildcardRefresherTaskSpec extends AcmeBaseSpec {
 
     void "test send https request when the cert is in place"() {
         when:
-            Flowable<HttpResponse<String>> flowable = Flowable.fromPublisher(client.exchange(
-                    HttpRequest.GET("/wildcardssl"), String
-            ))
-            HttpResponse<String> response = flowable.blockingFirst()
+        HttpResponse<String> response = client.toBlocking().exchange(HttpRequest.GET("/wildcardssl"), String)
 
         then:
-            response.body() == "Hello Wildcard"
+        response.body() == "Hello Wildcard"
     }
 
     @Controller('/')

diff --git a/...test/groovy/io/micronaut/acme/challenge/http/endpoint/WellKnownTokenControllerSpec.groovy b/...test/groovy/io/micronaut/acme/challenge/http/endpoint/WellKnownTokenControllerSpec.groovy
@@ -6,7 +6,6 @@ import io.micronaut.http.HttpRequest
 import io.micronaut.http.HttpResponse
 import io.micronaut.http.HttpStatus
 import io.micronaut.http.client.exceptions.HttpClientResponseException
-import io.reactivex.Flowable
 
 import static org.testcontainers.shaded.org.apache.commons.lang.RandomStringUtils.randomAlphanumeric
 
@@ -52,9 +51,6 @@ class WellKnownTokenControllerSpec extends AcmeBaseSpec {
     }
 
     private HttpResponse<String> callWellKnownEndpoint(String randomToken) {
-        Flowable<HttpResponse<String>> flowable = Flowable.fromPublisher(client.exchange(
-                HttpRequest.GET("/.well-known/acme-challenge/$randomToken"), String
-        ))
-        flowable.blockingFirst()
+        client.toBlocking().exchange(HttpRequest.GET("/.well-known/acme-challenge/$randomToken"), String)
     }
 }
diff --git a/.../test/groovy/io/micronaut/acme/challenges/AcmeCertRefresherTaskHttp01ChallengeSpec.groovy b/.../test/groovy/io/micronaut/acme/challenges/AcmeCertRefresherTaskHttp01ChallengeSpec.groovy
@@ -6,7 +6,6 @@ import io.micronaut.http.HttpResponse
 import io.micronaut.http.annotation.Controller
 import io.micronaut.http.annotation.Get
 import io.netty.handler.ssl.util.InsecureTrustManagerFactory
-import io.reactivex.Flowable
 import spock.lang.Stepwise
 import spock.util.concurrent.PollingConditions
 
@@ -74,13 +73,10 @@ class AcmeCertRefresherTaskHttp01ChallengeSpec extends AcmeBaseSpec {
 
     void "test send https request when the cert is in place"() {
         when:
-            Flowable<HttpResponse<String>> flowable = Flowable.fromPublisher(client.exchange(
-                    HttpRequest.GET("/httpchallenge"), String
-            ))
-            HttpResponse<String> response = flowable.blockingFirst()
+        HttpResponse<String> response = client.toBlocking().exchange(HttpRequest.GET("/httpchallenge"), String)
 
         then:
-            response.body() == "Hello HTTP"
+        response.body() == "Hello HTTP"
     }
 
     @Controller('/')

diff --git a/...st/groovy/io/micronaut/acme/challenges/AcmeCertRefresherTaskTlsApln01ChallengeSpec.groovy b/...st/groovy/io/micronaut/acme/challenges/AcmeCertRefresherTaskTlsApln01ChallengeSpec.groovy
@@ -6,7 +6,6 @@ import io.micronaut.http.HttpResponse
 import io.micronaut.http.annotation.Controller
 import io.micronaut.http.annotation.Get
 import io.netty.handler.ssl.util.InsecureTrustManagerFactory
-import io.reactivex.Flowable
 import spock.lang.Stepwise
 import spock.util.concurrent.PollingConditions
 
@@ -72,13 +71,10 @@ class AcmeCertRefresherTaskTlsApln01ChallengeSpec extends AcmeBaseSpec {
 
     void "test send https request when the cert is in place"() {
         when:
-            Flowable<HttpResponse<String>> flowable = Flowable.fromPublisher(client.exchange(
-                    HttpRequest.GET("/tlschallenge"), String
-            ))
-            HttpResponse<String> response = flowable.blockingFirst()
+        HttpResponse<String> response = client.toBlocking().exchange(HttpRequest.GET("/tlschallenge"), String)
 
         then:
-            response.body() == "Hello TLS"
+        response.body() == "Hello TLS"
     }
 
     @Controller('/')