Merge branch '754-property-doc'

Author: twoseat

README.md

@@ -277,7 +277,7 @@ Name | Description
 `TEST_ADMIN_CLIENTSECRET` | Client secret for a client with permissions for a Client Credentials grant
 `TEST_ADMIN_PASSWORD` | Password for a user with admin permissions
 `TEST_ADMIN_USERNAME` | Username for a user with admin permissions
-`TEST_APIHOST` | The host of Cloud Foundry instance.  Typically something like `api.local.pcfdev.io`.
+`TEST_APIHOST` | The host of a Cloud Foundry instance.  Typically something like `api.local.pcfdev.io`.
 `TEST_PROXY_HOST` | _(Optional)_ The host of a proxy to route all requests through
 `TEST_PROXY_PASSWORD` | _(Optional)_ The password for a proxy to route all requests through
 `TEST_PROXY_PORT` | _(Optional)_ The port of a proxy to route all requests through. Defaults to `8080`.

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

@@ -120,6 +120,9 @@ public ObjectMapper getObjectMapper() {
         return objectMapper;
     }
 
+    /**
+     * The port for the Cloud Foundry instance
+     */
     @Value.Default
     public Integer getPort() {
         return DEFAULT_PORT;

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

@@ -323,13 +323,19 @@ public Users users() {
         return new ReactorUsers(getConnectionContext(), getRoot(), getTokenProvider());
     }
 
+    /**
+     * The connection context
+     */
     abstract ConnectionContext getConnectionContext();
 
     @Value.Default
     Mono<String> getRoot() {
         return getConnectionContext().getRoot();
     }
 
+    /**
+     * The token provider
+     */
     abstract TokenProvider getTokenProvider();
 
 }

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/doppler/_ReactorDopplerClient.java

@@ -54,6 +54,9 @@ public Flux<Envelope> stream(StreamRequest request) {
         return getDopplerEndpoints().stream(request);
     }
 
+    /**
+     * The connection context
+     */
     abstract ConnectionContext getConnectionContext();
 
     @Value.Derived
@@ -66,6 +69,9 @@ Mono<String> getRoot() {
         return getConnectionContext().getRoot("doppler_logging_endpoint");
     }
 
+    /**
+     * The token provider
+     */
     abstract TokenProvider getTokenProvider();
 
 

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/routing/_ReactorRoutingClient.java

@@ -45,13 +45,19 @@ public TcpRoutes tcpRoutes() {
         return new ReactorTcpRoutes(getConnectionContext(), getRoot(), getTokenProvider());
     }
 
+    /**
+     * The connection context
+     */
     abstract ConnectionContext getConnectionContext();
 
     @Value.Default
     Mono<String> getRoot() {
         return getConnectionContext().getRoot("routing_endpoint");
     }
 
+    /**
+     * The token provider
+     */
     abstract TokenProvider getTokenProvider();
 
 }

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/tokenprovider/AbstractUaaTokenProvider.java

@@ -19,6 +19,7 @@
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.netty.util.AsciiString;
+import org.cloudfoundry.Nullable;
 import org.cloudfoundry.reactor.ConnectionContext;
 import org.cloudfoundry.reactor.TokenProvider;
 import org.cloudfoundry.reactor.util.ErrorPayloadMapper;
@@ -78,15 +79,15 @@ public abstract class AbstractUaaTokenProvider implements TokenProvider {
     private final ConcurrentMap<ConnectionContext, Mono<String>> refreshTokens = new ConcurrentHashMap<>(1);
 
     /**
-     * The client id.  Defaults to {@code cf}.
+     * The client id. Defaults to {@code cf}.
      */
     @Value.Default
     public String getClientId() {
         return "cf";
     }
 
     /**
-     * The client secret Defaults to {@code ""}.
+     * The client secret. Defaults to {@code ""}.
      */
     @Value.Default
     public String getClientSecret() {
@@ -113,7 +114,11 @@ public void invalidate(ConnectionContext connectionContext) {
         this.accessTokens.put(connectionContext, token(connectionContext));
     }
 
-    abstract Optional<String> identityZoneId();
+    /**
+     * The identity zone id
+     */
+    @Nullable
+    abstract String identityZoneId();
 
     /**
      * Transforms a {@code Mono} in order to make a request to negotiate an access token
@@ -154,10 +159,12 @@ private static String extractAccessToken(Map<String, String> payload) {
         return String.format("%s %s", payload.get(TOKEN_TYPE), accessToken);
     }
 
-    private static String getTokenUri(String root, Optional<String> identityZoneId) {
+    private static String getTokenUri(String root, String identityZoneId) {
         UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(root);
 
-        identityZoneId.ifPresent(id -> builder.host(String.format("%s.%s", id, builder.build().getHost())));
+        if (identityZoneId != null) {
+            builder.host(String.format("%s.%s", identityZoneId, builder.build().getHost()));
+        }
 
         return builder
             .pathSegment("oauth", "token")

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/tokenprovider/_OneTimePasscodeTokenProvider.java

@@ -27,7 +27,6 @@
 @Value.Immutable
 abstract class _OneTimePasscodeTokenProvider extends AbstractUaaTokenProvider {
 
-
     /**
      * The passcode
      */

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/uaa/_ReactorUaaClient.java

@@ -94,6 +94,9 @@ public Users users() {
         return new ReactorUsers(getConnectionContext(), getRoot(), getTokenProvider());
     }
 
+    /**
+     * The connection context
+     */
     abstract ConnectionContext getConnectionContext();
 
     @Value.Default
@@ -103,6 +106,9 @@ Mono<String> getRoot() {
             .cache();
     }
 
+    /**
+     * The token provider
+     */
     abstract TokenProvider getTokenProvider();
 
     @Value.Default