Skip to content

Commit a0ab5f9

Browse files
HoussemNasriHoussemNasri
committed
Fix rebase
1 parent 7139225 commit a0ab5f9

File tree

6 files changed

+37
-23
lines changed

6 files changed

+37
-23
lines changed

‎tmail-backend/apps/distributed/src/test/java/com/linagora/tmail/james/app/DistributedServerWithOpenPaasConfiguredTest.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package com.linagora.tmail.james.app;
2020

21+
import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
2122
import static com.linagora.tmail.OpenPaasModuleChooserConfiguration.ENABLED;
2223
import static com.linagora.tmail.OpenPaasModuleChooserConfiguration.ENABLE_CARDDAV;
2324
import static com.linagora.tmail.OpenPaasModuleChooserConfiguration.ENABLE_CONTACTS_CONSUMER;
@@ -38,17 +39,18 @@
3839
import org.junit.jupiter.api.extension.RegisterExtension;
3940

4041
import com.github.fge.lambdas.Throwing;
42+
import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
4143
import com.google.common.collect.ImmutableList;
4244
import com.google.inject.multibindings.Multibinder;
4345
import com.linagora.tmail.AmqpUri;
4446
import com.linagora.tmail.OpenPaasModuleChooserConfiguration;
4547
import com.linagora.tmail.OpenPaasTestModule;
4648
import com.linagora.tmail.UsersRepositoryModuleChooser;
4749
import com.linagora.tmail.api.OpenPaasServerExtension;
48-
import com.linagora.tmail.carddav.CardDavServerExtension;
4950
import com.linagora.tmail.combined.identity.LdapExtension;
5051
import com.linagora.tmail.combined.identity.UsersRepositoryClassProbe;
5152
import com.linagora.tmail.configuration.OpenPaasConfiguration;
53+
import com.linagora.tmail.dav.DavServerExtension;
5254

5355
public class DistributedServerWithOpenPaasConfiguredTest {
5456

@@ -96,7 +98,9 @@ void serverShouldStart(GuiceJamesServer server) {
9698
@Nested
9799
class CardDav {
98100
@RegisterExtension
99-
static CardDavServerExtension cardDavServerExtension = new CardDavServerExtension();
101+
static DavServerExtension davServerExtension = new DavServerExtension(
102+
WireMockExtension.extensionOptions()
103+
.options(wireMockConfig().dynamicPort()));
100104

101105
@RegisterExtension
102106
static JamesServerExtension
@@ -111,7 +115,7 @@ class CardDav {
111115
.build())
112116
.server(configuration -> DistributedServer.createServer(configuration)
113117
.overrideWith(binder -> Multibinder.newSetBinder(binder, GuiceProbe.class).addBinding().to(UsersRepositoryClassProbe.class))
114-
.overrideWith(new OpenPaasTestModule(openPaasServerExtension, Optional.of(cardDavServerExtension.getCardDavConfiguration()), Optional.empty())))
118+
.overrideWith(new OpenPaasTestModule(openPaasServerExtension, Optional.of(davServerExtension.getCardDavConfiguration()), Optional.empty())))
115119
.extension(new DockerOpenSearchExtension())
116120
.extension(new CassandraExtension())
117121
.extension(new RabbitMQExtension())

‎tmail-backend/apps/memory/src/test/java/com/linagora/tmail/james/app/MemoryServerWithOpenPaasConfiguredTest.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package com.linagora.tmail.james.app;
2020

21+
import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
2122
import static com.linagora.tmail.OpenPaasModuleChooserConfiguration.ENABLED;
2223
import static com.linagora.tmail.OpenPaasModuleChooserConfiguration.ENABLE_CARDDAV;
2324
import static com.linagora.tmail.OpenPaasModuleChooserConfiguration.ENABLE_CONTACTS_CONSUMER;
@@ -38,14 +39,15 @@
3839
import org.junit.jupiter.api.extension.RegisterExtension;
3940

4041
import com.github.fge.lambdas.Throwing;
42+
import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
4143
import com.google.common.collect.ImmutableList;
4244
import com.google.inject.multibindings.Multibinder;
4345
import com.linagora.tmail.AmqpUri;
4446
import com.linagora.tmail.OpenPaasModuleChooserConfiguration;
4547
import com.linagora.tmail.OpenPaasTestModule;
4648
import com.linagora.tmail.api.OpenPaasServerExtension;
47-
import com.linagora.tmail.carddav.CardDavServerExtension;
4849
import com.linagora.tmail.configuration.OpenPaasConfiguration;
50+
import com.linagora.tmail.dav.DavServerExtension;
4951
import com.linagora.tmail.encrypted.MailboxConfiguration;
5052
import com.linagora.tmail.encrypted.MailboxManagerClassProbe;
5153
import com.linagora.tmail.module.LinagoraTestJMAPServerModule;
@@ -91,7 +93,9 @@ void serverShouldStart(GuiceJamesServer server) {
9193
@Nested
9294
class CardDav {
9395
@RegisterExtension
94-
static CardDavServerExtension cardDavServerExtension = new CardDavServerExtension();
96+
static DavServerExtension davServerExtension = new DavServerExtension(
97+
WireMockExtension.extensionOptions()
98+
.options(wireMockConfig().dynamicPort()));
9599

96100
@RegisterExtension
97101
static JamesServerExtension jamesServerExtension = new JamesServerBuilder<MemoryConfiguration>(tmpDir ->
@@ -106,7 +110,7 @@ class CardDav {
106110
.overrideWith(new LinagoraTestJMAPServerModule())
107111
.overrideWith(binder -> Multibinder.newSetBinder(binder, GuiceProbe.class).addBinding().to(MailboxManagerClassProbe.class))
108112
.overrideWith(new RabbitMQModule())
109-
.overrideWith(new OpenPaasTestModule(openPaasServerExtension, Optional.of(cardDavServerExtension.getCardDavConfiguration()), Optional.empty())))
113+
.overrideWith(new OpenPaasTestModule(openPaasServerExtension, Optional.of(davServerExtension.getCardDavConfiguration()), Optional.empty())))
110114
.extension(new RabbitMQExtension())
111115
.build();
112116

‎tmail-backend/integration-tests/webadmin/distributed-webadmin-integration-tests/src/test/java/com/linagora/tmail/integration/distributed/DistributedOpenpaasContactIndexingIntegrationTest.java

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package com.linagora.tmail.integration.distributed;
2020

21+
import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
2122
import static io.restassured.RestAssured.given;
2223
import static org.apache.james.jmap.JmapRFCCommonRequests.ACCEPT_JMAP_RFC_HEADER;
2324
import static org.hamcrest.Matchers.empty;
@@ -40,13 +41,14 @@
4041
import org.junit.jupiter.api.Test;
4142
import org.junit.jupiter.api.extension.RegisterExtension;
4243

44+
import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
4345
import com.google.inject.util.Modules;
4446
import com.linagora.tmail.OpenPaasModule;
4547
import com.linagora.tmail.OpenPaasTestModule;
4648
import com.linagora.tmail.api.OpenPaasServerExtension;
4749
import com.linagora.tmail.blob.guice.BlobStoreConfiguration;
48-
import com.linagora.tmail.carddav.CardDavCreationFactory;
49-
import com.linagora.tmail.carddav.CardDavServerExtension;
50+
import com.linagora.tmail.dav.CardDavUtils;
51+
import com.linagora.tmail.dav.DavServerExtension;
5052
import com.linagora.tmail.integration.ContactIndexingIntegrationContract;
5153
import com.linagora.tmail.james.app.CassandraExtension;
5254
import com.linagora.tmail.james.app.DistributedJamesConfiguration;
@@ -63,7 +65,9 @@ public class DistributedOpenpaasContactIndexingIntegrationTest extends ContactIn
6365
static OpenPaasServerExtension openPaasServerExtension = new OpenPaasServerExtension();
6466

6567
@RegisterExtension
66-
static CardDavServerExtension cardDavServerExtension = new CardDavServerExtension();
68+
static DavServerExtension davServerExtension = new DavServerExtension(
69+
WireMockExtension.extensionOptions()
70+
.options(wireMockConfig().dynamicPort()));
6771

6872
@RegisterExtension
6973
static JamesServerExtension testExtension = new JamesServerBuilder<DistributedJamesConfiguration>(tmpDir ->
@@ -88,8 +92,8 @@ public class DistributedOpenpaasContactIndexingIntegrationTest extends ContactIn
8892
.extension(new ClockExtension())
8993
.server(configuration -> DistributedServer.createServer(configuration)
9094
.overrideWith(new LinagoraTestJMAPServerModule())
91-
.overrideWith(Modules.override(new OpenPaasModule(), new OpenPaasModule.CardDavModule())
92-
.with(new OpenPaasTestModule(openPaasServerExtension, Optional.of(cardDavServerExtension.getCardDavConfiguration()), Optional.empty()))))
95+
.overrideWith(Modules.override(new OpenPaasModule(), new OpenPaasModule.DavModule())
96+
.with(new OpenPaasTestModule(openPaasServerExtension, Optional.of(davServerExtension.getCardDavConfiguration()), Optional.empty()))))
9397
.build();
9498

9599
@Disabled("This is responsibility of the OpenPaas server")
@@ -105,11 +109,11 @@ void contactIndexingTaskShouldCreateCardDavContact(GuiceJamesServer server) thro
105109

106110
// Set up the scenario for openpaas & carddav extensions
107111
String bobOpenPassUid = UUID.randomUUID().toString();
108-
String andreContactUid = CardDavCreationFactory.createContactUid(ANDRE.asMailAddress());
112+
String andreContactUid = CardDavUtils.createContactUid(ANDRE.asMailAddress());
109113

110114
openPaasServerExtension.setSearchEmailExist(BOB.asString(), bobOpenPassUid);
111-
cardDavServerExtension.setCollectedContactExists(BOB.asString(), bobOpenPassUid, andreContactUid, false);
112-
cardDavServerExtension.setCreateCollectedContact(BOB.asString(), bobOpenPassUid, andreContactUid);
115+
davServerExtension.setCollectedContactExists(BOB.asString(), bobOpenPassUid, andreContactUid, false);
116+
davServerExtension.setCreateCollectedContact(BOB.asString(), bobOpenPassUid, andreContactUid);
113117

114118
// Verify that the andre contact is not indexed
115119
given(jmapSpec)
@@ -152,6 +156,6 @@ void contactIndexingTaskShouldCreateCardDavContact(GuiceJamesServer server) thro
152156
.body("additionalInformation.failedUsers", empty());
153157

154158
// Verify that the andre contact was created in carddav
155-
cardDavServerExtension.assertCreateCollectedContactWasCalled(BOB.asString(), bobOpenPassUid, andreContactUid, 1);
159+
davServerExtension.assertCreateCollectedContactWasCalled(BOB.asString(), bobOpenPassUid, andreContactUid, 1);
156160
}
157161
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,12 @@
3434
import com.google.inject.Provides;
3535
import com.google.inject.Scopes;
3636
import com.linagora.tmail.api.OpenPaasRestClient;
37-
import com.linagora.tmail.carddav.CardDavAddContactProcessor;
3837
import com.linagora.tmail.configuration.OpenPaasConfiguration;
38+
import com.linagora.tmail.dav.CardDavAddContactProcessor;
3939
import com.linagora.tmail.dav.DavClient;
4040
import com.linagora.tmail.james.jmap.contact.ContactAddIndexingProcessor;
4141

42+
4243
public class OpenPaasModule extends AbstractModule {
4344
private static final Logger LOGGER = LoggerFactory.getLogger(OpenPaasModule.class);
4445
public static final String OPENPAAS_INJECTION_KEY = "openpaas";

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

Lines changed: 5 additions & 4 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.util.Optional;
2222
import java.util.concurrent.TimeUnit;
@@ -34,6 +34,7 @@
3434
import com.github.benmanes.caffeine.cache.AsyncLoadingCache;
3535
import com.github.benmanes.caffeine.cache.Caffeine;
3636
import com.linagora.tmail.api.OpenPaasRestClient;
37+
import com.linagora.tmail.dav.request.CardDavCreationObjectRequest;
3738
import com.linagora.tmail.james.jmap.contact.ContactAddIndexingProcessor;
3839
import com.linagora.tmail.james.jmap.contact.ContactFields;
3940

@@ -44,12 +45,12 @@ public class CardDavAddContactProcessor implements ContactAddIndexingProcessor {
4445

4546
private static final Logger LOGGER = LoggerFactory.getLogger(CardDavAddContactProcessor.class);
4647

47-
private final CardDavClient cardDavClient;
48+
private final DavClient cardDavClient;
4849
private final AsyncLoadingCache<Username, String> openPassUserIdLoader;
4950

5051
@Inject
5152
@Singleton
52-
public CardDavAddContactProcessor(CardDavClient cardDavClient,
53+
public CardDavAddContactProcessor(DavClient cardDavClient,
5354
OpenPaasRestClient openPaasRestClient) {
5455
this.cardDavClient = cardDavClient;
5556

@@ -67,7 +68,7 @@ public CardDavAddContactProcessor(CardDavClient cardDavClient,
6768
public Publisher<Void> process(Username username, ContactFields contactFields) {
6869
return Mono.fromFuture(openPassUserIdLoader.get(username))
6970
.flatMap(openPassUserId -> {
70-
CardDavCreationObjectRequest cardDavCreationObjectRequest = CardDavCreationFactory.create(Optional.of(contactFields.fullName()), contactFields.address());
71+
CardDavCreationObjectRequest cardDavCreationObjectRequest = CardDavUtils.createObjectCreationRequest(Optional.of(contactFields.fullName()), contactFields.address());
7172
return cardDavClient.existsCollectedContact(username.asString(), openPassUserId, cardDavCreationObjectRequest.uid())
7273
.filter(FunctionalUtils.identityPredicate().negate())
7374
.flatMap(exists -> cardDavClient.createCollectedContact(username.asString(), openPassUserId, cardDavCreationObjectRequest))

‎tmail-backend/tmail-third-party/openpaas/src/test/java/com/linagora/tmail/OpenPaasTestModule.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@
2424
import com.google.inject.Provides;
2525
import com.google.inject.Singleton;
2626
import com.linagora.tmail.api.OpenPaasServerExtension;
27-
import com.linagora.tmail.configuration.CardDavConfiguration;
27+
import com.linagora.tmail.configuration.DavConfiguration;
2828
import com.linagora.tmail.configuration.OpenPaasConfiguration;
2929

3030
public class OpenPaasTestModule extends AbstractModule {
3131

3232
private final OpenPaasServerExtension openPaasServerExtension;
33-
private final Optional<CardDavConfiguration> cardDavConfiguration;
33+
private final Optional<DavConfiguration> cardDavConfiguration;
3434
private final Optional<OpenPaasConfiguration.ContactConsumerConfiguration> contactConsumerConfiguration;
3535

3636
public OpenPaasTestModule(OpenPaasServerExtension openPaasServerExtension,
37-
Optional<CardDavConfiguration> cardDavConfiguration,
37+
Optional<DavConfiguration> cardDavConfiguration,
3838
Optional<OpenPaasConfiguration.ContactConsumerConfiguration> contactConsumerConfiguration) {
3939
this.openPaasServerExtension = openPaasServerExtension;
4040
this.cardDavConfiguration = cardDavConfiguration;

0 commit comments

Comments
 (0)