Skip to content

add metadata in get bulk state request #401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
artursouza merged 8 commits into from
Dec 29, 2020
Merged

add metadata in get bulk state request #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
24884ea
add metadata in get bulk state request
skyao Dec 3, 2020
9114bbb
rollback DaprClientGrpcTest which should be comitted in another PR
skyao Dec 3, 2020
a289450
Merge branch 'master' into add-metadata-in-bulk-get-state
Dec 14, 2020
2006975
Merge remote-tracking branch 'upstream/master' into add-metadata-in-b…
skyao Dec 29, 2020
2c54187
fix compile error after merge
skyao Dec 29, 2020
e221b4e
update unit test for metadata in getBulkState()
skyao Dec 29, 2020
ab95648
re-trigger build again
skyao Dec 29, 2020
5ffbb63
add test for withMetadata()
skyao Dec 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions sdk/src/main/java/io/dapr/client/DaprClientGrpc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,9 @@ public <T> Mono<Response<List<State<T>>>> getBulkState(GetBulkStateRequest reque
.setStoreName(stateStoreName)
.addAllKeys(keys)
.setParallelism(parallelism);
if (request.getMetadata() != null) {
builder.putAllMetadata(request.getMetadata());
}

DaprProtos.GetBulkStateRequest envelope = builder.build();
return Mono.fromCallable(wrap(context, () -> {
Expand Down
11 changes: 11 additions & 0 deletions sdk/src/main/java/io/dapr/client/domain/GetBulkStateRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import io.opentelemetry.context.Context;

import java.util.List;
import java.util.Map;

/**
* A request to get bulk state by keys.
Expand All @@ -18,6 +19,8 @@ public class GetBulkStateRequest {

private List<String> keys;

private Map<String, String> metadata;

private int parallelism;

private Context context;
Expand Down Expand Up @@ -53,4 +56,12 @@ public Context getContext() {
void setContext(Context context) {
this.context = context;
}

public Map<String, String> getMetadata() {
return metadata;
}

void setMetadata(Map<String, String> metadata) {
this.metadata = metadata;
}
}
9 changes: 9 additions & 0 deletions sdk/src/main/java/io/dapr/client/domain/GetBulkStateRequestBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;

/**
* Builds a request to request states.
Expand All @@ -20,6 +21,8 @@ public class GetBulkStateRequestBuilder {

private final List<String> keys;

private Map<String, String> metadata;

private int parallelism = 1;

private Context context;
Expand All @@ -34,6 +37,11 @@ public GetBulkStateRequestBuilder(String storeName, String... keys) {
this.keys = keys == null ? null : Collections.unmodifiableList(Arrays.asList(keys));
}

public GetBulkStateRequestBuilder withMetadata(Map<String, String> metadata) {
this.metadata = metadata == null ? null : Collections.unmodifiableMap(metadata);
return this;
}

public GetBulkStateRequestBuilder withParallelism(int parallelism) {
this.parallelism = parallelism;
return this;
Expand All @@ -52,6 +60,7 @@ public GetBulkStateRequest build() {
GetBulkStateRequest request = new GetBulkStateRequest();
request.setStoreName(this.storeName);
request.setKeys(this.keys);
request.setMetadata(this.metadata);
request.setParallelism(this.parallelism);
request.setContext(this.context);
return request;
Expand Down
18 changes: 18 additions & 0 deletions sdk/src/test/java/io/dapr/client/DaprClientGrpcTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -951,17 +951,22 @@ public void getStatesIllegalArgumentExceptionTest() {
});
// negative parallelism
GetBulkStateRequest req = new GetBulkStateRequestBuilder(STATE_STORE_NAME, Collections.singletonList("100"))
.withMetadata(new HashMap<>())
.withParallelism(-1)
.build();
assertThrows(IllegalArgumentException.class, () -> adapter.getBulkState(req, TypeRef.BOOLEAN).block());
}

@Test
public void getStatesString() throws IOException {
Map<String, String> metadata = new HashMap<>();
metadata.put("meta1", "value1");
metadata.put("meta2", "value2");
DaprProtos.GetBulkStateResponse responseEnvelope = DaprProtos.GetBulkStateResponse.newBuilder()
.addItems(DaprProtos.BulkStateItem.newBuilder()
.setData(serialize("hello world"))
.setKey("100")
.putAllMetadata(metadata)
.setEtag("1")
.build())
.addItems(DaprProtos.BulkStateItem.newBuilder()
Expand All @@ -983,6 +988,7 @@ public void getStatesString() throws IOException {
assertEquals(2, result.size());
assertEquals("100", result.stream().findFirst().get().getKey());
assertEquals("hello world", result.stream().findFirst().get().getValue());
assertEquals(metadata, result.stream().findFirst().get().getMetadata());
assertEquals("1", result.stream().findFirst().get().getEtag());
assertNull(result.stream().findFirst().get().getError());
assertEquals("200", result.stream().skip(1).findFirst().get().getKey());
Expand All @@ -993,10 +999,13 @@ public void getStatesString() throws IOException {

@Test
public void getStatesInteger() throws IOException {
Map<String, String> metadata = new HashMap<>();
metadata.put("meta1", "value1");
DaprProtos.GetBulkStateResponse responseEnvelope = DaprProtos.GetBulkStateResponse.newBuilder()
.addItems(DaprProtos.BulkStateItem.newBuilder()
.setData(serialize(1234))
.setKey("100")
.putAllMetadata(metadata)
.setEtag("1")
.build())
.addItems(DaprProtos.BulkStateItem.newBuilder()
Expand All @@ -1018,6 +1027,7 @@ public void getStatesInteger() throws IOException {
assertEquals(2, result.size());
assertEquals("100", result.stream().findFirst().get().getKey());
assertEquals(1234, (int)result.stream().findFirst().get().getValue());
assertEquals(metadata, result.stream().findFirst().get().getMetadata());
assertEquals("1", result.stream().findFirst().get().getEtag());
assertNull(result.stream().findFirst().get().getError());
assertEquals("200", result.stream().skip(1).findFirst().get().getKey());
Expand All @@ -1028,10 +1038,13 @@ public void getStatesInteger() throws IOException {

@Test
public void getStatesBoolean() throws IOException {
Map<String, String> metadata = new HashMap<>();
metadata.put("meta1", "value1");
DaprProtos.GetBulkStateResponse responseEnvelope = DaprProtos.GetBulkStateResponse.newBuilder()
.addItems(DaprProtos.BulkStateItem.newBuilder()
.setData(serialize(true))
.setKey("100")
.putAllMetadata(metadata)
.setEtag("1")
.build())
.addItems(DaprProtos.BulkStateItem.newBuilder()
Expand All @@ -1053,6 +1066,7 @@ public void getStatesBoolean() throws IOException {
assertEquals(2, result.size());
assertEquals("100", result.stream().findFirst().get().getKey());
assertEquals(true, result.stream().findFirst().get().getValue());
assertEquals(metadata, result.stream().findFirst().get().getMetadata());
assertEquals("1", result.stream().findFirst().get().getEtag());
assertNull(result.stream().findFirst().get().getError());
assertEquals("200", result.stream().skip(1).findFirst().get().getKey());
Expand All @@ -1063,10 +1077,12 @@ public void getStatesBoolean() throws IOException {

@Test
public void getStatesByteArray() throws IOException {
Map<String, String> metadata = new HashMap<>();
DaprProtos.GetBulkStateResponse responseEnvelope = DaprProtos.GetBulkStateResponse.newBuilder()
.addItems(DaprProtos.BulkStateItem.newBuilder()
.setData(serialize(new byte[]{1, 2, 3}))
.setKey("100")
.putAllMetadata(metadata)
.setEtag("1")
.build())
.addItems(DaprProtos.BulkStateItem.newBuilder()
Expand All @@ -1088,6 +1104,7 @@ public void getStatesByteArray() throws IOException {
assertEquals(2, result.size());
assertEquals("100", result.stream().findFirst().get().getKey());
assertArrayEquals(new byte[]{1, 2, 3}, result.stream().findFirst().get().getValue());
assertEquals(0, result.stream().findFirst().get().getMetadata().size());
assertEquals("1", result.stream().findFirst().get().getEtag());
assertNull(result.stream().findFirst().get().getError());
assertEquals("200", result.stream().skip(1).findFirst().get().getKey());
Expand Down Expand Up @@ -1124,6 +1141,7 @@ public void getStatesObject() throws IOException {
assertEquals(2, result.size());
assertEquals("100", result.stream().findFirst().get().getKey());
assertEquals(object, result.stream().findFirst().get().getValue());
assertEquals(0, result.stream().findFirst().get().getMetadata().size());
assertEquals("1", result.stream().findFirst().get().getEtag());
assertNull(result.stream().findFirst().get().getError());
assertEquals("200", result.stream().skip(1).findFirst().get().getKey());
Expand Down