Merge branch '2.x'

Author: nebhale

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

@@ -45,7 +45,7 @@ protected Mono<UriComponents> doGetRoot(String key, ConnectionContext connection
                     return getInfoPayloadRootProvider().doGetRoot(connectionContext)
                         .map(uri -> UriComponentsBuilder.fromUriString(uri.toUriString()).pathSegment("v3").build());
                 } else if ("logging".equals(key)) {
-                    return getInfoPayloadRootProvider().doGetRoot("logging_endpoint", connectionContext);
+                    return getInfoPayloadRootProvider().doGetRoot("doppler_logging_endpoint", connectionContext);
                 } else if ("routing".equals(key)) {
                     return getInfoPayloadRootProvider().doGetRoot("routing_endpoint", connectionContext);
                 } else if ("uaa".equals(key)) {

cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/DelegatingRootProviderTest.java

@@ -169,7 +169,7 @@ public void getRootDopplerClientFallback() {
         this.rootProvider
             .getRoot("logging", CONNECTION_CONTEXT)
             .as(StepVerifier::create)
-            .expectNext("http://loggregator.vcap.me:80")
+            .expectNext("http://doppler.vcap.me:80")
             .expectComplete()
             .verify(Duration.ofSeconds(5));
     }

cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/info/ReactorInfoTest.java

@@ -64,6 +64,7 @@ public void get() {
                 .applicationSshHostKeyFingerprint("47:0d:d1:c8:c3:3d:0a:36:d1:49:2f:f2:90:27:31:d0")
                 .routingEndpoint("http://localhost:3000")
                 .loggingEndpoint("ws://loggregator.vcap.me:80")
+                .dopplerLoggingEndpoint("ws://doppler.vcap.me:80")
                 .build())
             .expectComplete()
             .verify(Duration.ofSeconds(5));

cloudfoundry-client-reactor/src/test/resources/fixtures/client/v2/info/GET_response.json

@@ -13,5 +13,6 @@
   "app_ssh_host_key_fingerprint": "47:0d:d1:c8:c3:3d:0a:36:d1:49:2f:f2:90:27:31:d0",
   "app_ssh_oauth_client": null,
   "routing_endpoint": "http://localhost:3000",
-  "logging_endpoint": "ws://loggregator.vcap.me:80"
+  "logging_endpoint": "ws://loggregator.vcap.me:80",
+  "doppler_logging_endpoint": "ws://doppler.vcap.me:80"
 }