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/08/16 09:45:41 UTC
[08/18] james-project git commit: JAMES-2107 Run IntelliJ inspection:
"Simplify stream call chain"
JAMES-2107 Run IntelliJ inspection: "Simplify stream call chain"
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/94db8075
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/94db8075
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/94db8075
Branch: refs/heads/master
Commit: 94db8075ba8404e6de36bc5538a7fde690bda087
Parents: 03b574c
Author: benwa <bt...@linagora.com>
Authored: Wed Aug 2 09:27:15 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Aug 16 16:44:08 2017 +0700
----------------------------------------------------------------------
.../james/mailbox/cassandra/mail/FlagsExtractor.java | 2 --
.../cassandra/mail/CassandraUidProviderTest.java | 2 +-
.../org/apache/james/http/jetty/JettyHttpServer.java | 2 +-
.../apache/james/mailets/TemporaryFilesystemModule.java | 2 +-
.../integration/cucumber/GetMessagesMethodStepdefs.java | 1 -
.../main/java/org/apache/james/jmap/model/Message.java | 12 ++++--------
.../jmap/utils/SortingHierarchicalCollections.java | 2 +-
.../apache/james/jmap/utils/DependencyGraphTest.java | 2 +-
8 files changed, 9 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/94db8075/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/FlagsExtractor.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/FlagsExtractor.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/FlagsExtractor.java
index d1b33b5..873e438 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/FlagsExtractor.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/FlagsExtractor.java
@@ -40,7 +40,6 @@ public class FlagsExtractor {
}
}
row.getSet(Flag.USER_FLAGS, String.class)
- .stream()
.forEach(flags::add);
return flags;
}
@@ -48,7 +47,6 @@ public class FlagsExtractor {
public Flags getApplicableFlags() {
Flags flags = new Flags();
row.getSet(Flag.USER_FLAGS, String.class)
- .stream()
.forEach(flags::add);
return flags;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/94db8075/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProviderTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProviderTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProviderTest.java
index 7e61a92..9faddfb 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProviderTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProviderTest.java
@@ -97,7 +97,7 @@ public class CassandraUidProviderTest {
int nbEntries = 100;
long nbValues = LongStream.range(0, nbEntries)
.parallel()
- .mapToObj(x -> x)
+ .boxed()
.map(Throwing.function(x -> uidProvider.nextUid(null, mailbox)))
.distinct()
.count();
http://git-wip-us.apache.org/repos/asf/james-project/blob/94db8075/server/container/jetty/src/main/java/org/apache/james/http/jetty/JettyHttpServer.java
----------------------------------------------------------------------
diff --git a/server/container/jetty/src/main/java/org/apache/james/http/jetty/JettyHttpServer.java b/server/container/jetty/src/main/java/org/apache/james/http/jetty/JettyHttpServer.java
index c0a63bc..7bb7ffa 100644
--- a/server/container/jetty/src/main/java/org/apache/james/http/jetty/JettyHttpServer.java
+++ b/server/container/jetty/src/main/java/org/apache/james/http/jetty/JettyHttpServer.java
@@ -70,7 +70,7 @@ public class JettyHttpServer implements Closeable {
BiConsumer<String, ServletHolder> addServletMapping = (path, servletHolder) -> servletHandler.addServletWithMapping(servletHolder, path);
BiConsumer<String, Collection<FilterHolder>> addFilterMappings =
- (path, filterHolders) -> filterHolders.stream().forEachOrdered(
+ (path, filterHolders) -> filterHolders.forEach(
filterHolder -> servletHandler.addFilterWithMapping(filterHolder, path, EnumSet.of(DispatcherType.REQUEST)));
Maps.transformEntries(configuration.getMappings(), this::toServletHolder).forEach(addServletMapping);
http://git-wip-us.apache.org/repos/asf/james-project/blob/94db8075/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryFilesystemModule.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryFilesystemModule.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryFilesystemModule.java
index d470352..7aee891 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryFilesystemModule.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryFilesystemModule.java
@@ -82,7 +82,7 @@ public class TemporaryFilesystemModule extends AbstractModule {
}
private void copyResources(Path resourcesFolder) throws FileNotFoundException, IOException {
- CONFIGURATION_FILE_NAMES.stream()
+ CONFIGURATION_FILE_NAMES
.forEach(resourceName -> copyResource(resourcesFolder, resourceName));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/94db8075/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java
index 1024bec..13200f9 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java
@@ -505,7 +505,6 @@ public class GetMessagesMethodStepdefs {
private void assertAttachment(String attachment, DataTable attachmentProperties) {
attachmentProperties.asList(TableRow.class)
- .stream()
.forEach(entry -> assertThat(jsonPath.<Object>read(attachment + "." + entry.getKey())).isEqualTo(entry.getValue()));
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/94db8075/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Message.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Message.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Message.java
index 9dae5e9..969525d 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Message.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Message.java
@@ -235,18 +235,14 @@ public class Message {
}
private static Predicate<BlobId> inAttachments(ImmutableList<Attachment> attachments) {
- return (key) -> {
- return attachments.stream()
- .map(Attachment::getBlobId)
- .anyMatch(blobId -> blobId.equals(key));
- };
+ return (key) -> attachments.stream()
+ .map(Attachment::getBlobId)
+ .anyMatch(blobId -> blobId.equals(key));
}
private static boolean hasAttachment(List<Attachment> attachments) {
return attachments.stream()
- .filter(attachment -> !attachment.isInlinedWithCid())
- .findAny()
- .isPresent();
+ .anyMatch(attachment -> !attachment.isInlinedWithCid());
}
private final MessageId id;
http://git-wip-us.apache.org/repos/asf/james-project/blob/94db8075/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/SortingHierarchicalCollections.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/SortingHierarchicalCollections.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/SortingHierarchicalCollections.java
index bbf0d2e..ca82680 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/SortingHierarchicalCollections.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/SortingHierarchicalCollections.java
@@ -48,7 +48,7 @@ public class SortingHierarchicalCollections<T, Id> {
DependencyGraph<T> graph = new DependencyGraph<>(m ->
parentId.apply(m).map(mapOfElementsById::get));
- elements.stream().forEach(graph::registerItem);
+ elements.forEach(graph::registerItem);
return graph.getBuildChain().collect(Collectors.toList());
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/94db8075/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/DependencyGraphTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/DependencyGraphTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/DependencyGraphTest.java
index add1853..7acc0fa 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/DependencyGraphTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/DependencyGraphTest.java
@@ -63,7 +63,7 @@ public class DependencyGraphTest {
public void getBuildChainOnIsolatedVerticesShouldReturnSameOrder() {
DependencyGraph<Commit> graph = new DependencyGraph<>(m -> Optional.empty());
ImmutableList<Commit> isolatedMailboxes = ImmutableList.of(new Commit("A"), new Commit("B"), new Commit("C"));
- isolatedMailboxes.stream().forEach(graph::registerItem);
+ isolatedMailboxes.forEach(graph::registerItem);
List<Commit> orderedResultList = graph.getBuildChain().collect(Collectors.toList());
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org