MAILBOX-266 DeleteByQuery type should be void

apache · Apr 6, 2016 · d1d5712 · d1d5712
1 parent 1d43ec8
commit d1d5712
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/...icsearch/src/main/java/org/apache/james/mailbox/elasticsearch/DeleteByQueryPerformer.java b/...icsearch/src/main/java/org/apache/james/mailbox/elasticsearch/DeleteByQueryPerformer.java
@@ -56,9 +56,8 @@ public DeleteByQueryPerformer(Client client, @Named("AsyncExecutor") ExecutorSer
         this.batchSize = batchSize;
     }
 
-    public Void perform(QueryBuilder queryBuilder) {
+    public void perform(QueryBuilder queryBuilder) {
         executor.execute(() -> doDeleteByQuery(queryBuilder));
-        return null;
     }
 
     protected void doDeleteByQuery(QueryBuilder queryBuilder) {

diff --git a/...sticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIndexer.java b/...sticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIndexer.java
@@ -86,8 +86,8 @@ public BulkResponse deleteMessages(List<String> ids) {
         return bulkRequestBuilder.get();
     }
 
-    public Void deleteAllMatchingQuery(QueryBuilder queryBuilder) {
-        return deleteByQueryPerformer.perform(queryBuilder);
+    public void deleteAllMatchingQuery(QueryBuilder queryBuilder) {
+        deleteByQueryPerformer.perform(queryBuilder);
     }
 
     private void checkArgument(String content) {

diff --git a/...search/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIndexerTest.java b/...search/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIndexerTest.java
@@ -58,9 +58,8 @@ public void setup() throws IOException {
         TestingClientProvider clientProvider = new TestingClientProvider(node);
         DeleteByQueryPerformer deleteByQueryPerformer = new DeleteByQueryPerformer(clientProvider.get(), Executors.newSingleThreadExecutor(), MINIMUM_BATCH_SIZE) {
             @Override
-            public Void perform(QueryBuilder queryBuilder) {
+            public void perform(QueryBuilder queryBuilder) {
                 doDeleteByQuery(queryBuilder);
-                return null;
             }
         };
         testee = new ElasticSearchIndexer(clientProvider.get(), deleteByQueryPerformer);

diff --git a/...mes/mailbox/elasticsearch/events/ElasticSearchListeningMailboxMessageSearchIndexTest.java b/...mes/mailbox/elasticsearch/events/ElasticSearchListeningMailboxMessageSearchIndexTest.java
@@ -40,6 +40,7 @@
 import org.apache.james.mailbox.store.mail.MessageMapperFactory;
 import org.apache.james.mailbox.store.mail.model.Mailbox;
 import org.apache.james.mailbox.store.mail.model.MailboxMessage;
+import org.easymock.EasyMock;
 import org.easymock.IMocksControl;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.action.bulk.BulkResponse;
@@ -237,8 +238,8 @@ public void deleteAllShouldWork() throws Exception {
         expectLastCall();
         expect(mailbox.getMailboxId()).andReturn(mailboxId);
 
-        expect(indexer.deleteAllMatchingQuery(anyObject(QueryBuilder.class)))
-            .andReturn(null);
+        indexer.deleteAllMatchingQuery(anyObject(QueryBuilder.class));
+        EasyMock.expectLastCall();
 
         control.replay();
         testee.deleteAll(session, mailbox);
@@ -256,8 +257,8 @@ public void deleteAllShouldNotPropagateExceptionWhenExceptionOccurs() throws Exc
         expectLastCall();
         expect(mailbox.getMailboxId()).andReturn(mailboxId).times(2);
 
-        expect(indexer.deleteAllMatchingQuery(anyObject(QueryBuilder.class)))
-            .andThrow(new ElasticsearchException(""));
+        indexer.deleteAllMatchingQuery(anyObject(QueryBuilder.class));
+        EasyMock.expectLastCall().andThrow(new ElasticsearchException(""));
 
         control.replay();
         testee.deleteAll(session, mailbox);