You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2022/08/23 10:25:17 UTC
[james-project] 24/26: JAMES-3771 Metrics reporter: Reuse OpenSearch tooling
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 c407f46ac3c78069ac2ef685e0c8eb35502307e8
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Mon Aug 8 10:59:38 2022 +0700
JAMES-3771 Metrics reporter: Reuse OpenSearch tooling
---
.../apache/james/metric/es/v7/DockerElasticSearchExtension.java | 8 ++++----
.../test/java/org/apache/james/metric/es/v7/ES2ReporterTest.java | 4 ++--
.../test/java/org/apache/james/metric/es/v7/ES6ReporterTest.java | 4 ++--
.../test/java/org/apache/james/metric/es/v7/ES7ReporterTest.java | 4 ++--
.../java/org/apache/james/metric/es/v7/ESReporterContract.java | 4 ++--
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/server/container/metrics/metrics-es-reporter-v7/src/test/java/org/apache/james/metric/es/v7/DockerElasticSearchExtension.java b/server/container/metrics/metrics-es-reporter-v7/src/test/java/org/apache/james/metric/es/v7/DockerElasticSearchExtension.java
index 051df471bb..76d8b4199d 100644
--- a/server/container/metrics/metrics-es-reporter-v7/src/test/java/org/apache/james/metric/es/v7/DockerElasticSearchExtension.java
+++ b/server/container/metrics/metrics-es-reporter-v7/src/test/java/org/apache/james/metric/es/v7/DockerElasticSearchExtension.java
@@ -19,7 +19,7 @@
package org.apache.james.metric.es.v7;
-import org.apache.james.backends.opensearch.DockerElasticSearch;
+import org.apache.james.backends.opensearch.DockerOpenSearch;
import org.junit.jupiter.api.extension.AfterAllCallback;
import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.BeforeAllCallback;
@@ -32,9 +32,9 @@ import org.junit.jupiter.api.extension.ParameterResolver;
public class DockerElasticSearchExtension implements AfterAllCallback, BeforeAllCallback, BeforeEachCallback, AfterEachCallback,
ParameterResolver {
- private final DockerElasticSearch elasticSearch;
+ private final DockerOpenSearch elasticSearch;
- DockerElasticSearchExtension(DockerElasticSearch elasticSearch) {
+ DockerElasticSearchExtension(DockerOpenSearch elasticSearch) {
this.elasticSearch = elasticSearch;
}
@@ -63,7 +63,7 @@ public class DockerElasticSearchExtension implements AfterAllCallback, BeforeAll
@Override
public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) throws ParameterResolutionException {
- return (parameterContext.getParameter().getType() == DockerElasticSearch.class);
+ return (parameterContext.getParameter().getType() == DockerOpenSearch.class);
}
@Override
diff --git a/server/container/metrics/metrics-es-reporter-v7/src/test/java/org/apache/james/metric/es/v7/ES2ReporterTest.java b/server/container/metrics/metrics-es-reporter-v7/src/test/java/org/apache/james/metric/es/v7/ES2ReporterTest.java
index e077e2c74b..38172f6f41 100644
--- a/server/container/metrics/metrics-es-reporter-v7/src/test/java/org/apache/james/metric/es/v7/ES2ReporterTest.java
+++ b/server/container/metrics/metrics-es-reporter-v7/src/test/java/org/apache/james/metric/es/v7/ES2ReporterTest.java
@@ -19,7 +19,7 @@
package org.apache.james.metric.es.v7;
-import org.apache.james.backends.opensearch.DockerElasticSearch;
+import org.apache.james.backends.opensearch.DockerOpenSearch;
import org.apache.james.util.docker.Images;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -27,5 +27,5 @@ class ES2ReporterTest extends ESReporterContract {
@RegisterExtension
static DockerElasticSearchExtension testExtension = new DockerElasticSearchExtension(
- new DockerElasticSearch.NoAuth(Images.ELASTICSEARCH_2));
+ new DockerOpenSearch.NoAuth(Images.ELASTICSEARCH_2));
}
diff --git a/server/container/metrics/metrics-es-reporter-v7/src/test/java/org/apache/james/metric/es/v7/ES6ReporterTest.java b/server/container/metrics/metrics-es-reporter-v7/src/test/java/org/apache/james/metric/es/v7/ES6ReporterTest.java
index 5310333054..d84e85e922 100644
--- a/server/container/metrics/metrics-es-reporter-v7/src/test/java/org/apache/james/metric/es/v7/ES6ReporterTest.java
+++ b/server/container/metrics/metrics-es-reporter-v7/src/test/java/org/apache/james/metric/es/v7/ES6ReporterTest.java
@@ -19,7 +19,7 @@
package org.apache.james.metric.es.v7;
-import org.apache.james.backends.opensearch.DockerElasticSearch;
+import org.apache.james.backends.opensearch.DockerOpenSearch;
import org.apache.james.util.docker.Images;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -27,5 +27,5 @@ class ES6ReporterTest extends ESReporterContract {
@RegisterExtension
static DockerElasticSearchExtension testExtension = new DockerElasticSearchExtension(
- new DockerElasticSearch.NoAuth(Images.ELASTICSEARCH_6));
+ new DockerOpenSearch.NoAuth(Images.ELASTICSEARCH_6));
}
diff --git a/server/container/metrics/metrics-es-reporter-v7/src/test/java/org/apache/james/metric/es/v7/ES7ReporterTest.java b/server/container/metrics/metrics-es-reporter-v7/src/test/java/org/apache/james/metric/es/v7/ES7ReporterTest.java
index ebb683c66e..8bae723b53 100644
--- a/server/container/metrics/metrics-es-reporter-v7/src/test/java/org/apache/james/metric/es/v7/ES7ReporterTest.java
+++ b/server/container/metrics/metrics-es-reporter-v7/src/test/java/org/apache/james/metric/es/v7/ES7ReporterTest.java
@@ -19,7 +19,7 @@
package org.apache.james.metric.es.v7;
-import org.apache.james.backends.opensearch.DockerElasticSearch;
+import org.apache.james.backends.opensearch.DockerOpenSearch;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -27,7 +27,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
class ES7ReporterTest extends ESReporterContract {
@RegisterExtension
- static DockerElasticSearchExtension testExtension = new DockerElasticSearchExtension(new DockerElasticSearch.NoAuth());
+ static DockerElasticSearchExtension testExtension = new DockerElasticSearchExtension(new DockerOpenSearch.NoAuth());
@Override
@Disabled("JAMES-3492")
diff --git a/server/container/metrics/metrics-es-reporter-v7/src/test/java/org/apache/james/metric/es/v7/ESReporterContract.java b/server/container/metrics/metrics-es-reporter-v7/src/test/java/org/apache/james/metric/es/v7/ESReporterContract.java
index 452737cccc..5e68df127e 100644
--- a/server/container/metrics/metrics-es-reporter-v7/src/test/java/org/apache/james/metric/es/v7/ESReporterContract.java
+++ b/server/container/metrics/metrics-es-reporter-v7/src/test/java/org/apache/james/metric/es/v7/ESReporterContract.java
@@ -27,7 +27,7 @@ import java.util.Timer;
import java.util.TimerTask;
import org.apache.http.HttpStatus;
-import org.apache.james.backends.opensearch.DockerElasticSearch;
+import org.apache.james.backends.opensearch.DockerOpenSearch;
import org.apache.james.metrics.api.Metric;
import org.apache.james.metrics.api.TimeMetric;
import org.apache.james.metrics.dropwizard.DropWizardMetricFactory;
@@ -53,7 +53,7 @@ abstract class ESReporterContract {
private Timer timer;
@BeforeEach
- void setUp(DockerElasticSearch elasticSearch) {
+ void setUp(DockerOpenSearch elasticSearch) {
RestAssured.baseURI = String.format("http://%s:%d",
elasticSearch.getHttpHost().getHostName(), elasticSearch.getHttpHost().getPort());
await().atMost(Durations.ONE_MINUTE)
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org