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 2019/05/20 09:40:04 UTC
[james-project] 07/09: JAMES-2765 User parameter is not required
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit b463bd3165f6703b5054b13d8b460b1d9706aafd
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Sat May 18 16:37:34 2019 +0700
JAMES-2765 User parameter is not required
User can very easily be retrieved from the event
---
.../elasticsearch/events/ElasticSearchQuotaMailboxListener.java | 9 ++++-----
.../search/elasticsearch/json/QuotaRatioToElasticSearchJson.java | 4 ++--
.../elasticsearch/json/QuotaRatioToElasticSearchJsonTest.java | 5 ++---
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/mailbox/plugin/quota-search-elasticsearch-v6/src/main/java/org/apache/james/quota/search/elasticsearch/events/ElasticSearchQuotaMailboxListener.java b/mailbox/plugin/quota-search-elasticsearch-v6/src/main/java/org/apache/james/quota/search/elasticsearch/events/ElasticSearchQuotaMailboxListener.java
index 1a14c0c..1b48778 100644
--- a/mailbox/plugin/quota-search-elasticsearch-v6/src/main/java/org/apache/james/quota/search/elasticsearch/events/ElasticSearchQuotaMailboxListener.java
+++ b/mailbox/plugin/quota-search-elasticsearch-v6/src/main/java/org/apache/james/quota/search/elasticsearch/events/ElasticSearchQuotaMailboxListener.java
@@ -24,7 +24,6 @@ import javax.inject.Inject;
import javax.inject.Named;
import org.apache.james.backends.es.v6.ElasticSearchIndexer;
-import org.apache.james.core.User;
import org.apache.james.mailbox.events.Event;
import org.apache.james.mailbox.events.Group;
import org.apache.james.mailbox.events.MailboxListener;
@@ -60,11 +59,11 @@ public class ElasticSearchQuotaMailboxListener implements MailboxListener.GroupM
@Override
public void event(Event event) throws IOException {
- handleEvent(event.getUser(), (QuotaUsageUpdatedEvent) event);
+ handleEvent((QuotaUsageUpdatedEvent) event);
}
- private void handleEvent(User user, QuotaUsageUpdatedEvent event) throws IOException {
- indexer.index(user.asString(),
- quotaRatioToElasticSearchJson.convertToJson(user.asString(), event));
+ private void handleEvent(QuotaUsageUpdatedEvent event) throws IOException {
+ indexer.index(event.getUser().asString(),
+ quotaRatioToElasticSearchJson.convertToJson(event));
}
}
diff --git a/mailbox/plugin/quota-search-elasticsearch-v6/src/main/java/org/apache/james/quota/search/elasticsearch/json/QuotaRatioToElasticSearchJson.java b/mailbox/plugin/quota-search-elasticsearch-v6/src/main/java/org/apache/james/quota/search/elasticsearch/json/QuotaRatioToElasticSearchJson.java
index 12f9629..b9b0937 100644
--- a/mailbox/plugin/quota-search-elasticsearch-v6/src/main/java/org/apache/james/quota/search/elasticsearch/json/QuotaRatioToElasticSearchJson.java
+++ b/mailbox/plugin/quota-search-elasticsearch-v6/src/main/java/org/apache/james/quota/search/elasticsearch/json/QuotaRatioToElasticSearchJson.java
@@ -39,9 +39,9 @@ public class QuotaRatioToElasticSearchJson {
this.mapper.registerModule(new Jdk8Module());
}
- public String convertToJson(String user, QuotaUsageUpdatedEvent event) throws JsonProcessingException {
+ public String convertToJson(QuotaUsageUpdatedEvent event) throws JsonProcessingException {
return mapper.writeValueAsString(QuotaRatioAsJson.builder()
- .user(user)
+ .user(event.getUser().asString())
.domain(event.getQuotaRoot().getDomain().map(Domain::asString))
.quotaRatio(QuotaRatio.from(event.getSizeQuota(), event.getCountQuota()))
.build());
diff --git a/mailbox/plugin/quota-search-elasticsearch-v6/src/test/java/org/apache/james/quota/search/elasticsearch/json/QuotaRatioToElasticSearchJsonTest.java b/mailbox/plugin/quota-search-elasticsearch-v6/src/test/java/org/apache/james/quota/search/elasticsearch/json/QuotaRatioToElasticSearchJsonTest.java
index 4f42c92..83e7b28 100644
--- a/mailbox/plugin/quota-search-elasticsearch-v6/src/test/java/org/apache/james/quota/search/elasticsearch/json/QuotaRatioToElasticSearchJsonTest.java
+++ b/mailbox/plugin/quota-search-elasticsearch-v6/src/test/java/org/apache/james/quota/search/elasticsearch/json/QuotaRatioToElasticSearchJsonTest.java
@@ -50,7 +50,7 @@ class QuotaRatioToElasticSearchJsonTest {
.instant(Instant.now())
.build();
QuotaRatioToElasticSearchJson quotaRatioToElasticSearchJson = new QuotaRatioToElasticSearchJson();
- String convertToJson = quotaRatioToElasticSearchJson.convertToJson(user, event);
+ String convertToJson = quotaRatioToElasticSearchJson.convertToJson(event);
assertThatJson(convertToJson)
.when(IGNORING_ARRAY_ORDER)
@@ -69,9 +69,8 @@ class QuotaRatioToElasticSearchJsonTest {
.instant(Instant.now())
.build();
-
QuotaRatioToElasticSearchJson quotaRatioToElasticSearchJson = new QuotaRatioToElasticSearchJson();
- String convertToJson = quotaRatioToElasticSearchJson.convertToJson(user, event);
+ String convertToJson = quotaRatioToElasticSearchJson.convertToJson( event);
assertThatJson(convertToJson)
.when(IGNORING_ARRAY_ORDER)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org