Adopt Reactor Netty 0.8.11.RELEASE

Author: nictas

cloudfoundry-client-reactor/pom.xml

@@ -66,7 +66,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.projectreactor.ipc</groupId>
+            <groupId>io.projectreactor.netty</groupId>
             <artifactId>reactor-netty</artifactId>
         </dependency>
         <dependency>

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/AbstractRootProvider.java

@@ -16,10 +16,17 @@
 
 package org.cloudfoundry.reactor;
 
+import org.cloudfoundry.reactor.util.JsonCodec;
+import org.cloudfoundry.reactor.util.Operator;
+import org.cloudfoundry.reactor.util.OperatorContext;
+import org.cloudfoundry.reactor.util.UserAgent;
 import org.immutables.value.Value;
 import org.springframework.web.util.UriComponents;
 import org.springframework.web.util.UriComponentsBuilder;
+
+import io.netty.handler.codec.http.HttpHeaders;
 import reactor.core.publisher.Mono;
+import reactor.netty.http.client.HttpClient;
 
 import java.util.Optional;
 import java.util.regex.Matcher;
@@ -41,19 +48,19 @@ public final void checkForValidApiHost() {
         Matcher matcher = HOSTNAME_PATTERN.matcher(getApiHost());
 
         if (!matcher.matches()) {
-            throw new IllegalArgumentException(String.format("API hostname %s is not correctly formatted (e.g. 'api.local.pcfdev.io')", getApiHost()));
+            throw new IllegalArgumentException(String.format("API hostname %s is not correctly formatted (e.g. 'api.local.pcfdev.io')",
+                getApiHost()));
         }
     }
 
     /**
-     * The hostname of the API root.  Typically something like {@code api.run.pivotal.io}.
+     * The hostname of the API root. Typically something like {@code api.run.pivotal.io}.
      */
     public abstract String getApiHost();
 
     @Override
     public final Mono<String> getRoot(ConnectionContext connectionContext) {
-        Mono<String> cached = doGetRoot(connectionContext)
-            .delayUntil(uri -> trust(uri.getHost(), uri.getPort(), connectionContext))
+        Mono<String> cached = doGetRoot(connectionContext).delayUntil(uri -> trust(uri.getHost(), uri.getPort(), connectionContext))
             .map(UriComponents::toUriString);
 
         return connectionContext.getCacheDuration()
@@ -63,8 +70,7 @@ public final Mono<String> getRoot(ConnectionContext connectionContext) {
 
     @Override
     public final Mono<String> getRoot(String key, ConnectionContext connectionContext) {
-        Mono<String> cached = doGetRoot(key, connectionContext)
-            .delayUntil(uri -> trust(uri.getHost(), uri.getPort(), connectionContext))
+        Mono<String> cached = doGetRoot(key, connectionContext).delayUntil(uri -> trust(uri.getHost(), uri.getPort(), connectionContext))
             .map(UriComponents::toUriString);
 
         return connectionContext.getCacheDuration()
@@ -77,7 +83,9 @@ public final Mono<String> getRoot(String key, ConnectionContext connectionContex
     protected abstract Mono<UriComponents> doGetRoot(String key, ConnectionContext connectionContext);
 
     protected final UriComponents getRoot() {
-        UriComponentsBuilder builder = UriComponentsBuilder.newInstance().scheme("https").host(getApiHost());
+        UriComponentsBuilder builder = UriComponentsBuilder.newInstance()
+            .scheme("https")
+            .host(getApiHost());
         getPort().ifPresent(builder::port);
 
         return normalize(builder);
@@ -92,7 +100,8 @@ protected final UriComponents normalize(UriComponentsBuilder builder) {
             builder.port(getPort().orElse(DEFAULT_PORT));
         }
 
-        return builder.build().encode();
+        return builder.build()
+            .encode();
     }
 
     /**
@@ -101,7 +110,7 @@ protected final UriComponents normalize(UriComponentsBuilder builder) {
     abstract Optional<Integer> getPort();
 
     /**
-     * Whether the connection to the root API should be secure (i.e. using HTTPS).  Defaults to {@code true}.
+     * Whether the connection to the root API should be secure (i.e. using HTTPS). Defaults to {@code true}.
      */
     abstract Optional<Boolean> getSecure();
 
@@ -117,4 +126,16 @@ private Mono<Void> trust(String host, int port, ConnectionContext connectionCont
         return connectionContext.trust(host, port);
     }
 
+    public Mono<Operator> createOperator(ConnectionContext connectionContext) {
+        HttpClient httpClient = connectionContext.getHttpClient();
+        return getRoot(connectionContext).map(root -> OperatorContext.of(connectionContext, root))
+            .map(operatorContext -> new Operator(operatorContext, httpClient))
+            .map(operator -> operator.headers(this::addHeaders));
+    }
+
+    private void addHeaders(HttpHeaders httpHeaders) {
+        UserAgent.setUserAgent(httpHeaders);
+        JsonCodec.setDecodeHeaders(httpHeaders);
+    }
+
 }

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/ConnectionContext.java

@@ -18,7 +18,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import reactor.core.publisher.Mono;
-import reactor.ipc.netty.http.client.HttpClient;
+import reactor.netty.http.client.HttpClient;
 
 import java.time.Duration;
 import java.util.Optional;