Implement service instances and plans creation and update (#1157)

Author: IvanBorislavovDimitrov

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/client/v3/AbstractClientV3Operations.java

@@ -65,6 +65,16 @@ protected final Mono<String> delete(Object requestPayload, Function<UriComponent
             .map(AbstractClientV3Operations::extractJobId);
     }
 
+    protected final <T> Mono<HttpClientResponseWithParsedBody<T>> deleteWithResponse(Object requestPayload, Class<T> responseType,
+                                                                                     Function<UriComponentsBuilder, UriComponentsBuilder> uriTransformer) {
+        return createOperator()
+            .flatMap(operator -> operator.delete()
+                .uri(queryTransformer(requestPayload).andThen(uriTransformer))
+                .send(requestPayload)
+                .response()
+                .parseBodyWithResponse(responseType));
+    }
+
     protected final <T> Mono<T> delete(Object requestPayload, Class<T> responseType, Function<UriComponentsBuilder, UriComponentsBuilder> uriTransformer) {
         return createOperator()
             .flatMap(operator -> operator.delete()
@@ -130,6 +140,16 @@ protected <T> Mono<T> post(Object requestPayload, Class<T> responseType, Functio
                 .parseBody(responseType));
     }
 
+    protected final <T> Mono<HttpClientResponseWithParsedBody<T>> postWithResponse(Object requestPayload, Class<T> responseType,
+                                                                                    Function<UriComponentsBuilder, UriComponentsBuilder> uriTransformer) {
+        return createOperator()
+            .flatMap(operator -> operator.post()
+                .uri(queryTransformer(requestPayload).andThen(uriTransformer))
+                .send(requestPayload)
+                .response()
+                .parseBodyWithResponse(responseType));
+    }
+
     protected final Mono<String> post(Object requestPayload, Function<UriComponentsBuilder, UriComponentsBuilder> uriTransformer) {
         return createOperator()
             .flatMap(operator -> operator.post()

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/client/v3/serviceinstances/ReactorServiceInstancesV3.java

@@ -16,26 +16,35 @@
 
 package org.cloudfoundry.reactor.client.v3.serviceinstances;
 
+
+import org.cloudfoundry.client.v3.serviceinstances.CreateServiceInstanceRequest;
+import org.cloudfoundry.client.v3.serviceinstances.CreateServiceInstanceResponse;
+import org.cloudfoundry.client.v3.serviceinstances.DeleteServiceInstanceRequest;
 import org.cloudfoundry.client.v3.serviceinstances.GetManagedServiceParametersRequest;
 import org.cloudfoundry.client.v3.serviceinstances.GetManagedServiceParametersResponse;
+import org.cloudfoundry.client.v3.serviceinstances.GetServiceInstanceRequest;
+import org.cloudfoundry.client.v3.serviceinstances.GetServiceInstanceResponse;
 import org.cloudfoundry.client.v3.serviceinstances.GetUserProvidedCredentialsRequest;
 import org.cloudfoundry.client.v3.serviceinstances.GetUserProvidedCredentialsResponse;
 import org.cloudfoundry.client.v3.serviceinstances.ListServiceInstancesRequest;
 import org.cloudfoundry.client.v3.serviceinstances.ListServiceInstancesResponse;
 import org.cloudfoundry.client.v3.serviceinstances.ListSharedSpacesRelationshipRequest;
 import org.cloudfoundry.client.v3.serviceinstances.ListSharedSpacesRelationshipResponse;
+import org.cloudfoundry.client.v3.serviceinstances.ServiceInstanceResource;
 import org.cloudfoundry.client.v3.serviceinstances.ServiceInstancesV3;
 import org.cloudfoundry.client.v3.serviceinstances.ShareServiceInstanceRequest;
 import org.cloudfoundry.client.v3.serviceinstances.ShareServiceInstanceResponse;
 import org.cloudfoundry.client.v3.serviceinstances.UnshareServiceInstanceRequest;
 import org.cloudfoundry.client.v3.serviceinstances.UpdateServiceInstanceRequest;
 import org.cloudfoundry.client.v3.serviceinstances.UpdateServiceInstanceResponse;
 import org.cloudfoundry.reactor.ConnectionContext;
+import org.cloudfoundry.reactor.HttpClientResponseWithParsedBody;
 import org.cloudfoundry.reactor.TokenProvider;
 import org.cloudfoundry.reactor.client.v3.AbstractClientV3Operations;
 import reactor.core.publisher.Mono;
 
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * The Reactor-based implementation of {@link ServiceInstancesV3}
@@ -54,16 +63,43 @@ public ReactorServiceInstancesV3(ConnectionContext connectionContext, Mono<Strin
         super(connectionContext, root, tokenProvider, requestTags);
     }
 
+    @Override
+    public Mono<CreateServiceInstanceResponse> create(CreateServiceInstanceRequest request) {
+        return postWithResponse(request, ServiceInstanceResource.class, builder -> builder.pathSegment("service_instances"))
+            .map(responseTuple -> CreateServiceInstanceResponse.builder()
+                .jobId(getJobId(responseTuple))
+                .serviceInstance(responseTuple.getBody())
+                .build())
+            .checkpoint();
+    }
+
+    private <T> Optional<String> getJobId(HttpClientResponseWithParsedBody<T> responseTuple) {
+        return Optional.ofNullable(extractJobId(responseTuple.getResponse()));
+    }
+
+    @Override
+    public Mono<GetServiceInstanceResponse> get(GetServiceInstanceRequest request) {
+        return get(request, GetServiceInstanceResponse.class, builder -> builder.pathSegment("service_instances", request.getServiceInstanceId()))
+            .checkpoint();
+    }
+
+    @Override
+    public Mono<Optional<String>> delete(DeleteServiceInstanceRequest request) {
+        return deleteWithResponse(request, String.class, builder -> builder.pathSegment("service_instances", request.getServiceInstanceId()))
+            .map(this::getJobId)
+            .checkpoint();
+    }
+
     @Override
     public Mono<GetManagedServiceParametersResponse> getManagedServiceParameters(GetManagedServiceParametersRequest request) {
-	return get(request, GetManagedServiceParametersResponse.class, builder -> builder.pathSegment("service_instances", request.getServiceInstanceId(), "parameters"))
-	    .checkpoint();
+        return get(request, GetManagedServiceParametersResponse.class, builder -> builder.pathSegment("service_instances", request.getServiceInstanceId(), "parameters"))
+            .checkpoint();
     }
 
     @Override
     public Mono<GetUserProvidedCredentialsResponse> getUserProvidedCredentials(GetUserProvidedCredentialsRequest request) {
-	return get(request, GetUserProvidedCredentialsResponse.class, builder -> builder.pathSegment("service_instances", request.getServiceInstanceId(), "credentials"))
-	    .checkpoint();
+        return get(request, GetUserProvidedCredentialsResponse.class, builder -> builder.pathSegment("service_instances", request.getServiceInstanceId(), "credentials"))
+            .checkpoint();
     }
 
     @Override
@@ -92,6 +128,11 @@ public Mono<Void> unshare(UnshareServiceInstanceRequest request) {
 
     @Override
     public Mono<UpdateServiceInstanceResponse> update(UpdateServiceInstanceRequest request) {
-        return patch(request, UpdateServiceInstanceResponse.class, builder -> builder.pathSegment("service_instances", request.getServiceInstanceId()));
+        return patchWithResponse(request, ServiceInstanceResource.class, builder -> builder.pathSegment("service_instances", request.getServiceInstanceId()))
+            .map(responseTuple -> UpdateServiceInstanceResponse.builder()
+                .jobId(getJobId(responseTuple))
+                .serviceInstance(responseTuple.getBody())
+                .build())
+            .checkpoint();
     }
 }

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/client/v3/serviceplans/ReactorServicePlansV3.java

@@ -24,6 +24,8 @@
 import org.cloudfoundry.client.v3.serviceplans.ServicePlansV3;
 import org.cloudfoundry.client.v3.serviceplans.UpdateServicePlanRequest;
 import org.cloudfoundry.client.v3.serviceplans.UpdateServicePlanResponse;
+import org.cloudfoundry.client.v3.serviceplans.UpdateServicePlanVisibilityRequest;
+import org.cloudfoundry.client.v3.serviceplans.UpdateServicePlanVisibilityResponse;
 import org.cloudfoundry.reactor.ConnectionContext;
 import org.cloudfoundry.reactor.TokenProvider;
 import org.cloudfoundry.reactor.client.v3.AbstractClientV3Operations;
@@ -72,4 +74,9 @@ public Mono<UpdateServicePlanResponse> update(UpdateServicePlanRequest request)
             .checkpoint();
     }
 
+    @Override
+    public Mono<UpdateServicePlanVisibilityResponse> updateVisibility(UpdateServicePlanVisibilityRequest request) {
+        return post(request, UpdateServicePlanVisibilityResponse.class, builder -> builder.pathSegment("service_plans", request.getServicePlanId(), "visibility"))
+            .checkpoint();
+    }
 }