You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by rc...@apache.org on 2022/06/07 10:27:04 UTC

[james-project] branch upgrade-es-8.2 updated (97ae119ac1 -> fa0896f7b8)

This is an automated email from the ASF dual-hosted git repository.

rcordier pushed a change to branch upgrade-es-8.2
in repository https://gitbox.apache.org/repos/asf/james-project.git


    from 97ae119ac1 fixup! JAMES-3771 upgrade mailbox es module to v8
     add 1d7e4f5eae fixup! JAMES-3771 upgrade mailbox es module to v8
     add 1f259ddd7a JAMES-3771 upgrade quota search es module to v8
     add b8a4d2aa71 fixup! JAMES-3771 upgrade mailbox es module to v8
     add fa0896f7b8 fixup! JAMES-3771 upgrade quota search es module to v8

No new revisions were added by this update.

Summary of changes:
 .../james/backends/es/v8/ElasticSearchIndexer.java |  4 +-
 .../ElasticSearchListeningMessageSearchIndex.java  | 12 ++-
 .../elasticsearch/v8/query/CriterionConverter.java |  8 +-
 ...asticSearchListeningMessageSearchIndexTest.java |  4 +-
 .../elasticsearch/v7/QuotaRatioMappingFactory.java | 66 ---------------
 .../pom.xml                                        |  6 +-
 .../v8}/ElasticSearchQuotaConfiguration.java       |  8 +-
 .../v8}/ElasticSearchQuotaSearcher.java            | 67 ++++++++-------
 .../elasticsearch/v8}/QuotaQueryConverter.java     | 62 ++++++++------
 .../v8}/QuotaRatioElasticSearchConstants.java      |  8 +-
 .../elasticsearch/v8/QuotaRatioMappingFactory.java | 62 ++++++++++++++
 .../v8}/QuotaSearchIndexCreationUtil.java          | 12 +--
 .../elasticsearch/v8}/UserRoutingKeyFactory.java   |  4 +-
 .../events/ElasticSearchQuotaMailboxListener.java  | 12 +--
 .../v8}/json/JsonMessageConstants.java             |  2 +-
 .../elasticsearch/v8}/json/QuotaRatioAsJson.java   |  2 +-
 .../v8}/json/QuotaRatioToElasticSearchJson.java    |  2 +-
 .../v8}/ElasticSearchQuotaConfigurationTest.java   |  8 +-
 ...lasticSearchQuotaSearchTestSystemExtension.java | 14 +--
 .../v8}/ElasticSearchQuotaSearcherTest.java        |  2 +-
 .../elasticsearch/v8}/QuotaQueryConverterTest.java | 77 +++++++++++------
 .../v8}/UserRoutingKeyFactoryTest.java             |  4 +-
 .../ElasticSearchQuotaMailboxListenerTest.java     | 36 ++++----
 .../v8}/json/QuotaRatioAsJsonTest.java             |  2 +-
 .../json/QuotaRatioToElasticSearchJsonTest.java    |  2 +-
 .../src/test/resources/quotaRatio.json             |  0
 .../src/test/resources/quotaRatioNoDomain.json     |  0
 mailbox/pom.xml                                    |  2 +-
 pom.xml                                            |  2 +-
 server/apps/cassandra-app/pom.xml                  |  5 ++
 server/container/guice/elasticsearch/pom.xml       |  2 +-
 .../modules/mailbox/ElasticSearchClientModule.java |  4 +-
 .../mailbox/ElasticSearchQuotaSearcherModule.java  | 18 ++--
 .../modules/mailbox/ElasticSearchStartUpCheck.java | 60 ++++++-------
 server/protocols/webadmin/webadmin-mailbox/pom.xml |  2 +-
 .../routes/ElasticSearchQuotaSearchExtension.java  | 99 +++++++++++-----------
 36 files changed, 358 insertions(+), 322 deletions(-)
 delete mode 100644 mailbox/plugin/quota-search-elasticsearch-v7/src/main/java/org/apache/james/quota/search/elasticsearch/v7/QuotaRatioMappingFactory.java
 rename mailbox/plugin/{quota-search-elasticsearch-v7 => quota-search-elasticsearch-v8}/pom.xml (97%)
 rename mailbox/plugin/{quota-search-elasticsearch-v7/src/main/java/org/apache/james/quota/search/elasticsearch/v7 => quota-search-elasticsearch-v8/src/main/java/org/apache/james/quota/search/elasticsearch/v8}/ElasticSearchQuotaConfiguration.java (96%)
 rename mailbox/plugin/{quota-search-elasticsearch-v7/src/main/java/org/apache/james/quota/search/elasticsearch/v7 => quota-search-elasticsearch-v8/src/main/java/org/apache/james/quota/search/elasticsearch/v8}/ElasticSearchQuotaSearcher.java (60%)
 rename mailbox/plugin/{quota-search-elasticsearch-v7/src/main/java/org/apache/james/quota/search/elasticsearch/v7 => quota-search-elasticsearch-v8/src/main/java/org/apache/james/quota/search/elasticsearch/v8}/QuotaQueryConverter.java (62%)
 rename mailbox/plugin/{quota-search-elasticsearch-v7/src/main/java/org/apache/james/quota/search/elasticsearch/v7 => quota-search-elasticsearch-v8/src/main/java/org/apache/james/quota/search/elasticsearch/v8}/QuotaRatioElasticSearchConstants.java (84%)
 create mode 100644 mailbox/plugin/quota-search-elasticsearch-v8/src/main/java/org/apache/james/quota/search/elasticsearch/v8/QuotaRatioMappingFactory.java
 rename mailbox/plugin/{quota-search-elasticsearch-v7/src/main/java/org/apache/james/quota/search/elasticsearch/v7 => quota-search-elasticsearch-v8/src/main/java/org/apache/james/quota/search/elasticsearch/v8}/QuotaSearchIndexCreationUtil.java (87%)
 rename mailbox/plugin/{quota-search-elasticsearch-v7/src/main/java/org/apache/james/quota/search/elasticsearch/v7 => quota-search-elasticsearch-v8/src/main/java/org/apache/james/quota/search/elasticsearch/v8}/UserRoutingKeyFactory.java (93%)
 rename mailbox/plugin/{quota-search-elasticsearch-v7/src/main/java/org/apache/james/quota/search/elasticsearch/v7 => quota-search-elasticsearch-v8/src/main/java/org/apache/james/quota/search/elasticsearch/v8}/events/ElasticSearchQuotaMailboxListener.java (91%)
 rename mailbox/plugin/{quota-search-elasticsearch-v7/src/main/java/org/apache/james/quota/search/elasticsearch/v7 => quota-search-elasticsearch-v8/src/main/java/org/apache/james/quota/search/elasticsearch/v8}/json/JsonMessageConstants.java (95%)
 rename mailbox/plugin/{quota-search-elasticsearch-v7/src/main/java/org/apache/james/quota/search/elasticsearch/v7 => quota-search-elasticsearch-v8/src/main/java/org/apache/james/quota/search/elasticsearch/v8}/json/QuotaRatioAsJson.java (98%)
 rename mailbox/plugin/{quota-search-elasticsearch-v7/src/main/java/org/apache/james/quota/search/elasticsearch/v7 => quota-search-elasticsearch-v8/src/main/java/org/apache/james/quota/search/elasticsearch/v8}/json/QuotaRatioToElasticSearchJson.java (97%)
 rename mailbox/plugin/{quota-search-elasticsearch-v7/src/test/java/org/apache/james/quota/search/elasticsearch/v7 => quota-search-elasticsearch-v8/src/test/java/org/apache/james/quota/search/elasticsearch/v8}/ElasticSearchQuotaConfigurationTest.java (95%)
 rename mailbox/plugin/{quota-search-elasticsearch-v7/src/test/java/org/apache/james/quota/search/elasticsearch/v7 => quota-search-elasticsearch-v8/src/test/java/org/apache/james/quota/search/elasticsearch/v8}/ElasticSearchQuotaSearchTestSystemExtension.java (91%)
 rename mailbox/plugin/{quota-search-elasticsearch-v7/src/test/java/org/apache/james/quota/search/elasticsearch/v7 => quota-search-elasticsearch-v8/src/test/java/org/apache/james/quota/search/elasticsearch/v8}/ElasticSearchQuotaSearcherTest.java (98%)
 rename mailbox/plugin/{quota-search-elasticsearch-v7/src/test/java/org/apache/james/quota/search/elasticsearch/v7 => quota-search-elasticsearch-v8/src/test/java/org/apache/james/quota/search/elasticsearch/v8}/QuotaQueryConverterTest.java (51%)
 rename mailbox/plugin/{quota-search-elasticsearch-v7/src/test/java/org/apache/james/quota/search/elasticsearch/v7 => quota-search-elasticsearch-v8/src/test/java/org/apache/james/quota/search/elasticsearch/v8}/UserRoutingKeyFactoryTest.java (93%)
 rename mailbox/plugin/{quota-search-elasticsearch-v7/src/test/java/org/apache/james/quota/search/elasticsearch/v7 => quota-search-elasticsearch-v8/src/test/java/org/apache/james/quota/search/elasticsearch/v8}/events/ElasticSearchQuotaMailboxListenerTest.java (80%)
 rename mailbox/plugin/{quota-search-elasticsearch-v7/src/test/java/org/apache/james/quota/search/elasticsearch/v7 => quota-search-elasticsearch-v8/src/test/java/org/apache/james/quota/search/elasticsearch/v8}/json/QuotaRatioAsJsonTest.java (98%)
 rename mailbox/plugin/{quota-search-elasticsearch-v7/src/test/java/org/apache/james/quota/search/elasticsearch/v7 => quota-search-elasticsearch-v8/src/test/java/org/apache/james/quota/search/elasticsearch/v8}/json/QuotaRatioToElasticSearchJsonTest.java (98%)
 rename mailbox/plugin/{quota-search-elasticsearch-v7 => quota-search-elasticsearch-v8}/src/test/resources/quotaRatio.json (100%)
 rename mailbox/plugin/{quota-search-elasticsearch-v7 => quota-search-elasticsearch-v8}/src/test/resources/quotaRatioNoDomain.json (100%)


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org