chore: format some places to make the code more standardized (#578)

kevinten10 · web-flow · commit 50f80d8af5fe · 2021-07-21T14:09:38.000-07:00
* chore: format some places to make the code more standardized * test: add unit test for {@code DaprClient#getState} to cover {@code StateOptions#getStateOptionsAsMap}
diff --git a/sdk/src/main/java/io/dapr/client/AbstractDaprClient.java b/sdk/src/main/java/io/dapr/client/AbstractDaprClient.java
@@ -33,7 +33,6 @@
 import reactor.core.publisher.Mono;
 
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -91,6 +90,7 @@ public Mono<Void> publishEvent(String pubsubName, String topicName, Object data,
   /**
    * {@inheritDoc}
    */
+  @Override
   public <T> Mono<T> invokeMethod(
       String appId,
       String methodName,
diff --git a/sdk/src/main/java/io/dapr/client/DaprClientBuilder.java b/sdk/src/main/java/io/dapr/client/DaprClientBuilder.java
@@ -16,9 +16,8 @@
 
 /**
  * A builder for the DaprClient,
- * Currently only and HTTP Client will be supported.
+ * Currently only gRPC and HTTP Client will be supported.
  */
-
 public class DaprClientBuilder {
 
   /**
diff --git a/sdk/src/main/java/io/dapr/client/DaprClientGrpc.java b/sdk/src/main/java/io/dapr/client/DaprClientGrpc.java
@@ -71,7 +71,6 @@ public class DaprClientGrpc extends AbstractDaprClient {
    */
   private DaprGrpc.DaprStub asyncStub;
 
-
   /**
    * Default access level constructor, in order to create an instance of this class use io.dapr.client.DaprClientBuilder
    *
diff --git a/sdk/src/main/java/io/dapr/client/DaprClientHttp.java b/sdk/src/main/java/io/dapr/client/DaprClientHttp.java
@@ -161,6 +161,7 @@ public Mono<Void> publishEvent(PublishEventRequest request) {
   /**
    * {@inheritDoc}
    */
+  @Override
   public <T> Mono<T> invokeMethod(InvokeMethodRequest invokeMethodRequest, TypeRef<T> type) {
     try {
       final String appId = invokeMethodRequest.getAppId();
diff --git a/sdk/src/main/java/io/dapr/client/domain/CloudEvent.java b/sdk/src/main/java/io/dapr/client/domain/CloudEvent.java
@@ -118,7 +118,6 @@ public CloudEvent(
     this.datacontenttype = "application/octet-stream";
     this.binaryData = binaryData == null ? null : Arrays.copyOf(binaryData, binaryData.length);;
   }
-
     
   /**
    * Deserialize a message topic from Dapr.
diff --git a/sdk/src/main/java/io/dapr/client/domain/HttpExtension.java b/sdk/src/main/java/io/dapr/client/domain/HttpExtension.java
@@ -18,7 +18,6 @@
  * This class is only needed if the app you are calling is listening on HTTP.
  * It contains properties that represent data that may be populated for an HTTP receiver.
  */
-
 public final class HttpExtension {
   /**
    * Convenience HttpExtension object for {@link io.dapr.client.DaprHttp.HttpMethods#NONE} with empty queryString.
diff --git a/sdk/src/main/java/io/dapr/client/domain/StateOptions.java b/sdk/src/main/java/io/dapr/client/domain/StateOptions.java
@@ -52,15 +52,12 @@ public Consistency getConsistency() {
    */
   @JsonIgnore
   public Map<String, String> getStateOptionsAsMap() {
-    Map<String, String> mapOptions = null;
-    if (this != null) {
-      mapOptions = new HashMap<>();
-      if (this.getConsistency() != null) {
-        mapOptions.put("consistency", this.getConsistency().getValue());
-      }
-      if (this.getConcurrency() != null) {
-        mapOptions.put("concurrency", this.getConcurrency().getValue());
-      }
+    Map<String, String> mapOptions = new HashMap<>();
+    if (this.getConsistency() != null) {
+      mapOptions.put("consistency", this.getConsistency().getValue());
+    }
+    if (this.getConcurrency() != null) {
+      mapOptions.put("concurrency", this.getConcurrency().getValue());
     }
     return Collections.unmodifiableMap(Optional.ofNullable(mapOptions).orElse(Collections.EMPTY_MAP));
   }
@@ -128,6 +125,7 @@ public void serialize(
   }
 
   public static class StateOptionDurationDeserializer extends StdDeserializer<Duration> {
+
     public StateOptionDurationDeserializer(Class<?> vc) {
       super(vc);
     }
diff --git a/sdk/src/test/java/io/dapr/client/DaprClientHttpTest.java b/sdk/src/test/java/io/dapr/client/DaprClientHttpTest.java
@@ -742,6 +742,19 @@ public void getStateWithMetadata() {
     assertEquals(monoMetadata.block().getKey(), "key");
   }
 
+  @Test
+  public void getStateWithStateOptions() {
+    StateOptions stateOptions = new StateOptions(StateOptions.Consistency.STRONG, StateOptions.Concurrency.FIRST_WRITE);
+    mockInterceptor.addRule()
+      .get("http://127.0.0.1:3000/v1.0/state/MyStateStore/key?consistency=strong&concurrency=first-write")
+      .respond("\"" + EXPECTED_RESULT + "\"");
+
+    GetStateRequestBuilder builder = new GetStateRequestBuilder(STATE_STORE_NAME, "key");
+    builder.withStateOptions(stateOptions);
+    Mono<State<String>> monoOptions = daprClientHttp.getState(builder.build(), TypeRef.get(String.class));
+    assertEquals(monoOptions.block().getKey(), "key");
+  }
+
   @Test
   public void getStatesNullEtag() {
     State<String> stateNullEtag = new State<>("key", "value", null, null);

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,6 @@ public class DaprClientGrpc extends AbstractDaprClient {`
`71`	`71`	`*/`
`72`	`72`	`private DaprGrpc.DaprStub asyncStub;`
`73`	`73`
`74`		`-`
`75`	`74`	`/**`
`76`	`75`	`* Default access level constructor, in order to create an instance of this class use io.dapr.client.DaprClientBuilder`
`77`	`76`	`*`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,6 @@ public CloudEvent(`
`118`	`118`	`this.datacontenttype = "application/octet-stream";`
`119`	`119`	`this.binaryData = binaryData == null ? null : Arrays.copyOf(binaryData, binaryData.length);;`
`120`	`120`	`}`
`121`		`-`
`122`	`121`
`123`	`122`	`/**`
`124`	`123`	`* Deserialize a message topic from Dapr.`