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 2019/01/16 06:59:17 UTC
[09/17] james-project git commit: JAMES-2637 Strong typing for
AliasSourcesResponse
JAMES-2637 Strong typing for AliasSourcesResponse
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/03420dab
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/03420dab
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/03420dab
Branch: refs/heads/master
Commit: 03420dab14aedf1cca60d0dfc722401afecfed57
Parents: 92f44f2
Author: Rene Cordier <rc...@linagora.com>
Authored: Tue Jan 15 14:57:40 2019 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Wed Jan 16 13:48:56 2019 +0700
----------------------------------------------------------------------
.../org/apache/james/webadmin/dto/AliasSourcesResponse.java | 8 +++++---
.../java/org/apache/james/webadmin/routes/AliasRoutes.java | 3 +--
.../org/apache/james/webadmin/routes/AliasRoutesTest.java | 4 +++-
3 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/03420dab/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/dto/AliasSourcesResponse.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/dto/AliasSourcesResponse.java b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/dto/AliasSourcesResponse.java
index a57988b..09e6515 100644
--- a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/dto/AliasSourcesResponse.java
+++ b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/dto/AliasSourcesResponse.java
@@ -19,14 +19,16 @@
package org.apache.james.webadmin.dto;
+import org.apache.james.rrt.lib.MappingSource;
+
public class AliasSourcesResponse {
- private final String source;
+ private final MappingSource source;
- public AliasSourcesResponse(String source) {
+ public AliasSourcesResponse(MappingSource source) {
this.source = source;
}
- public String getSource() {
+ public MappingSource getSource() {
return source;
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/03420dab/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/AliasRoutes.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/AliasRoutes.java b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/AliasRoutes.java
index f039559..e88febf 100644
--- a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/AliasRoutes.java
+++ b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/AliasRoutes.java
@@ -227,8 +227,7 @@ public class AliasRoutes implements Routes {
.entrySet().stream()
.filter(e -> e.getValue().contains(Mapping.alias(baseAddress.asString())))
.map(Map.Entry::getKey)
- .map(MappingSource::asMailAddressString)
- .sorted()
+ .sorted(Comparator.comparing(MappingSource::asMailAddressString))
.map(AliasSourcesResponse::new)
.collect(Guavate.toImmutableSet());
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/03420dab/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java
index af6e4e1..3142b8d 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java
@@ -37,6 +37,7 @@ import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.memory.MemoryUsersRepository;
import org.apache.james.webadmin.WebAdminServer;
import org.apache.james.webadmin.WebAdminUtils;
+import org.apache.james.webadmin.dto.MappingSourceModule;
import org.apache.james.webadmin.utils.JsonTransformer;
import org.eclipse.jetty.http.HttpStatus;
import org.junit.jupiter.api.AfterEach;
@@ -113,6 +114,7 @@ class AliasRoutesTest {
.autoDetect(false)
.autoDetectIp(false));
domainList.addDomain(DOMAIN);
+ MappingSourceModule module = new MappingSourceModule();
usersRepository = MemoryUsersRepository.withVirtualHosting();
usersRepository.setDomainList(domainList);
@@ -122,7 +124,7 @@ class AliasRoutesTest {
usersRepository.addUser(BOB_WITH_SLASH, BOB_WITH_SLASH_PASSWORD);
usersRepository.addUser(ALICE, ALICE_PASSWORD);
- createServer(new AliasRoutes(memoryRecipientRewriteTable, usersRepository, new JsonTransformer()));
+ createServer(new AliasRoutes(memoryRecipientRewriteTable, usersRepository, new JsonTransformer(module)));
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org