Polishing

This change makes some whitespace and naming changes.

[#106155632][resolves #493]

Author: nebhale

cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/serviceadmin/DefaultServiceAdmin.java

@@ -49,14 +49,13 @@ public Mono<Void> create(CreateServiceBrokerRequest request) {
     }
 
     @Override
-    public Mono<Void> deleteServiceBroker(DeleteServiceBrokerRequest request) {
+    public Mono<Void> delete(DeleteServiceBrokerRequest request) {
         return getServiceBrokerId(this.cloudFoundryClient, request.getName())
-            .then(serviceBrokerId -> requestDeleteServiceBroker(this.cloudFoundryClient, serviceBrokerId))
-            .then();
+            .then(serviceBrokerId -> requestDeleteServiceBroker(this.cloudFoundryClient, serviceBrokerId));
     }
 
     @Override
-    public Flux<ServiceBroker> listServiceBrokers() {
+    public Flux<ServiceBroker> list() {
         return requestServiceBrokers(this.cloudFoundryClient)
             .map(this::toServiceBroker);
     }
@@ -91,19 +90,19 @@ private static Mono<Void> requestDeleteServiceBroker(CloudFoundryClient cloudFou
                 .build());
     }
 
-    private static Flux<ServiceBrokerResource> requestServiceBrokers(CloudFoundryClient cloudFoundryClient) {
+    private static Flux<ServiceBrokerResource> requestListServiceBrokers(CloudFoundryClient cloudFoundryClient, String serviceBrokerName) {
         return PaginationUtils
             .requestResources(page -> cloudFoundryClient.serviceBrokers()
                 .list(ListServiceBrokersRequest.builder()
+                    .name(serviceBrokerName)
                     .page(page)
                     .build()));
     }
 
-    private static Flux<ServiceBrokerResource> requestListServiceBrokers(CloudFoundryClient cloudFoundryClient, String serviceBrokerName) {
+    private static Flux<ServiceBrokerResource> requestServiceBrokers(CloudFoundryClient cloudFoundryClient) {
         return PaginationUtils
             .requestResources(page -> cloudFoundryClient.serviceBrokers()
                 .list(ListServiceBrokersRequest.builder()
-                    .name(serviceBrokerName)
                     .page(page)
                     .build()));
     }

cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/serviceadmin/ServiceAdmin.java

@@ -39,12 +39,13 @@ public interface ServiceAdmin {
      * @param request the Delete Service Broker request
      * @return a completion indicator
      */
-    Mono<Void> deleteServiceBroker(DeleteServiceBrokerRequest request);
+    Mono<Void> delete(DeleteServiceBrokerRequest request);
 
     /**
      * Lists the service brokers
      *
      * @return the service brokers
      */
-    Flux<ServiceBroker> listServiceBrokers();
+    Flux<ServiceBroker> list();
+
 }

cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/serviceadmin/_DeleteServiceBrokerRequest.java

@@ -21,7 +21,6 @@
 /**
  * Request options for the delete service broker operation
  */
-
 @Value.Immutable
 abstract class _DeleteServiceBrokerRequest {
 

cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/serviceadmin/DefaultServiceAdminTest.java

@@ -178,7 +178,7 @@ protected void assertions(TestSubscriber<Void> testSubscriber) {
         @Override
         protected Mono<Void> invoke() {
             return this.serviceAdmin
-                .deleteServiceBroker(DeleteServiceBrokerRequest.builder()
+                .delete(DeleteServiceBrokerRequest.builder()
                     .name("test-service-broker-name")
                     .build());
         }
@@ -204,7 +204,7 @@ protected void assertions(TestSubscriber<Void> testSubscriber) {
         @Override
         protected Mono<Void> invoke() {
             return this.serviceAdmin
-                .deleteServiceBroker(DeleteServiceBrokerRequest.builder()
+                .delete(DeleteServiceBrokerRequest.builder()
                     .name("test-service-broker-name")
                     .build());
         }
@@ -233,7 +233,7 @@ protected void assertions(TestSubscriber<ServiceBroker> testSubscriber) {
         @Override
         protected Publisher<ServiceBroker> invoke() {
             return this.serviceAdmin
-                .listServiceBrokers();
+                .list();
         }
 
     }
@@ -255,7 +255,7 @@ protected void assertions(TestSubscriber<ServiceBroker> testSubscriber) {
         @Override
         protected Publisher<ServiceBroker> invoke() {
             return this.serviceAdmin
-                .listServiceBrokers();
+                .list();
         }
 
     }

cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/serviceadmin/DeleteServiceBrokerRequestTest.java

@@ -32,4 +32,5 @@ public void valid() {
             .name("test-service-broker")
             .build();
     }
+
 }