JAMES-2107 finally remove usage of com.sun.* packages
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/e71db878 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/e71db878 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/e71db878 Branch: refs/heads/master Commit: e71db87813c6d05a55b6943ffc02590dde15f2cd Parents: 8d35995 Author: Matthieu Baechler <matth...@apache.org> Authored: Wed Aug 16 17:52:34 2017 +0200 Committer: benwa <btell...@linagora.com> Committed: Fri Aug 18 09:47:47 2017 +0700 ---------------------------------------------------------------------- server/container/core/pom.xml | 5 +++ server/container/filesystem-api/pom.xml | 5 +++ .../filesystem/api/AbstractFileSystemTest.java | 38 ++++++-------------- server/container/spring/pom.xml | 7 +++- server/pom.xml | 12 ++++++- .../integration/cucumber/UploadStepdefs.java | 12 ++++++- server/protocols/webadmin/webadmin-core/pom.xml | 1 - 7 files changed, 48 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/e71db878/server/container/core/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/core/pom.xml b/server/container/core/pom.xml index a0b315e..636a30b 100644 --- a/server/container/core/pom.xml +++ b/server/container/core/pom.xml @@ -66,6 +66,11 @@ <artifactId>guava</artifactId> </dependency> <dependency> + <groupId>com.sparkjava</groupId> + <artifactId>spark-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/e71db878/server/container/filesystem-api/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/filesystem-api/pom.xml b/server/container/filesystem-api/pom.xml index 9d69a2f..528d51c 100644 --- a/server/container/filesystem-api/pom.xml +++ b/server/container/filesystem-api/pom.xml @@ -34,6 +34,11 @@ <dependencies> <dependency> + <groupId>com.sparkjava</groupId> + <artifactId>spark-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/e71db878/server/container/filesystem-api/src/test/java/org/apache/james/filesystem/api/AbstractFileSystemTest.java ---------------------------------------------------------------------- diff --git a/server/container/filesystem-api/src/test/java/org/apache/james/filesystem/api/AbstractFileSystemTest.java b/server/container/filesystem-api/src/test/java/org/apache/james/filesystem/api/AbstractFileSystemTest.java index fe8e274..5dc5cf4 100644 --- a/server/container/filesystem-api/src/test/java/org/apache/james/filesystem/api/AbstractFileSystemTest.java +++ b/server/container/filesystem-api/src/test/java/org/apache/james/filesystem/api/AbstractFileSystemTest.java @@ -25,8 +25,6 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; -import java.io.OutputStream; -import java.net.InetSocketAddress; import org.apache.commons.io.Charsets; import org.apache.commons.io.FileUtils; @@ -38,15 +36,15 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; -import com.sun.net.httpserver.HttpExchange; -import com.sun.net.httpserver.HttpHandler; -import com.sun.net.httpserver.HttpServer; - import junitparams.JUnitParamsRunner; import junitparams.Parameters; +import spark.Request; +import spark.Response; +import spark.Service; @RunWith(JUnitParamsRunner.class) public abstract class AbstractFileSystemTest { + private static final int RANDOM_PORT = 0; private static final String FAKE_DIRECTORY = "b7b73e3a-5234-11e5-87f2-9b171f273b49/"; private static final String FAKE_FILE = "d9091ae6-521f-11e5-b666-bb11fef67c2a"; private static final String EXISTING_CLASSPATH_FILE = "classpathTest.txt"; @@ -56,16 +54,16 @@ public abstract class AbstractFileSystemTest { protected FileSystem fileSystem; - private HttpServer httpServer; + private Service httpServer; private File rootDirectory; protected abstract FileSystem buildFileSystem(String configurationRootDirectory); @Before public void setUp() throws Exception { - httpServer = HttpServer.create(new InetSocketAddress("localhost", 0), 0); - httpServer.createContext("/", new SlashHandler()); - httpServer.start(); + httpServer = Service.ignite().port(RANDOM_PORT); + httpServer.get("/", (Request request, Response response) -> "content"); + httpServer.awaitInitialization(); rootDirectory = tmpFolder.getRoot(); createSubFolderWithAFileIn("conf", "conf.txt", "confcontent"); @@ -83,23 +81,7 @@ public abstract class AbstractFileSystemTest { @After public void tearDown() throws Exception { - httpServer.stop(0); - } - - private static class SlashHandler implements HttpHandler { - - @Override - public void handle(HttpExchange exchange) throws IOException { - if (exchange.getRequestURI().getPath().equals("/")) { - String response = "content"; - exchange.sendResponseHeaders(200, response.length()); - OutputStream responseBody = exchange.getResponseBody(); - responseBody.write(response.getBytes()); - responseBody.close(); - } else { - exchange.sendResponseHeaders(404, 0); - } - } + httpServer.stop(); } @Test @@ -213,7 +195,7 @@ public abstract class AbstractFileSystemTest { } private String replacePort(String url) { - return url.replace("$PORT$", String.valueOf(httpServer.getAddress().getPort())); + return url.replace("$PORT$", String.valueOf(httpServer.port())); } public static class FileToCreateProvider { http://git-wip-us.apache.org/repos/asf/james-project/blob/e71db878/server/container/spring/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/spring/pom.xml b/server/container/spring/pom.xml index 1be665a..995b481 100644 --- a/server/container/spring/pom.xml +++ b/server/container/spring/pom.xml @@ -143,10 +143,15 @@ </dependency> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> <scope>provided</scope> </dependency> <dependency> + <groupId>com.sparkjava</groupId> + <artifactId>spark-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>commons-configuration</groupId> <artifactId>commons-configuration</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/e71db878/server/pom.xml ---------------------------------------------------------------------- diff --git a/server/pom.xml b/server/pom.xml index 5bc1db0..f4d8df4 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -180,7 +180,7 @@ <pax-logging-api.version>1.6.4</pax-logging-api.version> <mockito-core.version>1.9.0</mockito-core.version> <jackson-data.version>2.6.3</jackson-data.version> - <jetty.version>9.3.5.v20151012</jetty.version> + <jetty.version>9.4.4.v20170414</jetty.version> <cassandra-unit.version>2.1.9.2</cassandra-unit.version> <assertj-guava.version>3.1.0</assertj-guava.version> <testcontainers-version>1.3.1</testcontainers-version> @@ -1096,6 +1096,11 @@ <version>${servlet-api.version}</version> </dependency> <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>3.1.0</version> + </dependency> + <dependency> <groupId>commons-pool</groupId> <artifactId>commons-pool</artifactId> <version>${commons-pool.version}</version> @@ -1630,6 +1635,11 @@ <version>2.6.0</version> </dependency> <dependency> + <groupId>com.sparkjava</groupId> + <artifactId>spark-core</artifactId> + <version>2.6.0</version> + </dependency> + <dependency> <groupId>io.jsonwebtoken</groupId> <artifactId>jjwt</artifactId> <version>0.6.0</version> http://git-wip-us.apache.org/repos/asf/james-project/blob/e71db878/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java index 4c7d8a5..9ab258b 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java @@ -24,11 +24,13 @@ import static org.assertj.core.api.Assertions.assertThat; import java.io.BufferedInputStream; import java.net.URI; import java.net.URISyntaxException; +import java.util.Locale; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Future; import javax.inject.Inject; +import com.google.common.base.CharMatcher; import org.apache.http.Header; import org.apache.http.HttpResponse; import org.apache.http.client.fluent.Async; @@ -175,13 +177,21 @@ public class UploadStepdefs { @Then("^the user should receive a specified JSON content$") public void jsonResponse() throws Exception { - assertThat(response.getHeaders("Content-Type")).extracting(Header::getValue).containsExactly(org.apache.http.entity.ContentType.APPLICATION_JSON.toString()); + assertThat(response.getHeaders("Content-Type")) + .extracting(header -> + normalizeContentType(header.getValue())) + .containsExactly( + normalizeContentType(org.apache.http.entity.ContentType.APPLICATION_JSON.toString())); DocumentContext jsonPath = JsonPath.parse(response.getEntity().getContent()); assertThat(jsonPath.<String>read("blobId")).isEqualTo(_1M_ZEROED_FILE_BLOB_ID); assertThat(jsonPath.<String>read("type")).isEqualTo("application/octet-stream"); assertThat(jsonPath.<Integer>read("size")).isEqualTo(_1M); } + private String normalizeContentType(String input) { + return CharMatcher.WHITESPACE.removeFrom(input.toLowerCase(Locale.US)); + } + @Then("^\"([^\"]*)\" should be able to retrieve the content$") public void contentShouldBeRetrievable(String username) throws Exception { AccessToken accessToken = userStepdefs.tokenByUser.get(username); http://git-wip-us.apache.org/repos/asf/james-project/blob/e71db878/server/protocols/webadmin/webadmin-core/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-core/pom.xml b/server/protocols/webadmin/webadmin-core/pom.xml index 4537708..80a9c7f 100644 --- a/server/protocols/webadmin/webadmin-core/pom.xml +++ b/server/protocols/webadmin/webadmin-core/pom.xml @@ -73,7 +73,6 @@ <dependency> <groupId>com.sparkjava</groupId> <artifactId>spark-core</artifactId> - <version>2.5.5</version> </dependency> <dependency> <groupId>io.swagger</groupId> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org