JAMES-2428 Removing a not necessary collect step when creating DLP dto
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/01160d0e Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/01160d0e Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/01160d0e Branch: refs/heads/master Commit: 01160d0e1713b8a3e6ea0cedd21da2d496ce63f2 Parents: f7dcd55 Author: Benoit Tellier <[email protected]> Authored: Fri Aug 31 10:40:26 2018 +0700 Committer: Antoine Duprat <[email protected]> Committed: Thu Sep 6 09:49:34 2018 +0200 ---------------------------------------------------------------------- .../apache/james/webadmin/dto/DLPConfigurationDTO.java | 10 ++++------ .../james/webadmin/routes/DLPConfigurationRoutes.java | 8 ++------ 2 files changed, 6 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/01160d0e/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/dto/DLPConfigurationDTO.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/dto/DLPConfigurationDTO.java b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/dto/DLPConfigurationDTO.java index 5849f71..913ccea 100644 --- a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/dto/DLPConfigurationDTO.java +++ b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/dto/DLPConfigurationDTO.java @@ -20,6 +20,7 @@ package org.apache.james.webadmin.dto; import java.util.List; +import java.util.stream.Stream; import org.apache.james.dlp.api.DLPConfigurationItem; @@ -32,13 +33,11 @@ import com.google.common.collect.ImmutableList; public class DLPConfigurationDTO { - public static DLPConfigurationDTO toDTO(List<DLPConfigurationItem> dlpConfigurations) { + public static DLPConfigurationDTO toDTO(Stream<DLPConfigurationItem> dlpConfigurations) { Preconditions.checkNotNull(dlpConfigurations); return new DLPConfigurationDTO( - dlpConfigurations - .stream() - .map(DLPConfigurationItemDTO::toDTO) + dlpConfigurations.map(DLPConfigurationItemDTO::toDTO) .collect(Guavate.toImmutableList())); } @@ -56,8 +55,7 @@ public class DLPConfigurationDTO { @JsonIgnore public List<DLPConfigurationItem> toDLPConfigurations() { - return rules - .stream() + return rules.stream() .map(DLPConfigurationItemDTO::toDLPConfiguration) .collect(Guavate.toImmutableList()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/01160d0e/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/DLPConfigurationRoutes.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/DLPConfigurationRoutes.java b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/DLPConfigurationRoutes.java index 9da61f0..cd78646 100644 --- a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/DLPConfigurationRoutes.java +++ b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/DLPConfigurationRoutes.java @@ -24,7 +24,7 @@ import static org.apache.james.webadmin.Constants.EMPTY_BODY; import static org.apache.james.webadmin.Constants.JSON_CONTENT_TYPE; import static org.apache.james.webadmin.Constants.SEPARATOR; -import java.util.List; +import java.util.stream.Stream; import javax.inject.Inject; import javax.ws.rs.DELETE; @@ -48,8 +48,6 @@ import org.apache.james.webadmin.utils.JsonExtractor; import org.apache.james.webadmin.utils.JsonTransformer; import org.eclipse.jetty.http.HttpStatus; -import com.github.steveash.guavate.Guavate; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -155,9 +153,7 @@ public class DLPConfigurationRoutes implements Routes { public void defineList(Service service) { service.get(SPECIFIC_DLP_RULE_DOMAIN, (request, response) -> { Domain senderDomain = parseDomain(request); - List<DLPConfigurationItem> dlpConfigurations = dlpConfigurationStore - .list(senderDomain) - .collect(Guavate.toImmutableList()); + Stream<DLPConfigurationItem> dlpConfigurations = dlpConfigurationStore.list(senderDomain); DLPConfigurationDTO dto = DLPConfigurationDTO.toDTO(dlpConfigurations); response.status(HttpStatus.OK_200); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
