Apply review feedback

Author: schulzh

.idea/encodings.xml

@@ -51,6 +51,16 @@ protected AbstractClientV3Operations(ConnectionContext connectionContext, Mono<S
         super(connectionContext, root, tokenProvider, requestTags);
     }
 
+    protected static String extractJobId(HttpClientResponse response) {
+        String locationHeader = response.responseHeaders().get(HttpHeaderNames.LOCATION);
+        if (locationHeader == null) {
+            return null;
+        }
+
+        List<String> pathSegments = UriComponentsBuilder.fromUriString(locationHeader).build().getPathSegments();
+        return pathSegments.get(pathSegments.size() - 1);
+    }
+
     @Override
     protected Mono<Operator> createOperator() {
         return super.createOperator().map(this::attachErrorPayloadMapper);
@@ -66,23 +76,23 @@ protected final Mono<String> delete(Object requestPayload, Function<UriComponent
             .flatMap(response -> Mono.justOrEmpty(extractJobId(response)));
     }
 
-    protected final <T> Mono<HttpClientResponseWithParsedBody<T>> deleteWithResponse(Object requestPayload, Class<T> responseType,
-                                                                                     Function<UriComponentsBuilder, UriComponentsBuilder> uriTransformer) {
+    protected final <T> Mono<T> delete(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));
+                .parseBody(responseType));
     }
 
-    protected final <T> Mono<T> delete(Object requestPayload, Class<T> responseType, Function<UriComponentsBuilder, UriComponentsBuilder> uriTransformer) {
+    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()
-                .parseBody(responseType));
+                .parseBodyWithResponse(responseType));
     }
 
     protected final <T> Flux<T> get(Object requestPayload, Function<UriComponentsBuilder, UriComponentsBuilder> uriTransformer, Function<ByteBufFlux, Flux<T>> bodyTransformer) {
@@ -112,7 +122,7 @@ protected final <T> Mono<T> patch(Object requestPayload, Class<T> responseType,
     }
 
     protected final <T> Mono<HttpClientResponseWithParsedBody<T>> patchWithResponse(Object requestPayload, Class<T> responseType,
-	                                                                            Function<UriComponentsBuilder, UriComponentsBuilder> uriTransformer) {
+                                                                                    Function<UriComponentsBuilder, UriComponentsBuilder> uriTransformer) {
         return createOperator()
             .flatMap(operator -> operator.patch()
                 .uri(queryTransformer(requestPayload).andThen(uriTransformer))
@@ -141,16 +151,18 @@ 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) {
+    protected final Mono<String> post(Object requestPayload, Function<UriComponentsBuilder, UriComponentsBuilder> uriTransformer) {
         return createOperator()
             .flatMap(operator -> operator.post()
                 .uri(queryTransformer(requestPayload).andThen(uriTransformer))
                 .send(requestPayload)
                 .response()
-                .parseBodyWithResponse(responseType));
+                .get())
+            .flatMap(response -> Mono.justOrEmpty(extractJobId(response)));
     }
-    protected <T> Mono<HttpClientResponseWithParsedBody<T>> postRawWithResponse(byte[] requestPayload, String contentType, Class<T> responseType, Function<UriComponentsBuilder, UriComponentsBuilder> uriTransformer) {
+
+    protected <T> Mono<HttpClientResponseWithParsedBody<T>> postRawWithResponse(byte[] requestPayload, String contentType, Class<T> responseType, Function<UriComponentsBuilder,
+        UriComponentsBuilder> uriTransformer) {
         return createOperator()
             .flatMap(operator -> operator.post()
                 .uri(queryTransformer(requestPayload).andThen(uriTransformer))
@@ -166,14 +178,14 @@ protected <T> Mono<HttpClientResponseWithParsedBody<T>> postRawWithResponse(byte
                 .parseBodyWithResponse(responseType));
     }
 
-    protected final Mono<String> post(Object requestPayload, Function<UriComponentsBuilder, UriComponentsBuilder> uriTransformer) {
+    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()
-                .get())
-            .flatMap(response -> Mono.justOrEmpty(extractJobId(response)));
+                .parseBodyWithResponse(responseType));
     }
 
     protected final <T> Mono<T> put(Object requestPayload, Class<T> responseType, Function<UriComponentsBuilder, UriComponentsBuilder> uriTransformer) {
@@ -185,16 +197,6 @@ protected final <T> Mono<T> put(Object requestPayload, Class<T> responseType, Fu
                 .parseBody(responseType));
     }
 
-    protected static String extractJobId(HttpClientResponse response) {
-        String locationHeader = response.responseHeaders().get(HttpHeaderNames.LOCATION);
-        if (locationHeader == null) {
-            return null;
-        }
-
-        List<String> pathSegments = UriComponentsBuilder.fromUriString(locationHeader).build().getPathSegments();
-        return pathSegments.get(pathSegments.size() - 1);
-    }
-
     private Operator attachErrorPayloadMapper(Operator operator) {
         return operator.withErrorPayloadMapper(ErrorPayloadMappers.clientV3(this.connectionContext.getObjectMapper()));
     }

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

@@ -16,7 +16,6 @@
 
 package org.cloudfoundry.reactor.client.v3.spaces;
 
-import org.cloudfoundry.client.v3.servicebrokers.UpdateServiceBrokerResponse;
 import org.cloudfoundry.client.v3.spaces.ApplyManifestRequest;
 import org.cloudfoundry.client.v3.spaces.ApplyManifestResponse;
 import org.cloudfoundry.client.v3.spaces.AssignSpaceIsolationSegmentRequest;
@@ -59,6 +58,16 @@ public ReactorSpacesV3(ConnectionContext connectionContext, Mono<String> root, T
         super(connectionContext, root, tokenProvider, requestTags);
     }
 
+    @Override
+    public Mono<ApplyManifestResponse> applyManifest(ApplyManifestRequest request) {
+        return postRawWithResponse(request.getManifest(), "application/x-yaml", ApplyManifestResponse.class, builder -> builder.pathSegment("spaces", request.getSpaceId(), "actions",
+            "apply_manifest"))
+            .map(responseTuple -> ApplyManifestResponse.builder()
+                .jobId(Optional.ofNullable(
+                    extractJobId(responseTuple.getResponse())))
+                .build());
+    }
+
     @Override
     public Mono<AssignSpaceIsolationSegmentResponse> assignIsolationSegment(AssignSpaceIsolationSegmentRequest request) {
         return patch(request, AssignSpaceIsolationSegmentResponse.class, builder -> builder.pathSegment("spaces", request.getSpaceId(), "relationships", "isolation_segment"))
@@ -106,13 +115,4 @@ public Mono<UpdateSpaceResponse> update(UpdateSpaceRequest request) {
         return patch(request, UpdateSpaceResponse.class, builder -> builder.pathSegment("spaces", request.getSpaceId()))
             .checkpoint();
     }
-
-    @Override
-    public Mono<ApplyManifestResponse> applyManifest(ApplyManifestRequest request) {
-        return postRawWithResponse(request.manifest(), "application/x-yaml", ApplyManifestResponse.class, builder -> builder.pathSegment("spaces", request.getSpaceId(), "actions", "apply_manifest"))
-            .map(responseTuple -> ApplyManifestResponse.builder()
-                .jobId(Optional.ofNullable(
-                    extractJobId(responseTuple.getResponse())))
-                .build());
-    }
 }

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/client/v3/spaces/ReactorSpacesV3.java

@@ -183,6 +183,14 @@ public interface ApplicationsV3 {
      */
     Mono<ListApplicationTasksResponse> listTasks(ListApplicationTasksRequest request);
 
+    /**
+     * Makes the Restart Application request
+     *
+     * @param request the Restart Application request
+     * @return the response from the Restart Application request
+     */
+    Mono<RestartApplicationResponse> restart(RestartApplicationRequest request);
+
     /**
      * Makes the <a href="https://v3-apidocs.cloudfoundry.org/version/3.27.0/#scale-a-process">Scale Application</a> request
      *
@@ -207,14 +215,6 @@ public interface ApplicationsV3 {
      */
     Mono<StartApplicationResponse> start(StartApplicationRequest request);
 
-    /**
-     * Makes the Restart Application request
-     *
-     * @param request the Restart Application request
-     * @return the response from the Restart Application request
-     */
-    Mono<RestartApplicationResponse> restart(RestartApplicationRequest request);
-
     /**
      * Makes the <a href="https://v3-apidocs.cloudfoundry.org/version/3.27.0/index.html#stop-an-app">Stop Application</a> request
      *

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/applications/ApplicationsV3.java

@@ -45,16 +45,16 @@ abstract class _MatchedResource {
     abstract String getMode();
 
     /**
-     * The size
+     * The path relative to app root
      */
-    @JsonProperty("size_in_bytes")
+    @JsonProperty("path")
     @Nullable
-    abstract Integer getSize();
+    abstract String getPath();
 
     /**
-     * The path relative to app root
+     * The size
      */
-    @JsonProperty("path")
+    @JsonProperty("size_in_bytes")
     @Nullable
-    abstract String getPath();
+    abstract Integer getSize();
 }

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/resourcematch/_MatchedResource.java

@@ -30,7 +30,7 @@ abstract class _ApplyManifestRequest {
      * The manifest to apply
      */
     @JsonIgnore
-    abstract byte[] manifest();
+    abstract byte[] getManifest();
 
     /**
      * The space id

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/spaces/_ApplyManifestRequest.java

@@ -31,5 +31,5 @@ abstract class _ApplyManifestResponse {
     /**
      * The Job ID
      */
-    public abstract Optional<String> jobId();
+    public abstract Optional<String> getJobId();
 }

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/spaces/_ApplyManifestResponse.java

@@ -138,6 +138,12 @@ public interface Applications {
      */
     Mono<Void> pushManifest(PushApplicationManifestRequest request);
 
+    /**
+     * Push a manifest using the V3 API
+     *
+     * @param request the push manifest V3 request
+     * @return a completion indicator
+     */
     Mono<Void> pushManifestV3(PushManifestV3Request request);
 
     /**