Create/Update route options

Refactor _RouteOptions class to handle added options in future

Author: theghost5800

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/routes/_CreateRouteRequest.java

@@ -27,6 +27,13 @@ abstract class _CreateRouteRequest {
     @JsonProperty("metadata")
     abstract Metadata getMetadata();
 
+    /**
+     * Route options
+     */
+    @Nullable
+    @JsonProperty("options")
+    abstract RouteOptions getOptions();
+
     /**
      * The path
      */

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/routes/_RouteOptions.java

@@ -1,8 +1,14 @@
 package org.cloudfoundry.client.v3.routes;
 
+import java.util.Map;
+import java.util.Optional;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import org.cloudfoundry.Nullable;
+import org.cloudfoundry.AllowNulls;
 import org.immutables.value.Value;
 
 /**
@@ -13,10 +19,40 @@
 abstract class _RouteOptions {
 
     /**
-     * The loadbalancing
+     * All route options, including unknown future keys.
      */
-    @JsonProperty("loadbalancing")
-    @Nullable
-    public abstract String getLoadbalancing();
+    @JsonAnyGetter
+    @JsonProperty("options")
+    @JsonInclude(value = JsonInclude.Include.ALWAYS)
+    @AllowNulls
+    public abstract Map<String, Object> getValues();
+
+    @JsonIgnore
+    @Value.Derived
+    public Optional<String> getLoadbalancing() {
+        return getString("loadbalancing");
+    }
+
+    @JsonIgnore
+    @Value.Derived
+    public Optional<String> getHashHeader() {
+        return getString("hash_header");
+    }
+
+    @JsonIgnore
+    @Value.Derived
+    public Optional<String> getHashBalance() {
+        return getString("hash_balance");
+    }
+
+    @JsonIgnore
+    public Optional<Object> get(String key) {
+        return Optional.ofNullable(getValues().get(key));
+    }
+
+    private Optional<String> getString(String key) {
+        Object value = getValues().get(key);
+        return value instanceof String ? Optional.of((String) value) : Optional.empty();
+    }
 
 }

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/routes/_UpdateRouteRequest.java

@@ -21,6 +21,13 @@ abstract class _UpdateRouteRequest {
     @Nullable
     abstract Metadata getMetadata();
 
+    /**
+     * Route options
+     */
+    @JsonProperty("options")
+    @Nullable
+    abstract RouteOptions getOptions();
+
     /**
      * The route id
      */

cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/CreateRouteRequestTest.java

@@ -16,6 +16,7 @@
 
 package org.cloudfoundry.client.v3.routes;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.cloudfoundry.client.v3.Relationship;
@@ -94,4 +95,37 @@ void valid() {
                                                 .build())
                                 .build());
     }
+
+    @Test
+    void validWithRouteOptions() {
+        CreateRouteRequest request = CreateRouteRequest.builder()
+                .relationships(
+                        RouteRelationships.builder()
+                                .domain(
+                                        ToOneRelationship.builder()
+                                                .data(
+                                                        Relationship.builder()
+                                                                .id("test-domain-id")
+                                                                .build())
+                                                .build())
+                                .space(
+                                        ToOneRelationship.builder()
+                                                .data(
+                                                        Relationship.builder()
+                                                                .id("test-space-id")
+                                                                .build())
+                                                .build())
+                                .build())
+                .options(
+                        RouteOptions.builder()
+                                .value("loadbalancing", "hash")
+                                .value("hash_header", "X-Hash")
+                                .value("hash_balance", "90")
+                                .build())
+                .build();
+
+        assertEquals("hash", request.getOptions().getLoadbalancing().get());
+        assertEquals("X-Hash", request.getOptions().getHashHeader().get());
+        assertEquals("90", request.getOptions().getHashBalance().get());
+    }
 }

cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/routes/UpdateRouteRequestTest.java

@@ -16,6 +16,7 @@
 
 package org.cloudfoundry.client.v3.routes;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.cloudfoundry.client.v3.Metadata;
@@ -39,4 +40,22 @@ void valid() {
                 .routeId("test-route-id")
                 .build();
     }
+
+    @Test
+    void validWithRouteOptions() {
+        UpdateRouteRequest request = UpdateRouteRequest.builder()
+                .metadata(Metadata.builder().label("test-key", "test-value").build())
+                .options(
+                        RouteOptions.builder()
+                                    .value("loadbalancing", "hash")
+                                    .value("hash_header", "X-Hash")
+                                    .value("hash_balance", "90")
+                                    .build())
+                .routeId("test-route-id")
+                .build();
+
+        assertEquals("hash", request.getOptions().getLoadbalancing().get());
+        assertEquals("X-Hash", request.getOptions().getHashHeader().get());
+        assertEquals("90", request.getOptions().getHashBalance().get());
+    }
 }