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:23 UTC
[15/17] james-project git commit: JAMES-2637 return streams for
getSourcesForType and getMappingsForType methods
JAMES-2637 return streams for getSourcesForType and getMappingsForType methods
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/dcb093e5
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/dcb093e5
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/dcb093e5
Branch: refs/heads/master
Commit: dcb093e5a39aad79377a608d0443f72202befa0e
Parents: 03ee195
Author: Rene Cordier <rc...@linagora.com>
Authored: Tue Jan 15 15:50:52 2019 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Wed Jan 16 13:48:57 2019 +0700
----------------------------------------------------------------------
.../java/org/apache/james/rrt/api/RecipientRewriteTable.java | 5 ++---
.../java/org/apache/james/webadmin/routes/ForwardRoutes.java | 2 +-
.../java/org/apache/james/webadmin/routes/GroupsRoutes.java | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/dcb093e5/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTable.java
----------------------------------------------------------------------
diff --git a/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTable.java b/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTable.java
index 3a15f72..ec0b363 100644
--- a/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTable.java
+++ b/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTable.java
@@ -126,13 +126,12 @@ public interface RecipientRewriteTable {
.collect(Guavate.toImmutableList());
}
- default List<MappingSource> getSourcesForType(Mapping.Type type) throws RecipientRewriteTableException {
+ default Stream<MappingSource> getSourcesForType(Mapping.Type type) throws RecipientRewriteTableException {
return getAllMappings()
.entrySet().stream()
.filter(e -> e.getValue().contains(type))
.map(Map.Entry::getKey)
- .sorted(Comparator.comparing(MappingSource::asMailAddressString))
- .collect(Guavate.toImmutableList());
+ .sorted(Comparator.comparing(MappingSource::asMailAddressString));
}
default Stream<Mapping> getMappingsForType(Mapping.Type type) throws RecipientRewriteTableException {
http://git-wip-us.apache.org/repos/asf/james-project/blob/dcb093e5/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/ForwardRoutes.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/ForwardRoutes.java b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/ForwardRoutes.java
index 5484f58..85d6142 100644
--- a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/ForwardRoutes.java
+++ b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/ForwardRoutes.java
@@ -124,7 +124,7 @@ public class ForwardRoutes implements Routes {
message = "Internal server error - Something went bad on the server side.")
})
public List<MappingSource> listForwards(Request request, Response response) throws RecipientRewriteTableException {
- return recipientRewriteTable.getSourcesForType(Mapping.Type.Forward);
+ return recipientRewriteTable.getSourcesForType(Mapping.Type.Forward).collect(Guavate.toImmutableList());
}
@PUT
http://git-wip-us.apache.org/repos/asf/james-project/blob/dcb093e5/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/GroupsRoutes.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/GroupsRoutes.java b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/GroupsRoutes.java
index f191b31..fdb471b 100644
--- a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/GroupsRoutes.java
+++ b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/GroupsRoutes.java
@@ -121,7 +121,7 @@ public class GroupsRoutes implements Routes {
message = "Internal server error - Something went bad on the server side.")
})
public List<MappingSource> listGroups(Request request, Response response) throws RecipientRewriteTableException {
- return recipientRewriteTable.getSourcesForType(Mapping.Type.Group);
+ return recipientRewriteTable.getSourcesForType(Mapping.Type.Group).collect(Guavate.toImmutableList());
}
@PUT
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org