[ignite] branch master updated: IGNITE-12045: JmxExporterSpi -> JmxMetricExporterSpi. (#6754)

[ni...@apache.org]

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

nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new 963eb37  IGNITE-12045: JmxExporterSpi -> JmxMetricExporterSpi. (#6754)
963eb37 is described below

commit 963eb37d0c112f2ae5be8b7f72760569a546c67f
Author: Nikolay <ni...@apache.org>
AuthorDate: Wed Aug 7 14:03:33 2019 +0300

    IGNITE-12045: JmxExporterSpi -> JmxMetricExporterSpi. (#6754)
---
 .../main/java/org/apache/ignite/spi/metric/MetricExporterSpi.java   | 4 ++--
 .../metric/jmx/{JmxExporterSpi.java => JmxMetricExporterSpi.java}   | 2 +-
 .../{JmxExporterSpiTest.java => JmxMetricExporterSpiTest.java}      | 6 +++---
 .../java/org/apache/ignite/testsuites/IgniteCacheTestSuite9.java    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/core/src/main/java/org/apache/ignite/spi/metric/MetricExporterSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/metric/MetricExporterSpi.java
index 893fdff..20aad78 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/metric/MetricExporterSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/metric/MetricExporterSpi.java
@@ -21,7 +21,7 @@ import java.util.function.Consumer;
 import java.util.function.Predicate;
 import org.apache.ignite.internal.processors.metric.MetricRegistry;
 import org.apache.ignite.spi.IgniteSpi;
-import org.apache.ignite.spi.metric.jmx.JmxExporterSpi;
+import org.apache.ignite.spi.metric.jmx.JmxMetricExporterSpi;
 
 /**
  * Exporter of metric information to the external recepient.
@@ -38,7 +38,7 @@ import org.apache.ignite.spi.metric.jmx.JmxExporterSpi;
  * @see IntMetric
  * @see LongMetric
  * @see ObjectMetric
- * @see JmxExporterSpi
+ * @see JmxMetricExporterSpi
  */
 public interface MetricExporterSpi extends IgniteSpi {
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/metric/jmx/JmxExporterSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/metric/jmx/JmxMetricExporterSpi.java
similarity index 97%
rename from modules/core/src/main/java/org/apache/ignite/spi/metric/jmx/JmxExporterSpi.java
rename to modules/core/src/main/java/org/apache/ignite/spi/metric/jmx/JmxMetricExporterSpi.java
index 2a11b3ad..3487049 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/metric/jmx/JmxExporterSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/metric/jmx/JmxMetricExporterSpi.java
@@ -38,7 +38,7 @@ import static org.apache.ignite.internal.processors.metric.impl.MetricUtils.pars
 /**
  * This SPI implementation exports metrics as JMX beans.
  */
-public class JmxExporterSpi extends IgniteSpiAdapter implements MetricExporterSpi {
+public class JmxMetricExporterSpi extends IgniteSpiAdapter implements MetricExporterSpi {
     /** Monitoring registry. */
     private ReadOnlyMetricRegistry mreg;
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/metric/JmxExporterSpiTest.java b/modules/core/src/test/java/org/apache/ignite/internal/metric/JmxMetricExporterSpiTest.java
similarity index 96%
rename from modules/core/src/test/java/org/apache/ignite/internal/metric/JmxExporterSpiTest.java
rename to modules/core/src/test/java/org/apache/ignite/internal/metric/JmxMetricExporterSpiTest.java
index 7eff8f1..83392d2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/metric/JmxExporterSpiTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/metric/JmxMetricExporterSpiTest.java
@@ -31,7 +31,7 @@ import org.apache.ignite.configuration.DataStorageConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.IgniteEx;
 import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.spi.metric.jmx.JmxExporterSpi;
+import org.apache.ignite.spi.metric.jmx.JmxMetricExporterSpi;
 import org.apache.ignite.testframework.GridTestUtils.RunnableX;
 import org.junit.Test;
 
@@ -44,7 +44,7 @@ import static org.apache.ignite.internal.processors.metric.impl.MetricUtils.metr
 import static org.apache.ignite.testframework.GridTestUtils.assertThrowsWithCause;
 
 /** */
-public class JmxExporterSpiTest extends AbstractExporterSpiTest {
+public class JmxMetricExporterSpiTest extends AbstractExporterSpiTest {
     /** */
     private static IgniteEx ignite;
 
@@ -57,7 +57,7 @@ public class JmxExporterSpiTest extends AbstractExporterSpiTest {
                 new DataRegionConfiguration()
                     .setPersistenceEnabled(true)));
 
-        JmxExporterSpi jmxSpi = new JmxExporterSpi();
+        JmxMetricExporterSpi jmxSpi = new JmxMetricExporterSpi();
 
         jmxSpi.setExportFilter(mgrp -> !mgrp.name().startsWith(FILTERED_PREFIX));
 
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite9.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite9.java
index 4263f9d..0b17eec 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite9.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite9.java
@@ -25,7 +25,7 @@ import org.apache.ignite.internal.metric.IoStatisticsCachePersistenceSelfTest;
 import org.apache.ignite.internal.metric.IoStatisticsCacheSelfTest;
 import org.apache.ignite.internal.metric.IoStatisticsMetricsLocalMXBeanImplSelfTest;
 import org.apache.ignite.internal.metric.IoStatisticsSelfTest;
-import org.apache.ignite.internal.metric.JmxExporterSpiTest;
+import org.apache.ignite.internal.metric.JmxMetricExporterSpiTest;
 import org.apache.ignite.internal.metric.LogExporterSpiTest;
 import org.apache.ignite.internal.metric.MetricsSelfTest;
 import org.apache.ignite.internal.processors.cache.CachePutIfAbsentTest;
@@ -111,7 +111,7 @@ public class IgniteCacheTestSuite9 {
         GridTestUtils.addTestIfNeeded(suite, IoStatisticsMetricsLocalMXBeanImplSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, MetricsSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, CacheMetricsAddRemoveTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, JmxExporterSpiTest.class, ignoredTests);
+        GridTestUtils.addTestIfNeeded(suite, JmxMetricExporterSpiTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, LogExporterSpiTest.class, ignoredTests);
 
         GridTestUtils.addTestIfNeeded(suite, GridCacheLongRunningTransactionDiagnosticsTest.class, ignoredTests);