DefaultDomains: use v3 api

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/domains/_CreateDomainRequest.java

@@ -56,4 +56,11 @@ abstract class _CreateDomainRequest {
     @Nullable
     abstract DomainRelationships getRelationships();
 
+    /**
+     * The router group
+     */
+    @JsonProperty("router_group")
+    @Nullable
+    abstract RouterGroup getRouterGroup();
+
 }

cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/_DefaultCloudFoundryOperations.java

@@ -91,7 +91,15 @@ public Buildpacks buildpacks() {
     @Override
     @Value.Derived
     public Domains domains() {
-        return new DefaultDomains(getCloudFoundryClientPublisher(), getRoutingClientPublisher());
+        CloudFoundryClient cloudFoundryClient = getCloudFoundryClient();
+        if (cloudFoundryClient == null) {
+            throw new IllegalStateException("CloudFoundryClient must be set");
+        }
+        RoutingClient routingClient = getRoutingClient();
+        if (routingClient == null) {
+            throw new IllegalStateException("RoutingClient must be set");
+        }
+        return new DefaultDomains(cloudFoundryClient, routingClient);
     }
 
     @Override

cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/domains/Domains.java

@@ -37,7 +37,9 @@ public interface Domains {
      *
      * @param request the Create Shared Domain request
      * @return a completion indicator
+     * @deprecated use {@link #create} instead
      */
+    @Deprecated
     Mono<Void> createShared(CreateSharedDomainRequest request);
 
     /**

cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/domains/_CreateDomainRequest.java

@@ -16,6 +16,7 @@
 
 package org.cloudfoundry.operations.domains;
 
+import org.cloudfoundry.Nullable;
 import org.immutables.value.Value;
 
 /**
@@ -32,6 +33,13 @@ abstract class _CreateDomainRequest {
     /**
      * The organization name of the domain
      */
+    @Nullable
     abstract String getOrganization();
 
+    /**
+     * The router group of the domain
+     */
+    @Nullable
+    abstract String getRouterGroup();
+
 }

cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/DefaultCloudFoundryOperationsTest.java

@@ -26,6 +26,7 @@ final class DefaultCloudFoundryOperationsTest extends AbstractOperationsTest {
             DefaultCloudFoundryOperations.builder()
                     .cloudFoundryClient(this.cloudFoundryClient)
                     .dopplerClient(this.dopplerClient)
+                    .routingClient(this.routingClient)
                     .organization(TEST_ORGANIZATION_NAME)
                     .space(TEST_SPACE_NAME)
                     .uaaClient(this.uaaClient)

cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/domains/CreateDomainRequestTest.java

@@ -31,15 +31,6 @@ void noDomain() {
                 });
     }
 
-    @Test
-    void noOrganization() {
-        assertThrows(
-                IllegalStateException.class,
-                () -> {
-                    CreateDomainRequest.builder().domain("test-domain").build();
-                });
-    }
-
     @Test
     void valid() {
         CreateDomainRequest.builder()