@@ -91,7 +91,7 @@ public class DsInboxStorage
9191 extends DsMessageStorage <InboxMessageId , InboxMessage , InboxReadRequest >
9292 implements InboxStorage {
9393
94- private final Behavior behavior ;
94+ private final Client client ;
9595
9696 private static final Kind PARENT_KIND = Kind .of (
9797 TypeUrl .of (ShardSessionRecord .getDefaultInstance ())
@@ -126,9 +126,9 @@ protected DsInboxStorage(DatastoreWrapper datastore, boolean multitenant) {
126126 */
127127 protected DsInboxStorage (DatastoreWrapper datastore , boolean multitenant , DatastoreMode mode ) {
128128 super (datastore , multitenant );
129- this .behavior = mode == DatastoreMode .NATIVE
130- ? new NativeBehavior ()
131- : new FirestoreBehavior ();
129+ this .client = mode == DatastoreMode .NATIVE
130+ ? new NativeClient ()
131+ : new FirestoreClient ();
132132 }
133133
134134 @ Override
@@ -138,7 +138,7 @@ protected InboxMessageId idOf(InboxMessage message) {
138138
139139 @ Override
140140 protected final Key key (InboxMessageId id ) {
141- return behavior .key (id );
141+ return client .key (id );
142142 }
143143
144144 @ Override
@@ -152,15 +152,15 @@ public Page<InboxMessage> readAll(ShardIndex index, int pageSize) {
152152 InboxPage page = new InboxPage (
153153 sinceWhen -> {
154154 EntityQuery .Builder query = queryPage (index , sinceWhen );
155- return behavior .readAll (query , pageSize );
155+ return client .readAll (query , pageSize );
156156 });
157157 return page ;
158158 }
159159
160160 @ Override
161161 public Optional <InboxMessage > newestMessageToDeliver (ShardIndex index ) {
162162 EntityQuery .Builder builder = queryInShard (index , statusFilter (TO_DELIVER )).setLimit (1 );
163- Iterator <InboxMessage > iterator = behavior .readAll (builder );
163+ Iterator <InboxMessage > iterator = client .readAll (builder );
164164 if (iterator .hasNext ()) {
165165 return Optional .of (iterator .next ());
166166 }
@@ -174,7 +174,7 @@ public Optional<InboxMessage> newestMessageToDeliver(ShardIndex index) {
174174 */
175175 @ Override
176176 public void write (InboxMessage message ) {
177- behavior .write (message );
177+ client .write (message );
178178 }
179179
180180 /**
@@ -184,7 +184,7 @@ public void write(InboxMessage message) {
184184 */
185185 @ Override
186186 public void writeAll (Iterable <InboxMessage > messages ) {
187- behavior .writeAll (messages );
187+ client .writeAll (messages );
188188 }
189189
190190 /**
@@ -194,7 +194,7 @@ public void writeAll(Iterable<InboxMessage> messages) {
194194 */
195195 @ Override
196196 public void removeAll (Iterable <InboxMessage > messages ) {
197- behavior .removeAll (messages );
197+ client .removeAll (messages );
198198 }
199199
200200 private EntityQuery .Builder queryPage (ShardIndex index , @ Nullable Timestamp sinceWhen ) {
@@ -211,7 +211,7 @@ private EntityQuery.Builder queryByTime(ShardIndex index, @Nullable Timestamp si
211211
212212 private EntityQuery .Builder queryInShard (ShardIndex index ,
213213 StructuredQuery .Filter ... additionalFilters ) {
214- return behavior .queryInShard (index , additionalFilters );
214+ return client .queryInShard (index , additionalFilters );
215215 }
216216
217217 private static PropertyFilter statusFilter (InboxMessageStatus status ) {
@@ -312,9 +312,10 @@ public Getter<InboxMessage> getter() {
312312 }
313313
314314 /**
315- * A behavior of the storage depending on the Datastore mode.
315+ * A client to the Datastore instance which implementation depends on the mode
316+ * in which Datastore runs.
316317 */
317- private interface Behavior {
318+ private interface Client {
318319
319320 /**
320321 * Creates a new key for the given identifier.
@@ -363,11 +364,11 @@ EntityQuery.Builder queryInShard(ShardIndex index,
363364 }
364365
365366 /**
366- * An implementation of the behavior specific to the Firestore in Datastore mode.
367+ * An implementation of the client specific to the Firestore in Datastore mode.
367368 *
368369 * @see DsInboxStorage class-level docs for more details
369370 */
370- private final class FirestoreBehavior implements Behavior {
371+ private final class FirestoreClient implements Client {
371372
372373 @ Override
373374 public Key key (InboxMessageId id ) {
@@ -415,11 +416,11 @@ public EntityQuery.Builder queryInShard(ShardIndex index,
415416 }
416417
417418 /**
418- * An implementation of the behavior specific to the Datastore in native mode.
419+ * An implementation of the client specific to the Datastore in native mode.
419420 *
420421 * @see DsInboxStorage class-level docs for more details
421422 */
422- private final class NativeBehavior implements Behavior {
423+ private final class NativeClient implements Client {
423424
424425 @ Override
425426 public Key key (InboxMessageId id ) {
0 commit comments