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 ro...@apache.org on 2018/12/21 16:18:39 UTC
[1/2] james-project git commit: Update Elasticsearch metrics reporter
to last RC
Repository: james-project
Updated Branches:
refs/heads/master 3764ac48e -> 97edbf904
Update Elasticsearch metrics reporter to last RC
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/bc3563e0
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/bc3563e0
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/bc3563e0
Branch: refs/heads/master
Commit: bc3563e0ac1f252a274377a87c567435a3bf5b60
Parents: 3764ac4
Author: Raphael Ouazana <ra...@linagora.com>
Authored: Fri Dec 21 11:36:52 2018 +0100
Committer: Raphael Ouazana <ra...@linagora.com>
Committed: Fri Dec 21 11:36:52 2018 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/bc3563e0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6ce19bc..1cc4a2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -634,7 +634,7 @@
<testcontainers.version>1.9.0</testcontainers.version>
<assertj.version>3.3.0</assertj.version>
<es.version>2.2.1</es.version>
- <es-reporter.version>6.0.0-RC</es-reporter.version>
+ <es-reporter.version>6.0.0-RC2</es-reporter.version>
<guava.version>25.1-jre</guava.version>
<jutf7.version>1.0.0</jutf7.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/2] james-project git commit: Fix warnings and checkstyle
Posted by ro...@apache.org.
Fix warnings and checkstyle
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/97edbf90
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/97edbf90
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/97edbf90
Branch: refs/heads/master
Commit: 97edbf904270b095d3d5d94de9a45bee57c15525
Parents: bc3563e
Author: Raphael Ouazana <ra...@linagora.com>
Authored: Fri Dec 21 11:48:38 2018 +0100
Committer: Raphael Ouazana <ra...@linagora.com>
Committed: Fri Dec 21 11:48:38 2018 +0100
----------------------------------------------------------------------
.../james/backends/cassandra/components/CassandraTableTest.java | 2 +-
.../james/backends/cassandra/components/CassandraTypeTest.java | 1 -
.../org/apache/james/mailbox/events/GroupAlreadyRegistered.java | 4 ++++
.../src/main/java/org/apache/james/mailbox/model/MailboxACL.java | 1 -
.../java/org/apache/james/mailbox/events/EventBusContract.java | 1 +
.../src/test/java/org/apache/james/mailbox/events/GroupTest.java | 2 ++
.../apache/james/blob/objectstorage/ObjectStorageBlobsDAO.java | 1 -
.../src/main/java/org/apache/james/GuiceJamesServer.java | 1 -
.../cassandra/CassandraMailRepositoryMailDAOTest.java | 1 -
9 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/97edbf90/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/components/CassandraTableTest.java
----------------------------------------------------------------------
diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/components/CassandraTableTest.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/components/CassandraTableTest.java
index a0d264f..04f6979 100644
--- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/components/CassandraTableTest.java
+++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/components/CassandraTableTest.java
@@ -30,7 +30,6 @@ import static org.mockito.Mockito.when;
import java.util.stream.Stream;
import org.apache.james.backends.cassandra.components.CassandraTable.InitializationStatus;
-import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
@@ -87,6 +86,7 @@ class CassandraTableTest {
assertThat(left.reduce(right)).isEqualByComparingTo(expectedResult);
}
+ @SuppressWarnings("unused")
private static Stream<Arguments> initializationStatusReduceShouldFallIntoTheRightState() {
return Stream.of(
Arguments.of(ALREADY_DONE, ALREADY_DONE, ALREADY_DONE),
http://git-wip-us.apache.org/repos/asf/james-project/blob/97edbf90/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/components/CassandraTypeTest.java
----------------------------------------------------------------------
diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/components/CassandraTypeTest.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/components/CassandraTypeTest.java
index 7973c83..33d4267 100644
--- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/components/CassandraTypeTest.java
+++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/components/CassandraTypeTest.java
@@ -30,7 +30,6 @@ import static org.mockito.Mockito.when;
import java.util.stream.Stream;
import org.apache.james.backends.cassandra.components.CassandraType.InitializationStatus;
-import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
http://git-wip-us.apache.org/repos/asf/james-project/blob/97edbf90/mailbox/api/src/main/java/org/apache/james/mailbox/events/GroupAlreadyRegistered.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/events/GroupAlreadyRegistered.java b/mailbox/api/src/main/java/org/apache/james/mailbox/events/GroupAlreadyRegistered.java
index 710de75..d1f3b15 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/events/GroupAlreadyRegistered.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/events/GroupAlreadyRegistered.java
@@ -26,4 +26,8 @@ public class GroupAlreadyRegistered extends RuntimeException {
super(group.getClass().getCanonicalName() + " is already Registered and thus can not be used.");
this.group = group;
}
+
+ public Group getGroup() {
+ return group;
+ }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/97edbf90/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxACL.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxACL.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxACL.java
index d02d6ff..36fd1ae 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxACL.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxACL.java
@@ -193,7 +193,6 @@ public class MailboxACL {
}
// JSON Deserialization
- @SuppressWarnings("unused")
private Rfc4314Rights(String serializedRfc4314Rights) throws UnsupportedRightException {
this(rightListFromSerializedRfc4314Rights(serializedRfc4314Rights));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/97edbf90/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventBusContract.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventBusContract.java b/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventBusContract.java
index bef6ec3..d884076 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventBusContract.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventBusContract.java
@@ -45,6 +45,7 @@ public interface EventBusContract {
MailboxListener.MailboxEvent event = mock(MailboxListener.MailboxEvent.class);
class GroupA extends Group {}
+
class GroupB extends Group {}
MailboxId ID_1 = TestId.of(18);
http://git-wip-us.apache.org/repos/asf/james-project/blob/97edbf90/mailbox/api/src/test/java/org/apache/james/mailbox/events/GroupTest.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/events/GroupTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/events/GroupTest.java
index f954027..80a7029 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/events/GroupTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/events/GroupTest.java
@@ -27,7 +27,9 @@ import nl.jqno.equalsverifier.EqualsVerifier;
class GroupTest {
static class GroupA extends Group {}
+
static class GroupB extends Group {}
+
static class GroupC extends GroupA {}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/97edbf90/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAO.java
----------------------------------------------------------------------
diff --git a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAO.java b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAO.java
index 9c2ebe2..b51f431 100644
--- a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAO.java
+++ b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAO.java
@@ -47,7 +47,6 @@ import com.google.common.hash.Hashing;
import com.google.common.hash.HashingInputStream;
public class ObjectStorageBlobsDAO implements BlobStore {
- private static final InputStream EMPTY_STREAM = new ByteArrayInputStream(new byte[0]);
private static final Location DEFAULT_LOCATION = null;
private static final Logger LOGGER = LoggerFactory.getLogger(ObjectStorageBlobsDAO.class);
http://git-wip-us.apache.org/repos/asf/james-project/blob/97edbf90/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java
----------------------------------------------------------------------
diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java b/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java
index 74c7c64..d355840 100644
--- a/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java
+++ b/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java
@@ -46,7 +46,6 @@ public class GuiceJamesServer {
private final IsStartedProbe isStartedProbe;
private Stager<PreDestroy> preDestroy;
private GuiceProbeProvider guiceProbeProvider;
- private CleanupTasksPerformer cleanupTasksPerformer;
public static GuiceJamesServer forConfiguration(Configuration configuration) {
IsStartedProbe isStartedProbe = new IsStartedProbe();
http://git-wip-us.apache.org/repos/asf/james-project/blob/97edbf90/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryMailDAOTest.java
----------------------------------------------------------------------
diff --git a/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryMailDAOTest.java b/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryMailDAOTest.java
index a04b8ed..c187823 100644
--- a/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryMailDAOTest.java
+++ b/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryMailDAOTest.java
@@ -22,7 +22,6 @@ package org.apache.james.mailrepository.cassandra;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.SoftAssertions.assertSoftly;
-import java.util.Collection;
import java.util.List;
import java.util.Optional;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org