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/05/04 10:53:53 UTC
[2/4] james-project git commit: JAMES-2387 Don't forget to call
join() for CompletableFuture
JAMES-2387 Don't forget to call join() for CompletableFuture<Void>
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/e2ea1125
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/e2ea1125
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/e2ea1125
Branch: refs/heads/master
Commit: e2ea11259d839619e1f0b5920f22962deaa0f08c
Parents: 33ca2a6
Author: Raphael Ouazana <ra...@linagora.com>
Authored: Thu May 3 15:22:48 2018 +0200
Committer: benwa <bt...@linagora.com>
Committed: Fri May 4 17:53:17 2018 +0700
----------------------------------------------------------------------
.../cassandra/migration/CassandraMigrationService.java | 2 +-
.../cassandra/migration/CassandraMigrationServiceTest.java | 3 +++
.../java/org/apache/james/jmap/AuthenticationFilterTest.java | 4 ++--
.../james/webadmin/routes/CassandraMigrationRoutesTest.java | 7 +++++--
4 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/e2ea1125/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/CassandraMigrationService.java
----------------------------------------------------------------------
diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/CassandraMigrationService.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/CassandraMigrationService.java
index d6eeaa8..5ee175d 100644
--- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/CassandraMigrationService.java
+++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/CassandraMigrationService.java
@@ -91,7 +91,7 @@ public class CassandraMigrationService {
logger.info("Migrating to version {} ", newVersion);
return allMigrationClazz.get(version).run()
- .onComplete(() -> schemaVersionDAO.updateVersion(newVersion),
+ .onComplete(() -> schemaVersionDAO.updateVersion(newVersion).join(),
() -> logger.info("Migrating to version {} done", newVersion))
.onFailure(() -> logger.warn(failureMessage(newVersion)),
() -> throwMigrationException(newVersion));
http://git-wip-us.apache.org/repos/asf/james-project/blob/e2ea1125/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/migration/CassandraMigrationServiceTest.java
----------------------------------------------------------------------
diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/migration/CassandraMigrationServiceTest.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/migration/CassandraMigrationServiceTest.java
index ac1fc82..c9a184f 100644
--- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/migration/CassandraMigrationServiceTest.java
+++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/migration/CassandraMigrationServiceTest.java
@@ -20,6 +20,7 @@
package org.apache.james.backends.cassandra.migration;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
@@ -63,6 +64,8 @@ public class CassandraMigrationServiceTest {
@Before
public void setUp() throws Exception {
schemaVersionDAO = mock(CassandraSchemaVersionDAO.class);
+ when(schemaVersionDAO.updateVersion(any())).thenReturn(CompletableFuture.completedFuture(null));
+
successfulMigration = mock(Migration.class);
when(successfulMigration.run()).thenReturn(Migration.Result.COMPLETED);
Map<SchemaVersion, Migration> allMigrationClazz = ImmutableMap.<SchemaVersion, Migration>builder()
http://git-wip-us.apache.org/repos/asf/james-project/blob/e2ea1125/server/protocols/jmap/src/test/java/org/apache/james/jmap/AuthenticationFilterTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/AuthenticationFilterTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/AuthenticationFilterTest.java
index 2589b2a..b9bb7d1 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/AuthenticationFilterTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/AuthenticationFilterTest.java
@@ -92,7 +92,7 @@ public class AuthenticationFilterTest {
when(mockedRequest.getHeader("Authorization"))
.thenReturn(TOKEN);
- accessTokenRepository.addToken("user@domain.tld", token);
+ accessTokenRepository.addToken("user@domain.tld", token).join();
AuthenticationFilter sut = new AuthenticationFilter(ImmutableList.of(new FakeAuthenticationStrategy(true)), new NoopMetricFactory());
sut.doFilter(mockedRequest, mockedResponse, filterChain);
@@ -106,7 +106,7 @@ public class AuthenticationFilterTest {
when(mockedRequest.getHeader("Authorization"))
.thenReturn(TOKEN);
- accessTokenRepository.addToken("user@domain.tld", token);
+ accessTokenRepository.addToken("user@domain.tld", token).join();
AuthenticationFilter sut = new AuthenticationFilter(ImmutableList.of(new FakeAuthenticationStrategy(false), new FakeAuthenticationStrategy(true)), new NoopMetricFactory());
sut.doFilter(mockedRequest, mockedResponse, filterChain);
http://git-wip-us.apache.org/repos/asf/james-project/blob/e2ea1125/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
index b016ffe..700b539 100644
--- a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
@@ -26,7 +26,9 @@ import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
+import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -75,6 +77,7 @@ public class CassandraMigrationRoutesTest {
.put(LATEST_VERSION, successfulMigration)
.build();
schemaVersionDAO = mock(CassandraSchemaVersionDAO.class);
+ when(schemaVersionDAO.updateVersion(any())).thenReturn(CompletableFuture.completedFuture(null));
taskManager = new MemoryTaskManager();
JsonTransformer jsonTransformer = new JsonTransformer();
@@ -188,7 +191,7 @@ public class CassandraMigrationRoutesTest {
.then()
.body("status", is("completed"));
- verify(schemaVersionDAO, times(2)).getCurrentSchemaVersion();
+ verify(schemaVersionDAO, atLeastOnce()).getCurrentSchemaVersion();
verify(schemaVersionDAO, times(1)).updateVersion(eq(CURRENT_VERSION));
verifyNoMoreInteractions(schemaVersionDAO);
}
@@ -244,7 +247,7 @@ public class CassandraMigrationRoutesTest {
.basePath(TasksRoutes.BASE)
.get(taskId + "/await");
- verify(schemaVersionDAO, times(3)).getCurrentSchemaVersion();
+ verify(schemaVersionDAO, atLeastOnce()).getCurrentSchemaVersion();
verify(schemaVersionDAO, times(1)).updateVersion(eq(CURRENT_VERSION));
verify(schemaVersionDAO, times(1)).updateVersion(eq(LATEST_VERSION));
verifyNoMoreInteractions(schemaVersionDAO);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org