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 9df9506af7c IGNITE-19773 Move Encryption tasks classes to commands
classes package (#10790)
9df9506af7c is described below
commit 9df9506af7c322fe1efd2cdc9dc9eef9975a64d4
Author: Valery Shorin <[email protected]>
AuthorDate: Tue Jun 20 14:57:08 2023 +0300
IGNITE-19773 Move Encryption tasks classes to commands classes package
(#10790)
---
.../encryption/CacheGroupEncryptionCommand.java | 5 +--
.../encryption/CacheGroupEncryptionTask.java} | 27 ++++++------
.../CacheGroupEncryptionTaskResult.java} | 10 ++---
.../encryption/ChangeCacheGroupKeyTask.java} | 11 +++--
.../encryption/ChangeMasterKeyTask.java} | 11 +++--
.../encryption/EncryptionCacheKeyIdsCommand.java | 9 ++--
.../EncryptionChangeCacheKeyCommand.java | 5 +--
.../EncryptionChangeMasterKeyCommand.java | 5 +--
.../EncryptionGetMasterKeyNameCommand.java | 5 +--
.../encryption/EncryptionKeyIdsTask.java} | 21 +++++-----
.../EncryptionReencryptionRateLimitCommand.java | 10 ++---
.../EncryptionReencryptionStatusCommand.java | 6 +--
.../EncryptionResumeReencryptionCommand.java | 6 +--
.../EncryptionSuspendReencryptionCommand.java | 6 +--
.../encryption/GetMasterKeyNameTask.java} | 10 ++---
.../encryption/ReencryptionRateTask.java} | 19 ++++-----
.../encryption/ReencryptionResumeTask.java} | 18 ++++----
.../encryption/ReencryptionStatusTask.java} | 21 +++++-----
.../encryption/ReencryptionSuspendTask.java} | 21 +++++-----
.../main/resources/META-INF/classnames.properties | 48 +++++++++++-----------
20 files changed, 129 insertions(+), 145 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/CacheGroupEncryptionCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/CacheGroupEncryptionCommand.java
index 190171803d3..3584ff08c1f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/CacheGroupEncryptionCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/CacheGroupEncryptionCommand.java
@@ -24,18 +24,17 @@ import java.util.function.Consumer;
import org.apache.ignite.IgniteException;
import org.apache.ignite.internal.client.GridClientNode;
import org.apache.ignite.internal.management.api.ComputeCommand;
-import
org.apache.ignite.internal.visor.encryption.VisorCacheGroupEncryptionTaskResult;
import static
org.apache.ignite.internal.management.api.CommandUtils.DOUBLE_INDENT;
import static org.apache.ignite.internal.management.api.CommandUtils.INDENT;
/** */
abstract class CacheGroupEncryptionCommand<T>
- implements ComputeCommand<EncryptionCacheGroupArg,
VisorCacheGroupEncryptionTaskResult<T>> {
+ implements ComputeCommand<EncryptionCacheGroupArg,
CacheGroupEncryptionTaskResult<T>> {
/** {@inheritDoc} */
@Override public void printResult(
EncryptionCacheGroupArg arg,
- VisorCacheGroupEncryptionTaskResult<T> res,
+ CacheGroupEncryptionTaskResult<T> res,
Consumer<String> printer
) {
Map<UUID, IgniteException> exceptions = res.exceptions();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/encryption/VisorCacheGroupEncryptionTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/CacheGroupEncryptionTask.java
similarity index 76%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/encryption/VisorCacheGroupEncryptionTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/encryption/CacheGroupEncryptionTask.java
index 5f925f4ad22..837b4b90621 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/encryption/VisorCacheGroupEncryptionTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/CacheGroupEncryptionTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.encryption;
+package org.apache.ignite.internal.management.encryption;
import java.util.HashMap;
import java.util.List;
@@ -25,7 +25,6 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.compute.ComputeJobResult;
import org.apache.ignite.internal.dto.IgniteDataTransferObject;
-import
org.apache.ignite.internal.management.encryption.EncryptionCacheGroupArg;
import org.apache.ignite.internal.processors.cache.CacheGroupContext;
import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
import org.apache.ignite.internal.util.typedef.internal.CU;
@@ -38,10 +37,10 @@ import org.jetbrains.annotations.Nullable;
*
* @param <T> The type of the task result.
*/
-public abstract class VisorCacheGroupEncryptionTask<T> extends
VisorMultiNodeTask<EncryptionCacheGroupArg,
- VisorCacheGroupEncryptionTaskResult<T>,
VisorCacheGroupEncryptionTask.VisorSingleFieldDto<T>> {
+public abstract class CacheGroupEncryptionTask<T> extends
VisorMultiNodeTask<EncryptionCacheGroupArg,
+ CacheGroupEncryptionTaskResult<T>,
CacheGroupEncryptionTask.SingleFieldDto<T>> {
/** {@inheritDoc} */
- @Nullable @Override protected VisorCacheGroupEncryptionTaskResult<T>
reduce0(List<ComputeJobResult> results) {
+ @Nullable @Override protected CacheGroupEncryptionTaskResult<T>
reduce0(List<ComputeJobResult> results) {
Map<UUID, T> jobResults = new HashMap<>();
Map<UUID, IgniteException> exceptions = new HashMap<>();
@@ -54,16 +53,16 @@ public abstract class VisorCacheGroupEncryptionTask<T>
extends VisorMultiNodeTas
continue;
}
- VisorSingleFieldDto<T> dtoRes = res.getData();
+ SingleFieldDto<T> dtoRes = res.getData();
jobResults.put(nodeId, dtoRes.value());
}
- return new VisorCacheGroupEncryptionTaskResult<>(jobResults,
exceptions);
+ return new CacheGroupEncryptionTaskResult<>(jobResults, exceptions);
}
/** */
- public abstract static class VisorSingleFieldDto<T> extends
IgniteDataTransferObject {
+ public abstract static class SingleFieldDto<T> extends
IgniteDataTransferObject {
/** Object value. */
private T val;
@@ -78,7 +77,7 @@ public abstract class VisorCacheGroupEncryptionTask<T>
extends VisorMultiNodeTas
* @param val Data object.
* @return {@code this} for chaining.
*/
- protected VisorSingleFieldDto<T> value(T val) {
+ protected SingleFieldDto<T> value(T val) {
this.val = val;
return this;
@@ -88,18 +87,18 @@ public abstract class VisorCacheGroupEncryptionTask<T>
extends VisorMultiNodeTas
/**
* @param <T> Type of job result.
*/
- protected abstract static class VisorReencryptionBaseJob<T>
- extends VisorJob<EncryptionCacheGroupArg, VisorSingleFieldDto<T>> {
+ protected abstract static class ReencryptionBaseJob<T>
+ extends VisorJob<EncryptionCacheGroupArg, SingleFieldDto<T>> {
/**
* @param arg Job argument.
* @param debug Flag indicating whether debug information should be
printed into node log.
*/
- protected VisorReencryptionBaseJob(@Nullable EncryptionCacheGroupArg
arg, boolean debug) {
+ protected ReencryptionBaseJob(@Nullable EncryptionCacheGroupArg arg,
boolean debug) {
super(arg, debug);
}
/** {@inheritDoc} */
- @Override protected VisorSingleFieldDto<T> run(EncryptionCacheGroupArg
arg) throws IgniteException {
+ @Override protected SingleFieldDto<T> run(EncryptionCacheGroupArg arg)
throws IgniteException {
try {
String grpName = arg.cacheGroupName();
CacheGroupContext grp =
ignite.context().cache().cacheGroup(CU.cacheId(grpName));
@@ -132,6 +131,6 @@ public abstract class VisorCacheGroupEncryptionTask<T>
extends VisorMultiNodeTas
* @return Result.
* @throws IgniteCheckedException In case of error.
*/
- protected abstract VisorSingleFieldDto<T> run0(CacheGroupContext grp)
throws IgniteCheckedException;
+ protected abstract SingleFieldDto<T> run0(CacheGroupContext grp)
throws IgniteCheckedException;
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/encryption/VisorCacheGroupEncryptionTaskResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/CacheGroupEncryptionTaskResult.java
similarity index 87%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/encryption/VisorCacheGroupEncryptionTaskResult.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/encryption/CacheGroupEncryptionTaskResult.java
index f29a99b2957..eb5768da08f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/encryption/VisorCacheGroupEncryptionTaskResult.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/CacheGroupEncryptionTaskResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.encryption;
+package org.apache.ignite.internal.management.encryption;
import java.io.IOException;
import java.io.ObjectInput;
@@ -35,7 +35,7 @@ import org.apache.ignite.internal.util.typedef.internal.U;
* @param <T> Job result type.
*/
@SuppressWarnings("AssignmentOrReturnOfFieldWithMutableType")
-public class VisorCacheGroupEncryptionTaskResult<T> extends
IgniteDataTransferObject {
+public class CacheGroupEncryptionTaskResult<T> extends
IgniteDataTransferObject {
/** */
private static final long serialVersionUID = 0L;
@@ -51,13 +51,13 @@ public class VisorCacheGroupEncryptionTaskResult<T> extends
IgniteDataTransferOb
* @param results Per node job result.
* @param exceptions Per node execution problems.
*/
- public VisorCacheGroupEncryptionTaskResult(Map<UUID, T> results, Map<UUID,
IgniteException> exceptions) {
+ public CacheGroupEncryptionTaskResult(Map<UUID, T> results, Map<UUID,
IgniteException> exceptions) {
this.results = results;
this.exceptions = exceptions;
}
/** */
- public VisorCacheGroupEncryptionTaskResult() {
+ public CacheGroupEncryptionTaskResult() {
// No-op.
}
@@ -85,6 +85,6 @@ public class VisorCacheGroupEncryptionTaskResult<T> extends
IgniteDataTransferOb
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(VisorCacheGroupEncryptionTaskResult.class, this);
+ return S.toString(CacheGroupEncryptionTaskResult.class, this);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/encryption/VisorChangeCacheGroupKeyTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/ChangeCacheGroupKeyTask.java
similarity index 80%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/encryption/VisorChangeCacheGroupKeyTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/encryption/ChangeCacheGroupKeyTask.java
index e9386324c67..bc9bb5a0f09 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/encryption/VisorChangeCacheGroupKeyTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/ChangeCacheGroupKeyTask.java
@@ -15,13 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.encryption;
+package org.apache.ignite.internal.management.encryption;
import java.util.Collection;
import java.util.Collections;
import org.apache.ignite.IgniteEncryption;
import org.apache.ignite.IgniteException;
-import
org.apache.ignite.internal.management.encryption.EncryptionCacheGroupArg;
import org.apache.ignite.internal.visor.VisorJob;
import org.apache.ignite.internal.visor.VisorOneNodeTask;
@@ -30,17 +29,17 @@ import org.apache.ignite.internal.visor.VisorOneNodeTask;
*
* @see IgniteEncryption#changeCacheGroupKey(Collection)
*/
-public class VisorChangeCacheGroupKeyTask extends
VisorOneNodeTask<EncryptionCacheGroupArg, Void> {
+public class ChangeCacheGroupKeyTask extends
VisorOneNodeTask<EncryptionCacheGroupArg, Void> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
@Override protected VisorJob<EncryptionCacheGroupArg, Void>
job(EncryptionCacheGroupArg arg) {
- return new VisorChangeCacheGroupKeyJob(arg, debug);
+ return new ChangeCacheGroupKeyJob(arg, debug);
}
/** The job for changing the encryption key of the cache group. */
- private static class VisorChangeCacheGroupKeyJob extends
VisorJob<EncryptionCacheGroupArg, Void> {
+ private static class ChangeCacheGroupKeyJob extends
VisorJob<EncryptionCacheGroupArg, Void> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
@@ -48,7 +47,7 @@ public class VisorChangeCacheGroupKeyTask extends
VisorOneNodeTask<EncryptionCac
* @param arg Job argument.
* @param debug Flag indicating whether debug information should be
printed into node log.
*/
- protected VisorChangeCacheGroupKeyJob(EncryptionCacheGroupArg arg,
boolean debug) {
+ protected ChangeCacheGroupKeyJob(EncryptionCacheGroupArg arg, boolean
debug) {
super(arg, debug);
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/encryption/VisorChangeMasterKeyTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/ChangeMasterKeyTask.java
similarity index 79%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/encryption/VisorChangeMasterKeyTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/encryption/ChangeMasterKeyTask.java
index 9057094db9d..75ada440fd6 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/encryption/VisorChangeMasterKeyTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/ChangeMasterKeyTask.java
@@ -15,11 +15,10 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.encryption;
+package org.apache.ignite.internal.management.encryption;
import org.apache.ignite.IgniteEncryption;
import org.apache.ignite.IgniteException;
-import
org.apache.ignite.internal.management.encryption.EncryptionChangeMasterKeyCommandArg;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.visor.VisorJob;
import org.apache.ignite.internal.visor.VisorOneNodeTask;
@@ -30,17 +29,17 @@ import org.apache.ignite.internal.visor.VisorOneNodeTask;
* @see IgniteEncryption#changeMasterKey(String)
*/
@GridInternal
-public class VisorChangeMasterKeyTask extends
VisorOneNodeTask<EncryptionChangeMasterKeyCommandArg, String> {
+public class ChangeMasterKeyTask extends
VisorOneNodeTask<EncryptionChangeMasterKeyCommandArg, String> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
@Override protected VisorJob<EncryptionChangeMasterKeyCommandArg, String>
job(EncryptionChangeMasterKeyCommandArg arg) {
- return new VisorChangeMasterKeyJob(arg, debug);
+ return new ChangeMasterKeyJob(arg, debug);
}
/** The job for changing the master key. */
- private static class VisorChangeMasterKeyJob extends
VisorJob<EncryptionChangeMasterKeyCommandArg, String> {
+ private static class ChangeMasterKeyJob extends
VisorJob<EncryptionChangeMasterKeyCommandArg, String> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
@@ -50,7 +49,7 @@ public class VisorChangeMasterKeyTask extends
VisorOneNodeTask<EncryptionChangeM
* @param masterKeyName Master key name.
* @param debug Flag indicating whether debug information should be
printed into node log.
*/
- protected VisorChangeMasterKeyJob(EncryptionChangeMasterKeyCommandArg
masterKeyName, boolean debug) {
+ protected ChangeMasterKeyJob(EncryptionChangeMasterKeyCommandArg
masterKeyName, boolean debug) {
super(masterKeyName, debug);
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionCacheKeyIdsCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionCacheKeyIdsCommand.java
index 1de272b2c01..b2b0f6c04c3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionCacheKeyIdsCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionCacheKeyIdsCommand.java
@@ -20,8 +20,7 @@ package org.apache.ignite.internal.management.encryption;
import java.util.List;
import java.util.function.Consumer;
import org.apache.ignite.internal.util.typedef.F;
-import
org.apache.ignite.internal.visor.encryption.VisorCacheGroupEncryptionTaskResult;
-import org.apache.ignite.internal.visor.encryption.VisorEncryptionKeyIdsTask;
+
import static
org.apache.ignite.internal.management.api.CommandUtils.DOUBLE_INDENT;
/** */
@@ -37,14 +36,14 @@ public class EncryptionCacheKeyIdsCommand extends
CacheGroupEncryptionCommand<Li
}
/** {@inheritDoc} */
- @Override public Class<VisorEncryptionKeyIdsTask> taskClass() {
- return VisorEncryptionKeyIdsTask.class;
+ @Override public Class<EncryptionKeyIdsTask> taskClass() {
+ return EncryptionKeyIdsTask.class;
}
/** {@inheritDoc} */
@Override public void printResult(
EncryptionCacheGroupArg arg,
- VisorCacheGroupEncryptionTaskResult<List<Integer>> res,
+ CacheGroupEncryptionTaskResult<List<Integer>> res,
Consumer<String> printer
) {
printer.accept("Encryption key identifiers for cache: " +
arg.cacheGroupName());
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionChangeCacheKeyCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionChangeCacheKeyCommand.java
index 2e1cf7277c3..17e8b6e528b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionChangeCacheKeyCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionChangeCacheKeyCommand.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.management.encryption;
import java.util.function.Consumer;
import org.apache.ignite.internal.management.api.ComputeCommand;
-import
org.apache.ignite.internal.visor.encryption.VisorChangeCacheGroupKeyTask;
/** */
public class EncryptionChangeCacheKeyCommand implements
ComputeCommand<EncryptionCacheGroupArg, Void> {
@@ -34,8 +33,8 @@ public class EncryptionChangeCacheKeyCommand implements
ComputeCommand<Encryptio
}
/** {@inheritDoc} */
- @Override public Class<VisorChangeCacheGroupKeyTask> taskClass() {
- return VisorChangeCacheGroupKeyTask.class;
+ @Override public Class<ChangeCacheGroupKeyTask> taskClass() {
+ return ChangeCacheGroupKeyTask.class;
}
/** {@inheritDoc} */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionChangeMasterKeyCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionChangeMasterKeyCommand.java
index 0ade6f836af..e3717a2880f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionChangeMasterKeyCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionChangeMasterKeyCommand.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.management.encryption;
import java.util.function.Consumer;
import org.apache.ignite.internal.management.api.ComputeCommand;
-import org.apache.ignite.internal.visor.encryption.VisorChangeMasterKeyTask;
/** */
public class EncryptionChangeMasterKeyCommand implements
ComputeCommand<EncryptionChangeMasterKeyCommandArg, String> {
@@ -34,8 +33,8 @@ public class EncryptionChangeMasterKeyCommand implements
ComputeCommand<Encrypti
}
/** {@inheritDoc} */
- @Override public Class<VisorChangeMasterKeyTask> taskClass() {
- return VisorChangeMasterKeyTask.class;
+ @Override public Class<ChangeMasterKeyTask> taskClass() {
+ return ChangeMasterKeyTask.class;
}
/** {@inheritDoc} */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionGetMasterKeyNameCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionGetMasterKeyNameCommand.java
index 695c6fa8460..b592906903a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionGetMasterKeyNameCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionGetMasterKeyNameCommand.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.management.encryption;
import java.util.function.Consumer;
import org.apache.ignite.internal.management.api.ComputeCommand;
import org.apache.ignite.internal.management.api.NoArg;
-import org.apache.ignite.internal.visor.encryption.VisorGetMasterKeyNameTask;
/** */
public class EncryptionGetMasterKeyNameCommand implements
ComputeCommand<NoArg, String> {
@@ -35,8 +34,8 @@ public class EncryptionGetMasterKeyNameCommand implements
ComputeCommand<NoArg,
}
/** {@inheritDoc} */
- @Override public Class<VisorGetMasterKeyNameTask> taskClass() {
- return VisorGetMasterKeyNameTask.class;
+ @Override public Class<GetMasterKeyNameTask> taskClass() {
+ return GetMasterKeyNameTask.class;
}
/** {@inheritDoc} */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/encryption/VisorEncryptionKeyIdsTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionKeyIdsTask.java
similarity index 71%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/encryption/VisorEncryptionKeyIdsTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionKeyIdsTask.java
index 89c4b82db47..42d47c16166 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/encryption/VisorEncryptionKeyIdsTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionKeyIdsTask.java
@@ -15,13 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.encryption;
+package org.apache.ignite.internal.management.encryption;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.List;
-import
org.apache.ignite.internal.management.encryption.EncryptionCacheGroupArg;
import org.apache.ignite.internal.processors.cache.CacheGroupContext;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.util.typedef.internal.U;
@@ -32,18 +31,18 @@ import org.jetbrains.annotations.Nullable;
* Get current encryption key IDs of the cache group.
*/
@GridInternal
-public class VisorEncryptionKeyIdsTask extends
VisorCacheGroupEncryptionTask<List<Integer>> {
+public class EncryptionKeyIdsTask extends
CacheGroupEncryptionTask<List<Integer>> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
- @Override protected VisorJob<EncryptionCacheGroupArg,
VisorSingleFieldDto<List<Integer>>> job(
+ @Override protected VisorJob<EncryptionCacheGroupArg,
SingleFieldDto<List<Integer>>> job(
EncryptionCacheGroupArg arg) {
- return new VisorEncryptionKeyIdsJob(arg, debug);
+ return new EncryptionKeyIdsJob(arg, debug);
}
/** The job for get current encryption key IDs of the cache group. */
- private static class VisorEncryptionKeyIdsJob extends
VisorReencryptionBaseJob<List<Integer>> {
+ private static class EncryptionKeyIdsJob extends
ReencryptionBaseJob<List<Integer>> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
@@ -51,23 +50,23 @@ public class VisorEncryptionKeyIdsTask extends
VisorCacheGroupEncryptionTask<Lis
* @param arg Job argument.
* @param debug Flag indicating whether debug information should be
printed into node log.
*/
- protected VisorEncryptionKeyIdsJob(@Nullable EncryptionCacheGroupArg
arg, boolean debug) {
+ protected EncryptionKeyIdsJob(@Nullable EncryptionCacheGroupArg arg,
boolean debug) {
super(arg, debug);
}
/** {@inheritDoc} */
- @Override protected VisorSingleFieldDto<List<Integer>>
run0(CacheGroupContext grp) {
- return new
VisorEncryptionKeyIdsResult().value(ignite.context().encryption().groupKeyIds(grp.groupId()));
+ @Override protected SingleFieldDto<List<Integer>>
run0(CacheGroupContext grp) {
+ return new
EncryptionKeyIdsResult().value(ignite.context().encryption().groupKeyIds(grp.groupId()));
}
}
/** */
- protected static class VisorEncryptionKeyIdsResult extends
VisorSingleFieldDto<List<Integer>> {
+ protected static class EncryptionKeyIdsResult extends
SingleFieldDto<List<Integer>> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
/** */
- public VisorEncryptionKeyIdsResult() {
+ public EncryptionKeyIdsResult() {
// No-op.
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionReencryptionRateLimitCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionReencryptionRateLimitCommand.java
index 03f4d09fc54..771774c365a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionReencryptionRateLimitCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionReencryptionRateLimitCommand.java
@@ -24,15 +24,13 @@ import java.util.function.Consumer;
import org.apache.ignite.IgniteException;
import org.apache.ignite.internal.client.GridClientNode;
import org.apache.ignite.internal.management.api.ComputeCommand;
-import
org.apache.ignite.internal.visor.encryption.VisorCacheGroupEncryptionTaskResult;
-import org.apache.ignite.internal.visor.encryption.VisorReencryptionRateTask;
import static
org.apache.ignite.internal.management.api.CommandUtils.DOUBLE_INDENT;
import static org.apache.ignite.internal.management.api.CommandUtils.INDENT;
/** */
public class EncryptionReencryptionRateLimitCommand
- implements ComputeCommand<EncryptionReencryptionRateLimitCommandArg,
VisorCacheGroupEncryptionTaskResult<Double>> {
+ implements ComputeCommand<EncryptionReencryptionRateLimitCommandArg,
CacheGroupEncryptionTaskResult<Double>> {
/** {@inheritDoc} */
@Override public String description() {
return "View/change re-encryption rate limit";
@@ -44,8 +42,8 @@ public class EncryptionReencryptionRateLimitCommand
}
/** {@inheritDoc} */
- @Override public Class<VisorReencryptionRateTask> taskClass() {
- return VisorReencryptionRateTask.class;
+ @Override public Class<ReencryptionRateTask> taskClass() {
+ return ReencryptionRateTask.class;
}
/** {@inheritDoc} */
@@ -56,7 +54,7 @@ public class EncryptionReencryptionRateLimitCommand
/** {@inheritDoc} */
@Override public void printResult(
EncryptionReencryptionRateLimitCommandArg arg,
- VisorCacheGroupEncryptionTaskResult<Double> res,
+ CacheGroupEncryptionTaskResult<Double> res,
Consumer<String> printer
) {
Map<UUID, IgniteException> exceptions = res.exceptions();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionReencryptionStatusCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionReencryptionStatusCommand.java
index 175f5d35301..15d89925e09 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionReencryptionStatusCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionReencryptionStatusCommand.java
@@ -18,7 +18,7 @@
package org.apache.ignite.internal.management.encryption;
import java.util.function.Consumer;
-import org.apache.ignite.internal.visor.encryption.VisorReencryptionStatusTask;
+
import static
org.apache.ignite.internal.management.api.CommandUtils.DOUBLE_INDENT;
/** */
@@ -34,8 +34,8 @@ public class EncryptionReencryptionStatusCommand extends
CacheGroupEncryptionCom
}
/** {@inheritDoc} */
- @Override public Class<VisorReencryptionStatusTask> taskClass() {
- return VisorReencryptionStatusTask.class;
+ @Override public Class<ReencryptionStatusTask> taskClass() {
+ return ReencryptionStatusTask.class;
}
/** {@inheritDoc} */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionResumeReencryptionCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionResumeReencryptionCommand.java
index e47a1bda942..ce5e731d792 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionResumeReencryptionCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionResumeReencryptionCommand.java
@@ -18,7 +18,7 @@
package org.apache.ignite.internal.management.encryption;
import java.util.function.Consumer;
-import org.apache.ignite.internal.visor.encryption.VisorReencryptionResumeTask;
+
import static
org.apache.ignite.internal.management.api.CommandUtils.DOUBLE_INDENT;
/** */
@@ -34,8 +34,8 @@ public class EncryptionResumeReencryptionCommand extends
CacheGroupEncryptionCom
}
/** {@inheritDoc} */
- @Override public Class<VisorReencryptionResumeTask> taskClass() {
- return VisorReencryptionResumeTask.class;
+ @Override public Class<ReencryptionResumeTask> taskClass() {
+ return ReencryptionResumeTask.class;
}
/** {@inheritDoc} */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionSuspendReencryptionCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionSuspendReencryptionCommand.java
index b58bb855b9a..0ff593f9279 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionSuspendReencryptionCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionSuspendReencryptionCommand.java
@@ -18,7 +18,7 @@
package org.apache.ignite.internal.management.encryption;
import java.util.function.Consumer;
-import
org.apache.ignite.internal.visor.encryption.VisorReencryptionSuspendTask;
+
import static
org.apache.ignite.internal.management.api.CommandUtils.DOUBLE_INDENT;
/** */
@@ -34,8 +34,8 @@ public class EncryptionSuspendReencryptionCommand extends
CacheGroupEncryptionCo
}
/** {@inheritDoc} */
- @Override public Class<VisorReencryptionSuspendTask> taskClass() {
- return VisorReencryptionSuspendTask.class;
+ @Override public Class<ReencryptionSuspendTask> taskClass() {
+ return ReencryptionSuspendTask.class;
}
/** {@inheritDoc} */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/encryption/VisorGetMasterKeyNameTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/GetMasterKeyNameTask.java
similarity index 85%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/encryption/VisorGetMasterKeyNameTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/encryption/GetMasterKeyNameTask.java
index 742c5b0e55b..01c721d8db9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/encryption/VisorGetMasterKeyNameTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/GetMasterKeyNameTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.encryption;
+package org.apache.ignite.internal.management.encryption;
import org.apache.ignite.IgniteEncryption;
import org.apache.ignite.IgniteException;
@@ -30,17 +30,17 @@ import org.apache.ignite.internal.visor.VisorOneNodeTask;
* @see IgniteEncryption#getMasterKeyName()
*/
@GridInternal
-public class VisorGetMasterKeyNameTask extends VisorOneNodeTask<NoArg, String>
{
+public class GetMasterKeyNameTask extends VisorOneNodeTask<NoArg, String> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
@Override protected VisorJob<NoArg, String> job(NoArg arg) {
- return new VisorGetMasterKeyNameJob(arg, debug);
+ return new GetMasterKeyNameJob(arg, debug);
}
/** The job for getting the master key name. */
- private static class VisorGetMasterKeyNameJob extends VisorJob<NoArg,
String> {
+ private static class GetMasterKeyNameJob extends VisorJob<NoArg, String> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
@@ -50,7 +50,7 @@ public class VisorGetMasterKeyNameTask extends
VisorOneNodeTask<NoArg, String> {
* @param arg Job argument.
* @param debug Flag indicating whether debug information should be
printed into node log.
*/
- protected VisorGetMasterKeyNameJob(NoArg arg, boolean debug) {
+ protected GetMasterKeyNameJob(NoArg arg, boolean debug) {
super(arg, debug);
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/encryption/VisorReencryptionRateTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/ReencryptionRateTask.java
similarity index 84%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/encryption/VisorReencryptionRateTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/encryption/ReencryptionRateTask.java
index b647db2d3a7..ab1df0037e1 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/encryption/VisorReencryptionRateTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/ReencryptionRateTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.encryption;
+package org.apache.ignite.internal.management.encryption;
import java.io.IOException;
import java.io.ObjectInput;
@@ -27,7 +27,6 @@ import java.util.UUID;
import org.apache.ignite.IgniteException;
import org.apache.ignite.compute.ComputeJobResult;
import org.apache.ignite.internal.dto.IgniteDataTransferObject;
-import
org.apache.ignite.internal.management.encryption.EncryptionReencryptionRateLimitCommandArg;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.visor.VisorJob;
import org.apache.ignite.internal.visor.VisorMultiNodeTask;
@@ -37,21 +36,21 @@ import org.jetbrains.annotations.Nullable;
* View/change cache group re-encryption rate limit .
*/
@GridInternal
-public class VisorReencryptionRateTask extends VisorMultiNodeTask<
+public class ReencryptionRateTask extends VisorMultiNodeTask<
EncryptionReencryptionRateLimitCommandArg,
- VisorCacheGroupEncryptionTaskResult<Double>,
- VisorReencryptionRateTask.ReencryptionRateJobResult> {
+ CacheGroupEncryptionTaskResult<Double>,
+ ReencryptionRateTask.ReencryptionRateJobResult> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
@Override protected VisorJob<EncryptionReencryptionRateLimitCommandArg,
ReencryptionRateJobResult> job(
EncryptionReencryptionRateLimitCommandArg arg) {
- return new VisorReencryptionRateJob(arg, debug);
+ return new ReencryptionRateJob(arg, debug);
}
/** {@inheritDoc} */
- @Nullable @Override protected VisorCacheGroupEncryptionTaskResult<Double>
reduce0(List<ComputeJobResult> results) {
+ @Nullable @Override protected CacheGroupEncryptionTaskResult<Double>
reduce0(List<ComputeJobResult> results) {
Map<UUID, Double> jobResults = new HashMap<>();
Map<UUID, IgniteException> exceptions = new HashMap<>();
@@ -69,11 +68,11 @@ public class VisorReencryptionRateTask extends
VisorMultiNodeTask<
jobResults.put(nodeId, dtoRes.limit());
}
- return new VisorCacheGroupEncryptionTaskResult<>(jobResults,
exceptions);
+ return new CacheGroupEncryptionTaskResult<>(jobResults, exceptions);
}
/** The job for view/change cache group re-encryption rate limit. */
- private static class VisorReencryptionRateJob
+ private static class ReencryptionRateJob
extends VisorJob<EncryptionReencryptionRateLimitCommandArg,
ReencryptionRateJobResult> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
@@ -82,7 +81,7 @@ public class VisorReencryptionRateTask extends
VisorMultiNodeTask<
* @param arg Job argument.
* @param debug Flag indicating whether debug information should be
printed into node log.
*/
- protected
VisorReencryptionRateJob(EncryptionReencryptionRateLimitCommandArg arg, boolean
debug) {
+ protected
ReencryptionRateJob(EncryptionReencryptionRateLimitCommandArg arg, boolean
debug) {
super(arg, debug);
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/encryption/VisorReencryptionResumeTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/ReencryptionResumeTask.java
similarity index 66%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/encryption/VisorReencryptionResumeTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/encryption/ReencryptionResumeTask.java
index 16e3d141bc5..87136ee150d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/encryption/VisorReencryptionResumeTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/ReencryptionResumeTask.java
@@ -15,32 +15,30 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.encryption;
+package org.apache.ignite.internal.management.encryption;
import org.apache.ignite.IgniteCheckedException;
-import
org.apache.ignite.internal.management.encryption.EncryptionCacheGroupArg;
import org.apache.ignite.internal.processors.cache.CacheGroupContext;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.visor.VisorJob;
-import
org.apache.ignite.internal.visor.encryption.VisorReencryptionSuspendTask.VisorReencryptionSuspendResumeJobResult;
import org.jetbrains.annotations.Nullable;
/**
* Resume re-encryption of the cache group.
*/
@GridInternal
-public class VisorReencryptionResumeTask extends
VisorCacheGroupEncryptionTask<Boolean> {
+public class ReencryptionResumeTask extends CacheGroupEncryptionTask<Boolean> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
- @Override protected VisorJob<EncryptionCacheGroupArg,
VisorSingleFieldDto<Boolean>> job(
+ @Override protected VisorJob<EncryptionCacheGroupArg,
SingleFieldDto<Boolean>> job(
EncryptionCacheGroupArg arg) {
- return new VisorReencryptionResumeJob(arg, debug);
+ return new ReencryptionResumeJob(arg, debug);
}
/** The job to resume re-encryption of the cache group. */
- private static class VisorReencryptionResumeJob extends
VisorReencryptionBaseJob<Boolean> {
+ private static class ReencryptionResumeJob extends
ReencryptionBaseJob<Boolean> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
@@ -48,13 +46,13 @@ public class VisorReencryptionResumeTask extends
VisorCacheGroupEncryptionTask<B
* @param arg Job argument.
* @param debug Flag indicating whether debug information should be
printed into node log.
*/
- protected VisorReencryptionResumeJob(@Nullable EncryptionCacheGroupArg
arg, boolean debug) {
+ protected ReencryptionResumeJob(@Nullable EncryptionCacheGroupArg arg,
boolean debug) {
super(arg, debug);
}
/** {@inheritDoc} */
- @Override protected VisorSingleFieldDto<Boolean>
run0(CacheGroupContext grp) throws IgniteCheckedException {
- return new VisorReencryptionSuspendResumeJobResult().value(
+ @Override protected SingleFieldDto<Boolean> run0(CacheGroupContext
grp) throws IgniteCheckedException {
+ return new
ReencryptionSuspendTask.ReencryptionSuspendResumeJobResult().value(
ignite.context().encryption().resumeReencryption(grp.groupId()));
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/encryption/VisorReencryptionStatusTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/ReencryptionStatusTask.java
similarity index 74%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/encryption/VisorReencryptionStatusTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/encryption/ReencryptionStatusTask.java
index 163ff38b5b3..2647301dcf8 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/encryption/VisorReencryptionStatusTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/ReencryptionStatusTask.java
@@ -15,12 +15,11 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.encryption;
+package org.apache.ignite.internal.management.encryption;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import
org.apache.ignite.internal.management.encryption.EncryptionCacheGroupArg;
import org.apache.ignite.internal.processors.cache.CacheGroupContext;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.visor.VisorJob;
@@ -30,18 +29,18 @@ import org.jetbrains.annotations.Nullable;
* Get re-encryption status of the cache group.
*/
@GridInternal
-public class VisorReencryptionStatusTask extends
VisorCacheGroupEncryptionTask<Long> {
+public class ReencryptionStatusTask extends CacheGroupEncryptionTask<Long> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
- @Override protected VisorJob<EncryptionCacheGroupArg,
VisorSingleFieldDto<Long>> job(
+ @Override protected VisorJob<EncryptionCacheGroupArg,
SingleFieldDto<Long>> job(
EncryptionCacheGroupArg arg) {
- return new VisorReencryptionStatusJob(arg, debug);
+ return new ReencryptionStatusJob(arg, debug);
}
/** The job to get re-encryption status of the cache group. */
- private static class VisorReencryptionStatusJob extends
VisorReencryptionBaseJob<Long> {
+ private static class ReencryptionStatusJob extends
ReencryptionBaseJob<Long> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
@@ -49,12 +48,12 @@ public class VisorReencryptionStatusTask extends
VisorCacheGroupEncryptionTask<L
* @param arg Job argument.
* @param debug Flag indicating whether debug information should be
printed into node log.
*/
- protected VisorReencryptionStatusJob(@Nullable EncryptionCacheGroupArg
arg, boolean debug) {
+ protected ReencryptionStatusJob(@Nullable EncryptionCacheGroupArg arg,
boolean debug) {
super(arg, debug);
}
/** {@inheritDoc} */
- @Override protected VisorSingleFieldDto<Long> run0(CacheGroupContext
grp) {
+ @Override protected SingleFieldDto<Long> run0(CacheGroupContext grp) {
long res;
if
(!ignite.context().encryption().reencryptionInProgress(grp.groupId()))
@@ -62,17 +61,17 @@ public class VisorReencryptionStatusTask extends
VisorCacheGroupEncryptionTask<L
else
res =
ignite.context().encryption().getBytesLeftForReencryption(grp.groupId());
- return new VisorReencryptionStatusResult().value(res);
+ return new ReencryptionStatusResult().value(res);
}
}
/** */
- protected static class VisorReencryptionStatusResult extends
VisorSingleFieldDto<Long> {
+ protected static class ReencryptionStatusResult extends
SingleFieldDto<Long> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
/** */
- public VisorReencryptionStatusResult() {
+ public ReencryptionStatusResult() {
// No-op.
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/encryption/VisorReencryptionSuspendTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/ReencryptionSuspendTask.java
similarity index 72%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/encryption/VisorReencryptionSuspendTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/encryption/ReencryptionSuspendTask.java
index 0e5b29bf621..726129c425e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/encryption/VisorReencryptionSuspendTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/ReencryptionSuspendTask.java
@@ -15,13 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.encryption;
+package org.apache.ignite.internal.management.encryption;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import org.apache.ignite.IgniteCheckedException;
-import
org.apache.ignite.internal.management.encryption.EncryptionCacheGroupArg;
import org.apache.ignite.internal.processors.cache.CacheGroupContext;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.visor.VisorJob;
@@ -31,18 +30,18 @@ import org.jetbrains.annotations.Nullable;
* Suspend re-encryption of the cache group.
*/
@GridInternal
-public class VisorReencryptionSuspendTask extends
VisorCacheGroupEncryptionTask<Boolean> {
+public class ReencryptionSuspendTask extends CacheGroupEncryptionTask<Boolean>
{
/** Serial version uid. */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
- @Override protected VisorJob<EncryptionCacheGroupArg,
VisorSingleFieldDto<Boolean>> job(
+ @Override protected VisorJob<EncryptionCacheGroupArg,
SingleFieldDto<Boolean>> job(
EncryptionCacheGroupArg arg) {
- return new VisorReencryptionSuspendJob(arg, debug);
+ return new ReencryptionSuspendJob(arg, debug);
}
/** The job to suspend re-encryption of the cache group. */
- private static class VisorReencryptionSuspendJob extends
VisorReencryptionBaseJob<Boolean> {
+ private static class ReencryptionSuspendJob extends
ReencryptionBaseJob<Boolean> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
@@ -50,24 +49,24 @@ public class VisorReencryptionSuspendTask extends
VisorCacheGroupEncryptionTask<
* @param arg Job argument.
* @param debug Flag indicating whether debug information should be
printed into node log.
*/
- protected VisorReencryptionSuspendJob(@Nullable
EncryptionCacheGroupArg arg, boolean debug) {
+ protected ReencryptionSuspendJob(@Nullable EncryptionCacheGroupArg
arg, boolean debug) {
super(arg, debug);
}
/** {@inheritDoc} */
- @Override protected VisorSingleFieldDto<Boolean>
run0(CacheGroupContext grp) throws IgniteCheckedException {
- return new VisorReencryptionSuspendResumeJobResult().value(
+ @Override protected SingleFieldDto<Boolean> run0(CacheGroupContext
grp) throws IgniteCheckedException {
+ return new ReencryptionSuspendResumeJobResult().value(
ignite.context().encryption().suspendReencryption(grp.groupId()));
}
}
/** */
- protected static class VisorReencryptionSuspendResumeJobResult extends
VisorSingleFieldDto<Boolean> {
+ protected static class ReencryptionSuspendResumeJobResult extends
SingleFieldDto<Boolean> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
/** */
- public VisorReencryptionSuspendResumeJobResult() {
+ public ReencryptionSuspendResumeJobResult() {
// No-op.
}
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties
b/modules/core/src/main/resources/META-INF/classnames.properties
index 4adf3b8cb50..6fe1be79e4f 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -2209,30 +2209,30 @@
org.apache.ignite.internal.visor.diagnostic.VisorPageLocksTask$VisorPageLocksTra
org.apache.ignite.internal.visor.diagnostic.availability.VisorConnectivityResult
org.apache.ignite.internal.visor.diagnostic.availability.VisorConnectivityTask
org.apache.ignite.internal.visor.diagnostic.availability.VisorConnectivityTask$VisorConnectivityJob
-org.apache.ignite.internal.visor.encryption.VisorCacheGroupEncryptionTask
-org.apache.ignite.internal.visor.encryption.VisorCacheGroupEncryptionTask$VisorReencryptionBaseJob
-org.apache.ignite.internal.visor.encryption.VisorCacheGroupEncryptionTask$VisorSingleFieldDto
-org.apache.ignite.internal.visor.encryption.VisorCacheGroupEncryptionTaskResult
-org.apache.ignite.internal.visor.encryption.VisorChangeCacheGroupKeyTask
-org.apache.ignite.internal.visor.encryption.VisorChangeCacheGroupKeyTask$VisorChangeCacheGroupKeyJob
-org.apache.ignite.internal.visor.encryption.VisorChangeMasterKeyTask
-org.apache.ignite.internal.visor.encryption.VisorChangeMasterKeyTask$VisorChangeMasterKeyJob
-org.apache.ignite.internal.visor.encryption.VisorEncryptionKeyIdsTask
-org.apache.ignite.internal.visor.encryption.VisorEncryptionKeyIdsTask$VisorEncryptionKeyIdsJob
-org.apache.ignite.internal.visor.encryption.VisorEncryptionKeyIdsTask$VisorEncryptionKeyIdsResult
-org.apache.ignite.internal.visor.encryption.VisorGetMasterKeyNameTask
-org.apache.ignite.internal.visor.encryption.VisorGetMasterKeyNameTask$VisorGetMasterKeyNameJob
-org.apache.ignite.internal.visor.encryption.VisorReencryptionRateTask
-org.apache.ignite.internal.visor.encryption.VisorReencryptionRateTask$ReencryptionRateJobResult
-org.apache.ignite.internal.visor.encryption.VisorReencryptionRateTask$VisorReencryptionRateJob
-org.apache.ignite.internal.visor.encryption.VisorReencryptionResumeTask
-org.apache.ignite.internal.visor.encryption.VisorReencryptionResumeTask$VisorReencryptionResumeJob
-org.apache.ignite.internal.visor.encryption.VisorReencryptionStatusTask
-org.apache.ignite.internal.visor.encryption.VisorReencryptionStatusTask$VisorReencryptionStatusJob
-org.apache.ignite.internal.visor.encryption.VisorReencryptionStatusTask$VisorReencryptionStatusResult
-org.apache.ignite.internal.visor.encryption.VisorReencryptionSuspendTask
-org.apache.ignite.internal.visor.encryption.VisorReencryptionSuspendTask$VisorReencryptionSuspendJob
-org.apache.ignite.internal.visor.encryption.VisorReencryptionSuspendTask$VisorReencryptionSuspendResumeJobResult
+org.apache.ignite.internal.management.encryption.CacheGroupEncryptionTask
+org.apache.ignite.internal.management.encryption.CacheGroupEncryptionTask$ReencryptionBaseJob
+org.apache.ignite.internal.management.encryption.CacheGroupEncryptionTask$SingleFieldDto
+org.apache.ignite.internal.management.encryption.CacheGroupEncryptionTaskResult
+org.apache.ignite.internal.management.encryption.ChangeCacheGroupKeyTask
+org.apache.ignite.internal.management.encryption.ChangeCacheGroupKeyTask$ChangeCacheGroupKeyJob
+org.apache.ignite.internal.management.encryption.ChangeMasterKeyTask
+org.apache.ignite.internal.management.encryption.ChangeMasterKeyTask$ChangeMasterKeyJob
+org.apache.ignite.internal.management.encryption.EncryptionKeyIdsTask
+org.apache.ignite.internal.management.encryption.EncryptionKeyIdsTask$EncryptionKeyIdsJob
+org.apache.ignite.internal.management.encryption.EncryptionKeyIdsTask$EncryptionKeyIdsResult
+org.apache.ignite.internal.management.encryption.GetMasterKeyNameTask
+org.apache.ignite.internal.management.encryption.GetMasterKeyNameTask$GetMasterKeyNameJob
+org.apache.ignite.internal.management.encryption.ReencryptionRateTask
+org.apache.ignite.internal.management.encryption.ReencryptionRateTask$ReencryptionRateJobResult
+org.apache.ignite.internal.management.encryption.ReencryptionRateTask$ReencryptionRateJob
+org.apache.ignite.internal.management.encryption.ReencryptionResumeTask
+org.apache.ignite.internal.management.encryption.ReencryptionResumeTask$ReencryptionResumeJob
+org.apache.ignite.internal.management.encryption.ReencryptionStatusTask
+org.apache.ignite.internal.management.encryption.ReencryptionStatusTask$ReencryptionStatusJob
+org.apache.ignite.internal.management.encryption.ReencryptionStatusTask$ReencryptionStatusResult
+org.apache.ignite.internal.management.encryption.ReencryptionSuspendTask
+org.apache.ignite.internal.management.encryption.ReencryptionSuspendTask$ReencryptionSuspendJob
+org.apache.ignite.internal.management.encryption.ReencryptionSuspendTask$ReencryptionSuspendResumeJobResult
org.apache.ignite.internal.management.metric.MetricTask
org.apache.ignite.internal.management.metric.MetricTask$MetricJob
org.apache.ignite.internal.management.ClusterChangeTagTask
