JAMES-2428 Removing a not necessary collect step when creating DLP dto

apache · Sep 6, 2018 · 01160d0 · 01160d0
1 parent f7dcd55
commit 01160d0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/...badmin/webadmin-data/src/main/java/org/apache/james/webadmin/dto/DLPConfigurationDTO.java b/...badmin/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 @@
 
 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 ImmutableList<DLPConfigurationItemDTO> getRules() {
 
     @JsonIgnore
     public List<DLPConfigurationItem> toDLPConfigurations() {
-        return rules
-            .stream()
+        return rules.stream()
             .map(DLPConfigurationItemDTO::toDLPConfiguration)
             .collect(Guavate.toImmutableList());
     }

diff --git a/.../webadmin-data/src/main/java/org/apache/james/webadmin/routes/DLPConfigurationRoutes.java b/.../webadmin-data/src/main/java/org/apache/james/webadmin/routes/DLPConfigurationRoutes.java
@@ -24,7 +24,7 @@
 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.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 void defineStore(Service service) {
     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);