Skip to content

Return empty metadata for key not found + add IT test. #528

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 2 commits into from
May 14, 2021
Merged

Return empty metadata for key not found + add IT test. #528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1916dee
Return empty metadata for key not found + add IT test.
artursouza Mar 26, 2021
c9a030f
Merge branch 'master' into state_null_etag_test
artursouza May 14, 2021
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
47 changes: 47 additions & 0 deletions sdk-tests/src/test/java/io/dapr/it/state/AbstractStateClientIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.util.UUID;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
Expand Down Expand Up @@ -249,6 +250,52 @@ public void saveUpdateAndGetStateWithEtag() {
assertEquals("data in property B2", myDataResponse.getValue().getPropertyB());
}

@Test
public void saveUpdateAndGetNullStateWithEtag() {
// The key use to store the state and be updated using etags
final String stateKey = UUID.randomUUID().toString();
DaprClient daprClient = buildDaprClient();
MyData data = new MyData();
data.setPropertyA("data in property A");
data.setPropertyB("data in property B");

// Get state to validate case for key not found.
State<MyData> stateNotFound = daprClient.getState(STATE_STORE_NAME, stateKey, MyData.class).block();
assertEquals(stateKey, stateNotFound.getKey());
assertNull(stateNotFound.getValue());
assertNull(stateNotFound.getEtag());
assertNull(stateNotFound.getOptions());
assertNull(stateNotFound.getError());
assertEquals(0, stateNotFound.getMetadata().size());

// Set non null value
daprClient.saveState(STATE_STORE_NAME, stateKey, null, data, null).block();

// Get state to validate case for key with value.
State<MyData> stateFound = daprClient.getState(STATE_STORE_NAME, stateKey, MyData.class).block();
assertEquals(stateKey, stateFound.getKey());
assertNotNull(stateFound.getValue());
assertEquals("data in property A", stateFound.getValue().getPropertyA());
assertEquals("data in property B", stateFound.getValue().getPropertyB());
assertNotNull(stateFound.getEtag());
assertFalse(stateFound.getEtag().isEmpty());
assertNull(stateFound.getOptions());
assertNull(stateFound.getError());
assertEquals(0, stateFound.getMetadata().size());
Comment thread
artursouza marked this conversation as resolved.

// Set to null value
daprClient.saveState(STATE_STORE_NAME, stateKey, null, null, null).block();

// Get state to validate case for key not found.
State<MyData> stateNullValue = daprClient.getState(STATE_STORE_NAME, stateKey, MyData.class).block();
assertEquals(stateKey, stateNullValue.getKey());
assertNull(stateNullValue.getValue());
assertNotNull(stateNullValue.getEtag());
assertFalse(stateNullValue.getEtag().isEmpty());
assertNull(stateNullValue.getOptions());
assertNull(stateNullValue.getError());
assertEquals(0, stateNullValue.getMetadata().size());
}

@Test(expected = RuntimeException.class)
public void saveUpdateAndGetStateWithWrongEtag() {
Expand Down
2 changes: 1 addition & 1 deletion sdk/src/main/java/io/dapr/client/DaprClientHttp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ private <T> State<T> buildState(
if (response.getHeaders() != null && response.getHeaders().containsKey("Etag")) {
etag = response.getHeaders().get("Etag");
}
return new State<>(requestedKey, value, etag, stateOptions);
return new State<>(requestedKey, value, etag, Collections.emptyMap(), stateOptions);
}

/**
Expand Down