Skip to content

Commit 0df173e

Browse files
HoussemNasriHoussemNasri
committed
Implement getUserParticipationStatus
1 parent fecb130 commit 0df173e

File tree

28 files changed

+693
-182
lines changed

28 files changed

+693
-182
lines changed

‎tmail-backend/apps/distributed/src/main/java/com/linagora/tmail/james/app/DistributedServer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ private static List<Module> chooseOpenPaasModule(OpenPaasModuleChooserConfigurat
493493
if (openPaasModuleChooserConfiguration.enabled()) {
494494
ImmutableList.Builder<Module> moduleBuilder = ImmutableList.<Module>builder().add(new OpenPaasModule());
495495
if (openPaasModuleChooserConfiguration.cardDavCollectedContactEnabled()) {
496-
moduleBuilder.add(new OpenPaasModule.CardDavModule());
496+
moduleBuilder.add(new OpenPaasModule.DavModule());
497497
}
498498
if (openPaasModuleChooserConfiguration.contactsConsumerEnabled()) {
499499
moduleBuilder.add(new OpenPaasContactsConsumerModule());

‎tmail-backend/apps/memory/src/main/java/com/linagora/tmail/james/app/MemoryServer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ private static List<Module> chooseOpenPaas(OpenPaasModuleChooserConfiguration mo
264264
ImmutableList.Builder<Module> moduleBuilder = ImmutableList.<Module>builder().add(new OpenPaasModule());
265265

266266
if (moduleChooserConfiguration.cardDavCollectedContactEnabled()) {
267-
moduleBuilder.add(new OpenPaasModule.CardDavModule());
267+
moduleBuilder.add(new OpenPaasModule.DavModule());
268268
}
269269
if (moduleChooserConfiguration.contactsConsumerEnabled()) {
270270
moduleBuilder.add(Modules.override(new OpenPaasContactsConsumerModule())

‎tmail-backend/jmap/extensions/src/main/scala/com/linagora/tmail/james/jmap/model/CalendarEventParse.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ object CalendarAttendeeParticipationStatus {
311311
.map(_.getValue)
312312
.map(CalendarAttendeeParticipationStatus(_))
313313
}
314-
case class CalendarAttendeeParticipationStatus(value: String) extends AnyVal
314+
case class CalendarAttendeeParticipationStatus(value: String)
315315
object CalendarAttendeeExpectReply {
316316
def from(attendee: Attendee): Option[CalendarAttendeeExpectReply] =
317317
Option(attendee.getParameter("RSVP").asInstanceOf[Parameter])

‎tmail-backend/tmail-third-party/openpaas/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@
3737
<groupId>${james.groupId}</groupId>
3838
<artifactId>apache-james-backends-rabbitmq</artifactId>
3939
</dependency>
40+
<dependency>
41+
<groupId>${project.groupId}</groupId>
42+
<artifactId>jmap-extensions</artifactId>
43+
</dependency>
4044
<dependency>
4145
<groupId>${james.groupId}</groupId>
4246
<artifactId>apache-james-backends-rabbitmq</artifactId>

‎tmail-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/OpenPaasModule.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
import com.google.inject.AbstractModule;
3434
import com.google.inject.Provides;
3535
import com.linagora.tmail.api.OpenPaasRestClient;
36-
import com.linagora.tmail.carddav.CardDavClient;
3736
import com.linagora.tmail.configuration.OpenPaasConfiguration;
37+
import com.linagora.tmail.dav.DavClient;
3838

3939
public class OpenPaasModule extends AbstractModule {
4040
private static final Logger LOGGER = LoggerFactory.getLogger(OpenPaasModule.class);
@@ -65,14 +65,14 @@ public OpenPaasRestClient provideOpenPaasRestCLient(OpenPaasConfiguration openPa
6565
return new OpenPaasRestClient(openPaasConfiguration);
6666
}
6767

68-
public static class CardDavModule extends AbstractModule {
68+
public static class DavModule extends AbstractModule {
6969

7070
@Provides
7171
@Singleton
72-
public CardDavClient provideCardDavClient(OpenPaasConfiguration openPaasConfiguration) {
72+
public DavClient provideDavClient(OpenPaasConfiguration openPaasConfiguration) {
7373
Preconditions.checkArgument(openPaasConfiguration.cardDavConfiguration().isPresent(),
74-
"OpenPaasConfiguration should have a carddav configuration");
75-
return new CardDavClient.OpenpaasCardDavClient(openPaasConfiguration.cardDavConfiguration().get());
74+
"OpenPaasConfiguration should have dav configuration");
75+
return new DavClient(openPaasConfiguration.cardDavConfiguration().get());
7676
}
7777
}
7878
}

‎tmail-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/OpenPaasModuleChooserConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.slf4j.Logger;
2727
import org.slf4j.LoggerFactory;
2828

29-
import com.linagora.tmail.configuration.CardDavConfiguration;
29+
import com.linagora.tmail.configuration.DavConfiguration;
3030
import com.linagora.tmail.configuration.OpenPaasConfiguration;
3131

3232
public record OpenPaasModuleChooserConfiguration(boolean enabled,
@@ -43,7 +43,7 @@ public static OpenPaasModuleChooserConfiguration parse(PropertiesProvider proper
4343
try {
4444
Configuration configuration = propertiesProvider.getConfiguration("openpaas");
4545
boolean contactsConsumerEnabled = OpenPaasConfiguration.isConfiguredContactConsumer(configuration);
46-
boolean cardDavCollectedContactEnabled = CardDavConfiguration.isConfigured(configuration);
46+
boolean cardDavCollectedContactEnabled = DavConfiguration.isConfigured(configuration);
4747
LOGGER.info("OpenPaas module is turned on. Contacts consumer is enabled: {}, CardDav is enabled: {}",
4848
contactsConsumerEnabled, cardDavCollectedContactEnabled);
4949
return new OpenPaasModuleChooserConfiguration(ENABLED, cardDavCollectedContactEnabled, contactsConsumerEnabled);

‎tmail-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/carddav/CardDavClient.java

Lines changed: 0 additions & 110 deletions
This file was deleted.

‎tmail-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/configuration/CardDavConfiguration.java renamed to ‎tmail-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/configuration/DavConfiguration.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,25 @@
2828

2929
import com.google.common.base.Preconditions;
3030

31-
public record CardDavConfiguration(UsernamePasswordCredentials adminCredential,
32-
URI baseUrl,
33-
Optional<Boolean> trustAllSslCerts,
34-
Optional<Duration> responseTimeout) {
31+
public record DavConfiguration(UsernamePasswordCredentials adminCredential,
32+
URI baseUrl,
33+
Optional<Boolean> trustAllSslCerts,
34+
Optional<Duration> responseTimeout) {
3535
static final boolean CLIENT_TRUST_ALL_SSL_CERTS_DISABLED = false;
3636
static final String CARD_DAV_API_URI_PROPERTY = "carddav.api.uri";
3737
static final String CARD_DAV_ADMIN_USER_PROPERTY = "carddav.admin.user";
3838
static final String CARD_DAV_ADMIN_PASSWORD_PROPERTY = "carddav.admin.password";
3939
static final String CARD_DAV_REST_CLIENT_TRUST_ALL_SSL_CERTS_PROPERTY = "carddav.rest.client.trust.all.ssl.certs";
4040
static final String CARD_DAV_REST_CLIENT_RESPONSE_TIMEOUT_PROPERTY = "carddav.rest.client.response.timeout";
4141

42-
public static Optional<CardDavConfiguration> maybeFrom(Configuration configuration) {
42+
public static Optional<DavConfiguration> maybeFrom(Configuration configuration) {
4343
if (isConfigured(configuration)) {
4444
return Optional.of(from(configuration));
4545
}
4646
return Optional.empty();
4747
}
4848

49-
public static CardDavConfiguration from(Configuration configuration) {
49+
public static DavConfiguration from(Configuration configuration) {
5050
String adminUser = configuration.getString(CARD_DAV_ADMIN_USER_PROPERTY, null);
5151
String adminPassword = configuration.getString(CARD_DAV_ADMIN_PASSWORD_PROPERTY, null);
5252

@@ -64,7 +64,7 @@ public static CardDavConfiguration from(Configuration configuration) {
6464
Preconditions.checkArgument(durationAsMilliseconds > 0, "Response timeout should not be negative");
6565
return Duration.ofMillis(durationAsMilliseconds);
6666
});
67-
return new CardDavConfiguration(adminCredential, baseUrl, trustAllSslCerts, responseTimeout);
67+
return new DavConfiguration(adminCredential, baseUrl, trustAllSslCerts, responseTimeout);
6868
}
6969

7070
public static boolean isConfigured(Configuration configuration) {

‎tmail-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/configuration/OpenPaasConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public record OpenPaasConfiguration(URI apirUri,
3636
String adminPassword,
3737
boolean trustAllSslCerts,
3838
Optional<ContactConsumerConfiguration> contactConsumerConfiguration,
39-
Optional<CardDavConfiguration> cardDavConfiguration) {
39+
Optional<DavConfiguration> cardDavConfiguration) {
4040

4141
public record ContactConsumerConfiguration(List<AmqpUri> amqpUri,
4242
boolean quorumQueuesBypass) {
@@ -46,7 +46,7 @@ public OpenPaasConfiguration(URI apirUri, String adminUsername, String adminPass
4646
this(apirUri, adminUsername, adminPassword, trustAllSslCerts, Optional.of(contactConsumerConfiguration), Optional.empty());
4747
}
4848

49-
public OpenPaasConfiguration(URI apirUri, String adminUsername, String adminPassword, boolean trustAllSslCerts, CardDavConfiguration cardDavConfiguration) {
49+
public OpenPaasConfiguration(URI apirUri, String adminUsername, String adminPassword, boolean trustAllSslCerts, DavConfiguration cardDavConfiguration) {
5050
this(apirUri, adminUsername, adminPassword, trustAllSslCerts, Optional.empty(), Optional.of(cardDavConfiguration));
5151
}
5252

@@ -69,7 +69,7 @@ public static OpenPaasConfiguration from(Configuration configuration) {
6969
Optional<ContactConsumerConfiguration> contactConsumerConfiguration = readRabbitMqUri(configuration)
7070
.map(amqpUri -> new ContactConsumerConfiguration(amqpUri, readQuorumQueuesBypass(configuration)));
7171

72-
Optional<CardDavConfiguration> cardDavConfiguration = CardDavConfiguration.maybeFrom(configuration);
72+
Optional<DavConfiguration> cardDavConfiguration = DavConfiguration.maybeFrom(configuration);
7373

7474
return new OpenPaasConfiguration(openPaasApiUri, adminUser, adminPassword, trustAllSslCerts, contactConsumerConfiguration, cardDavConfiguration);
7575
}

‎tmail-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/carddav/CardDavCreationFactory.java renamed to ‎tmail-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/dav/CardDavUtils.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* more details. *
1717
********************************************************************/
1818

19-
package com.linagora.tmail.carddav;
19+
package com.linagora.tmail.dav;
2020

2121
import java.nio.charset.StandardCharsets;
2222
import java.util.List;
@@ -25,20 +25,21 @@
2525
import org.apache.james.core.MailAddress;
2626

2727
import com.google.common.hash.Hashing;
28+
import com.linagora.tmail.dav.request.CardDavCreationObjectRequest;
2829

2930
import ezvcard.parameter.EmailType;
3031

31-
public class CardDavCreationFactory {
32+
public class CardDavUtils {
3233
private static final String VERSION = "4.0";
33-
private static final EmailType EMAIL_TYPE_DEFAULT = EmailType.WORK;
34+
private static final EmailType DEFAULT_EMAIL_TYPE = EmailType.WORK;
3435

35-
public static CardDavCreationObjectRequest create(Optional<String> fullName, MailAddress email) {
36-
CardDavCreationObjectRequest.Email emailObject = new CardDavCreationObjectRequest.Email(List.of(EMAIL_TYPE_DEFAULT), email);
37-
return new CardDavCreationObjectRequest(VERSION, createContactUid(email), fullName, Optional.empty(), emailObject);
36+
public static CardDavCreationObjectRequest createObjectCreationRequest(Optional<String> maybeFullName, MailAddress email) {
37+
CardDavCreationObjectRequest.Email emailObject = new CardDavCreationObjectRequest.Email(List.of(DEFAULT_EMAIL_TYPE), email);
38+
return new CardDavCreationObjectRequest(VERSION, createContactUid(email), maybeFullName, Optional.empty(), emailObject);
3839
}
3940

40-
public static CardDavCreationObjectRequest create(MailAddress email) {
41-
return create(Optional.empty(), email);
41+
public static CardDavCreationObjectRequest createObjectCreationRequest(MailAddress email) {
42+
return createObjectCreationRequest(Optional.empty(), email);
4243
}
4344

4445
public static String createContactUid(MailAddress email) {

0 commit comments

Comments
 (0)