This is an automated email from the ASF dual-hosted git repository.
rouazana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit cdb167a6a8d150906d350dbde3309338332ffb86
Author: Rémi Kowalski <rkowal...@linagora.com>
AuthorDate: Thu Jul 18 11:22:28 2019 +0200
JAMES-2813 move delete message vault query from webadmin to
deleted-message-vault
---
.../james/vault/dto}/query/CriterionDTO.java | 2 +-
.../apache/james/vault/dto}/query/QueryDTO.java | 2 +-
.../james/vault/dto}/query/QueryElement.java | 2 +-
.../vault/dto}/query/QueryElementDeserializer.java | 2 +-
.../james/vault/dto}/query/QueryTranslator.java | 38 +++++++++++-----------
.../dto}/query/QueryElementDeserializerTest.java | 6 ++--
.../james/vault/dto}/query/QueryElementTest.java | 2 +-
.../vault/dto}/query/QueryTranslatorTest.java | 6 ++--
.../vault/routes/DeletedMessagesVaultRoutes.java | 5 ++-
.../routes/DeletedMessagesVaultRoutesTest.java | 3 +-
10 files changed, 33 insertions(+), 35 deletions(-)
diff --git
a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/query/CriterionDTO.java
b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/dto/query/CriterionDTO.java
similarity index 98%
rename from
server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/query/CriterionDTO.java
rename to
mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/dto/query/CriterionDTO.java
index 547d3c0..325136d 100644
---
a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/query/CriterionDTO.java
+++
b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/dto/query/CriterionDTO.java
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.webadmin.vault.routes.query;
+package org.apache.james.vault.dto.query;
import java.util.Objects;
diff --git
a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/query/QueryDTO.java
b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/dto/query/QueryDTO.java
similarity index 98%
rename from
server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/query/QueryDTO.java
rename to
mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/dto/query/QueryDTO.java
index 496811b..2a379de 100644
---
a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/query/QueryDTO.java
+++
b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/dto/query/QueryDTO.java
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.webadmin.vault.routes.query;
+package org.apache.james.vault.dto.query;
import java.util.List;
import java.util.Objects;
diff --git
a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/query/QueryElement.java
b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/dto/query/QueryElement.java
similarity index 96%
rename from
server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/query/QueryElement.java
rename to
mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/dto/query/QueryElement.java
index 1f258ba..204e77f 100644
---
a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/query/QueryElement.java
+++
b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/dto/query/QueryElement.java
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.webadmin.vault.routes.query;
+package org.apache.james.vault.dto.query;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
diff --git
a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/query/QueryElementDeserializer.java
b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/dto/query/QueryElementDeserializer.java
similarity index 97%
rename from
server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/query/QueryElementDeserializer.java
rename to
mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/dto/query/QueryElementDeserializer.java
index ad608bb..be1179c 100644
---
a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/query/QueryElementDeserializer.java
+++
b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/dto/query/QueryElementDeserializer.java
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.webadmin.vault.routes.query;
+package org.apache.james.vault.dto.query;
import java.io.IOException;
diff --git
a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/query/QueryTranslator.java
b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/dto/query/QueryTranslator.java
similarity index 84%
rename from
server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/query/QueryTranslator.java
rename to
mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/dto/query/QueryTranslator.java
index 3494b7e..17845fe 100644
---
a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/query/QueryTranslator.java
+++
b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/dto/query/QueryTranslator.java
@@ -17,25 +17,25 @@
* under the License. *
****************************************************************/
-package org.apache.james.webadmin.vault.routes.query;
-
-import static
org.apache.james.webadmin.vault.routes.query.QueryTranslator.FieldName.DELETION_DATE;
-import static
org.apache.james.webadmin.vault.routes.query.QueryTranslator.FieldName.DELIVERY_DATE;
-import static
org.apache.james.webadmin.vault.routes.query.QueryTranslator.FieldName.HAS_ATTACHMENT;
-import static
org.apache.james.webadmin.vault.routes.query.QueryTranslator.FieldName.ORIGIN_MAILBOXES;
-import static
org.apache.james.webadmin.vault.routes.query.QueryTranslator.FieldName.RECIPIENTS;
-import static
org.apache.james.webadmin.vault.routes.query.QueryTranslator.FieldName.SENDER;
-import static
org.apache.james.webadmin.vault.routes.query.QueryTranslator.FieldName.SUBJECT;
-import static
org.apache.james.webadmin.vault.routes.query.QueryTranslator.FieldValueParser.BOOLEAN_PARSER;
-import static
org.apache.james.webadmin.vault.routes.query.QueryTranslator.FieldValueParser.MAIL_ADDRESS_PARSER;
-import static
org.apache.james.webadmin.vault.routes.query.QueryTranslator.FieldValueParser.STRING_PARSER;
-import static
org.apache.james.webadmin.vault.routes.query.QueryTranslator.FieldValueParser.ZONED_DATE_TIME_PARSER;
-import static
org.apache.james.webadmin.vault.routes.query.QueryTranslator.Operator.AFTER_OR_EQUALS;
-import static
org.apache.james.webadmin.vault.routes.query.QueryTranslator.Operator.BEFORE_OR_EQUALS;
-import static
org.apache.james.webadmin.vault.routes.query.QueryTranslator.Operator.CONTAINS;
-import static
org.apache.james.webadmin.vault.routes.query.QueryTranslator.Operator.CONTAINS_IGNORE_CASE;
-import static
org.apache.james.webadmin.vault.routes.query.QueryTranslator.Operator.EQUALS;
-import static
org.apache.james.webadmin.vault.routes.query.QueryTranslator.Operator.EQUALS_IGNORE_CASE;
+package org.apache.james.vault.dto.query;
+
+import static
org.apache.james.vault.dto.query.QueryTranslator.FieldName.DELETION_DATE;
+import static
org.apache.james.vault.dto.query.QueryTranslator.FieldName.DELIVERY_DATE;
+import static
org.apache.james.vault.dto.query.QueryTranslator.FieldName.HAS_ATTACHMENT;
+import static
org.apache.james.vault.dto.query.QueryTranslator.FieldName.ORIGIN_MAILBOXES;
+import static
org.apache.james.vault.dto.query.QueryTranslator.FieldName.RECIPIENTS;
+import static
org.apache.james.vault.dto.query.QueryTranslator.FieldName.SENDER;
+import static
org.apache.james.vault.dto.query.QueryTranslator.FieldName.SUBJECT;
+import static
org.apache.james.vault.dto.query.QueryTranslator.FieldValueParser.BOOLEAN_PARSER;
+import static
org.apache.james.vault.dto.query.QueryTranslator.FieldValueParser.MAIL_ADDRESS_PARSER;
+import static
org.apache.james.vault.dto.query.QueryTranslator.FieldValueParser.STRING_PARSER;
+import static
org.apache.james.vault.dto.query.QueryTranslator.FieldValueParser.ZONED_DATE_TIME_PARSER;
+import static
org.apache.james.vault.dto.query.QueryTranslator.Operator.AFTER_OR_EQUALS;
+import static
org.apache.james.vault.dto.query.QueryTranslator.Operator.BEFORE_OR_EQUALS;
+import static
org.apache.james.vault.dto.query.QueryTranslator.Operator.CONTAINS;
+import static
org.apache.james.vault.dto.query.QueryTranslator.Operator.CONTAINS_IGNORE_CASE;
+import static org.apache.james.vault.dto.query.QueryTranslator.Operator.EQUALS;
+import static
org.apache.james.vault.dto.query.QueryTranslator.Operator.EQUALS_IGNORE_CASE;
import java.time.ZonedDateTime;
import java.util.Objects;
diff --git
a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/query/QueryElementDeserializerTest.java
b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/dto/query/QueryElementDeserializerTest.java
similarity index 94%
rename from
server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/query/QueryElementDeserializerTest.java
rename to
mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/dto/query/QueryElementDeserializerTest.java
index d338c9b..bfd82ac 100644
---
a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/query/QueryElementDeserializerTest.java
+++
b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/dto/query/QueryElementDeserializerTest.java
@@ -17,14 +17,14 @@
* under the License. *
****************************************************************/
-package org.apache.james.webadmin.vault.routes.query;
+package org.apache.james.vault.dto.query;
import static org.apache.james.vault.DeletedMessageFixture.SUBJECT;
import static org.apache.mailet.base.MailAddressFixture.SENDER;
import static org.assertj.core.api.Assertions.assertThat;
-import org.apache.james.webadmin.vault.routes.query.QueryTranslator.FieldName;
-import org.apache.james.webadmin.vault.routes.query.QueryTranslator.Operator;
+import org.apache.james.vault.dto.query.QueryTranslator.FieldName;
+import org.apache.james.vault.dto.query.QueryTranslator.Operator;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git
a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/query/QueryElementTest.java
b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/dto/query/QueryElementTest.java
similarity index 96%
rename from
server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/query/QueryElementTest.java
rename to
mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/dto/query/QueryElementTest.java
index 6478a4e..a00684c 100644
---
a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/query/QueryElementTest.java
+++
b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/dto/query/QueryElementTest.java
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.webadmin.vault.routes.query;
+package org.apache.james.vault.dto.query;
import org.junit.jupiter.api.Test;
diff --git
a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/query/QueryTranslatorTest.java
b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/dto/query/QueryTranslatorTest.java
similarity index 93%
rename from
server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/query/QueryTranslatorTest.java
rename to
mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/dto/query/QueryTranslatorTest.java
index f159503..deb6f04 100644
---
a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/query/QueryTranslatorTest.java
+++
b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/dto/query/QueryTranslatorTest.java
@@ -17,14 +17,14 @@
* under the License. *
****************************************************************/
-package org.apache.james.webadmin.vault.routes.query;
+package org.apache.james.vault.dto.query;
import static org.assertj.core.api.Assertions.assertThatCode;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.apache.james.mailbox.inmemory.InMemoryId;
-import org.apache.james.webadmin.vault.routes.query.QueryTranslator.FieldName;
-import org.apache.james.webadmin.vault.routes.query.QueryTranslator.Operator;
+import org.apache.james.vault.dto.query.QueryTranslator.FieldName;
+import org.apache.james.vault.dto.query.QueryTranslator.Operator;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git
a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutes.java
b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutes.java
index 37acd23..a94b161 100644
---
a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutes.java
+++
b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutes.java
@@ -44,6 +44,8 @@ import org.apache.james.task.TaskManager;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.UsersRepositoryException;
import org.apache.james.vault.DeletedMessageVault;
+import org.apache.james.vault.dto.query.QueryElement;
+import org.apache.james.vault.dto.query.QueryTranslator;
import org.apache.james.vault.search.Query;
import org.apache.james.webadmin.Constants;
import org.apache.james.webadmin.Routes;
@@ -52,15 +54,12 @@ import org.apache.james.webadmin.utils.ErrorResponder;
import org.apache.james.webadmin.utils.JsonExtractException;
import org.apache.james.webadmin.utils.JsonExtractor;
import org.apache.james.webadmin.utils.JsonTransformer;
-import org.apache.james.webadmin.vault.routes.query.QueryElement;
-import org.apache.james.webadmin.vault.routes.query.QueryTranslator;
import org.eclipse.jetty.http.HttpStatus;
import com.github.steveash.guavate.Guavate;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
-
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
diff --git
a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
index 740a170..b51f694 100644
---
a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
+++
b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
@@ -103,6 +103,7 @@ import org.apache.james.user.memory.MemoryUsersRepository;
import org.apache.james.vault.DeletedMessage;
import org.apache.james.vault.DeletedMessageZipper;
import org.apache.james.vault.RetentionConfiguration;
+import org.apache.james.vault.dto.query.QueryTranslator;
import org.apache.james.vault.memory.MemoryDeletedMessagesVault;
import org.apache.james.vault.search.Query;
import org.apache.james.vault.utils.DeleteByQueryExecutor;
@@ -112,7 +113,6 @@ import org.apache.james.webadmin.WebAdminUtils;
import org.apache.james.webadmin.routes.TasksRoutes;
import org.apache.james.webadmin.utils.ErrorResponder;
import org.apache.james.webadmin.utils.JsonTransformer;
-import org.apache.james.webadmin.vault.routes.query.QueryTranslator;
import org.eclipse.jetty.http.HttpStatus;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -122,7 +122,6 @@ import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import com.google.common.collect.ImmutableList;
-
import io.restassured.RestAssured;
import io.restassured.filter.log.LogDetail;
import reactor.core.publisher.Flux;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
