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 6b6f76d335d IGNITE-19786 Move Persistence and Property task classes to
command class packages (#10794)
6b6f76d335d is described below
commit 6b6f76d335d46980030a08de66196d28ac664434
Author: Valery Shorin <[email protected]>
AuthorDate: Wed Jun 21 11:07:44 2023 +0300
IGNITE-19786 Move Persistence and Property task classes to command class
packages (#10794)
---
.../persistence/PersistenceAbstractCommand.java | 2 --
.../management/persistence/PersistenceCommand.java | 2 --
.../persistence/PersistenceTask.java | 4 +---
.../persistence/PersistenceTaskResult.java | 2 +-
.../property}/PropertiesListResult.java | 2 +-
.../property}/PropertiesListTask.java | 2 +-
.../management/property/PropertyGetCommand.java | 2 --
.../management/property/PropertyListCommand.java | 2 --
.../property}/PropertyOperationResult.java | 2 +-
.../management/property/PropertySetCommand.java | 2 --
.../tasks => management/property}/PropertyTask.java | 4 +---
.../src/main/resources/META-INF/classnames.properties | 18 +++++++++---------
.../persistence/MaintenancePersistenceTaskTest.java | 5 +++--
13 files changed, 18 insertions(+), 31 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceAbstractCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceAbstractCommand.java
index 054c2df55c7..3a23bf6b8f5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceAbstractCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceAbstractCommand.java
@@ -23,8 +23,6 @@ import
org.apache.ignite.internal.management.api.ComputeCommand;
import
org.apache.ignite.internal.management.persistence.PersistenceCommand.PersistenceCleanAllTaskArg;
import
org.apache.ignite.internal.management.persistence.PersistenceCommand.PersistenceCleanCorruptedTaskArg;
import
org.apache.ignite.internal.management.persistence.PersistenceCommand.PersistenceTaskArg;
-import org.apache.ignite.internal.visor.persistence.PersistenceTask;
-import org.apache.ignite.internal.visor.persistence.PersistenceTaskResult;
import org.apache.ignite.lang.IgniteBiTuple;
import static org.apache.ignite.internal.management.api.CommandUtils.INDENT;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceCommand.java
index 72f5b3a24a7..4f24b61818d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceCommand.java
@@ -25,8 +25,6 @@ import
org.apache.ignite.internal.dto.IgniteDataTransferObject;
import org.apache.ignite.internal.management.api.CommandRegistryImpl;
import org.apache.ignite.internal.management.api.ComputeCommand;
import
org.apache.ignite.internal.management.persistence.PersistenceCommand.PersistenceTaskArg;
-import org.apache.ignite.internal.visor.persistence.PersistenceTask;
-import org.apache.ignite.internal.visor.persistence.PersistenceTaskResult;
/** */
public class PersistenceCommand extends
CommandRegistryImpl<PersistenceTaskArg, PersistenceTaskResult>
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/persistence/PersistenceTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceTask.java
similarity index 98%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/persistence/PersistenceTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceTask.java
index 693c000c15f..67d0a192bfa 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/persistence/PersistenceTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.persistence;
+package org.apache.ignite.internal.management.persistence;
import java.io.File;
import java.io.IOException;
@@ -33,8 +33,6 @@ import java.util.stream.Collectors;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.configuration.DataStorageConfiguration;
-import
org.apache.ignite.internal.management.persistence.PersistenceBackupCachesTaskArg;
-import
org.apache.ignite.internal.management.persistence.PersistenceCleanCachesTaskArg;
import
org.apache.ignite.internal.management.persistence.PersistenceCommand.PersistenceBackupAllTaskArg;
import
org.apache.ignite.internal.management.persistence.PersistenceCommand.PersistenceBackupCorruptedTaskArg;
import
org.apache.ignite.internal.management.persistence.PersistenceCommand.PersistenceCleanAllTaskArg;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/persistence/PersistenceTaskResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceTaskResult.java
similarity index 98%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/persistence/PersistenceTaskResult.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceTaskResult.java
index 6c19b624bb0..f1d8abf8e79 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/persistence/PersistenceTaskResult.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceTaskResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.persistence;
+package org.apache.ignite.internal.management.persistence;
import java.io.IOException;
import java.io.ObjectInput;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/property/tasks/PropertiesListResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertiesListResult.java
similarity index 97%
rename from
modules/core/src/main/java/org/apache/ignite/internal/commandline/property/tasks/PropertiesListResult.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertiesListResult.java
index 7c350775fcc..a14587a00e0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/property/tasks/PropertiesListResult.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertiesListResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.commandline.property.tasks;
+package org.apache.ignite.internal.management.property;
import java.io.IOException;
import java.io.ObjectInput;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/property/tasks/PropertiesListTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertiesListTask.java
similarity index 98%
rename from
modules/core/src/main/java/org/apache/ignite/internal/commandline/property/tasks/PropertiesListTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertiesListTask.java
index e2d48e6b372..f2c3cbc9a92 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/property/tasks/PropertiesListTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertiesListTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.commandline.property.tasks;
+package org.apache.ignite.internal.management.property;
import java.util.List;
import java.util.stream.Collectors;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyGetCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyGetCommand.java
index 8f60792a91d..312a724042c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyGetCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyGetCommand.java
@@ -18,8 +18,6 @@
package org.apache.ignite.internal.management.property;
import java.util.function.Consumer;
-import
org.apache.ignite.internal.commandline.property.tasks.PropertyOperationResult;
-import org.apache.ignite.internal.commandline.property.tasks.PropertyTask;
import org.apache.ignite.internal.management.api.ComputeCommand;
/** */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyListCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyListCommand.java
index 858bbeb1bc6..f7a85497020 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyListCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyListCommand.java
@@ -18,8 +18,6 @@
package org.apache.ignite.internal.management.property;
import java.util.function.Consumer;
-import
org.apache.ignite.internal.commandline.property.tasks.PropertiesListResult;
-import
org.apache.ignite.internal.commandline.property.tasks.PropertiesListTask;
import org.apache.ignite.internal.management.api.ComputeCommand;
import org.apache.ignite.internal.management.api.NoArg;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/property/tasks/PropertyOperationResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyOperationResult.java
similarity index 96%
rename from
modules/core/src/main/java/org/apache/ignite/internal/commandline/property/tasks/PropertyOperationResult.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyOperationResult.java
index 9f5a8999c99..6facede9622 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/property/tasks/PropertyOperationResult.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyOperationResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.commandline.property.tasks;
+package org.apache.ignite.internal.management.property;
import java.io.IOException;
import java.io.ObjectInput;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertySetCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertySetCommand.java
index 382bd4e93a2..82c92cb35e7 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertySetCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertySetCommand.java
@@ -17,8 +17,6 @@
package org.apache.ignite.internal.management.property;
-import
org.apache.ignite.internal.commandline.property.tasks.PropertyOperationResult;
-import org.apache.ignite.internal.commandline.property.tasks.PropertyTask;
import org.apache.ignite.internal.management.api.ComputeCommand;
/** */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/property/tasks/PropertyTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyTask.java
similarity index 95%
rename from
modules/core/src/main/java/org/apache/ignite/internal/commandline/property/tasks/PropertyTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyTask.java
index 938e8688b15..a6aa55f569f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/property/tasks/PropertyTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.commandline.property.tasks;
+package org.apache.ignite.internal.management.property;
import java.io.Serializable;
import java.util.List;
@@ -23,8 +23,6 @@ import java.util.Objects;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.compute.ComputeJobResult;
-import org.apache.ignite.internal.management.property.PropertyGetCommandArg;
-import org.apache.ignite.internal.management.property.PropertySetCommandArg;
import
org.apache.ignite.internal.processors.configuration.distributed.DistributedChangeableProperty;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.visor.VisorJob;
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties
b/modules/core/src/main/resources/META-INF/classnames.properties
index 85ca7d984ba..77ddbb372f6 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -377,12 +377,12 @@
org.apache.ignite.internal.management.meta.MetadataRemoveTask$DropAllThinSession
org.apache.ignite.internal.management.meta.MetadataRemoveTask$MetadataRemoveJob
org.apache.ignite.internal.management.meta.MetadataUpdateTask
org.apache.ignite.internal.management.meta.MetadataUpdateTask$MetadataUpdateJob
-org.apache.ignite.internal.commandline.property.tasks.PropertiesListResult
-org.apache.ignite.internal.commandline.property.tasks.PropertiesListTask
-org.apache.ignite.internal.commandline.property.tasks.PropertiesListTask$PropertiesListJob
-org.apache.ignite.internal.commandline.property.tasks.PropertyOperationResult
-org.apache.ignite.internal.commandline.property.tasks.PropertyTask
-org.apache.ignite.internal.commandline.property.tasks.PropertyTask$PropertyJob
+org.apache.ignite.internal.management.property.PropertiesListResult
+org.apache.ignite.internal.management.property.PropertiesListTask
+org.apache.ignite.internal.management.property.PropertiesListTask$PropertiesListJob
+org.apache.ignite.internal.management.property.PropertyOperationResult
+org.apache.ignite.internal.management.property.PropertyTask
+org.apache.ignite.internal.management.property.PropertyTask$PropertyJob
org.apache.ignite.internal.compute.ComputeTaskCancelledCheckedException
org.apache.ignite.internal.compute.ComputeTaskTimeoutCheckedException
org.apache.ignite.internal.direct.DirectMessageReader$1
@@ -2248,9 +2248,9 @@ org.apache.ignite.internal.visor.misc.VisorWalTaskResult
org.apache.ignite.internal.visor.performancestatistics.VisorPerformanceStatisticsOperation
org.apache.ignite.internal.management.performancestatistics.PerformanceStatisticsTask
org.apache.ignite.internal.management.performancestatistics.PerformanceStatisticsTask$VisorPerformanceStatisticsJob
-org.apache.ignite.internal.visor.persistence.PersistenceTask
-org.apache.ignite.internal.visor.persistence.PersistenceTask$PersistenceJob
-org.apache.ignite.internal.visor.persistence.PersistenceTaskResult
+org.apache.ignite.internal.management.persistence.PersistenceTask
+org.apache.ignite.internal.management.persistence.PersistenceTask$PersistenceJob
+org.apache.ignite.internal.management.persistence.PersistenceTaskResult
org.apache.ignite.internal.management.kill.ContinuousQueryCancelTask
org.apache.ignite.internal.management.kill.ContinuousQueryCancelTask$ContinuousQueryCancelJob
org.apache.ignite.internal.management.kill.QueryCancelOnInitiatorTask
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/MaintenancePersistenceTaskTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/MaintenancePersistenceTaskTest.java
index 99f57c3cfa5..23fa918dd55 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/MaintenancePersistenceTaskTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/MaintenancePersistenceTaskTest.java
@@ -28,11 +28,12 @@ import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
import
org.apache.ignite.internal.management.persistence.PersistenceCleanCachesTaskArg;
import org.apache.ignite.internal.management.persistence.PersistenceCommand;
+import org.apache.ignite.internal.management.persistence.PersistenceTask;
+import org.apache.ignite.internal.management.persistence.PersistenceTaskResult;
import org.apache.ignite.internal.visor.VisorTaskArgument;
-import org.apache.ignite.internal.visor.persistence.PersistenceTask;
-import org.apache.ignite.internal.visor.persistence.PersistenceTaskResult;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.junit.Test;
+
import static
org.apache.ignite.testframework.GridTestUtils.deleteLastCheckpointEndMarker;
/**
