IGNITE-21139 Provide ability to extract a command argument and class …

modules/core/src/main/java/org/apache/ignite/internal/events/ManagementTaskEvent.java

@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.events;
+
+import java.util.UUID;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.events.EventType;
+import org.apache.ignite.events.TaskEvent;
+import org.apache.ignite.internal.visor.VisorTaskArgument;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Management task started event.
+ *
+ * @see EventType#EVT_MANAGEMENT_TASK_STARTED
+ */
+public class ManagementTaskEvent extends TaskEvent {
+    /** */
+    private static final long serialVersionUID = 0L;
+
+    /** */
+    private final VisorTaskArgument<?> arg;
+
+    /**
+     * Creates task event with given parameters.
+     *
+     * @param node Node.
+     * @param msg Optional message.
+     * @param type Event type.
+     * @param sesId Task session ID.
+     * @param taskName Task name.
+     * @param subjId Subject ID.
+     * @param internal Whether current task belongs to Ignite internal tasks.
+     * @param taskClsName Name ot the task class.
+     */
+    public ManagementTaskEvent(ClusterNode node, String msg, int type, IgniteUuid sesId, String taskName,
+        String taskClsName, boolean internal, @Nullable UUID subjId, VisorTaskArgument<?> arg) {
+        super(node, msg, type, sesId, taskName, taskClsName, internal, subjId);
+
+        this.arg = arg;
+    }
+
+    /** @return Task argument. */
+    public VisorTaskArgument<?> argument() {
+        return arg;
+    }
+}

modules/core/src/main/java/org/apache/ignite/internal/management/ClusterChangeTagTask.java

@@ -21,15 +21,13 @@
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.internal.cluster.IgniteClusterEx;
 import org.apache.ignite.internal.processors.task.GridInternal;
-import org.apache.ignite.internal.processors.task.GridVisorManagementTask;
 import org.apache.ignite.internal.visor.VisorJob;
 import org.apache.ignite.internal.visor.VisorOneNodeTask;
 
 /**
  *
  */
 @GridInternal
-@GridVisorManagementTask
 public class ClusterChangeTagTask extends VisorOneNodeTask<ChangeTagCommandArg, ClusterChangeTagTaskResult> {
     /** */
     private static final long serialVersionUID = 0L;

modules/core/src/main/java/org/apache/ignite/internal/management/ShutdownPolicyTask.java

@@ -20,7 +20,6 @@
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.IgniteLogger;
 import org.apache.ignite.internal.processors.task.GridInternal;
-import org.apache.ignite.internal.processors.task.GridVisorManagementTask;
 import org.apache.ignite.internal.visor.VisorJob;
 import org.apache.ignite.internal.visor.VisorOneNodeTask;
 import org.apache.ignite.resources.LoggerResource;
@@ -29,7 +28,6 @@
  * Shutdown policy task.
  */
 @GridInternal
-@GridVisorManagementTask
 public class ShutdownPolicyTask extends VisorOneNodeTask<ShutdownPolicyCommandArg, ShutdownPolicyTaskResult> {
     /** Serial version id. */
     private static final long serialVersionUID = 0L;

modules/core/src/main/java/org/apache/ignite/internal/management/SystemViewTask.java

@@ -28,7 +28,6 @@
 import org.apache.ignite.compute.ComputeJobResult;
 import org.apache.ignite.internal.managers.systemview.GridSystemViewManager;
 import org.apache.ignite.internal.processors.task.GridInternal;
-import org.apache.ignite.internal.processors.task.GridVisorManagementTask;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.internal.visor.VisorJob;
 import org.apache.ignite.internal.visor.VisorMultiNodeTask;
@@ -46,7 +45,6 @@
 
 /** Reperesents visor task for obtaining system view content. */
 @GridInternal
-@GridVisorManagementTask
 public class SystemViewTask extends VisorMultiNodeTask<SystemViewCommandArg, SystemViewTaskResult, SystemViewTaskResult> {
     /** */
     private static final long serialVersionUID = 0L;

modules/core/src/main/java/org/apache/ignite/internal/management/api/CommandUtils.java

@@ -42,7 +42,6 @@
 import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.cluster.ClusterNode;
-import org.apache.ignite.compute.ComputeTask;
 import org.apache.ignite.internal.client.GridClient;
 import org.apache.ignite.internal.client.GridClientCacheMode;
 import org.apache.ignite.internal.client.GridClientCompute;
@@ -54,6 +53,7 @@
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.internal.SB;
 import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.visor.VisorMultiNodeTask;
 import org.apache.ignite.internal.visor.VisorTaskArgument;
 import org.apache.ignite.lang.IgniteExperimental;
 import org.apache.ignite.lang.IgniteUuid;
@@ -764,7 +764,7 @@ public static <A extends IgniteDataTransferObject> A argument(
     public static <A, R> R execute(
         @Nullable GridClient cli,
         @Nullable Ignite ignite,
-        Class<? extends ComputeTask<VisorTaskArgument<A>, R>> taskCls,
+        Class<? extends VisorMultiNodeTask<A, R, ?>> taskCls,
         A arg,
         Collection<GridClientNode> nodes
     ) throws GridClientException {

modules/core/src/main/java/org/apache/ignite/internal/management/api/ComputeCommand.java

@@ -19,18 +19,17 @@
 
 import java.util.Collection;
 import java.util.function.Consumer;
-import org.apache.ignite.compute.ComputeTask;
 import org.apache.ignite.internal.client.GridClientNode;
 import org.apache.ignite.internal.dto.IgniteDataTransferObject;
-import org.apache.ignite.internal.visor.VisorTaskArgument;
+import org.apache.ignite.internal.visor.VisorMultiNodeTask;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * Command that executed with some compute task.
  */
 public interface ComputeCommand<A extends IgniteDataTransferObject, R> extends Command<A, R> {
     /** @return Task class. */
-    public Class<? extends ComputeTask<VisorTaskArgument<A>, R>> taskClass();
+    public Class<? extends VisorMultiNodeTask<A, R, ?>> taskClass();
 
     /**
      * Prints command result to the user.

modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineTask.java

@@ -30,7 +30,6 @@
 import org.apache.ignite.internal.management.baseline.BaselineCommand.BaselineTaskArg;
 import org.apache.ignite.internal.processors.cluster.baseline.autoadjust.BaselineAutoAdjustStatus;
 import org.apache.ignite.internal.processors.task.GridInternal;
-import org.apache.ignite.internal.processors.task.GridVisorManagementTask;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.visor.VisorJob;
@@ -41,7 +40,6 @@
  * Task that will collect information about baseline topology and can change its state.
  */
 @GridInternal
-@GridVisorManagementTask
 public class BaselineTask extends VisorOneNodeTask<BaselineTaskArg, BaselineTaskResult> {
     /** */
     private static final long serialVersionUID = 0L;

modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheMetricsTask.java

@@ -24,18 +24,17 @@
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
 import org.apache.ignite.internal.processors.task.GridInternal;
-import org.apache.ignite.internal.processors.task.GridVisorManagementTask;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.visor.VisorJob;
 import org.apache.ignite.internal.visor.VisorOneNodeTask;
 import org.jetbrains.annotations.Nullable;
+
 import static org.apache.ignite.internal.management.cache.CacheMetricsOperation.ENABLE;
 
 /**
  * Task for a cache metrics command.
  */
 @GridInternal
-@GridVisorManagementTask
 public class CacheMetricsTask extends VisorOneNodeTask<CacheMetricsCommandArg, CacheMetricsTaskResult> {
     /** Serial version uid. */
     private static final long serialVersionUID = 0L;

modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheScanTask.java

@@ -30,7 +30,6 @@
 import org.apache.ignite.cache.query.ScanQuery;
 import org.apache.ignite.internal.binary.BinaryObjectEx;
 import org.apache.ignite.internal.processors.task.GridInternal;
-import org.apache.ignite.internal.processors.task.GridVisorManagementTask;
 import org.apache.ignite.internal.util.IgniteUtils;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.internal.S;
@@ -47,7 +46,6 @@
  * Task that scan cache entries.
  */
 @GridInternal
-@GridVisorManagementTask
 public class CacheScanTask extends VisorOneNodeTask<CacheScanCommandArg, CacheScanTaskResult> {
     /** */
     private static final long serialVersionUID = 0L;

modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheStopTask.java

@@ -21,7 +21,6 @@
 import java.util.Collection;
 import java.util.HashSet;
 import org.apache.ignite.internal.processors.task.GridInternal;
-import org.apache.ignite.internal.processors.task.GridVisorManagementTask;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.visor.VisorJob;
@@ -34,7 +33,6 @@
  * Task that stop specified caches on specified node.
  */
 @GridInternal
-@GridVisorManagementTask
 public class CacheStopTask extends VisorOneNodeTask<CacheDestroyCommandArg, Void> {
     /** */
     private static final long serialVersionUID = 0L;

modules/core/src/main/java/org/apache/ignite/internal/management/defragmentation/DefragmentationTask.java

@@ -26,15 +26,13 @@
 import org.apache.ignite.internal.management.defragmentation.DefragmentationCommand.DefragmentationStatusCommandArg;
 import org.apache.ignite.internal.processors.cache.persistence.defragmentation.IgniteDefragmentation;
 import org.apache.ignite.internal.processors.task.GridInternal;
-import org.apache.ignite.internal.processors.task.GridVisorManagementTask;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.visor.VisorJob;
 import org.apache.ignite.internal.visor.VisorMultiNodeTask;
 import org.jetbrains.annotations.Nullable;
 
 /** */
 @GridInternal
-@GridVisorManagementTask
 public class DefragmentationTask extends VisorMultiNodeTask
     <DefragmentationStatusCommandArg, DefragmentationTaskResult, DefragmentationTaskResult> {
     /** Serial version uid. */

modules/core/src/main/java/org/apache/ignite/internal/management/kill/CancelServiceTask.java

@@ -19,7 +19,6 @@
 
 import org.apache.ignite.internal.ServiceMXBeanImpl;
 import org.apache.ignite.internal.processors.task.GridInternal;
-import org.apache.ignite.internal.processors.task.GridVisorManagementTask;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.visor.VisorJob;
 import org.apache.ignite.internal.visor.VisorOneNodeTask;
@@ -28,7 +27,6 @@
  * Task for cancel services with specified name.
  */
 @GridInternal
-@GridVisorManagementTask
 public class CancelServiceTask extends VisorOneNodeTask<KillServiceCommandArg, Void> {
     /** */
     private static final long serialVersionUID = 0L;

modules/core/src/main/java/org/apache/ignite/internal/management/kill/ClientConnectionDropTask.java

@@ -21,7 +21,6 @@
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.compute.ComputeJobResult;
 import org.apache.ignite.internal.processors.task.GridInternal;
-import org.apache.ignite.internal.processors.task.GridVisorManagementTask;
 import org.apache.ignite.internal.visor.VisorJob;
 import org.apache.ignite.internal.visor.VisorMultiNodeTask;
 import org.apache.ignite.mxbean.ClientProcessorMXBean;
@@ -31,7 +30,6 @@
  * Task to cancel client connection(s).
  */
 @GridInternal
-@GridVisorManagementTask
 public class ClientConnectionDropTask extends VisorMultiNodeTask<KillClientCommandArg, Void, Boolean> {
     /** */
     private static final long serialVersionUID = 0L;

modules/core/src/main/java/org/apache/ignite/internal/management/kill/ComputeCancelSessionTask.java

@@ -21,7 +21,6 @@
 import org.apache.ignite.compute.ComputeJobResult;
 import org.apache.ignite.internal.ComputeMXBeanImpl;
 import org.apache.ignite.internal.processors.task.GridInternal;
-import org.apache.ignite.internal.processors.task.GridVisorManagementTask;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.visor.VisorJob;
 import org.apache.ignite.internal.visor.VisorOneNodeTask;
@@ -31,7 +30,6 @@
  * Cancels given tasks sessions on all cluster nodes.
  */
 @GridInternal
-@GridVisorManagementTask
 public class ComputeCancelSessionTask extends VisorOneNodeTask<KillComputeCommandArg, Void> {
     /** */
     private static final long serialVersionUID = 0L;

modules/core/src/main/java/org/apache/ignite/internal/management/kill/ContinuousQueryCancelTask.java

@@ -21,7 +21,6 @@
 import org.apache.ignite.IgniteLogger;
 import org.apache.ignite.internal.QueryMXBeanImpl;
 import org.apache.ignite.internal.processors.task.GridInternal;
-import org.apache.ignite.internal.processors.task.GridVisorManagementTask;
 import org.apache.ignite.internal.visor.VisorJob;
 import org.apache.ignite.internal.visor.VisorOneNodeTask;
 import org.jetbrains.annotations.Nullable;
@@ -30,7 +29,6 @@
  * Task to cancel continuous query.
  */
 @GridInternal
-@GridVisorManagementTask
 public class ContinuousQueryCancelTask extends VisorOneNodeTask<KillContinuousCommandArg, Void> {
     /** */
     private static final long serialVersionUID = 0L;

modules/core/src/main/java/org/apache/ignite/internal/management/kill/QueryCancelOnInitiatorTask.java

@@ -22,7 +22,6 @@
 import org.apache.ignite.compute.ComputeJobResult;
 import org.apache.ignite.internal.QueryMXBeanImpl;
 import org.apache.ignite.internal.processors.task.GridInternal;
-import org.apache.ignite.internal.processors.task.GridVisorManagementTask;
 import org.apache.ignite.internal.visor.VisorJob;
 import org.apache.ignite.internal.visor.VisorOneNodeTask;
 import org.jetbrains.annotations.Nullable;
@@ -31,7 +30,6 @@
  * Task to cancel queries on initiator node.
  */
 @GridInternal
-@GridVisorManagementTask
 public class QueryCancelOnInitiatorTask extends VisorOneNodeTask<KillSqlCommandArg, Void> {
     /** */
     private static final long serialVersionUID = 0L;

modules/core/src/main/java/org/apache/ignite/internal/management/kill/ScanQueryCancelTask.java

@@ -20,15 +20,13 @@
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.internal.QueryMXBeanImpl;
 import org.apache.ignite.internal.processors.task.GridInternal;
-import org.apache.ignite.internal.processors.task.GridVisorManagementTask;
 import org.apache.ignite.internal.visor.VisorJob;
 import org.apache.ignite.internal.visor.VisorOneNodeTask;
 
 /**
  * Task to cancel scan queries.
  */
 @GridInternal
-@GridVisorManagementTask
 public class ScanQueryCancelTask extends VisorOneNodeTask<KillScanCommandArg, Void> {
     /** */
     private static final long serialVersionUID = 0L;

modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricTask.java

@@ -24,7 +24,6 @@
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.internal.processors.metric.GridMetricManager;
 import org.apache.ignite.internal.processors.task.GridInternal;
-import org.apache.ignite.internal.processors.task.GridVisorManagementTask;
 import org.apache.ignite.internal.visor.VisorJob;
 import org.apache.ignite.internal.visor.VisorOneNodeTask;
 import org.apache.ignite.spi.metric.BooleanMetric;
@@ -43,7 +42,6 @@
 
 /** Reperesents visor task for obtaining metric values. */
 @GridInternal
-@GridVisorManagementTask
 public class MetricTask extends VisorOneNodeTask<MetricCommandArg, Map<String, ?>> {
     /** */
     private static final long serialVersionUID = 0L;