Polishing

twoseat · twoseat · commit 1b71f755a5b7 · 2020-04-03T13:59:11.000+01:00
Almost entirely formatting. [resolves #1036] Signed-off-by: Paul Harris <pharris@pivotal.io>
diff --git a/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/client/v2/AbstractClientV2Operations.java b/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/client/v2/AbstractClientV2Operations.java
@@ -106,18 +106,6 @@ protected final <T> Mono<T> put(Object requestPayload, Class<T> responseType, Fu
                 .parseBody(responseType));
     }
 
-    private Function<UriComponentsBuilder, UriComponentsBuilder> queryTransformer(Object requestPayload) {
-        return builder -> {
-            Stream<UriQueryParameter> parameters = getUriQueryParameterBuilder().build(requestPayload);
-            UriQueryParameters.set(builder, parameters);
-            return builder;
-        };
-    }
-
-    private UriQueryParameterBuilder getUriQueryParameterBuilder() {
-        return DelegatingUriQueryParameterBuilder.builder().builders(new FilterBuilder(), new QueryBuilder()).build();
-    }
-
     private Operator attachErrorPayloadMapper(Operator operator) {
         return operator.withErrorPayloadMapper(ErrorPayloadMappers.clientV2(this.connectionContext.getObjectMapper()));
     }
@@ -126,11 +114,23 @@ private MultipartHttpClientRequest createMultipartRequest(HttpClientRequest requ
         return new MultipartHttpClientRequest(this.connectionContext.getObjectMapper(), request, form);
     }
 
+    private UriQueryParameterBuilder getUriQueryParameterBuilder() {
+        return DelegatingUriQueryParameterBuilder.builder().builders(new FilterBuilder(), new QueryBuilder()).build();
+    }
+
     private BiConsumer<HttpClientRequest, HttpClientForm> multipartRequest(Consumer<MultipartHttpClientRequest> requestTransformer) {
         return (request, form) -> {
             MultipartHttpClientRequest multipartRequest = createMultipartRequest(request, form);
             requestTransformer.accept(multipartRequest);
         };
     }
 
+    private Function<UriComponentsBuilder, UriComponentsBuilder> queryTransformer(Object requestPayload) {
+        return builder -> {
+            Stream<UriQueryParameter> parameters = getUriQueryParameterBuilder().build(requestPayload);
+            UriQueryParameters.set(builder, parameters);
+            return builder;
+        };
+    }
+
 }
diff --git a/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/uaa/AbstractUaaOperations.java b/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/uaa/AbstractUaaOperations.java
@@ -162,6 +162,10 @@ private static void addHeaders(HttpHeaders httpHeaders, Object requestPayload) {
         VersionBuilder.augment(httpHeaders, requestPayload);
     }
 
+    private Operator attachErrorPayloadMapper(Operator operator) {
+        return operator.withErrorPayloadMapper(ErrorPayloadMappers.uaa(this.connectionContext.getObjectMapper()));
+    }
+
     private Function<UriComponentsBuilder, UriComponentsBuilder> queryTransformer(Object requestPayload) {
         return builder -> {
             Stream<UriQueryParameter> parameters = new QueryBuilder().build(requestPayload);
@@ -170,8 +174,4 @@ private Function<UriComponentsBuilder, UriComponentsBuilder> queryTransformer(Ob
         };
     }
 
-    private Operator attachErrorPayloadMapper(Operator operator) {
-        return operator.withErrorPayloadMapper(ErrorPayloadMappers.uaa(this.connectionContext.getObjectMapper()));
-    }
-
 }
diff --git a/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/util/AnnotationUtils.java b/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/util/AnnotationUtils.java
@@ -45,11 +45,11 @@ public AnnotatedValue(T annotation, Object value) {
         }
 
         public T getAnnotation() {
-            return annotation;
+            return this.annotation;
         }
 
         public Object getValue() {
-            return value;
+            return this.value;
         }
 
     }
diff --git a/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/util/UriQueryParameters.java b/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/util/UriQueryParameters.java
@@ -18,7 +18,6 @@
 
 import org.springframework.web.util.UriComponentsBuilder;
 
-import java.util.List;
 import java.util.stream.Stream;
 
 public class UriQueryParameters {
diff --git a/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/util/UriVariablesRegistry.java b/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/util/UriVariablesRegistry.java
@@ -21,23 +21,23 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-public class UriVariablesRegistry {
+class UriVariablesRegistry {
 
     private final List<UriVariable> uriVariables = new ArrayList<>();
 
-    public Map<String, Object> getUriVariablesMap() {
-        return uriVariables.stream().collect(Collectors.toMap(UriVariable::getKey, UriVariable::getValue));
+    Map<String, Object> getUriVariablesMap() {
+        return this.uriVariables.stream().collect(Collectors.toMap(UriVariable::getKey, UriVariable::getValue));
     }
 
-    public UriVariable register(Object value) {
+    UriVariable register(Object value) {
         UriVariable uriVariable = UriVariable.of(getNextUriVariableKey(), value);
-        uriVariables.add(uriVariable);
+        this.uriVariables.add(uriVariable);
 
         return uriVariable;
     }
 
     private String getNextUriVariableKey() {
-        return Integer.toString(uriVariables.size());
+        return Integer.toString(this.uriVariables.size());
     }
 
 }
diff --git a/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/util/_DelegatingUriQueryParameterBuilder.java b/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/util/_DelegatingUriQueryParameterBuilder.java
@@ -24,11 +24,11 @@
 @Value.Immutable
 public abstract class _DelegatingUriQueryParameterBuilder implements UriQueryParameterBuilder {
 
-    public abstract List<UriQueryParameterBuilder> getBuilders();
-
     @Override
     public Stream<UriQueryParameter> build(Object request) {
         return getBuilders().stream().flatMap(extractor -> extractor.build(request));
     }
 
+    public abstract List<UriQueryParameterBuilder> getBuilders();
+
 }
diff --git a/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/util/_UriVariable.java b/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/util/_UriVariable.java
@@ -26,12 +26,12 @@ public interface _UriVariable {
     @Value.Parameter
     String getKey();
 
-    @Value.Parameter
-    Object getValue();
-
     @Value.Derived
     default String getPlaceholder() {
         return String.format(PLACEHOLDER_PATTERN, getKey());
     }
 
+    @Value.Parameter
+    Object getValue();
+
 }
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/QueryBuilderTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/QueryBuilderTest.java
@@ -77,16 +77,16 @@ public final String getNull() {
             return null;
         }
 
-        @QueryParameter("test-single")
-        public final String getSingle() {
-            return "test-value-1";
-        }
-
         @QueryParameter("test-reserved-characters")
         public final String getReservedCharacters() {
             return ":/?#[]@!$&'()*+,;=";
         }
 
+        @QueryParameter("test-single")
+        public final String getSingle() {
+            return "test-value-1";
+        }
+
         @QueryParameter("test-override")
         abstract String getOverride();
 
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/FilterBuilderTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/FilterBuilderTest.java
@@ -102,16 +102,16 @@ public final String getLessThanOrEqualTo() {
             return "test-value-7";
         }
 
-        @FilterParameter("test-reserved-characters")
-        public final String getReservedCharacters() {
-            return ":/?#[]@!$&'()*+,;=";
-        }
-
         @FilterParameter("test-null")
         public final String getNull() {
             return null;
         }
 
+        @FilterParameter("test-reserved-characters")
+        public final String getReservedCharacters() {
+            return ":/?#[]@!$&'()*+,;=";
+        }
+
         @FilterParameter("test-override")
         abstract String getOverride();
 
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/FilterBuilderTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/FilterBuilderTest.java
@@ -71,16 +71,16 @@ public final String getNull() {
             return null;
         }
 
-        @FilterParameter("test-single")
-        public final String getSingle() {
-            return "test-value-1";
-        }
-
         @FilterParameter("test-reserved-characters")
         public final String getReservedCharacters() {
             return ":/?#[]@!$&'()*+,;=";
         }
 
+        @FilterParameter("test-single")
+        public final String getSingle() {
+            return "test-value-1";
+        }
+
         @FilterParameter("test-override")
         abstract String getOverride();
 

Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,10 @@ private static void addHeaders(HttpHeaders httpHeaders, Object requestPayload) {`
`162`	`162`	`VersionBuilder.augment(httpHeaders, requestPayload);`
`163`	`163`	`}`
`164`	`164`
	`165`	`+ private Operator attachErrorPayloadMapper(Operator operator) {`
	`166`	`+ return operator.withErrorPayloadMapper(ErrorPayloadMappers.uaa(this.connectionContext.getObjectMapper()));`
	`167`	`+ }`
	`168`	`+`
`165`	`169`	`private Function<UriComponentsBuilder, UriComponentsBuilder> queryTransformer(Object requestPayload) {`
`166`	`170`	`return builder -> {`
`167`	`171`	`Stream<UriQueryParameter> parameters = new QueryBuilder().build(requestPayload);`
`@@ -170,8 +174,4 @@ private Function<UriComponentsBuilder, UriComponentsBuilder> queryTransformer(Ob`
`170`	`174`	`};`
`171`	`175`	`}`
`172`	`176`
`173`		`- private Operator attachErrorPayloadMapper(Operator operator) {`
`174`		`- return operator.withErrorPayloadMapper(ErrorPayloadMappers.uaa(this.connectionContext.getObjectMapper()));`
`175`		`- }`
`176`		`-`
`177`	`177`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,11 +45,11 @@ public AnnotatedValue(T annotation, Object value) {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`public T getAnnotation() {`
`48`		`- return annotation;`
	`48`	`+ return this.annotation;`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public Object getValue() {`
`52`		`- return value;`
	`52`	`+ return this.value;`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,23 +21,23 @@`
`21`	`21`	`import java.util.Map;`
`22`	`22`	`import java.util.stream.Collectors;`
`23`	`23`
`24`		`-public class UriVariablesRegistry {`
	`24`	`+class UriVariablesRegistry {`
`25`	`25`
`26`	`26`	`private final List<UriVariable> uriVariables = new ArrayList<>();`
`27`	`27`
`28`		`- public Map<String, Object> getUriVariablesMap() {`
`29`		`- return uriVariables.stream().collect(Collectors.toMap(UriVariable::getKey, UriVariable::getValue));`
	`28`	`+ Map<String, Object> getUriVariablesMap() {`
	`29`	`+ return this.uriVariables.stream().collect(Collectors.toMap(UriVariable::getKey, UriVariable::getValue));`
`30`	`30`	`}`
`31`	`31`
`32`		`- public UriVariable register(Object value) {`
	`32`	`+ UriVariable register(Object value) {`
`33`	`33`	`UriVariable uriVariable = UriVariable.of(getNextUriVariableKey(), value);`
`34`		`- uriVariables.add(uriVariable);`
	`34`	`+ this.uriVariables.add(uriVariable);`
`35`	`35`
`36`	`36`	`return uriVariable;`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`private String getNextUriVariableKey() {`
`40`		`- return Integer.toString(uriVariables.size());`
	`40`	`+ return Integer.toString(this.uriVariables.size());`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,11 +24,11 @@`
`24`	`24`	`@Value.Immutable`
`25`	`25`	`public abstract class _DelegatingUriQueryParameterBuilder implements UriQueryParameterBuilder {`
`26`	`26`
`27`		`- public abstract List<UriQueryParameterBuilder> getBuilders();`
`28`		`-`
`29`	`27`	`@Override`
`30`	`28`	`public Stream<UriQueryParameter> build(Object request) {`
`31`	`29`	`return getBuilders().stream().flatMap(extractor -> extractor.build(request));`
`32`	`30`	`}`
`33`	`31`
	`32`	`+ public abstract List<UriQueryParameterBuilder> getBuilders();`
	`33`	`+`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,12 +26,12 @@ public interface _UriVariable {`
`26`	`26`	`@Value.Parameter`
`27`	`27`	`String getKey();`
`28`	`28`
`29`		`- @Value.Parameter`
`30`		`- Object getValue();`
`31`		`-`
`32`	`29`	`@Value.Derived`
`33`	`30`	`default String getPlaceholder() {`
`34`	`31`	`return String.format(PLACEHOLDER_PATTERN, getKey());`
`35`	`32`	`}`
`36`	`33`
	`34`	`+ @Value.Parameter`
	`35`	`+ Object getValue();`
	`36`	`+`
`37`	`37`	`}`