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

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


The following commit(s) were added to refs/heads/IGNITE-19753 by this push:
     new fd8ca65122a IGNITE-19734 SystemViewTask moved next to Command class 
(#10772)
fd8ca65122a is described below

commit fd8ca65122ab20cbb2a3e644fbe921080587f481
Author: Valery Shorin <[email protected]>
AuthorDate: Fri Jun 16 10:58:54 2023 +0300

    IGNITE-19734 SystemViewTask moved next to Command class (#10772)
---
 .../commandline/indexreader/IgniteIndexReader.java |  4 +--
 .../apache/ignite/util/SystemViewCommandTest.java  |  5 ++--
 .../internal/management/SystemViewCommand.java     | 24 ++++++++---------
 .../SystemViewTask.java}                           | 31 +++++++++++-----------
 .../SystemViewTaskResult.java}                     | 12 ++++-----
 .../management/cache/CacheMetricsCommand.java      |  2 +-
 .../management/cache/CacheScanCommand.java         |  6 ++---
 .../internal/management/metric/MetricCommand.java  |  2 +-
 .../management/snapshot/SnapshotStatusCommand.java | 11 ++++----
 .../main/resources/META-INF/classnames.properties  |  8 +++---
 ...inaryConfigurationCustomSerializerSelfTest.java |  4 +--
 11 files changed, 54 insertions(+), 55 deletions(-)

diff --git 
a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/indexreader/IgniteIndexReader.java
 
b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/indexreader/IgniteIndexReader.java
index d20478754dc..04429ae2f10 100644
--- 
a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/indexreader/IgniteIndexReader.java
+++ 
b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/indexreader/IgniteIndexReader.java
@@ -106,6 +106,8 @@ import static java.util.stream.Collectors.toList;
 import static 
org.apache.ignite.configuration.DataStorageConfiguration.DFLT_PAGE_SIZE;
 import static 
org.apache.ignite.internal.commandline.argument.parser.CLIArgument.mandatoryArg;
 import static 
org.apache.ignite.internal.commandline.argument.parser.CLIArgument.optionalArg;
+import static 
org.apache.ignite.internal.management.SystemViewTask.SimpleType.NUMBER;
+import static 
org.apache.ignite.internal.management.SystemViewTask.SimpleType.STRING;
 import static org.apache.ignite.internal.pagemem.PageIdAllocator.FLAG_DATA;
 import static org.apache.ignite.internal.pagemem.PageIdAllocator.FLAG_IDX;
 import static 
org.apache.ignite.internal.pagemem.PageIdAllocator.INDEX_PARTITION;
@@ -119,8 +121,6 @@ import static 
org.apache.ignite.internal.processors.cache.persistence.file.FileP
 import static org.apache.ignite.internal.util.GridUnsafe.allocateBuffer;
 import static org.apache.ignite.internal.util.GridUnsafe.bufferAddress;
 import static org.apache.ignite.internal.util.GridUnsafe.freeBuffer;
-import static 
org.apache.ignite.internal.visor.systemview.VisorSystemViewTask.SimpleType.NUMBER;
-import static 
org.apache.ignite.internal.visor.systemview.VisorSystemViewTask.SimpleType.STRING;
 
 /**
  * Offline reader for index files.
diff --git 
a/modules/control-utility/src/test/java/org/apache/ignite/util/SystemViewCommandTest.java
 
b/modules/control-utility/src/test/java/org/apache/ignite/util/SystemViewCommandTest.java
index 3561f7a5547..03f02209c12 100644
--- 
a/modules/control-utility/src/test/java/org/apache/ignite/util/SystemViewCommandTest.java
+++ 
b/modules/control-utility/src/test/java/org/apache/ignite/util/SystemViewCommandTest.java
@@ -60,6 +60,7 @@ import org.apache.ignite.internal.IgniteEx;
 import 
org.apache.ignite.internal.binary.mutabletest.GridBinaryTestClasses.TestObjectAllTypes;
 import 
org.apache.ignite.internal.binary.mutabletest.GridBinaryTestClasses.TestObjectEnum;
 import org.apache.ignite.internal.management.SystemViewCommand;
+import org.apache.ignite.internal.management.SystemViewTask;
 import org.apache.ignite.internal.metric.SystemViewSelfTest.TestPredicate;
 import org.apache.ignite.internal.metric.SystemViewSelfTest.TestRunnable;
 import org.apache.ignite.internal.metric.SystemViewSelfTest.TestTransformer;
@@ -74,13 +75,13 @@ import org.apache.ignite.internal.util.StripedExecutor;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.G;
 import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.internal.visor.systemview.VisorSystemViewTask;
 import org.apache.ignite.services.ServiceConfiguration;
 import org.apache.ignite.spi.systemview.view.SystemView;
 import 
org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker.AttributeVisitor;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.transactions.Transaction;
 import org.junit.Test;
+
 import static java.util.Arrays.asList;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.regex.Pattern.quote;
@@ -306,7 +307,7 @@ public class SystemViewCommandTest extends 
GridCommandHandlerClusterByClassAbstr
             COMPUTE_JOB_BLOCK_LATCH.await();
 
             List<List<String>> tasksView = systemView(ignite0, 
TASKS_VIEW).stream()
-                .filter(row -> 
!VisorSystemViewTask.class.getName().equals(row.get(3)))
+                .filter(row -> 
!SystemViewTask.class.getName().equals(row.get(3)))
                 .collect(Collectors.toList());
 
             assertEquals(tasksCnt, tasksView.size());
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/management/SystemViewCommand.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/management/SystemViewCommand.java
index 7e8a8225b6c..f42ff0edd03 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/management/SystemViewCommand.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/management/SystemViewCommand.java
@@ -31,16 +31,14 @@ import java.util.stream.Collectors;
 import org.apache.ignite.internal.client.GridClientNode;
 import org.apache.ignite.internal.management.api.ComputeCommand;
 import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.internal.visor.systemview.VisorSystemViewTask;
-import org.apache.ignite.internal.visor.systemview.VisorSystemViewTaskResult;
 
 import static java.util.Collections.nCopies;
-import static 
org.apache.ignite.internal.visor.systemview.VisorSystemViewTask.SimpleType.DATE;
-import static 
org.apache.ignite.internal.visor.systemview.VisorSystemViewTask.SimpleType.NUMBER;
-import static 
org.apache.ignite.internal.visor.systemview.VisorSystemViewTask.SimpleType.STRING;
+import static 
org.apache.ignite.internal.management.SystemViewTask.SimpleType.DATE;
+import static 
org.apache.ignite.internal.management.SystemViewTask.SimpleType.NUMBER;
+import static 
org.apache.ignite.internal.management.SystemViewTask.SimpleType.STRING;
 
 /** Command for printing system view content. */
-public class SystemViewCommand implements ComputeCommand<SystemViewCommandArg, 
VisorSystemViewTaskResult> {
+public class SystemViewCommand implements ComputeCommand<SystemViewCommandArg, 
SystemViewTaskResult> {
     /** Column separator. */
     public static final String COLUMN_SEPARATOR = "    ";
 
@@ -55,8 +53,8 @@ public class SystemViewCommand implements 
ComputeCommand<SystemViewCommandArg, V
     }
 
     /** {@inheritDoc} */
-    @Override public Class<VisorSystemViewTask> taskClass() {
-        return VisorSystemViewTask.class;
+    @Override public Class<SystemViewTask> taskClass() {
+        return SystemViewTask.class;
     }
 
     /** {@inheritDoc} */
@@ -73,7 +71,7 @@ public class SystemViewCommand implements 
ComputeCommand<SystemViewCommandArg, V
     }
 
     /** {@inheritDoc} */
-    @Override public void printResult(SystemViewCommandArg arg, 
VisorSystemViewTaskResult res, Consumer<String> printer) {
+    @Override public void printResult(SystemViewCommandArg arg, 
SystemViewTaskResult res, Consumer<String> printer) {
         if (res != null) {
             res.rows().forEach((nodeId, rows) -> {
                 printer.accept("Results from node with ID: " + nodeId);
@@ -98,7 +96,7 @@ public class SystemViewCommand implements 
ComputeCommand<SystemViewCommandArg, V
      */
     public static void printTable(
         List<String> titles,
-        List<VisorSystemViewTask.SimpleType> types,
+        List<SystemViewTask.SimpleType> types,
         List<List<?>> data,
         Consumer<String> printer
     ) {
@@ -139,15 +137,15 @@ public class SystemViewCommand implements 
ComputeCommand<SystemViewCommandArg, V
      */
     private static void printRow(
         Collection<String> row,
-        Collection<VisorSystemViewTask.SimpleType> types,
+        Collection<SystemViewTask.SimpleType> types,
         Collection<Integer> colSzs,
         Consumer<String> printer
     ) {
-        Iterator<VisorSystemViewTask.SimpleType> typeIter = types.iterator();
+        Iterator<SystemViewTask.SimpleType> typeIter = types.iterator();
         Iterator<Integer> colSzsIter = colSzs.iterator();
 
         printer.accept(row.stream().map(colVal -> {
-            VisorSystemViewTask.SimpleType colType = typeIter.next();
+            SystemViewTask.SimpleType colType = typeIter.next();
 
             int colSz = colSzsIter.next();
 
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/systemview/VisorSystemViewTask.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/management/SystemViewTask.java
similarity index 84%
rename from 
modules/core/src/main/java/org/apache/ignite/internal/visor/systemview/VisorSystemViewTask.java
rename to 
modules/core/src/main/java/org/apache/ignite/internal/management/SystemViewTask.java
index 17bcd3236b4..45db9dd749f 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/systemview/VisorSystemViewTask.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/management/SystemViewTask.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.internal.visor.systemview;
+package org.apache.ignite.internal.management;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -26,7 +26,6 @@ import java.util.TreeMap;
 import java.util.UUID;
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.compute.ComputeJobResult;
-import org.apache.ignite.internal.management.SystemViewCommandArg;
 import org.apache.ignite.internal.managers.systemview.GridSystemViewManager;
 import org.apache.ignite.internal.processors.task.GridInternal;
 import org.apache.ignite.internal.processors.task.GridVisorManagementTask;
@@ -40,28 +39,28 @@ import 
org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker.Attrib
 import org.jetbrains.annotations.Nullable;
 
 import static java.util.Collections.singletonMap;
+import static 
org.apache.ignite.internal.management.SystemViewTask.SimpleType.DATE;
+import static 
org.apache.ignite.internal.management.SystemViewTask.SimpleType.NUMBER;
+import static 
org.apache.ignite.internal.management.SystemViewTask.SimpleType.STRING;
 import static 
org.apache.ignite.internal.processors.metric.impl.MetricUtils.toSqlName;
-import static 
org.apache.ignite.internal.visor.systemview.VisorSystemViewTask.SimpleType.DATE;
-import static 
org.apache.ignite.internal.visor.systemview.VisorSystemViewTask.SimpleType.NUMBER;
-import static 
org.apache.ignite.internal.visor.systemview.VisorSystemViewTask.SimpleType.STRING;
 
 /** Reperesents visor task for obtaining system view content. */
 @GridInternal
 @GridVisorManagementTask
-public class VisorSystemViewTask extends 
VisorMultiNodeTask<SystemViewCommandArg, VisorSystemViewTaskResult,
-    VisorSystemViewTaskResult> {
+public class SystemViewTask extends VisorMultiNodeTask<SystemViewCommandArg, 
SystemViewTaskResult,
+    SystemViewTaskResult> {
     /** */
     private static final long serialVersionUID = 0L;
 
     /** {@inheritDoc} */
-    @Override protected VisorJob<SystemViewCommandArg, 
VisorSystemViewTaskResult> job(SystemViewCommandArg arg) {
-        return new VisorSystemViewJob(arg, false);
+    @Override protected VisorJob<SystemViewCommandArg, SystemViewTaskResult> 
job(SystemViewCommandArg arg) {
+        return new SystemViewJob(arg, false);
     }
 
     /** {@inheritDoc} */
-    @Override protected @Nullable VisorSystemViewTaskResult 
reduce0(List<ComputeJobResult> results)
+    @Override protected @Nullable SystemViewTaskResult 
reduce0(List<ComputeJobResult> results)
         throws IgniteException {
-        VisorSystemViewTaskResult res = null;
+        SystemViewTaskResult res = null;
 
         Map<UUID, List<List<?>>> merged = new TreeMap<>();
 
@@ -77,11 +76,11 @@ public class VisorSystemViewTask extends 
VisorMultiNodeTask<SystemViewCommandArg
             merged.putAll(res.rows());
         }
 
-        return new VisorSystemViewTaskResult(res.attributes(), res.types(), 
merged);
+        return new SystemViewTaskResult(res.attributes(), res.types(), merged);
     }
 
     /** */
-    private static class VisorSystemViewJob extends 
VisorJob<SystemViewCommandArg, VisorSystemViewTaskResult> {
+    private static class SystemViewJob extends VisorJob<SystemViewCommandArg, 
SystemViewTaskResult> {
         /** */
         private static final long serialVersionUID = 0L;
 
@@ -91,12 +90,12 @@ public class VisorSystemViewTask extends 
VisorMultiNodeTask<SystemViewCommandArg
          * @param arg Job argument.
          * @param debug Flag indicating whether debug information should be 
printed into node log.
          */
-        protected VisorSystemViewJob(@Nullable SystemViewCommandArg arg, 
boolean debug) {
+        protected SystemViewJob(@Nullable SystemViewCommandArg arg, boolean 
debug) {
             super(arg, debug);
         }
 
         /** {@inheritDoc} */
-        @Override protected VisorSystemViewTaskResult run(@Nullable 
SystemViewCommandArg arg) throws IgniteException {
+        @Override protected SystemViewTaskResult run(@Nullable 
SystemViewCommandArg arg) throws IgniteException {
             if (arg == null)
                 return null;
 
@@ -180,7 +179,7 @@ public class VisorSystemViewTask extends 
VisorMultiNodeTask<SystemViewCommandArg
                 rows.add(attrVals);
             }
 
-            return new VisorSystemViewTaskResult(attrNames, attrTypes, 
singletonMap(ignite.localNode().id(), rows));
+            return new SystemViewTaskResult(attrNames, attrTypes, 
singletonMap(ignite.localNode().id(), rows));
         }
 
         /**
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/systemview/VisorSystemViewTaskResult.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/management/SystemViewTaskResult.java
similarity index 86%
rename from 
modules/core/src/main/java/org/apache/ignite/internal/visor/systemview/VisorSystemViewTaskResult.java
rename to 
modules/core/src/main/java/org/apache/ignite/internal/management/SystemViewTaskResult.java
index 91522d1099b..e3a13a8a71a 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/systemview/VisorSystemViewTaskResult.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/management/SystemViewTaskResult.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.internal.visor.systemview;
+package org.apache.ignite.internal.management;
 
 import java.io.IOException;
 import java.io.ObjectInput;
@@ -24,11 +24,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import org.apache.ignite.internal.dto.IgniteDataTransferObject;
+import org.apache.ignite.internal.management.SystemViewTask.SimpleType;
 import org.apache.ignite.internal.util.typedef.internal.U;
-import 
org.apache.ignite.internal.visor.systemview.VisorSystemViewTask.SimpleType;
 
-/** Reperesents result of {@link VisorSystemViewTask}. */
-public class VisorSystemViewTaskResult extends IgniteDataTransferObject {
+/** Reperesents result of {@link SystemViewTask}. */
+public class SystemViewTaskResult extends IgniteDataTransferObject {
     /** */
     private static final long serialVersionUID = 0L;
 
@@ -42,7 +42,7 @@ public class VisorSystemViewTaskResult extends 
IgniteDataTransferObject {
     List<SimpleType> types;
 
     /** Default constructor. */
-    public VisorSystemViewTaskResult() {
+    public SystemViewTaskResult() {
         // No-op.
     }
 
@@ -51,7 +51,7 @@ public class VisorSystemViewTaskResult extends 
IgniteDataTransferObject {
      * @param types Types of the system view attributes.
      * @param rows Attribute values for each row of the system view per node 
ID.
      */
-    public VisorSystemViewTaskResult(List<String> attrs, List<SimpleType> 
types, Map<UUID, List<List<?>>> rows) {
+    public SystemViewTaskResult(List<String> attrs, List<SimpleType> types, 
Map<UUID, List<List<?>>> rows) {
         this.attrs = attrs;
         this.types = types;
         this.rows = rows;
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheMetricsCommand.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheMetricsCommand.java
index d4accdb7d1f..9798da146b3 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheMetricsCommand.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheMetricsCommand.java
@@ -26,7 +26,7 @@ import 
org.apache.ignite.internal.visor.cache.metrics.VisorCacheMetricsTask;
 import 
org.apache.ignite.internal.visor.cache.metrics.VisorCacheMetricsTaskResult;
 import static java.util.Arrays.asList;
 import static 
org.apache.ignite.internal.management.SystemViewCommand.printTable;
-import static 
org.apache.ignite.internal.visor.systemview.VisorSystemViewTask.SimpleType.STRING;
+import static 
org.apache.ignite.internal.management.SystemViewTask.SimpleType.STRING;
 
 /** Enable / disable cache metrics collection or show metrics collection 
status. */
 public class CacheMetricsCommand implements 
ComputeCommand<CacheMetricsCommandArg, VisorCacheMetricsTaskResult> {
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheScanCommand.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheScanCommand.java
index 76c33447b2e..ef30c9f95e0 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheScanCommand.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheScanCommand.java
@@ -21,10 +21,10 @@ import java.util.List;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import org.apache.ignite.internal.management.SystemViewCommand;
+import org.apache.ignite.internal.management.SystemViewTask;
 import org.apache.ignite.internal.management.api.ComputeCommand;
 import org.apache.ignite.internal.visor.cache.VisorCacheScanTask;
 import org.apache.ignite.internal.visor.cache.VisorCacheScanTaskResult;
-import org.apache.ignite.internal.visor.systemview.VisorSystemViewTask;
 
 /** Scan cache entries. */
 public class CacheScanCommand implements ComputeCommand<CacheScanCommandArg, 
VisorCacheScanTaskResult> {
@@ -45,8 +45,8 @@ public class CacheScanCommand implements 
ComputeCommand<CacheScanCommandArg, Vis
 
     /** {@inheritDoc} */
     @Override public void printResult(CacheScanCommandArg arg, 
VisorCacheScanTaskResult res, Consumer<String> printer) {
-        List<VisorSystemViewTask.SimpleType> types = res.titles().stream()
-            .map(x -> 
VisorSystemViewTask.SimpleType.STRING).collect(Collectors.toList());
+        List<SystemViewTask.SimpleType> types = res.titles().stream()
+            .map(x -> 
SystemViewTask.SimpleType.STRING).collect(Collectors.toList());
 
         SystemViewCommand.printTable(res.titles(), types, res.entries(), 
printer);
 
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricCommand.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricCommand.java
index a52d6c642b0..fa85bb6ea7e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricCommand.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricCommand.java
@@ -32,8 +32,8 @@ import 
org.apache.ignite.internal.visor.metric.VisorMetricTask;
 
 import static java.util.Arrays.asList;
 import static 
org.apache.ignite.internal.management.SystemViewCommand.printTable;
+import static 
org.apache.ignite.internal.management.SystemViewTask.SimpleType.STRING;
 import static 
org.apache.ignite.internal.management.api.CommandUtils.nodeOrNull;
-import static 
org.apache.ignite.internal.visor.systemview.VisorSystemViewTask.SimpleType.STRING;
 
 /** Command for printing metric values. */
 @CliSubcommandsWithPrefix
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotStatusCommand.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotStatusCommand.java
index ca0b7082d97..b16b981d7e1 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotStatusCommand.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotStatusCommand.java
@@ -28,6 +28,7 @@ import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.internal.management.SystemViewCommand;
+import org.apache.ignite.internal.management.SystemViewTask;
 import org.apache.ignite.internal.management.api.NoArg;
 import org.apache.ignite.internal.util.GridStringBuilder;
 import org.apache.ignite.internal.util.typedef.F;
@@ -36,9 +37,9 @@ import org.apache.ignite.internal.util.typedef.X;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.internal.visor.snapshot.VisorSnapshotStatusTask;
 import org.apache.ignite.internal.visor.snapshot.VisorSnapshotTaskResult;
-import org.apache.ignite.internal.visor.systemview.VisorSystemViewTask;
-import static 
org.apache.ignite.internal.visor.systemview.VisorSystemViewTask.SimpleType.NUMBER;
-import static 
org.apache.ignite.internal.visor.systemview.VisorSystemViewTask.SimpleType.STRING;
+
+import static 
org.apache.ignite.internal.management.SystemViewTask.SimpleType.NUMBER;
+import static 
org.apache.ignite.internal.management.SystemViewTask.SimpleType.STRING;
 
 /** */
 public class SnapshotStatusCommand extends AbstractSnapshotCommand<NoArg> {
@@ -136,8 +137,8 @@ public class SnapshotStatusCommand extends 
AbstractSnapshotCommand<NoArg> {
         }
 
         /** @return Progress table columns types. */
-        List<VisorSystemViewTask.SimpleType> types() {
-            List<VisorSystemViewTask.SimpleType> types = new ArrayList<>();
+        List<SystemViewTask.SimpleType> types() {
+            List<SystemViewTask.SimpleType> types = new ArrayList<>();
 
             types.add(STRING);
 
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties 
b/modules/core/src/main/resources/META-INF/classnames.properties
index f3895b26ed4..acd70f7b6d0 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -2284,10 +2284,10 @@ 
org.apache.ignite.internal.visor.snapshot.VisorSnapshotStatusTask$SnapshotOperat
 
org.apache.ignite.internal.visor.snapshot.VisorSnapshotStatusTask$SnapshotStatus
 
org.apache.ignite.internal.visor.snapshot.VisorSnapshotStatusTask$VisorSnapshotStatusJob
 org.apache.ignite.internal.visor.snapshot.VisorSnapshotTaskResult
-org.apache.ignite.internal.visor.systemview.VisorSystemViewTask
-org.apache.ignite.internal.visor.systemview.VisorSystemViewTask$SimpleType
-org.apache.ignite.internal.visor.systemview.VisorSystemViewTask$VisorSystemViewJob
-org.apache.ignite.internal.visor.systemview.VisorSystemViewTaskResult
+org.apache.ignite.internal.management.SystemViewTask
+org.apache.ignite.internal.management.SystemViewTask$SimpleType
+org.apache.ignite.internal.management.SystemViewTask$SystemViewJob
+org.apache.ignite.internal.management.SystemViewTaskResult
 
org.apache.ignite.internal.visor.tracing.configuration.VisorTracingConfigurationItem
 
org.apache.ignite.internal.visor.tracing.configuration.VisorTracingConfigurationTask
 
org.apache.ignite.internal.visor.tracing.configuration.VisorTracingConfigurationTask$VisorTracingConfigurationJob
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryConfigurationCustomSerializerSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryConfigurationCustomSerializerSelfTest.java
index ebeebb9fcb4..e19af7c25ea 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryConfigurationCustomSerializerSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryConfigurationCustomSerializerSelfTest.java
@@ -35,8 +35,8 @@ import org.apache.ignite.internal.client.GridClientFactory;
 import org.apache.ignite.internal.client.GridClientProtocol;
 import org.apache.ignite.internal.client.balancer.GridClientRoundRobinBalancer;
 import org.apache.ignite.internal.management.SystemViewCommandArg;
+import org.apache.ignite.internal.management.SystemViewTask;
 import org.apache.ignite.internal.visor.VisorTaskArgument;
-import org.apache.ignite.internal.visor.systemview.VisorSystemViewTask;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.junit.Test;
 
@@ -109,7 +109,7 @@ public class BinaryConfigurationCustomSerializerSelfTest 
extends GridCommonAbstr
 
         arg.systemViewName(CACHES_VIEW);
 
-        client.compute().execute(VisorSystemViewTask.class.getName(),
+        client.compute().execute(SystemViewTask.class.getName(),
             new VisorTaskArgument<>(nid, arg, false));
 
         GridClientFactory.stop(client.id(), false);

Reply via email to