[ISSUE-1462] Fix wiremock/mockserver clash

Remove uncalled constructors in Dav exceptions

Remove unneeded dependency

Polish DavClient

 - Line break management
 - Avoid a bit code duplication
 - Use specialized UnaryOperator
 - static and final where possible

Fix wiremock tests

Drop unused test method

Simplify DavServerExtension

Drop mockserver

Fix broken tests after dropping mockserver

tmail-openpaas: Drop scala as it is no longer needed

Remove mockserver from third-party/openpaas maven module

Because it clashes with wiremock, which is needed for custom HTTP methods.
Dependency clash will not be manageable on the long run.

Co-authored-by: Benoit Tellier <[email protected]>

Author: HoussemNasri

tmail-backend/apps/distributed/pom.xml

@@ -390,8 +390,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.mock-server</groupId>
-            <artifactId>mockserver-netty</artifactId>
+            <groupId>org.wiremock</groupId>
+            <artifactId>wiremock-standalone</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

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

@@ -18,7 +18,6 @@
 
 package com.linagora.tmail.james.app;
 
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
 import static com.linagora.tmail.OpenPaasModuleChooserConfiguration.ENABLED;
 import static com.linagora.tmail.OpenPaasModuleChooserConfiguration.ENABLE_DAV;
 import static com.linagora.tmail.OpenPaasModuleChooserConfiguration.ENABLE_CONTACTS_CONSUMER;
@@ -40,23 +39,22 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import com.github.fge.lambdas.Throwing;
-import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
 import com.google.common.collect.ImmutableList;
 import com.google.inject.multibindings.Multibinder;
 import com.linagora.tmail.AmqpUri;
 import com.linagora.tmail.OpenPaasModuleChooserConfiguration;
 import com.linagora.tmail.OpenPaasTestModule;
 import com.linagora.tmail.UsersRepositoryModuleChooser;
-import com.linagora.tmail.api.OpenPaasServerExtension;
 import com.linagora.tmail.combined.identity.LdapExtension;
 import com.linagora.tmail.combined.identity.UsersRepositoryClassProbe;
 import com.linagora.tmail.configuration.OpenPaasConfiguration;
 import com.linagora.tmail.dav.DavServerExtension;
+import com.linagora.tmail.dav.WireMockOpenPaaSServerExtension;
 
 public class DistributedServerWithOpenPaasConfiguredTest {
 
     @RegisterExtension
-    static OpenPaasServerExtension openPaasServerExtension = new OpenPaasServerExtension();
+    static WireMockOpenPaaSServerExtension openPaasServerExtension = new WireMockOpenPaaSServerExtension();
 
     @RegisterExtension
     static RabbitMQExtension rabbitMQExtension = new RabbitMQExtension();
@@ -100,9 +98,7 @@ void serverShouldStart(GuiceJamesServer server) {
     class DavConfigured {
         @RegisterExtension
         @Order(1)
-        static DavServerExtension davServerExtension = new DavServerExtension(
-            WireMockExtension.extensionOptions()
-                .options(wireMockConfig().dynamicPort()));
+        static DavServerExtension davServerExtension = new DavServerExtension();
 
         @Order(2)
         @RegisterExtension

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

@@ -57,10 +57,10 @@
 import com.linagora.tmail.OpenPaasModule;
 import com.linagora.tmail.OpenPaasTestModule;
 import com.linagora.tmail.ScheduledReconnectionHandler;
-import com.linagora.tmail.api.OpenPaasServerExtension;
 import com.linagora.tmail.blob.guice.BlobStoreConfiguration;
 import com.linagora.tmail.combined.identity.UsersRepositoryClassProbe;
 import com.linagora.tmail.configuration.OpenPaasConfiguration;
+import com.linagora.tmail.dav.WireMockOpenPaaSServerExtension;
 import com.linagora.tmail.encrypted.MailboxConfiguration;
 import com.linagora.tmail.encrypted.MailboxManagerClassProbe;
 import com.linagora.tmail.module.LinagoraTestJMAPServerModule;
@@ -80,7 +80,7 @@ class SchedulerReconnectionHandlerIntegrationTest {
         .await();
 
     @RegisterExtension
-    static OpenPaasServerExtension openPaasServerExtension = new OpenPaasServerExtension();
+    static WireMockOpenPaaSServerExtension openPaasServerExtension = new WireMockOpenPaaSServerExtension();
 
     static Function<RabbitMQExtension, OpenPaasConfiguration.ContactConsumerConfiguration> contactConsumerConfigurationFunction = rabbitMQExtension -> new OpenPaasConfiguration.ContactConsumerConfiguration(
         ImmutableList.of(AmqpUri.from(Throwing.supplier(() -> rabbitMQExtension.dockerRabbitMQ().amqpUri()).get())),
@@ -242,7 +242,7 @@ private long consumerCount(DockerRabbitMQ dockerRabbitMQ, String queueName) {
         }
     }
 
-    private static Module getOpenPaasModule(OpenPaasServerExtension openPaasServerExtension, RabbitMQExtension rabbitMQExtension) {
+    private static Module getOpenPaasModule(WireMockOpenPaaSServerExtension openPaasServerExtension, RabbitMQExtension rabbitMQExtension) {
         return Modules.override(new OpenPaasModule(), new OpenPaasContactsConsumerModule())
             .with(new OpenPaasTestModule(openPaasServerExtension, Optional.empty(),
                 Optional.of(contactConsumerConfigurationFunction.apply(rabbitMQExtension))));

tmail-backend/apps/memory/pom.xml

@@ -137,6 +137,12 @@
             <groupId>${james.groupId}</groupId>
             <artifactId>jmap-rfc-8621-integration-tests-common</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mock-server</groupId>
+                    <artifactId>mockserver-netty</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>${james.groupId}</groupId>
@@ -187,6 +193,11 @@
             <groupId>com.linagora.tmail</groupId>
             <artifactId>logback-json-classic</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.wiremock</groupId>
+            <artifactId>wiremock-standalone</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -18,7 +18,6 @@
 
 package com.linagora.tmail.james.app;
 
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
 import static com.linagora.tmail.OpenPaasModuleChooserConfiguration.ENABLED;
 import static com.linagora.tmail.OpenPaasModuleChooserConfiguration.ENABLE_DAV;
 import static com.linagora.tmail.OpenPaasModuleChooserConfiguration.ENABLE_CONTACTS_CONSUMER;
@@ -39,23 +38,22 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import com.github.fge.lambdas.Throwing;
-import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
 import com.google.common.collect.ImmutableList;
 import com.google.inject.multibindings.Multibinder;
 import com.linagora.tmail.AmqpUri;
 import com.linagora.tmail.OpenPaasModuleChooserConfiguration;
 import com.linagora.tmail.OpenPaasTestModule;
-import com.linagora.tmail.api.OpenPaasServerExtension;
 import com.linagora.tmail.configuration.OpenPaasConfiguration;
 import com.linagora.tmail.dav.DavServerExtension;
+import com.linagora.tmail.dav.WireMockOpenPaaSServerExtension;
 import com.linagora.tmail.encrypted.MailboxConfiguration;
 import com.linagora.tmail.encrypted.MailboxManagerClassProbe;
 import com.linagora.tmail.module.LinagoraTestJMAPServerModule;
 
 class MemoryServerWithOpenPaasConfiguredTest {
 
     @RegisterExtension
-    static OpenPaasServerExtension openPaasServerExtension = new OpenPaasServerExtension();
+    static WireMockOpenPaaSServerExtension openPaasServerExtension = new WireMockOpenPaaSServerExtension();
 
     @RegisterExtension
     static RabbitMQExtension rabbitMQExtension = new RabbitMQExtension();
@@ -93,9 +91,7 @@ void serverShouldStart(GuiceJamesServer server) {
     @Nested
     class DavConfigured {
         @RegisterExtension
-        static DavServerExtension davServerExtension = new DavServerExtension(
-            WireMockExtension.extensionOptions()
-                .options(wireMockConfig().dynamicPort()));
+        static DavServerExtension davServerExtension = new DavServerExtension();
 
         @RegisterExtension
         static JamesServerExtension jamesServerExtension = new JamesServerBuilder<MemoryConfiguration>(tmpDir ->

tmail-backend/integration-tests/webadmin/distributed-webadmin-integration-tests/pom.xml

@@ -136,8 +136,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.mock-server</groupId>
-            <artifactId>mockserver-netty</artifactId>
+            <groupId>org.wiremock</groupId>
+            <artifactId>wiremock-standalone</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

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

@@ -18,7 +18,6 @@
 
 package com.linagora.tmail.integration.distributed;
 
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
 import static io.restassured.RestAssured.given;
 import static org.apache.james.jmap.JmapRFCCommonRequests.ACCEPT_JMAP_RFC_HEADER;
 import static org.hamcrest.Matchers.empty;
@@ -41,14 +40,13 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
 import com.google.inject.util.Modules;
 import com.linagora.tmail.OpenPaasModule;
 import com.linagora.tmail.OpenPaasTestModule;
-import com.linagora.tmail.api.OpenPaasServerExtension;
 import com.linagora.tmail.blob.guice.BlobStoreConfiguration;
 import com.linagora.tmail.dav.CardDavUtils;
 import com.linagora.tmail.dav.DavServerExtension;
+import com.linagora.tmail.dav.WireMockOpenPaaSServerExtension;
 import com.linagora.tmail.integration.ContactIndexingIntegrationContract;
 import com.linagora.tmail.james.app.CassandraExtension;
 import com.linagora.tmail.james.app.DistributedJamesConfiguration;
@@ -62,12 +60,10 @@
 public class DistributedOpenpaasContactIndexingIntegrationTest extends ContactIndexingIntegrationContract {
 
     @RegisterExtension
-    static OpenPaasServerExtension openPaasServerExtension = new OpenPaasServerExtension();
+    static WireMockOpenPaaSServerExtension openPaasServerExtension = new WireMockOpenPaaSServerExtension();
 
     @RegisterExtension
-    static DavServerExtension davServerExtension = new DavServerExtension(
-        WireMockExtension.extensionOptions()
-            .options(wireMockConfig().dynamicPort()));
+    static DavServerExtension davServerExtension = new DavServerExtension();
 
     @RegisterExtension
     static JamesServerExtension testExtension = new JamesServerBuilder<DistributedJamesConfiguration>(tmpDir ->

tmail-backend/pom.xml

@@ -424,6 +424,11 @@
                 <artifactId>icu4j</artifactId>
                 <version>75.1</version>
             </dependency>
+            <dependency>
+                <groupId>org.wiremock</groupId>
+                <artifactId>wiremock-standalone</artifactId>
+                <version>3.10.0</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

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

@@ -85,11 +85,6 @@
             <groupId>io.projectreactor.netty</groupId>
             <artifactId>reactor-netty</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.mock-server</groupId>
-            <artifactId>mockserver-netty</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>net.javacrumbs.json-unit</groupId>
             <artifactId>json-unit-assertj</artifactId>
@@ -102,23 +97,12 @@
         <dependency>
             <groupId>org.wiremock</groupId>
             <artifactId>wiremock-standalone</artifactId>
-            <version>3.10.0</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>net.alchim31.maven</groupId>
-                <artifactId>scala-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>io.github.evis</groupId>
-                <artifactId>scalafix-maven-plugin_2.13</artifactId>
-                <configuration>
-                    <config>${project.parent.parent.parent.basedir}/.scalafix.conf</config>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>