Skip to content

Commit 8dbf275

Browse files
committed
Address comments
Signed-off-by: Artur Souza <asouza.pro@gmail.com>
1 parent 54343d1 commit 8dbf275

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

sdk-actors/src/main/java/io/dapr/actors/runtime/ActorStateManager.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.time.Duration;
2121
import java.time.Instant;
2222
import java.util.ArrayList;
23-
import java.util.Date;
2423
import java.util.List;
2524
import java.util.Map;
2625
import java.util.NoSuchElementException;
@@ -32,6 +31,9 @@
3231
*/
3332
public class ActorStateManager {
3433

34+
private static final StateChangeMetadata REMOVE_STATE_CHANGE_METADATA =
35+
new StateChangeMetadata(ActorStateChangeKind.REMOVE, null, null);
36+
3537
/**
3638
* Provides states using a state store.
3739
*/
@@ -206,9 +208,10 @@ public <T> Mono<Void> set(String stateName, T value, Duration ttl) {
206208
.switchIfEmpty(this.stateProvider.contains(this.actorTypeName, this.actorId, stateName)
207209
.map(exists -> {
208210
var expiration = buildExpiration(ttl);
211+
ActorStateChangeKind changeKind = exists ? ActorStateChangeKind.UPDATE : ActorStateChangeKind.ADD;
209212
this.stateChangeTracker.put(stateName,
210213
new StateChangeMetadata(
211-
exists ? ActorStateChangeKind.UPDATE : ActorStateChangeKind.ADD, value, expiration));
214+
changeKind, value, expiration));
212215
return exists;
213216
}))
214217
.then();
@@ -238,7 +241,7 @@ public Mono<Void> remove(String stateName) {
238241
return true;
239242
}
240243

241-
this.stateChangeTracker.put(stateName, new StateChangeMetadata(ActorStateChangeKind.REMOVE, null, null));
244+
this.stateChangeTracker.put(stateName, REMOVE_STATE_CHANGE_METADATA);
242245
return true;
243246
}
244247

@@ -248,7 +251,7 @@ public Mono<Void> remove(String stateName) {
248251
.switchIfEmpty(this.stateProvider.contains(this.actorTypeName, this.actorId, stateName))
249252
.filter(exists -> exists)
250253
.map(exists -> {
251-
this.stateChangeTracker.put(stateName, new StateChangeMetadata(ActorStateChangeKind.REMOVE, null, null));
254+
this.stateChangeTracker.put(stateName, REMOVE_STATE_CHANGE_METADATA);
252255
return exists;
253256
})
254257
.then();

sdk-tests/components/actorstatestore.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ scopes:
2323
- actorsdkresiliencytit-demoactorservice
2424
- actorstateit-statefulactorservice
2525
- actortimerrecoveryit
26-
- actorturnbasedconcurrencyit-myactorservice
26+
- actorturnbasedconcurrencyit-myactorservice

0 commit comments

Comments
 (0)