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 2018/01/24 08:04:13 UTC
[04/11] james-project git commit: JAMES-2293 Move Limit to a more
generic project
JAMES-2293 Move Limit to a more generic project
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/b773ace9
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/b773ace9
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/b773ace9
Branch: refs/heads/master
Commit: b773ace9d1a68ef3ec2c5e6a2870fd35a61d8a47
Parents: 6b2d54f
Author: benwa <bt...@linagora.com>
Authored: Mon Jan 22 10:05:57 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jan 24 14:58:37 2018 +0700
----------------------------------------------------------------------
.../cassandra/mail/CassandraMessageDAO.java | 2 +-
.../mail/CassandraMessageIdMapper.java | 2 +-
.../cassandra/mail/CassandraMessageMapper.java | 2 +-
.../mailbox/cassandra/mail/utils/Limit.java | 76 ------------
.../cassandra/mail/CassandraMessageDAOTest.java | 2 +-
.../mailbox/cassandra/mail/utils/LimitTest.java | 115 -------------------
.../org/apache/james/util/streams/Limit.java | 76 ++++++++++++
.../apache/james/util/streams/LimitTest.java | 115 +++++++++++++++++++
8 files changed, 195 insertions(+), 195 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/b773ace9/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAO.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAO.java
index e00ca41..dadd033 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAO.java
@@ -62,7 +62,6 @@ import org.apache.james.backends.cassandra.utils.CassandraUtils;
import org.apache.james.blob.api.BlobId;
import org.apache.james.blob.api.ObjectStore;
import org.apache.james.mailbox.cassandra.ids.CassandraMessageId;
-import org.apache.james.mailbox.cassandra.mail.utils.Limit;
import org.apache.james.mailbox.cassandra.table.CassandraMessageV2Table;
import org.apache.james.mailbox.cassandra.table.CassandraMessageV2Table.Attachments;
import org.apache.james.mailbox.cassandra.table.CassandraMessageV2Table.Properties;
@@ -80,6 +79,7 @@ import org.apache.james.mailbox.store.mail.model.impl.SimpleProperty;
import org.apache.james.util.CompletableFutureUtil;
import org.apache.james.util.FluentFutureStream;
import org.apache.james.util.streams.JamesCollectors;
+import org.apache.james.util.streams.Limit;
import com.datastax.driver.core.BoundStatement;
import com.datastax.driver.core.PreparedStatement;
http://git-wip-us.apache.org/repos/asf/james-project/blob/b773ace9/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapper.java
index 5307674..ef039c6 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapper.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapper.java
@@ -36,7 +36,6 @@ import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.cassandra.ids.CassandraId;
import org.apache.james.mailbox.cassandra.ids.CassandraMessageId;
-import org.apache.james.mailbox.cassandra.mail.utils.Limit;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.ComposedMessageId;
import org.apache.james.mailbox.model.ComposedMessageIdWithMetaData;
@@ -51,6 +50,7 @@ import org.apache.james.mailbox.store.mail.ModSeqProvider;
import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.apache.james.mailbox.store.mail.model.impl.SimpleMailboxMessage;
import org.apache.james.util.FluentFutureStream;
+import org.apache.james.util.streams.Limit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/james-project/blob/b773ace9/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
index 770c360..08172ed 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
@@ -39,7 +39,6 @@ import org.apache.james.mailbox.MessageUid;
import org.apache.james.mailbox.cassandra.ids.CassandraId;
import org.apache.james.mailbox.cassandra.ids.CassandraMessageId;
import org.apache.james.mailbox.cassandra.mail.utils.FlagsUpdateStageResult;
-import org.apache.james.mailbox.cassandra.mail.utils.Limit;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.ComposedMessageId;
import org.apache.james.mailbox.model.ComposedMessageIdWithMetaData;
@@ -56,6 +55,7 @@ import org.apache.james.mailbox.store.mail.model.impl.SimpleMailboxMessage;
import org.apache.james.util.FluentFutureStream;
import org.apache.james.util.OptionalUtils;
import org.apache.james.util.streams.JamesCollectors;
+import org.apache.james.util.streams.Limit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/james-project/blob/b773ace9/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/utils/Limit.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/utils/Limit.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/utils/Limit.java
deleted file mode 100644
index 3b8bb90..0000000
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/utils/Limit.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one *
- * or more contributor license agreements. See the NOTICE file *
- * distributed with this work for additional information *
- * regarding copyright ownership. The ASF licenses this file *
- * to you under the Apache License, Version 2.0 (the *
- * "License"); you may not use this file except in compliance *
- * with the License. You may obtain a copy of the License at *
- * *
- * http://www.apache.org/licenses/LICENSE-2.0 *
- * *
- * Unless required by applicable law or agreed to in writing, *
- * software distributed under the License is distributed on an *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
- * KIND, either express or implied. See the License for the *
- * specific language governing permissions and limitations *
- * under the License. *
- ****************************************************************/
-
-package org.apache.james.mailbox.cassandra.mail.utils;
-
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Stream;
-
-import com.google.common.base.Preconditions;
-
-public class Limit {
-
- public static Limit from(int limit) {
- if (limit > 0) {
- return new Limit(Optional.of(limit));
- } else {
- return unlimited();
- }
- }
-
- public static Limit unlimited() {
- return new Limit(Optional.empty());
- }
-
- public static Limit limit(int limit) {
- Preconditions.checkArgument(limit > 0, "limit should be positive");
- return new Limit(Optional.of(limit));
- }
-
- private final Optional<Integer> limit;
-
- private Limit(Optional<Integer> limit) {
- this.limit = limit;
- }
-
- public Optional<Integer> getLimit() {
- return limit;
- }
-
- public <T> Stream<T> applyOnStream(Stream<T> stream) {
- return limit
- .map(stream::limit)
- .orElse(stream);
- }
-
- @Override
- public final boolean equals(Object o) {
- if (o instanceof Limit) {
- Limit other = (Limit) o;
- return Objects.equals(limit, other.limit);
- }
- return false;
- }
-
- @Override
- public final int hashCode() {
- return Objects.hash(limit);
- }
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/b773ace9/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAOTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAOTest.java
index f9d3f45..8e00d7b 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAOTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAOTest.java
@@ -45,7 +45,6 @@ import org.apache.james.mailbox.MessageUid;
import org.apache.james.mailbox.cassandra.ids.CassandraId;
import org.apache.james.mailbox.cassandra.ids.CassandraMessageId;
import org.apache.james.mailbox.cassandra.mail.CassandraMessageDAO.MessageIdAttachmentIds;
-import org.apache.james.mailbox.cassandra.mail.utils.Limit;
import org.apache.james.mailbox.cassandra.modules.CassandraMessageModule;
import org.apache.james.mailbox.model.Attachment;
import org.apache.james.mailbox.model.ComposedMessageId;
@@ -55,6 +54,7 @@ import org.apache.james.mailbox.model.MessageId;
import org.apache.james.mailbox.store.mail.MessageMapper;
import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
import org.apache.james.mailbox.store.mail.model.impl.SimpleMailboxMessage;
+import org.apache.james.util.streams.Limit;
import org.junit.After;
import org.junit.Before;
import org.junit.ClassRule;
http://git-wip-us.apache.org/repos/asf/james-project/blob/b773ace9/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/LimitTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/LimitTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/LimitTest.java
deleted file mode 100644
index 81536f1..0000000
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/LimitTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one *
- * or more contributor license agreements. See the NOTICE file *
- * distributed with this work for additional information *
- * regarding copyright ownership. The ASF licenses this file *
- * to you under the Apache License, Version 2.0 (the *
- * "License"); you may not use this file except in compliance *
- * with the License. You may obtain a copy of the License at *
- * *
- * http://www.apache.org/licenses/LICENSE-2.0 *
- * *
- * Unless required by applicable law or agreed to in writing, *
- * software distributed under the License is distributed on an *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
- * KIND, either express or implied. See the License for the *
- * specific language governing permissions and limitations *
- * under the License. *
- ****************************************************************/
-
-package org.apache.james.mailbox.cassandra.mail.utils;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.List;
-import java.util.Optional;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-import com.github.steveash.guavate.Guavate;
-import com.google.common.collect.ImmutableList;
-
-import nl.jqno.equalsverifier.EqualsVerifier;
-
-public class LimitTest {
-
- private final List<Integer> aList = ImmutableList.of(1, 2, 3, 4, 5, 6);
-
- @Rule
- public final ExpectedException expectedException = ExpectedException.none();
-
- @Test
- public void unlimitedShouldCreateLimitWithNoLimit() {
- Limit testee = Limit.unlimited();
- assertThat(testee.getLimit()).isEqualTo(Optional.empty());
- }
-
- @Test
- public void beanShouldRespectBeanContract() {
- EqualsVerifier.forClass(Limit.class)
- .verify();
- }
-
- @Test
- public void unlimitedShouldCreateLimitThatDoesNotAffectStream() {
-
- Limit testee = Limit.unlimited();
- assertThat(
- testee
- .applyOnStream(aList.stream())
- .collect(Guavate.toImmutableList())
- ).isEqualTo(aList);
- }
-
- @Test
- public void limitShouldCreateLimitWithNoLimit() {
- int expected = 3;
-
- Limit testee = Limit.limit(expected);
- assertThat(testee.getLimit())
- .isEqualTo(Optional.of(expected));
- }
-
- @Test
- public void limitShouldCreateLimitThatCorrectlyTruncateStream() {
- Limit testee = Limit.limit(3);
-
- assertThat(testee
- .applyOnStream(aList.stream())
- .collect(Guavate.toImmutableList())
- ).isEqualTo(ImmutableList.of(1, 2, 3));
- }
-
- @Test
- public void limitShouldThrowAnErrorWhenCalledWithZero() {
- expectedException.expect(IllegalArgumentException.class);
- Limit.limit(0);
- }
-
-
- @Test
- public void limitShouldThrowAnErrorWhenCalledWithNegativeValue() {
- expectedException.expect(IllegalArgumentException.class);
- Limit.limit(-1);
- }
-
- @Test
- public void ofShouldTakePositiveValueAsLimit() {
- assertThat(Limit.from(3))
- .isEqualTo(Limit.limit(3));
- }
-
- @Test
- public void ofShouldTakeNegativeValueAsUnlimited() {
- assertThat(Limit.from(-1))
- .isEqualTo(Limit.unlimited());
- }
-
- @Test
- public void ofShouldTakeZeroValueAsUnlimited() {
- assertThat(Limit.from(0))
- .isEqualTo(Limit.unlimited());
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/b773ace9/server/container/util-java8/src/main/java/org/apache/james/util/streams/Limit.java
----------------------------------------------------------------------
diff --git a/server/container/util-java8/src/main/java/org/apache/james/util/streams/Limit.java b/server/container/util-java8/src/main/java/org/apache/james/util/streams/Limit.java
new file mode 100644
index 0000000..b3ba512
--- /dev/null
+++ b/server/container/util-java8/src/main/java/org/apache/james/util/streams/Limit.java
@@ -0,0 +1,76 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.util.streams;
+
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import com.google.common.base.Preconditions;
+
+public class Limit {
+
+ public static Limit from(int limit) {
+ if (limit > 0) {
+ return new Limit(Optional.of(limit));
+ } else {
+ return unlimited();
+ }
+ }
+
+ public static Limit unlimited() {
+ return new Limit(Optional.empty());
+ }
+
+ public static Limit limit(int limit) {
+ Preconditions.checkArgument(limit > 0, "limit should be positive");
+ return new Limit(Optional.of(limit));
+ }
+
+ private final Optional<Integer> limit;
+
+ private Limit(Optional<Integer> limit) {
+ this.limit = limit;
+ }
+
+ public Optional<Integer> getLimit() {
+ return limit;
+ }
+
+ public <T> Stream<T> applyOnStream(Stream<T> stream) {
+ return limit
+ .map(stream::limit)
+ .orElse(stream);
+ }
+
+ @Override
+ public final boolean equals(Object o) {
+ if (o instanceof Limit) {
+ Limit other = (Limit) o;
+ return Objects.equals(limit, other.limit);
+ }
+ return false;
+ }
+
+ @Override
+ public final int hashCode() {
+ return Objects.hash(limit);
+ }
+}
http://git-wip-us.apache.org/repos/asf/james-project/blob/b773ace9/server/container/util-java8/src/test/java/org/apache/james/util/streams/LimitTest.java
----------------------------------------------------------------------
diff --git a/server/container/util-java8/src/test/java/org/apache/james/util/streams/LimitTest.java b/server/container/util-java8/src/test/java/org/apache/james/util/streams/LimitTest.java
new file mode 100644
index 0000000..fcd92d8
--- /dev/null
+++ b/server/container/util-java8/src/test/java/org/apache/james/util/streams/LimitTest.java
@@ -0,0 +1,115 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.util.streams;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import com.github.steveash.guavate.Guavate;
+import com.google.common.collect.ImmutableList;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
+
+public class LimitTest {
+
+ private final List<Integer> aList = ImmutableList.of(1, 2, 3, 4, 5, 6);
+
+ @Rule
+ public final ExpectedException expectedException = ExpectedException.none();
+
+ @Test
+ public void unlimitedShouldCreateLimitWithNoLimit() {
+ Limit testee = Limit.unlimited();
+ assertThat(testee.getLimit()).isEqualTo(Optional.empty());
+ }
+
+ @Test
+ public void beanShouldRespectBeanContract() {
+ EqualsVerifier.forClass(Limit.class)
+ .verify();
+ }
+
+ @Test
+ public void unlimitedShouldCreateLimitThatDoesNotAffectStream() {
+
+ Limit testee = Limit.unlimited();
+ assertThat(
+ testee
+ .applyOnStream(aList.stream())
+ .collect(Guavate.toImmutableList())
+ ).isEqualTo(aList);
+ }
+
+ @Test
+ public void limitShouldCreateLimitWithNoLimit() {
+ int expected = 3;
+
+ Limit testee = Limit.limit(expected);
+ assertThat(testee.getLimit())
+ .isEqualTo(Optional.of(expected));
+ }
+
+ @Test
+ public void limitShouldCreateLimitThatCorrectlyTruncateStream() {
+ Limit testee = Limit.limit(3);
+
+ assertThat(testee
+ .applyOnStream(aList.stream())
+ .collect(Guavate.toImmutableList())
+ ).isEqualTo(ImmutableList.of(1, 2, 3));
+ }
+
+ @Test
+ public void limitShouldThrowAnErrorWhenCalledWithZero() {
+ expectedException.expect(IllegalArgumentException.class);
+ Limit.limit(0);
+ }
+
+
+ @Test
+ public void limitShouldThrowAnErrorWhenCalledWithNegativeValue() {
+ expectedException.expect(IllegalArgumentException.class);
+ Limit.limit(-1);
+ }
+
+ @Test
+ public void ofShouldTakePositiveValueAsLimit() {
+ assertThat(Limit.from(3))
+ .isEqualTo(Limit.limit(3));
+ }
+
+ @Test
+ public void ofShouldTakeNegativeValueAsUnlimited() {
+ assertThat(Limit.from(-1))
+ .isEqualTo(Limit.unlimited());
+ }
+
+ @Test
+ public void ofShouldTakeZeroValueAsUnlimited() {
+ assertThat(Limit.from(0))
+ .isEqualTo(Limit.unlimited());
+ }
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org