JAMES-2293 Factorize webAdmin request specification definitions
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/3cdb5adf Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/3cdb5adf Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/3cdb5adf Branch: refs/heads/master Commit: 3cdb5adf9d5e337d7384c48f4190c17b165a21d7 Parents: 1ab371e Author: benwa <[email protected]> Authored: Mon Jan 22 14:48:37 2018 +0700 Committer: benwa <[email protected]> Committed: Thu Jan 25 11:39:06 2018 +0700 ---------------------------------------------------------------------- .../webadmin/routes/CassandraMigrationRoutesTest.java | 11 ++--------- .../java/org/apache/james/webadmin/WebAdminUtils.java | 14 ++++++++++++++ .../apache/james/webadmin/routes/TasksRoutesTest.java | 11 +---------- .../james/webadmin/routes/DomainsRoutesTest.java | 10 +--------- .../james/webadmin/routes/GroupsRoutesTest.java | 10 +--------- .../apache/james/webadmin/routes/UsersRoutesTest.java | 10 +--------- .../james/webadmin/routes/GlobalQuotaRoutesTest.java | 10 +--------- .../webadmin/routes/UserMailboxesRoutesTest.java | 10 +--------- .../webadmin/routes/MailRepositoriesRoutesTest.java | 10 +--------- 9 files changed, 23 insertions(+), 73 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/3cdb5adf/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java index d3b3046..7b145af 100644 --- a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java +++ b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java @@ -22,8 +22,6 @@ package org.apache.james.webadmin.routes; import static com.jayway.restassured.RestAssured.given; import static com.jayway.restassured.RestAssured.when; import static com.jayway.restassured.RestAssured.with; -import static com.jayway.restassured.config.EncoderConfig.encoderConfig; -import static com.jayway.restassured.config.RestAssuredConfig.newConfig; import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.is; @@ -35,7 +33,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import java.nio.charset.StandardCharsets; import java.util.Map; import java.util.Optional; import java.util.concurrent.CompletableFuture; @@ -58,7 +55,6 @@ import org.junit.Test; import com.google.common.collect.ImmutableMap; import com.jayway.restassured.RestAssured; -import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.http.ContentType; public class CassandraMigrationRoutesTest { @@ -91,12 +87,9 @@ public class CassandraMigrationRoutesTest { webAdminServer.configure(NO_CONFIGURATION); webAdminServer.await(); - RestAssured.requestSpecification = new RequestSpecBuilder() - .setContentType(ContentType.JSON) - .setAccept(ContentType.JSON) + + RestAssured.requestSpecification = WebAdminUtils.defineRequestSpecification(webAdminServer) .setBasePath(CassandraMigrationRoutes.VERSION_BASE) - .setPort(webAdminServer.getPort().get().getValue()) - .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8))) .build(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/3cdb5adf/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java index 89a5310..1d312a0 100644 --- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java +++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java @@ -19,12 +19,18 @@ package org.apache.james.webadmin; +import static com.jayway.restassured.config.EncoderConfig.encoderConfig; +import static com.jayway.restassured.config.RestAssuredConfig.newConfig; + import java.io.IOException; +import java.nio.charset.StandardCharsets; import org.apache.james.metrics.api.MetricFactory; import org.apache.james.webadmin.authentication.NoAuthenticationFilter; import com.google.common.collect.ImmutableSet; +import com.jayway.restassured.builder.RequestSpecBuilder; +import com.jayway.restassured.http.ContentType; public class WebAdminUtils { @@ -42,4 +48,12 @@ public class WebAdminUtils { metricFactory); } + public static RequestSpecBuilder defineRequestSpecification(WebAdminServer webAdminServer) { + return new RequestSpecBuilder() + .setContentType(ContentType.JSON) + .setAccept(ContentType.JSON) + .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8))) + .setPort(webAdminServer.getPort().get().getValue()); + } + } http://git-wip-us.apache.org/repos/asf/james-project/blob/3cdb5adf/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java index cc18b42..1c1ff85 100644 --- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java +++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java @@ -22,8 +22,6 @@ package org.apache.james.webadmin.routes; import static com.jayway.restassured.RestAssured.given; import static com.jayway.restassured.RestAssured.when; import static com.jayway.restassured.RestAssured.with; -import static com.jayway.restassured.config.EncoderConfig.encoderConfig; -import static com.jayway.restassured.config.RestAssuredConfig.newConfig; import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.hasSize; @@ -46,11 +44,8 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.google.common.base.Charsets; import com.google.common.base.Throwables; import com.jayway.restassured.RestAssured; -import com.jayway.restassured.builder.RequestSpecBuilder; -import com.jayway.restassured.http.ContentType; public class TasksRoutesTest { @@ -68,12 +63,8 @@ public class TasksRoutesTest { webAdminServer.configure(NO_CONFIGURATION); webAdminServer.await(); - RestAssured.requestSpecification = new RequestSpecBuilder() - .setContentType(ContentType.JSON) - .setAccept(ContentType.JSON) + RestAssured.requestSpecification = WebAdminUtils.defineRequestSpecification(webAdminServer) .setBasePath(TasksRoutes.BASE) - .setPort(webAdminServer.getPort().get().getValue()) - .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(Charsets.UTF_8))) .build(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/3cdb5adf/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java index 26dbf47..137a187 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java @@ -22,8 +22,6 @@ package org.apache.james.webadmin.routes; import static com.jayway.restassured.RestAssured.given; import static com.jayway.restassured.RestAssured.when; import static com.jayway.restassured.RestAssured.with; -import static com.jayway.restassured.config.EncoderConfig.encoderConfig; -import static com.jayway.restassured.config.RestAssuredConfig.newConfig; import static org.apache.james.webadmin.Constants.SEPARATOR; import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION; import static org.assertj.core.api.Assertions.assertThat; @@ -33,7 +31,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.net.InetAddress; -import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Map; @@ -52,7 +49,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import com.jayway.restassured.RestAssured; -import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.http.ContentType; import de.bechte.junit.runners.context.HierarchicalContextRunner; @@ -70,11 +66,7 @@ public class DomainsRoutesTest { webAdminServer.configure(NO_CONFIGURATION); webAdminServer.await(); - RestAssured.requestSpecification = new RequestSpecBuilder() - .setContentType(ContentType.JSON) - .setAccept(ContentType.JSON) - .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8))) - .setPort(webAdminServer.getPort().get().getValue()) + RestAssured.requestSpecification = WebAdminUtils.defineRequestSpecification(webAdminServer) .setBasePath(DomainsRoutes.DOMAINS) .build(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/3cdb5adf/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java index ccbe64a..1b6aa7e 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java @@ -21,8 +21,6 @@ package org.apache.james.webadmin.routes; import static com.jayway.restassured.RestAssured.given; import static com.jayway.restassured.RestAssured.when; -import static com.jayway.restassured.config.EncoderConfig.encoderConfig; -import static com.jayway.restassured.config.RestAssuredConfig.newConfig; import static org.apache.james.webadmin.Constants.SEPARATOR; import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION; import static org.assertj.core.api.Assertions.assertThat; @@ -32,7 +30,6 @@ import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; -import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Map; @@ -58,7 +55,6 @@ import org.junit.runner.RunWith; import org.mockito.Mockito; import com.jayway.restassured.RestAssured; -import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.filter.log.LogDetail; import com.jayway.restassured.http.ContentType; @@ -86,11 +82,7 @@ public class GroupsRoutesTest { webAdminServer.configure(NO_CONFIGURATION); webAdminServer.await(); - RestAssured.requestSpecification = new RequestSpecBuilder() - .setContentType(ContentType.JSON) - .setAccept(ContentType.JSON) - .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8))) - .setPort(webAdminServer.getPort().get().getValue()) + RestAssured.requestSpecification = WebAdminUtils.defineRequestSpecification(webAdminServer) .setBasePath(GroupsRoutes.ROOT_PATH) .log(LogDetail.ALL) .build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/3cdb5adf/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java index a3d1072..086d4c9 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java @@ -22,8 +22,6 @@ package org.apache.james.webadmin.routes; import static com.jayway.restassured.RestAssured.given; import static com.jayway.restassured.RestAssured.when; import static com.jayway.restassured.RestAssured.with; -import static com.jayway.restassured.config.EncoderConfig.encoderConfig; -import static com.jayway.restassured.config.RestAssuredConfig.newConfig; import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.any; @@ -31,7 +29,6 @@ import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Map; @@ -53,7 +50,6 @@ import org.junit.runner.RunWith; import com.google.common.collect.ImmutableMap; import com.jayway.restassured.RestAssured; -import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.http.ContentType; import de.bechte.junit.runners.context.HierarchicalContextRunner; @@ -72,11 +68,7 @@ public class UsersRoutesTest { webAdminServer.configure(NO_CONFIGURATION); webAdminServer.await(); - RestAssured.requestSpecification = new RequestSpecBuilder() - .setContentType(ContentType.JSON) - .setAccept(ContentType.JSON) - .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8))) - .setPort(webAdminServer.getPort().get().getValue()) + RestAssured.requestSpecification = WebAdminUtils.defineRequestSpecification(webAdminServer) .setBasePath(UserRoutes.USERS) .build(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/3cdb5adf/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java index 825e24a..45869fe 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java @@ -20,12 +20,9 @@ package org.apache.james.webadmin.routes; import static com.jayway.restassured.RestAssured.given; -import static com.jayway.restassured.config.EncoderConfig.encoderConfig; -import static com.jayway.restassured.config.RestAssuredConfig.newConfig; import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION; import static org.assertj.core.api.Assertions.assertThat; -import java.nio.charset.StandardCharsets; import java.util.Map; import org.apache.james.mailbox.inmemory.quota.InMemoryPerUserMaxQuotaManager; @@ -40,7 +37,6 @@ import org.junit.Before; import org.junit.Test; import com.jayway.restassured.RestAssured; -import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.http.ContentType; import com.jayway.restassured.path.json.JsonPath; @@ -58,11 +54,7 @@ public class GlobalQuotaRoutesTest { webAdminServer.configure(NO_CONFIGURATION); webAdminServer.await(); - RestAssured.requestSpecification = new RequestSpecBuilder() - .setContentType(ContentType.JSON) - .setAccept(ContentType.JSON) - .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8))) - .setPort(webAdminServer.getPort().get().getValue()) + RestAssured.requestSpecification = WebAdminUtils.defineRequestSpecification(webAdminServer) .build(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/3cdb5adf/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java index 4d7d166..ef8fccd 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java @@ -21,8 +21,6 @@ package org.apache.james.webadmin.routes; import static com.jayway.restassured.RestAssured.when; import static com.jayway.restassured.RestAssured.with; -import static com.jayway.restassured.config.EncoderConfig.encoderConfig; -import static com.jayway.restassured.config.RestAssuredConfig.newConfig; import static org.apache.james.webadmin.Constants.SEPARATOR; import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION; import static org.apache.james.webadmin.routes.UserMailboxesRoutes.USERS_BASE; @@ -34,7 +32,6 @@ import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Map; @@ -65,7 +62,6 @@ import org.junit.runner.RunWith; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.jayway.restassured.RestAssured; -import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.http.ContentType; import de.bechte.junit.runners.context.HierarchicalContextRunner; @@ -88,12 +84,8 @@ public class UserMailboxesRoutesTest { webAdminServer.configure(NO_CONFIGURATION); webAdminServer.await(); - RestAssured.requestSpecification = new RequestSpecBuilder() - .setContentType(ContentType.JSON) - .setAccept(ContentType.JSON) + RestAssured.requestSpecification = WebAdminUtils.defineRequestSpecification(webAdminServer) .setBasePath(USERS_BASE + SEPARATOR + USERNAME + SEPARATOR + UserMailboxesRoutes.MAILBOXES) - .setPort(webAdminServer.getPort().get().getValue()) - .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8))) .build(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/3cdb5adf/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java index 6829f22..6a616b6 100644 --- a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java @@ -22,8 +22,6 @@ package org.apache.james.webadmin.routes; import static com.jayway.restassured.RestAssured.given; import static com.jayway.restassured.RestAssured.when; import static com.jayway.restassured.RestAssured.with; -import static com.jayway.restassured.config.EncoderConfig.encoderConfig; -import static com.jayway.restassured.config.RestAssuredConfig.newConfig; import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.contains; @@ -37,7 +35,6 @@ import static org.hamcrest.Matchers.notNullValue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import java.nio.charset.StandardCharsets; import java.util.List; import org.apache.james.mailrepository.api.MailRepositoryStore; @@ -58,7 +55,6 @@ import org.junit.Test; import com.google.common.collect.ImmutableList; import com.jayway.restassured.RestAssured; -import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.http.ContentType; public class MailRepositoriesRoutesTest { @@ -85,12 +81,8 @@ public class MailRepositoriesRoutesTest { webAdminServer.configure(NO_CONFIGURATION); webAdminServer.await(); - RestAssured.requestSpecification = new RequestSpecBuilder() - .setContentType(ContentType.JSON) - .setAccept(ContentType.JSON) + RestAssured.requestSpecification = WebAdminUtils.defineRequestSpecification(webAdminServer) .setBasePath(MailRepositoriesRoutes.MAIL_REPOSITORIES) - .setPort(webAdminServer.getPort().get().getValue()) - .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8))) .build(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
