You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ni...@apache.org on 2023/06/22 08:18:42 UTC
[ignite] branch IGNITE-19753 updated: IGNITE-19802 fix renamed class names occurrences in string literals (#10799)
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 926063646cc IGNITE-19802 fix renamed class names occurrences in string literals (#10799)
926063646cc is described below
commit 926063646ccc0d2bb033ec86cd4d58d90299fffe
Author: Valery Shorin <va...@gmail.com>
AuthorDate: Thu Jun 22 11:18:33 2023 +0300
IGNITE-19802 fix renamed class names occurrences in string literals (#10799)
---
config/ignite-log4j.xml | 2 +-
.../apache/ignite/util/GridCommandHandlerClusterByClassTest.java | 5 +++--
.../apache/ignite/util/GridCommandHandlerInterruptCommandTest.java | 6 ++++--
.../test/java/org/apache/ignite/util/GridCommandHandlerTest.java | 7 ++++---
.../src/main/java/org/apache/ignite/internal/util/IgniteUtils.java | 2 +-
.../ducktests/tests/ignitetest/services/utils/control_utility.py | 2 +-
6 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/config/ignite-log4j.xml b/config/ignite-log4j.xml
index ba7a4207844..b61b7915467 100644
--- a/config/ignite-log4j.xml
+++ b/config/ignite-log4j.xml
@@ -75,7 +75,7 @@
<Logger name="org.springframework" level="WARN"/>
<Logger name="org.eclipse.jetty" level="WARN"/>
- <Logger name="org.apache.ignite.internal.visor.consistency" additivity="false" level="INFO">
+ <Logger name="org.apache.ignite.internal.management.consistency" additivity="false" level="INFO">
<AppenderRef ref="CONSISTENCY"/>
</Logger>
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerClusterByClassTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerClusterByClassTest.java
index 5ddcb225129..76379ea5365 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerClusterByClassTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerClusterByClassTest.java
@@ -74,6 +74,7 @@ import org.apache.ignite.internal.management.api.Positional;
import org.apache.ignite.internal.management.cache.CacheClearCommand;
import org.apache.ignite.internal.management.cache.CacheCommand;
import org.apache.ignite.internal.management.cache.CacheDestroyCommand;
+import org.apache.ignite.internal.management.cache.IdleVerifyDumpTask;
import org.apache.ignite.internal.management.tx.TxTaskResult;
import org.apache.ignite.internal.processors.cache.CacheGroupContext;
import org.apache.ignite.internal.processors.cache.CacheType;
@@ -1159,8 +1160,8 @@ public class GridCommandHandlerClusterByClassTest extends GridCommandHandlerClus
* @return Build matcher for dump file name.
*/
@NotNull private Matcher dumpFileNameMatcher() {
- Pattern fileNamePattern = Pattern.compile(".*VisorIdleVerifyDumpTask successfully written output to '(.*)'");
-
+ Pattern fileNamePattern = Pattern.compile(".*" + IdleVerifyDumpTask.class.getSimpleName()
+ + " successfully written output to '(.*)'");
return fileNamePattern.matcher(testOut.toString());
}
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerInterruptCommandTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerInterruptCommandTest.java
index a6db6a42d23..9c138996de6 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerInterruptCommandTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerInterruptCommandTest.java
@@ -36,7 +36,9 @@ import org.apache.ignite.events.DeploymentEvent;
import org.apache.ignite.events.EventType;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.management.cache.IdleVerifyTaskV2;
import org.apache.ignite.internal.management.cache.ValidateIndexesClosure;
+import org.apache.ignite.internal.management.cache.ValidateIndexesTask;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.ListeningTestLogger;
@@ -53,10 +55,10 @@ public class GridCommandHandlerInterruptCommandTest extends GridCommandHandlerAb
private static final int LOAD_LOOP = 500_000;
/** Idle verify task name. */
- private static final String IDLE_VERIFY_TASK_V2 = "org.apache.ignite.internal.visor.verify.VisorIdleVerifyTaskV2";
+ private static final String IDLE_VERIFY_TASK_V2 = IdleVerifyTaskV2.class.getName();
/** Validate index task name. */
- private static final String VALIDATE_INDEX_TASK = "org.apache.ignite.internal.visor.verify.ValidateIndexesTask";
+ private static final String VALIDATE_INDEX_TASK = ValidateIndexesTask.class.getName();
/** Log listener. */
private ListeningTestLogger lnsrLog;
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
index 75a7110d9b7..9dbdf07329a 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
@@ -80,6 +80,7 @@ import org.apache.ignite.internal.client.impl.GridClientImpl;
import org.apache.ignite.internal.client.util.GridConcurrentHashSet;
import org.apache.ignite.internal.commandline.CommandHandler;
import org.apache.ignite.internal.management.cache.FindAndDeleteGarbageInPersistenceTaskResult;
+import org.apache.ignite.internal.management.cache.IdleVerifyDumpTask;
import org.apache.ignite.internal.management.snapshot.SnapshotTaskResult;
import org.apache.ignite.internal.management.tx.TxInfo;
import org.apache.ignite.internal.management.tx.TxTaskResult;
@@ -2203,7 +2204,7 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
public void testCacheIdleVerifyDumpCrcWithCorruptedPartition() throws Exception {
testCacheIdleVerifyWithCorruptedPartition("--cache", "idle_verify", "--dump", "--check-crc");
- String parts[] = testOut.toString().split("VisorIdleVerifyDumpTask successfully written output to '");
+ String parts[] = testOut.toString().split(IdleVerifyDumpTask.class.getSimpleName() + " successfully written output to '");
assertEquals(2, parts.length);
@@ -2340,8 +2341,8 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
* @return Build matcher for dump file name.
*/
@NotNull private Matcher dumpFileNameMatcher() {
- Pattern fileNamePattern = Pattern.compile(".*VisorIdleVerifyDumpTask successfully written output to '(.*)'");
-
+ Pattern fileNamePattern = Pattern.compile(".*" + IdleVerifyDumpTask.class.getSimpleName()
+ + " successfully written output to '(.*)'");
return fileNamePattern.matcher(testOut.toString());
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 3bd673b00da..25a9b9acd12 100755
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -6904,7 +6904,7 @@ public abstract class IgniteUtils {
* @return Replaces string.
*/
public static String compact(String s) {
- return s.replace("org.apache.ignite.internal.visor.", "o.a.i.i.v.").
+ return s.replace("org.apache.ignite.internal.manager.", "o.a.i.i.m.").
replace("org.apache.ignite.internal.", "o.a.i.i.").
replace(IGNITE_PKG, "o.a.i.");
}
diff --git a/modules/ducktests/tests/ignitetest/services/utils/control_utility.py b/modules/ducktests/tests/ignitetest/services/utils/control_utility.py
index 82eb2fcab96..7fd320d9488 100644
--- a/modules/ducktests/tests/ignitetest/services/utils/control_utility.py
+++ b/modules/ducktests/tests/ignitetest/services/utils/control_utility.py
@@ -177,7 +177,7 @@ class ControlUtility:
"""
data = self.__run("--cache idle_verify --dump", node=node)
- assert ('VisorIdleVerifyDumpTask successfully' in data), data
+ assert ('IdleVerifyDumpTask successfully' in data), data
return re.search(r'/.*.txt', data).group(0)