minor fixes

Author: Lokowandtg

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/logcache/v1/_ReactorLogCacheClient.java

@@ -24,7 +24,6 @@
 import org.cloudfoundry.logcache.v1.ReadRequest;
 import org.cloudfoundry.logcache.v1.ReadResponse;
 import org.cloudfoundry.reactor.ConnectionContext;
-import org.cloudfoundry.reactor.RootProvider;
 import org.cloudfoundry.reactor.TokenProvider;
 import org.immutables.value.Value;
 import reactor.core.publisher.Mono;
@@ -86,7 +85,7 @@ Mono<String> getRoot() {
 
     private Mono<String> deriveLogCacheUrl() {
         return getConnectionContext().getRootProvider().getRoot(getConnectionContext())
-            .map(root -> root.replace("api", "log-cache"))
+            .map(root -> root.replaceFirst("://api", "://log-cache"))
             .map(URI::create)
             .delayUntil(uri -> getConnectionContext().trust(uri.getHost(), uri.getPort()))
             .map(URI::toString);

cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/logcache/v1/ReactorLogCacheClientTest.java

@@ -24,7 +24,6 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import java.io.IOException;
 import java.net.URI;
 import java.time.Duration;
 import java.util.Collections;
@@ -52,15 +51,16 @@
 import reactor.test.StepVerifier;
 
 class ReactorLogCacheClientTest extends AbstractLogCacheApiTest {
-    private static final String API_ROOT = "http://api.my.rapid.server.com";
-    private static final String LOGCACHE = "http://log-cache.my.rlog-cached.server.com";
+    private static final String API_ROOT = "http://api.my.rapid.server.com"; // the ".rAPId." part also contains the string "api".
+    private static final String LOGCACHE = "http://log-cache.my.rapid.server.com"; // only the "api" at the start of
+    // the url should be replaced.
 
     private final ReactorLogCacheEndpoints logCacheEndpoints =
             new ReactorLogCacheEndpoints(
                     CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER, Collections.emptyMap());
 
     @Test
-    void getRootFromFallback() throws IOException {
+    void getRootFromFallback() {
         URI webServerUri = URI.create(this.root.block(Duration.ofSeconds(5)));
         Mono<String> apiRoot = Mono.just(API_ROOT);
         RootProvider rootProvider = mock(RootProvider.class);
@@ -111,7 +111,7 @@ void getRootFromEndpoint() {
         String rootString = logCacheRoot.block(Duration.ofSeconds(5));
         assertThat(rootString)
                 .isEqualTo(
-                        "http://cache-for-logging.cf.lod-cfcli3.cfrt-sof.sapcloud.io:"
+                        "http://cache-for-logging.run.pivotal.io:"
                                 + webServerUri.getPort());
     }
 

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

@@ -26,7 +26,7 @@
       "href": "https://uaa.run.pivotal.io"
     },
     "log_cache": {
-      "href": "https://cache-for-logging.cf.lod-cfcli3.cfrt-sof.sapcloud.io"
+      "href": "https://cache-for-logging.run.pivotal.io"
     },
     "logging": {
       "href": "wss://doppler.run.pivotal.io:443"