You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2017/09/11 02:36:47 UTC
[03/23] james-project git commit: JAMES-2138 upgrade some code to
java-8 style
JAMES-2138 upgrade some code to java-8 style
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/73b650ed
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/73b650ed
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/73b650ed
Branch: refs/heads/master
Commit: 73b650ed781e41dfba622fab4071af59956ad1c4
Parents: 2c411e8
Author: Matthieu Baechler <ma...@apache.org>
Authored: Mon Sep 4 10:01:38 2017 +0200
Committer: benwa <bt...@linagora.com>
Committed: Sat Sep 9 10:40:29 2017 +0700
----------------------------------------------------------------------
.../apache/james/webadmin/routes/CORSRoute.java | 17 +++++++++--------
.../james/webadmin/routes/DomainRoutesTest.java | 5 ++---
.../james/webadmin/routes/UsersRoutesTest.java | 6 +++---
3 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/73b650ed/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/routes/CORSRoute.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/routes/CORSRoute.java b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/routes/CORSRoute.java
index 39e9bd7..e966667 100644
--- a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/routes/CORSRoute.java
+++ b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/routes/CORSRoute.java
@@ -19,6 +19,8 @@
package org.apache.james.webadmin.routes;
+import java.util.Optional;
+
import org.apache.james.webadmin.Routes;
import spark.Service;
@@ -28,14 +30,13 @@ public class CORSRoute implements Routes {
@Override
public void define(Service service) {
service.options("/*", (request, response) -> {
- String accessControlRequestHeaders = request.headers("Access-Control-Request-Headers");
- if (accessControlRequestHeaders != null) {
- response.header("Access-Control-Allow-Headers", accessControlRequestHeaders);
- }
- String accessControlRequestMethod = request.headers("Access-Control-Request-Method");
- if (accessControlRequestMethod != null) {
- response.header("Access-Control-Allow-Methods", accessControlRequestMethod);
- }
+
+ Optional.ofNullable(request.headers("Access-Control-Request-Headers"))
+ .ifPresent(header -> response.header("Access-Control-Allow-Headers", header));
+
+ Optional.ofNullable(request.headers("Access-Control-Request-Method"))
+ .ifPresent(header -> response.header("Access-Control-Allow-Methods", header));
+
return "";
});
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/73b650ed/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainRoutesTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainRoutesTest.java
index 511638a..f17acd3 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainRoutesTest.java
@@ -34,6 +34,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.net.InetAddress;
+import java.nio.charset.StandardCharsets;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.domainlist.api.DomainList;
@@ -47,11 +48,9 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import com.google.common.base.Charsets;
import com.jayway.restassured.RestAssured;
import com.jayway.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.http.ContentType;
-
import de.bechte.junit.runners.context.HierarchicalContextRunner;
@RunWith(HierarchicalContextRunner.class)
@@ -70,7 +69,7 @@ public class DomainRoutesTest {
RestAssured.requestSpecification = new RequestSpecBuilder()
.setContentType(ContentType.JSON)
.setAccept(ContentType.JSON)
- .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(Charsets.UTF_8)))
+ .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
.setPort(webAdminServer.getPort().toInt())
.setBasePath(DomainRoutes.DOMAINS)
.build();
http://git-wip-us.apache.org/repos/asf/james-project/blob/73b650ed/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 684ea9b..cba4019 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
@@ -32,6 +32,8 @@ import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import java.nio.charset.StandardCharsets;
+
import org.apache.james.domainlist.api.DomainList;
import org.apache.james.metrics.logger.DefaultMetricFactory;
import org.apache.james.user.api.UsersRepository;
@@ -46,11 +48,9 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import com.google.common.base.Charsets;
import com.jayway.restassured.RestAssured;
import com.jayway.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.http.ContentType;
-
import de.bechte.junit.runners.context.HierarchicalContextRunner;
@RunWith(HierarchicalContextRunner.class)
@@ -70,7 +70,7 @@ public class UsersRoutesTest {
RestAssured.requestSpecification = new RequestSpecBuilder()
.setContentType(ContentType.JSON)
.setAccept(ContentType.JSON)
- .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(Charsets.UTF_8)))
+ .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
.setPort(webAdminServer.getPort().toInt())
.setBasePath(UserRoutes.USERS)
.build();
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org