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:30 UTC
[james-project] 02/02: JAMES-3469 EmailChange.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 4272fe903db06b0e1bc1143940fdc0684c374c47
Author: Tung Tran <vt...@linagora.com>
AuthorDate: Fri Jun 23 14:39:43 2023 +0700
JAMES-3469 EmailChange.isDelegated shall be renamed in isShared
---
.../change/CassandraEmailChangeRepository.java | 4 +-
.../cassandra/change/EmailChangeRepositoryDAO.java | 4 +-
.../apache/james/jmap/api/change/EmailChange.java | 32 ++--
.../jmap/api/change/MailboxAndEmailChange.java | 12 +-
.../memory/change/MemoryEmailChangeRepository.java | 4 +-
.../api/change/EmailChangeRepositoryContract.java | 200 ++++++++++-----------
.../james/jmap/api/change/EmailChangeTest.java | 6 +-
.../jmap/change/MailboxChangeListenerTest.scala | 8 +-
8 files changed, 135 insertions(+), 135 deletions(-)
diff --git a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/change/CassandraEmailChangeRepository.java b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/change/CassandraEmailChangeRepository.java
index 13d3c7c42b..6c31fee6e8 100644
--- a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/change/CassandraEmailChangeRepository.java
+++ b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/change/CassandraEmailChangeRepository.java
@@ -62,13 +62,13 @@ public class CassandraEmailChangeRepository implements EmailChangeRepository {
if (state.equals(State.INITIAL)) {
return emailChangeRepositoryDAO.getAllChanges(accountId)
- .filter(change -> !change.isDelegated())
+ .filter(change -> !change.isShared())
.collect(new EmailChanges.Builder.EmailChangeCollector(state, maxChanges.orElse(defaultLimit)));
}
return emailChangeRepositoryDAO.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 EmailChanges.Builder.EmailChangeCollector(state, maxChanges.orElse(defaultLimit)));
}
diff --git a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/change/EmailChangeRepositoryDAO.java b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/change/EmailChangeRepositoryDAO.java
index adb6c35224..2c608d3921 100644
--- a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/change/EmailChangeRepositoryDAO.java
+++ b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/change/EmailChangeRepositoryDAO.java
@@ -124,7 +124,7 @@ public class EmailChangeRepositoryDAO {
return executor.executeVoid(insertStatement.bind()
.setString(ACCOUNT_ID, change.getAccountId().getIdentifier())
.setUuid(STATE, change.getState().getValue())
- .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)
@@ -169,7 +169,7 @@ public class EmailChangeRepositoryDAO {
.accountId(accountId)
.state(State.of(row.getUuid(STATE)))
.date(CassandraZonedDateTimeModule.fromUDT(row.getUdtValue(DATE)))
- .isDelegated(row.getBoolean(IS_DELEGATED))
+ .isShared(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/EmailChange.java b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/change/EmailChange.java
index 6c51f6e2fe..e5069229cc 100644
--- a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/change/EmailChange.java
+++ b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/change/EmailChange.java
@@ -46,24 +46,24 @@ public class EmailChange implements JmapChange {
@FunctionalInterface
public interface RequireDate {
- RequireIsDelegated date(ZonedDateTime date);
+ RequireIsShared date(ZonedDateTime date);
}
@FunctionalInterface
- public interface RequireIsDelegated {
- Builder isDelegated(boolean isDelegated);
+ public interface RequireIsShared {
+ Builder isShared(boolean isShared);
}
private final AccountId accountId;
private final State state;
private final ZonedDateTime date;
- private final boolean isDelegated;
+ private final boolean shared;
private final ImmutableList.Builder<MessageId> created;
private final ImmutableList.Builder<MessageId> updated;
private final ImmutableList.Builder<MessageId> destroyed;
private Optional<Boolean> isDelivery;
- private Builder(AccountId accountId, State state, ZonedDateTime date, boolean isDelegated) {
+ private Builder(AccountId accountId, State state, ZonedDateTime date, boolean shared) {
Preconditions.checkNotNull(accountId, "'accountId' should not be null");
Preconditions.checkNotNull(state, "'state' should not be null");
Preconditions.checkNotNull(date, "'date' should not be null");
@@ -71,7 +71,7 @@ public class EmailChange implements JmapChange {
this.accountId = accountId;
this.state = state;
this.date = date;
- this.isDelegated = isDelegated;
+ this.shared = shared;
this.destroyed = ImmutableList.builder();
this.updated = ImmutableList.builder();
this.created = ImmutableList.builder();
@@ -114,28 +114,28 @@ public class EmailChange implements JmapChange {
}
public EmailChange build() {
- return new EmailChange(accountId, state, date, isDelegated, created.build(), updated.build(), destroyed.build(), isDelivery.orElse(false));
+ return new EmailChange(accountId, state, date, shared, created.build(), updated.build(), destroyed.build(), isDelivery.orElse(false));
}
}
public static Builder.RequireAccountId builder() {
- return accountId -> state -> date -> isDelegated -> new Builder(accountId, state, date, isDelegated);
+ return accountId -> state -> date -> isShared -> new Builder(accountId, state, date, isShared);
}
private final AccountId accountId;
private final State state;
private final ZonedDateTime date;
- private final boolean isDelegated;
+ private final boolean shared;
private final ImmutableList<MessageId> created;
private final ImmutableList<MessageId> updated;
private final ImmutableList<MessageId> destroyed;
private final boolean isDelivery;
- private EmailChange(AccountId accountId, State state, ZonedDateTime date, boolean isDelegated, ImmutableList<MessageId> created, ImmutableList<MessageId> updated, ImmutableList<MessageId> destroyed, boolean isDelivery) {
+ private EmailChange(AccountId accountId, State state, ZonedDateTime date, boolean shared, ImmutableList<MessageId> created, ImmutableList<MessageId> updated, ImmutableList<MessageId> destroyed, boolean isDelivery) {
this.accountId = accountId;
this.state = state;
this.date = date;
- this.isDelegated = isDelegated;
+ this.shared = shared;
this.created = created;
this.updated = updated;
this.destroyed = destroyed;
@@ -166,8 +166,8 @@ public class EmailChange implements JmapChange {
return destroyed;
}
- public boolean isDelegated() {
- return isDelegated;
+ public boolean isShared() {
+ return shared;
}
public boolean isDelivery() {
@@ -181,7 +181,7 @@ public class EmailChange implements JmapChange {
return Objects.equals(accountId, that.accountId)
&& Objects.equals(state, that.state)
&& Objects.equals(date, that.date)
- && Objects.equals(isDelegated, that.isDelegated)
+ && Objects.equals(shared, that.shared)
&& Objects.equals(created, that.created)
&& Objects.equals(updated, that.updated)
&& Objects.equals(destroyed, that.destroyed)
@@ -192,7 +192,7 @@ public class EmailChange implements JmapChange {
@Override
public final int hashCode() {
- return Objects.hash(accountId, state, date, isDelegated, created, updated, destroyed, isDelivery);
+ return Objects.hash(accountId, state, date, shared, created, updated, destroyed, isDelivery);
}
@Override
@@ -201,7 +201,7 @@ public class EmailChange implements JmapChange {
.add("accountId", accountId)
.add("state", state)
.add("date", date)
- .add("isDelegated", isDelegated)
+ .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/api/change/MailboxAndEmailChange.java b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/change/MailboxAndEmailChange.java
index 87fc985e5e..430fa6eec1 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
@@ -60,7 +60,7 @@ public class MailboxAndEmailChange implements JmapChange {
.accountId(accountId)
.state(state)
.date(now)
- .isDelegated(false)
+ .isShared(false)
.isDelivery(messageAdded.isDelivery())
.created(messageAdded.getMessageIds())
.build();
@@ -82,7 +82,7 @@ public class MailboxAndEmailChange implements JmapChange {
.accountId(shareeId)
.state(state)
.date(now)
- .isDelegated(true)
+ .isShared(true)
.isDelivery(messageAdded.isDelivery())
.created(messageAdded.getMessageIds())
.build(),
@@ -108,7 +108,7 @@ public class MailboxAndEmailChange implements JmapChange {
.accountId(accountId)
.state(stateFactory.generate())
.date(now)
- .isDelegated(false)
+ .isShared(false)
.updated(messageFlagUpdated.getMessageIds())
.build();
@@ -128,7 +128,7 @@ public class MailboxAndEmailChange implements JmapChange {
.accountId(shareeId)
.state(stateFactory.generate())
.date(now)
- .isDelegated(true)
+ .isShared(true)
.updated(messageFlagUpdated.getMessageIds())
.build(),
MailboxChange.builder()
@@ -149,7 +149,7 @@ public class MailboxAndEmailChange implements JmapChange {
.accountId(shareeId)
.state(stateFactory.generate())
.date(now)
- .isDelegated(true)
+ .isShared(true)
.updated(messageFlagUpdated.getMessageIds())
.build());
@@ -185,7 +185,7 @@ public class MailboxAndEmailChange implements JmapChange {
.accountId(AccountId.fromUsername(username))
.state(state)
.date(now)
- .isDelegated(delegated)
+ .isShared(delegated)
.updated(Sets.intersection(ImmutableSet.copyOf(expunged.getMessageIds()), accessibleMessageIds))
.destroyed(Sets.difference(ImmutableSet.copyOf(expunged.getMessageIds()), accessibleMessageIds))
.build(), mailboxChange))
diff --git a/server/data/data-jmap/src/main/java/org/apache/james/jmap/memory/change/MemoryEmailChangeRepository.java b/server/data/data-jmap/src/main/java/org/apache/james/jmap/memory/change/MemoryEmailChangeRepository.java
index 13fcc7cba9..dfc9e564b7 100644
--- a/server/data/data-jmap/src/main/java/org/apache/james/jmap/memory/change/MemoryEmailChangeRepository.java
+++ b/server/data/data-jmap/src/main/java/org/apache/james/jmap/memory/change/MemoryEmailChangeRepository.java
@@ -66,7 +66,7 @@ public class MemoryEmailChangeRepository implements EmailChangeRepository {
@Override
public Mono<State> getLatestState(AccountId accountId) {
return allChanges(accountId)
- .filter(change -> !change.isDelegated())
+ .filter(change -> !change.isShared())
.map(EmailChange::getState)
.last(State.INITIAL);
}
@@ -78,7 +78,7 @@ public class MemoryEmailChangeRepository implements EmailChangeRepository {
maxChanges.ifPresent(limit -> Preconditions.checkArgument(limit.getValue() > 0, "maxChanges must be a positive integer"));
return resolveAllChanges(accountId, state)
- .filter(change -> !change.isDelegated())
+ .filter(change -> !change.isShared())
.collect(new EmailChangeCollector(state, maxChanges.orElse(defaultLimit)));
}
diff --git a/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/change/EmailChangeRepositoryContract.java b/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/change/EmailChangeRepositoryContract.java
index 7112ab6e80..3ce866abe6 100644
--- a/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/change/EmailChangeRepositoryContract.java
+++ b/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/change/EmailChangeRepositoryContract.java
@@ -50,7 +50,7 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE)
- .isDelegated(false)
+ .isShared(false)
.created(generateNewMessageId())
.build();
@@ -78,21 +78,21 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(2))
- .isDelegated(false)
+ .isShared(false)
.created(messageId1)
.build();
EmailChange change2 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(1))
- .isDelegated(false)
+ .isShared(false)
.created(messageId2)
.build();
EmailChange change3 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE)
- .isDelegated(false)
+ .isShared(false)
.created(messageId3)
.build();
repository.save(change1).block();
@@ -115,21 +115,21 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(2))
- .isDelegated(false)
+ .isShared(false)
.created(messageId1)
.build();
EmailChange change2 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(1))
- .isDelegated(false)
+ .isShared(false)
.created(messageId2)
.build();
EmailChange change3 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE)
- .isDelegated(true)
+ .isShared(true)
.created(messageId3)
.build();
repository.save(change1).block();
@@ -151,14 +151,14 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(state)
.date(DATE.minusHours(1))
- .isDelegated(false)
+ .isShared(false)
.created(messageId)
.build();
EmailChange change = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE)
- .isDelegated(false)
+ .isShared(false)
.updated(messageId)
.build();
repository.save(oldState).block();
@@ -177,7 +177,7 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(state)
.date(DATE.minusHours(1))
- .isDelegated(false)
+ .isShared(false)
.created(generateNewMessageId())
.build();
repository.save(oldState).block();
@@ -196,7 +196,7 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(state)
.date(DATE.minusHours(1))
- .isDelegated(false)
+ .isShared(false)
.created(generateNewMessageId())
.build();
repository.save(oldState).block();
@@ -220,35 +220,35 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(state)
.date(DATE.minusHours(3))
- .isDelegated(false)
+ .isShared(false)
.created(messageId1)
.build();
EmailChange change1 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(2))
- .isDelegated(false)
+ .isShared(false)
.created(messageId2)
.build();
EmailChange change2 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(1))
- .isDelegated(false)
+ .isShared(false)
.created(messageId3)
.build();
EmailChange change3 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE)
- .isDelegated(false)
+ .isShared(false)
.created(messageId4)
.build();
EmailChange change4 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.plusHours(1))
- .isDelegated(false)
+ .isShared(false)
.created(messageId5)
.build();
repository.save(oldState).block();
@@ -275,28 +275,28 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(state)
.date(DATE.minusHours(3))
- .isDelegated(false)
+ .isShared(false)
.created(messageId1)
.build();
EmailChange change1 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(2))
- .isDelegated(false)
+ .isShared(false)
.created(messageId2)
.build();
EmailChange change2 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(1))
- .isDelegated(false)
+ .isShared(false)
.created(messageId3)
.build();
EmailChange change3 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE)
- .isDelegated(false)
+ .isShared(false)
.created(messageId4)
.build();
repository.save(oldState).block();
@@ -326,28 +326,28 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(state)
.date(DATE.minusHours(3))
- .isDelegated(false)
+ .isShared(false)
.created(messageId1)
.build();
EmailChange change2 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(state2)
.date(DATE.minusHours(2))
- .isDelegated(false)
+ .isShared(false)
.created(messageId2)
.build();
EmailChange change3 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(state3)
.date(DATE.minusHours(1))
- .isDelegated(false)
+ .isShared(false)
.created(messageId3)
.build();
EmailChange change4 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(state4)
.date(DATE)
- .isDelegated(false)
+ .isShared(false)
.created(messageId4)
.build();
@@ -378,21 +378,21 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(state)
.date(DATE.minusHours(2))
- .isDelegated(false)
+ .isShared(false)
.created(messageId1)
.build();
EmailChange change1 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(1))
- .isDelegated(false)
+ .isShared(false)
.created(messageId2, messageId3, messageId4, messageId5, messageId6)
.build();
EmailChange change2 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE)
- .isDelegated(false)
+ .isShared(false)
.created(messageId7)
.build();
@@ -420,21 +420,21 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(state)
.date(DATE.minusHours(2))
- .isDelegated(false)
+ .isShared(false)
.created(messageId1)
.build();
EmailChange change1 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(1))
- .isDelegated(false)
+ .isShared(false)
.created(messageId2, messageId3)
.build();
EmailChange change2 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE)
- .isDelegated(false)
+ .isShared(false)
.created(messageId4, messageId5)
.build();
repository.save(oldState).block();
@@ -461,14 +461,14 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(state)
.date(DATE.minusHours(2))
- .isDelegated(false)
+ .isShared(false)
.created(messageId1)
.build();
EmailChange change1 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(1))
- .isDelegated(false)
+ .isShared(false)
.created(messageId2, messageId3)
.build();
repository.save(oldState).block();
@@ -493,21 +493,21 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(state)
.date(DATE.minusHours(2))
- .isDelegated(false)
+ .isShared(false)
.created(messageId1)
.build();
EmailChange change1 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(1))
- .isDelegated(false)
+ .isShared(false)
.created(messageId2, messageId3)
.build();
EmailChange change2 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE)
- .isDelegated(false)
+ .isShared(false)
.updated(messageId2, messageId3)
.build();
repository.save(oldState).block();
@@ -532,21 +532,21 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(state)
.date(DATE.minusHours(2))
- .isDelegated(false)
+ .isShared(false)
.created(messageId1)
.build();
EmailChange change1 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(1))
- .isDelegated(false)
+ .isShared(false)
.created(messageId2, messageId3)
.build();
EmailChange change2 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE)
- .isDelegated(false)
+ .isShared(false)
.updated(messageId2, messageId1)
.build();
repository.save(oldState).block();
@@ -571,21 +571,21 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(state)
.date(DATE.minusHours(2))
- .isDelegated(false)
+ .isShared(false)
.created(messageId1)
.build();
EmailChange change1 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(1))
- .isDelegated(false)
+ .isShared(false)
.created(messageId2, messageId3)
.build();
EmailChange change2 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE)
- .isDelegated(false)
+ .isShared(false)
.updated(messageId2, messageId3)
.build();
repository.save(oldState).block();
@@ -617,21 +617,21 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(state)
.date(DATE.minusHours(3))
- .isDelegated(false)
+ .isShared(false)
.created(messageId1, messageId9, messageId10)
.build();
EmailChange change1 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(2))
- .isDelegated(false)
+ .isShared(false)
.created(messageId2, messageId3, messageId4, messageId5)
.build();
EmailChange change2 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(1))
- .isDelegated(false)
+ .isShared(false)
.created(messageId6, messageId7)
.updated(messageId2, messageId3, messageId10)
.destroyed(messageId4, messageId9)
@@ -640,7 +640,7 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE)
- .isDelegated(false)
+ .isShared(false)
.created(messageId8)
.updated(messageId6, messageId7, messageId1)
.destroyed(messageId5, messageId10)
@@ -678,28 +678,28 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(state)
.date(DATE.minusHours(3))
- .isDelegated(false)
+ .isShared(false)
.created(messageId1)
.build();
EmailChange change1 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(2))
- .isDelegated(false)
+ .isShared(false)
.created(messageId2, messageId3, messageId4, messageId5)
.build();
EmailChange change2 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(1))
- .isDelegated(true)
+ .isShared(true)
.created(messageId6, messageId7)
.build();
EmailChange change3 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE)
- .isDelegated(false)
+ .isShared(false)
.created(messageId8)
.build();
repository.save(oldState).block();
@@ -727,21 +727,21 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(state)
.date(DATE.minusHours(2))
- .isDelegated(false)
+ .isShared(false)
.created(messageId1)
.build();
EmailChange change1 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(1))
- .isDelegated(false)
+ .isShared(false)
.updated(messageId1, messageId2)
.build();
EmailChange change2 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE)
- .isDelegated(false)
+ .isShared(false)
.updated(messageId1, messageId2)
.created(messageId3)
.build();
@@ -780,21 +780,21 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(2))
- .isDelegated(false)
+ .isShared(false)
.created(generateNewMessageId())
.build();
EmailChange change2 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(1))
- .isDelegated(false)
+ .isShared(false)
.created(generateNewMessageId())
.build();
EmailChange change3 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE)
- .isDelegated(false)
+ .isShared(false)
.created(generateNewMessageId())
.build();
repository.save(change1).block();
@@ -813,21 +813,21 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(2))
- .isDelegated(false)
+ .isShared(false)
.created(generateNewMessageId())
.build();
EmailChange change2 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(1))
- .isDelegated(false)
+ .isShared(false)
.created(generateNewMessageId())
.build();
EmailChange change3 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE)
- .isDelegated(true)
+ .isShared(true)
.created(generateNewMessageId())
.build();
repository.save(change1).block();
@@ -848,14 +848,14 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(state)
.date(DATE.minusHours(1))
- .isDelegated(false)
+ .isShared(false)
.created(generateNewMessageId())
.build();
EmailChange change = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE)
- .isDelegated(false)
+ .isShared(false)
.updated(generateNewMessageId())
.build();
repository.save(oldState).block();
@@ -875,7 +875,7 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(state)
.date(DATE.minusHours(1))
- .isDelegated(false)
+ .isShared(false)
.created(generateNewMessageId())
.build();
repository.save(oldState).block();
@@ -894,7 +894,7 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(state)
.date(DATE.minusHours(1))
- .isDelegated(false)
+ .isShared(false)
.created(generateNewMessageId())
.build();
repository.save(oldState).block();
@@ -919,35 +919,35 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(state)
.date(DATE.minusHours(3))
- .isDelegated(false)
+ .isShared(false)
.created(messageId1)
.build();
EmailChange change1 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(2))
- .isDelegated(false)
+ .isShared(false)
.created(messageId2)
.build();
EmailChange change2 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(1))
- .isDelegated(false)
+ .isShared(false)
.created(messageId3)
.build();
EmailChange change3 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE)
- .isDelegated(false)
+ .isShared(false)
.created(messageId4)
.build();
EmailChange change4 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.plusHours(1))
- .isDelegated(false)
+ .isShared(false)
.created(messageId5)
.build();
repository.save(oldState).block();
@@ -973,28 +973,28 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(3))
- .isDelegated(false)
+ .isShared(false)
.created(messageId1)
.build();
EmailChange change1 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(2))
- .isDelegated(false)
+ .isShared(false)
.created(messageId2)
.build();
EmailChange change2 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(1))
- .isDelegated(false)
+ .isShared(false)
.created(messageId3)
.build();
EmailChange change3 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE)
- .isDelegated(false)
+ .isShared(false)
.created(messageId4)
.build();
repository.save(oldState).block();
@@ -1016,21 +1016,21 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(state)
.date(DATE.minusHours(2))
- .isDelegated(false)
+ .isShared(false)
.created(generateNewMessageId())
.build();
EmailChange change1 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(1))
- .isDelegated(false)
+ .isShared(false)
.created(generateNewMessageId(), generateNewMessageId(), generateNewMessageId(), generateNewMessageId(), generateNewMessageId())
.build();
EmailChange change2 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE)
- .isDelegated(false)
+ .isShared(false)
.created(generateNewMessageId())
.build();
@@ -1052,21 +1052,21 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(state)
.date(DATE.minusHours(2))
- .isDelegated(false)
+ .isShared(false)
.created(generateNewMessageId())
.build();
EmailChange change1 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(1))
- .isDelegated(false)
+ .isShared(false)
.created(generateNewMessageId(), generateNewMessageId())
.build();
EmailChange change2 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE)
- .isDelegated(false)
+ .isShared(false)
.created(generateNewMessageId(), generateNewMessageId())
.build();
repository.save(oldState).block();
@@ -1087,21 +1087,21 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(state)
.date(DATE.minusHours(2))
- .isDelegated(false)
+ .isShared(false)
.created(generateNewMessageId())
.build();
EmailChange change1 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(1))
- .isDelegated(false)
+ .isShared(false)
.created(generateNewMessageId(), generateNewMessageId())
.build();
EmailChange change2 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE)
- .isDelegated(false)
+ .isShared(false)
.created(generateNewMessageId(), generateNewMessageId())
.build();
repository.save(oldState).block();
@@ -1122,21 +1122,21 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(state)
.date(DATE.minusHours(2))
- .isDelegated(false)
+ .isShared(false)
.created(generateNewMessageId())
.build();
EmailChange change1 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(1))
- .isDelegated(false)
+ .isShared(false)
.created(generateNewMessageId(), generateNewMessageId())
.build();
EmailChange change2 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE)
- .isDelegated(false)
+ .isShared(false)
.updated(generateNewMessageId(), generateNewMessageId())
.build();
repository.save(oldState).block();
@@ -1157,21 +1157,21 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(state)
.date(DATE.minusHours(2))
- .isDelegated(false)
+ .isShared(false)
.created(generateNewMessageId())
.build();
EmailChange change1 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(1))
- .isDelegated(false)
+ .isShared(false)
.created(generateNewMessageId(), generateNewMessageId())
.build();
EmailChange change2 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE)
- .isDelegated(false)
+ .isShared(false)
.updated(generateNewMessageId(), generateNewMessageId())
.build();
repository.save(oldState).block();
@@ -1192,21 +1192,21 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(state)
.date(DATE.minusHours(2))
- .isDelegated(false)
+ .isShared(false)
.created(generateNewMessageId())
.build();
EmailChange change1 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(1))
- .isDelegated(false)
+ .isShared(false)
.created(generateNewMessageId(), generateNewMessageId())
.build();
EmailChange change2 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE)
- .isDelegated(false)
+ .isShared(false)
.updated(generateNewMessageId(), generateNewMessageId())
.build();
repository.save(oldState).block();
@@ -1238,21 +1238,21 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(state)
.date(DATE.minusHours(3))
- .isDelegated(false)
+ .isShared(false)
.created(messageId1, messageId9, messageId10)
.build();
EmailChange change1 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(2))
- .isDelegated(false)
+ .isShared(false)
.created(messageId2, messageId3, messageId4, messageId5)
.build();
EmailChange change2 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(1))
- .isDelegated(false)
+ .isShared(false)
.created(messageId6, messageId7)
.updated(messageId2, messageId3, messageId10)
.destroyed(messageId4, messageId9)
@@ -1261,7 +1261,7 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE)
- .isDelegated(false)
+ .isShared(false)
.created(messageId8)
.updated(messageId6, messageId7, messageId1)
.destroyed(messageId5, messageId10)
@@ -1298,28 +1298,28 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(state)
.date(DATE.minusHours(3))
- .isDelegated(false)
+ .isShared(false)
.created(messageId1)
.build();
EmailChange change1 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(2))
- .isDelegated(false)
+ .isShared(false)
.created(messageId2, messageId3, messageId4, messageId5)
.build();
EmailChange change2 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(1))
- .isDelegated(true)
+ .isShared(true)
.created(messageId6, messageId7)
.build();
EmailChange change3 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE)
- .isDelegated(false)
+ .isShared(false)
.created(messageId8)
.build();
repository.save(oldState).block();
@@ -1347,21 +1347,21 @@ public interface EmailChangeRepositoryContract {
.accountId(ACCOUNT_ID)
.state(state)
.date(DATE.minusHours(2))
- .isDelegated(false)
+ .isShared(false)
.created(messageId1)
.build();
EmailChange change1 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE.minusHours(1))
- .isDelegated(false)
+ .isShared(false)
.updated(messageId1, messageId2)
.build();
EmailChange change2 = EmailChange.builder()
.accountId(ACCOUNT_ID)
.state(generateNewState())
.date(DATE)
- .isDelegated(false)
+ .isShared(false)
.updated(messageId1, messageId2)
.created(messageId3)
.build();
diff --git a/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/change/EmailChangeTest.java b/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/change/EmailChangeTest.java
index 9f77771e20..08b09157aa 100644
--- a/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/change/EmailChangeTest.java
+++ b/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/change/EmailChangeTest.java
@@ -47,7 +47,7 @@ class EmailChangeTest {
.accountId(null)
.state(State.of(UUID.randomUUID()))
.date(DATE.minusHours(2))
- .isDelegated(false))
+ .isShared(false))
.isInstanceOf(NullPointerException.class);
}
@@ -58,7 +58,7 @@ class EmailChangeTest {
.accountId(ACCOUNT_ID)
.state(null)
.date(DATE.minusHours(2))
- .isDelegated(false))
+ .isShared(false))
.isInstanceOf(NullPointerException.class);;
}
@@ -69,7 +69,7 @@ class EmailChangeTest {
.accountId(ACCOUNT_ID)
.state(State.of(UUID.randomUUID()))
.date(null)
- .isDelegated(false))
+ .isShared(false))
.isInstanceOf(NullPointerException.class);;
}
}
\ No newline at end of file
diff --git a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/change/MailboxChangeListenerTest.scala b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/change/MailboxChangeListenerTest.scala
index 937ddaecfa..528dacffb4 100644
--- a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/change/MailboxChangeListenerTest.scala
+++ b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/change/MailboxChangeListenerTest.scala
@@ -304,7 +304,7 @@ class MailboxChangeListenerTest {
.accountId(ACCOUNT_ID)
.state(state)
.date(ZonedDateTime.now)
- .isDelegated(false)
+ .isShared(false)
.created(TestMessageId.of(0))
.build)
.block()
@@ -330,7 +330,7 @@ class MailboxChangeListenerTest {
.accountId(ACCOUNT_ID)
.state(state)
.date(ZonedDateTime.now)
- .isDelegated(false)
+ .isShared(false)
.created(TestMessageId.of(0))
.build)
.block()
@@ -356,7 +356,7 @@ class MailboxChangeListenerTest {
.accountId(ACCOUNT_ID)
.state(state)
.date(ZonedDateTime.now)
- .isDelegated(false)
+ .isShared(false)
.created(TestMessageId.of(0))
.build)
.block()
@@ -380,7 +380,7 @@ class MailboxChangeListenerTest {
.accountId(ACCOUNT_ID)
.state(state)
.date(ZonedDateTime.now)
- .isDelegated(false)
+ .isShared(false)
.created(TestMessageId.of(0))
.build)
.block()
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org