You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2023/06/23 12:45:29 UTC
[james-project] 01/02: JAMES-3481 MailboxChange.isDelegated shall be renamed in isShared
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 270db82c5d59d7af8071a49216488a78287ff6a1
Author: Tung Tran <vt...@linagora.com>
AuthorDate: Fri Jun 23 14:38:35 2023 +0700
JAMES-3481 MailboxChange.isDelegated shall be renamed in isShared
---
.../change/CassandraMailboxChangeRepository.java | 4 +--
.../change/MailboxChangeRepositoryDAO.java | 4 +--
.../jmap/api/change/MailboxAndEmailChange.java | 10 +++---
.../james/jmap/api/change/MailboxChange.java | 36 +++++++++++-----------
.../change/MemoryMailboxChangeRepository.java | 6 ++--
.../change/MailboxChangeRepositoryContract.java | 14 ++++-----
6 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/change/CassandraMailboxChangeRepository.java b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/change/CassandraMailboxChangeRepository.java
index 98c5046e82..3c07cae906 100644
--- a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/change/CassandraMailboxChangeRepository.java
+++ b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/change/CassandraMailboxChangeRepository.java
@@ -62,13 +62,13 @@ public class CassandraMailboxChangeRepository implements MailboxChangeRepository
if (state.equals(State.INITIAL)) {
return mailboxChangeRepositoryDAO.getAllChanges(accountId)
- .filter(change -> !change.isDelegated())
+ .filter(change -> !change.isShared())
.collect(new MailboxChanges.MailboxChangesBuilder.MailboxChangeCollector(state, maxChanges.orElse(defaultLimit)));
}
return mailboxChangeRepositoryDAO.getChangesSince(accountId, state)
.switchIfEmpty(Flux.error(() -> new ChangeNotFoundException(state, String.format("State '%s' could not be found", state.getValue()))))
- .filter(change -> !change.isDelegated())
+ .filter(change -> !change.isShared())
.filter(change -> !change.getState().equals(state))
.collect(new MailboxChanges.MailboxChangesBuilder.MailboxChangeCollector(state, maxChanges.orElse(defaultLimit)));
}
diff --git a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/change/MailboxChangeRepositoryDAO.java b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/change/MailboxChangeRepositoryDAO.java
index a4db97412c..d966d5194a 100644
--- a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/change/MailboxChangeRepositoryDAO.java
+++ b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/change/MailboxChangeRepositoryDAO.java
@@ -128,7 +128,7 @@ public class MailboxChangeRepositoryDAO {
.setString(ACCOUNT_ID, change.getAccountId().getIdentifier())
.setUuid(STATE, change.getState().getValue())
.setBoolean(IS_COUNT_CHANGE, change.isCountChange())
- .setBoolean(IS_DELEGATED, change.isDelegated())
+ .setBoolean(IS_DELEGATED, change.isShared())
.set(CREATED, toUuidSet(change.getCreated()), SET_OF_UUIDS_CODEC)
.set(UPDATED, toUuidSet(change.getUpdated()), SET_OF_UUIDS_CODEC)
.set(DESTROYED, toUuidSet(change.getDestroyed()), SET_OF_UUIDS_CODEC)
@@ -174,7 +174,7 @@ public class MailboxChangeRepositoryDAO {
.state(State.of(row.getUuid(STATE)))
.date(CassandraZonedDateTimeModule.fromUDT(row.getUdtValue(DATE)))
.isCountChange(row.getBoolean(IS_COUNT_CHANGE))
- .delegated(row.getBoolean(IS_DELEGATED))
+ .shared(row.getBoolean(IS_DELEGATED))
.created(toIdSet(row.get(CREATED, SET_OF_UUIDS_CODEC)))
.updated(toIdSet(row.get(UPDATED, SET_OF_UUIDS_CODEC)))
.destroyed(toIdSet(row.get(DESTROYED, SET_OF_UUIDS_CODEC)))
diff --git a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/change/MailboxAndEmailChange.java b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/change/MailboxAndEmailChange.java
index fe6761987a..87fc985e5e 100644
--- a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/change/MailboxAndEmailChange.java
+++ b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/change/MailboxAndEmailChange.java
@@ -70,7 +70,7 @@ public class MailboxAndEmailChange implements JmapChange {
.state(state)
.date(now)
.isCountChange(true)
- .delegated(false)
+ .shared(false)
.updated(ImmutableList.of(messageAdded.getMailboxId()))
.build();
@@ -91,7 +91,7 @@ public class MailboxAndEmailChange implements JmapChange {
.state(state)
.date(now)
.isCountChange(true)
- .delegated(true)
+ .shared(true)
.updated(ImmutableList.of(messageAdded.getMailboxId()))
.build()));
@@ -136,9 +136,9 @@ public class MailboxAndEmailChange implements JmapChange {
.state(stateFactory.generate())
.date(now)
.isCountChange(true)
- .delegated(true)
+ .shared(true)
.updated(ImmutableList.of(messageFlagUpdated.getMailboxId()))
- .delegated()
+ .shared()
.build()));
return Stream.concat(Stream.of(ownerChange), shareeChanges)
@@ -175,7 +175,7 @@ public class MailboxAndEmailChange implements JmapChange {
.state(state)
.date(now)
.isCountChange(true)
- .delegated(delegated)
+ .shared(delegated)
.updated(ImmutableList.of(expunged.getMailboxId()))
.build();
diff --git a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/change/MailboxChange.java b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/change/MailboxChange.java
index 57971dba33..e46758bf43 100644
--- a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/change/MailboxChange.java
+++ b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/change/MailboxChange.java
@@ -65,7 +65,7 @@ public class MailboxChange implements JmapChange {
private final AccountId accountId;
private final State state;
private final ZonedDateTime date;
- private boolean delegated;
+ private boolean shared;
private final boolean isCountChange;
private Optional<List<MailboxId>> created;
private Optional<List<MailboxId>> updated;
@@ -85,12 +85,12 @@ public class MailboxChange implements JmapChange {
this.destroyed = Optional.empty();
}
- public Builder delegated() {
- return delegated(true);
+ public Builder shared() {
+ return shared(true);
}
- public Builder delegated(boolean delegated) {
- this.delegated = delegated;
+ public Builder shared(boolean shared) {
+ this.shared = shared;
return this;
}
@@ -110,7 +110,7 @@ public class MailboxChange implements JmapChange {
}
public MailboxChange build() {
- return new MailboxChange(accountId, state, date, delegated, isCountChange, created.orElse(ImmutableList.of()), updated.orElse(ImmutableList.of()), destroyed.orElse(ImmutableList.of()));
+ return new MailboxChange(accountId, state, date, shared, isCountChange, created.orElse(ImmutableList.of()), updated.orElse(ImmutableList.of()), destroyed.orElse(ImmutableList.of()));
}
}
@@ -152,7 +152,7 @@ public class MailboxChange implements JmapChange {
.date(now)
.isCountChange(false)
.updated(ImmutableList.of(mailboxRenamed.getMailboxId()))
- .delegated()
+ .shared()
.build());
return Stream.concat(Stream.of(ownerChange), shareeChanges)
@@ -195,7 +195,7 @@ public class MailboxChange implements JmapChange {
.date(now)
.isCountChange(false)
.updated(ImmutableList.of(mailboxACLUpdated.getMailboxId()))
- .delegated()
+ .shared()
.build());
Stream<MailboxChange> deletionChanges = mailboxACLUpdated.getAclDiff()
@@ -208,7 +208,7 @@ public class MailboxChange implements JmapChange {
.date(now)
.isCountChange(false)
.updated(ImmutableList.of(mailboxACLUpdated.getMailboxId()))
- .delegated()
+ .shared()
.build());
return Stream.of(Stream.of(ownerChange), shareeChanges, deletionChanges)
@@ -237,7 +237,7 @@ public class MailboxChange implements JmapChange {
.date(now)
.isCountChange(false)
.destroyed(ImmutableList.of(mailboxDeletion.getMailboxId()))
- .delegated()
+ .shared()
.build());
return Stream.concat(Stream.of(ownerChange), shareeChanges)
@@ -248,17 +248,17 @@ public class MailboxChange implements JmapChange {
private final AccountId accountId;
private final State state;
private final ZonedDateTime date;
- private final boolean delegated;
+ private final boolean shared;
private final boolean isCountChange;
private final List<MailboxId> created;
private final List<MailboxId> updated;
private final List<MailboxId> destroyed;
- private MailboxChange(AccountId accountId, State state, ZonedDateTime date, boolean delegated, boolean isCountChange, List<MailboxId> created, List<MailboxId> updated, List<MailboxId> destroyed) {
+ private MailboxChange(AccountId accountId, State state, ZonedDateTime date, boolean shared, boolean isCountChange, List<MailboxId> created, List<MailboxId> updated, List<MailboxId> destroyed) {
this.accountId = accountId;
this.state = state;
this.date = date;
- this.delegated = delegated;
+ this.shared = shared;
this.isCountChange = isCountChange;
this.created = created;
this.updated = updated;
@@ -277,8 +277,8 @@ public class MailboxChange implements JmapChange {
return date;
}
- public boolean isDelegated() {
- return delegated;
+ public boolean isShared() {
+ return shared;
}
public boolean isCountChange() {
@@ -305,7 +305,7 @@ public class MailboxChange implements JmapChange {
&& Objects.equals(state, that.state)
&& Objects.equals(date, that.date)
&& Objects.equals(isCountChange, that.isCountChange)
- && Objects.equals(delegated, that.delegated)
+ && Objects.equals(shared, that.shared)
&& Objects.equals(created, that.created)
&& Objects.equals(updated, that.updated)
&& Objects.equals(destroyed, that.destroyed);
@@ -315,7 +315,7 @@ public class MailboxChange implements JmapChange {
@Override
public final int hashCode() {
- return Objects.hash(accountId, state, date, isCountChange, delegated, created, updated, destroyed);
+ return Objects.hash(accountId, state, date, isCountChange, shared, created, updated, destroyed);
}
@Override
@@ -325,7 +325,7 @@ public class MailboxChange implements JmapChange {
.add("state", state)
.add("date", date)
.add("isCountChange", isCountChange)
- .add("isDelegated", delegated)
+ .add("isShared", shared)
.add("created", created)
.add("updated", updated)
.add("destroyed", destroyed)
diff --git a/server/data/data-jmap/src/main/java/org/apache/james/jmap/memory/change/MemoryMailboxChangeRepository.java b/server/data/data-jmap/src/main/java/org/apache/james/jmap/memory/change/MemoryMailboxChangeRepository.java
index 9198922d16..b3bc740816 100644
--- a/server/data/data-jmap/src/main/java/org/apache/james/jmap/memory/change/MemoryMailboxChangeRepository.java
+++ b/server/data/data-jmap/src/main/java/org/apache/james/jmap/memory/change/MemoryMailboxChangeRepository.java
@@ -67,7 +67,7 @@ public class MemoryMailboxChangeRepository implements MailboxChangeRepository {
if (state.equals(State.INITIAL)) {
return Flux.fromIterable(mailboxChangeMap.get(accountId))
- .filter(Predicate.not(MailboxChange::isDelegated))
+ .filter(Predicate.not(MailboxChange::isShared))
.sort(Comparator.comparing(MailboxChange::getDate))
.collect(new MailboxChangeCollector(state, maxChanges.orElse(defaultLimit)));
}
@@ -75,7 +75,7 @@ public class MemoryMailboxChangeRepository implements MailboxChangeRepository {
return findByState(accountId, state)
.flatMapMany(currentState -> Flux.fromIterable(mailboxChangeMap.get(accountId))
.filter(change -> change.getDate().isAfter(currentState.getDate()))
- .filter(Predicate.not(MailboxChange::isDelegated))
+ .filter(Predicate.not(MailboxChange::isShared))
.sort(Comparator.comparing(MailboxChange::getDate)))
.collect(new MailboxChangeCollector(state, maxChanges.orElse(defaultLimit)));
}
@@ -108,7 +108,7 @@ public class MemoryMailboxChangeRepository implements MailboxChangeRepository {
@Override
public Mono<State> getLatestState(AccountId accountId) {
return Flux.fromIterable(mailboxChangeMap.get(accountId))
- .filter(change -> !change.isDelegated())
+ .filter(change -> !change.isShared())
.sort(Comparator.comparing(MailboxChange::getDate))
.map(MailboxChange::getState)
.last(State.INITIAL);
diff --git a/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/change/MailboxChangeRepositoryContract.java b/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/change/MailboxChangeRepositoryContract.java
index 57b4cf503e..3d2c6972d4 100644
--- a/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/change/MailboxChangeRepositoryContract.java
+++ b/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/change/MailboxChangeRepositoryContract.java
@@ -100,7 +100,7 @@ public interface MailboxChangeRepositoryContract {
.date(DATE)
.isCountChange(false)
.created(ImmutableList.of(id3))
- .delegated()
+ .shared()
.build();
repository.save(change1).block();
repository.save(change2).block();
@@ -153,7 +153,7 @@ public interface MailboxChangeRepositoryContract {
.date(DATE)
.isCountChange(false)
.created(ImmutableList.of(id3))
- .delegated()
+ .shared()
.build();
repository.save(change1).block();
repository.save(change2).block();
@@ -294,8 +294,8 @@ public interface MailboxChangeRepositoryContract {
MailboxChange change1 = MailboxChange.builder().accountId(ACCOUNT_ID).state(referenceState).date(DATE.minusHours(3)).isCountChange(false).created(ImmutableList.of(id1)).build();
MailboxChange change2 = MailboxChange.builder().accountId(ACCOUNT_ID).state(stateFactory.generate()).date(DATE.minusHours(2)).isCountChange(false).created(ImmutableList.of(id2)).build();
- MailboxChange change3 = MailboxChange.builder().accountId(ACCOUNT_ID).state(stateFactory.generate()).date(DATE.minusHours(1)).isCountChange(false).delegated(true).created(ImmutableList.of(id3)).build();
- MailboxChange change4 = MailboxChange.builder().accountId(ACCOUNT_ID).state(stateFactory.generate()).date(DATE).isCountChange(false).delegated(true).created(ImmutableList.of(id4)).build();
+ MailboxChange change3 = MailboxChange.builder().accountId(ACCOUNT_ID).state(stateFactory.generate()).date(DATE.minusHours(1)).isCountChange(false).shared(true).created(ImmutableList.of(id3)).build();
+ MailboxChange change4 = MailboxChange.builder().accountId(ACCOUNT_ID).state(stateFactory.generate()).date(DATE).isCountChange(false).shared(true).created(ImmutableList.of(id4)).build();
repository.save(change1).block();
repository.save(change2).block();
repository.save(change3).block();
@@ -318,8 +318,8 @@ public interface MailboxChangeRepositoryContract {
MailboxChange change1 = MailboxChange.builder().accountId(ACCOUNT_ID).state(referenceState).date(DATE.minusHours(3)).isCountChange(false).created(ImmutableList.of(id1)).build();
MailboxChange change2 = MailboxChange.builder().accountId(ACCOUNT_ID).state(stateFactory.generate()).date(DATE.minusHours(2)).isCountChange(false).created(ImmutableList.of(id2)).build();
- MailboxChange change3 = MailboxChange.builder().accountId(ACCOUNT_ID).state(stateFactory.generate()).date(DATE.minusHours(1)).isCountChange(false).delegated(true).created(ImmutableList.of(id3)).build();
- MailboxChange change4 = MailboxChange.builder().accountId(ACCOUNT_ID).state(stateFactory.generate()).date(DATE).isCountChange(false).delegated(true).created(ImmutableList.of(id4)).build();
+ MailboxChange change3 = MailboxChange.builder().accountId(ACCOUNT_ID).state(stateFactory.generate()).date(DATE.minusHours(1)).isCountChange(false).shared(true).created(ImmutableList.of(id3)).build();
+ MailboxChange change4 = MailboxChange.builder().accountId(ACCOUNT_ID).state(stateFactory.generate()).date(DATE).isCountChange(false).shared(true).created(ImmutableList.of(id4)).build();
repository.save(change1).block();
repository.save(change2).block();
repository.save(change3).block();
@@ -549,7 +549,7 @@ public interface MailboxChangeRepositoryContract {
.date(DATE.minusHours(1))
.isCountChange(false)
.updated(ImmutableList.of(id1))
- .delegated()
+ .shared()
.build();
repository.save(oldState).block();
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org