This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a commit to branch remove_deployment_spi in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 2de14bc39b34bbb3b79c2b9fabfb115beb92cf31 Author: Nikolay Izhikov <[email protected]> AuthorDate: Sat Mar 7 18:22:19 2026 +0300 WIP --- .../IgniteCacheSharedExecutionContextTest.java | 35 ---------------------- .../GridCacheNodeFailureAbstractTest.java | 11 ------- .../GridCachePreloadLifecycleAbstractTest.java | 2 -- .../GridCacheReplicatedPreloadSelfTest.java | 3 -- .../p2p/ClassLoadingProblemExceptionTest.java | 1 - .../ClassLoadingProblemExtendedLoggingTest.java | 2 -- .../apache/ignite/p2p/SharedDeploymentTest.java | 4 +-- .../ignite/testsuites/IgniteCacheTestSuite.java | 2 -- .../processors/cache/GridCacheOffHeapSelfTest.java | 3 -- .../cache/GridCacheOffheapIndexGetSelfTest.java | 3 -- 10 files changed, 1 insertion(+), 65 deletions(-) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheSharedExecutionContextTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheSharedExecutionContextTest.java deleted file mode 100644 index ba70be49eaf..00000000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheSharedExecutionContextTest.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * 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.processors.cache.context; - -import org.apache.ignite.configuration.DeploymentMode; -import org.apache.ignite.configuration.IgniteConfiguration; - -/** - * - */ -public class IgniteCacheSharedExecutionContextTest extends IgniteCacheAtomicExecutionContextTest { - /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { - IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); - - cfg.setDeploymentMode(DeploymentMode.SHARED); - - return cfg; - } -} diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java index a4a973ff562..9b43451d2ca 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java @@ -26,8 +26,6 @@ import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteState; import org.apache.ignite.Ignition; -import org.apache.ignite.configuration.DeploymentMode; -import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.events.Event; import org.apache.ignite.internal.transactions.IgniteTxOptimisticCheckedException; import org.apache.ignite.internal.util.typedef.G; @@ -75,15 +73,6 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac super(false /*start grid. */); } - /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { - IgniteConfiguration c = super.getConfiguration(igniteInstanceName); - - c.setDeploymentMode(DeploymentMode.SHARED); - - return c; - } - /** * @throws Exception If failed. */ diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java index 3b6ee2808ee..01b32ae83bb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java @@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache.distributed; import java.io.Serializable; import org.apache.ignite.cache.CacheRebalanceMode; -import org.apache.ignite.configuration.DeploymentMode; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lifecycle.LifecycleBean; @@ -66,7 +65,6 @@ public abstract class GridCachePreloadLifecycleAbstractTest extends GridCommonAb c.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED); c.setIncludeProperties(); - c.setDeploymentMode(DeploymentMode.SHARED); c.setNetworkTimeout(10000); c.setConnectorConfiguration(null); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java index 947539d0a29..e013047b8ee 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java @@ -57,7 +57,6 @@ import static org.apache.ignite.cache.CacheMode.REPLICATED; import static org.apache.ignite.cache.CacheRebalanceMode.ASYNC; import static org.apache.ignite.cache.CacheRebalanceMode.SYNC; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; -import static org.apache.ignite.configuration.DeploymentMode.CONTINUOUS; import static org.apache.ignite.events.EventType.EVTS_ALL; import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_PUT; import static org.apache.ignite.events.EventType.EVT_CACHE_REBALANCE_STARTED; @@ -102,8 +101,6 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cacheConfiguration(igniteInstanceName)); - cfg.setDeploymentMode(CONTINUOUS); - cfg.setUserAttributes(F.asMap("EVEN", !igniteInstanceName.endsWith("0") && !igniteInstanceName.endsWith("2"))); MemoryEventStorageSpi spi = new MemoryEventStorageSpi(); diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/ClassLoadingProblemExceptionTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/ClassLoadingProblemExceptionTest.java index 44a39859e05..890787e029a 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/ClassLoadingProblemExceptionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/ClassLoadingProblemExceptionTest.java @@ -95,7 +95,6 @@ public class ClassLoadingProblemExceptionTest extends GridCommonAbstractTest imp cfg .setClientMode(igniteInstanceName.startsWith(CLIENT_PREFIX)) .setPeerClassLoadingEnabled(true) - .setDeploymentMode(SHARED) .setCommunicationSpi(new TestCommunicationSpi()); return cfg; diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/ClassLoadingProblemExtendedLoggingTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/ClassLoadingProblemExtendedLoggingTest.java index fd0f825c3bc..17c272ae866 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/ClassLoadingProblemExtendedLoggingTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/ClassLoadingProblemExtendedLoggingTest.java @@ -33,7 +33,6 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import static com.google.common.primitives.Ints.asList; -import static org.apache.ignite.configuration.DeploymentMode.SHARED; import static org.apache.ignite.internal.TestRecordingCommunicationSpi.spi; import static org.apache.ignite.testframework.GridTestUtils.setFieldValue; @@ -65,7 +64,6 @@ public class ClassLoadingProblemExtendedLoggingTest extends GridCommonAbstractTe @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { return super.getConfiguration(igniteInstanceName) .setPeerClassLoadingEnabled(true) - .setDeploymentMode(SHARED) .setCommunicationSpi(new TestRecordingCommunicationSpi()) .setGridLogger(listeningLog) .setNetworkTimeout(1000); diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/SharedDeploymentTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/SharedDeploymentTest.java index 51966fa93a9..adab96325bb 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/SharedDeploymentTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/SharedDeploymentTest.java @@ -22,7 +22,6 @@ import java.lang.reflect.Method; import java.net.URL; import java.util.Collection; import org.apache.ignite.Ignite; -import org.apache.ignite.configuration.DeploymentMode; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.lang.IgniteCallable; import org.apache.ignite.testframework.GridTestExternalClassLoader; @@ -48,8 +47,7 @@ public class SharedDeploymentTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { return super.getConfiguration(igniteInstanceName) - .setPeerClassLoadingEnabled(true) - .setDeploymentMode(DeploymentMode.SHARED); + .setPeerClassLoadingEnabled(true); } /** diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java index fff7dd11c1a..666719c08ff 100755 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java @@ -79,7 +79,6 @@ import org.apache.ignite.internal.processors.cache.context.IgniteCacheIsolatedEx import org.apache.ignite.internal.processors.cache.context.IgniteCacheP2PDisableExecutionContextTest; import org.apache.ignite.internal.processors.cache.context.IgniteCachePrivateExecutionContextTest; import org.apache.ignite.internal.processors.cache.context.IgniteCacheReplicatedExecutionContextTest; -import org.apache.ignite.internal.processors.cache.context.IgniteCacheSharedExecutionContextTest; import org.apache.ignite.internal.processors.cache.context.IgniteCacheTxExecutionContextTest; import org.apache.ignite.internal.processors.cache.distributed.IgniteCrossCacheTxStoreSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheGetStoreErrorSelfTest; @@ -150,7 +149,6 @@ public class IgniteCacheTestSuite { GridTestUtils.addTestIfNeeded(suite, IgniteCacheIsolatedExecutionContextTest.class, ignoredTests); GridTestUtils.addTestIfNeeded(suite, IgniteCacheP2PDisableExecutionContextTest.class, ignoredTests); GridTestUtils.addTestIfNeeded(suite, IgniteCachePrivateExecutionContextTest.class, ignoredTests); - GridTestUtils.addTestIfNeeded(suite, IgniteCacheSharedExecutionContextTest.class, ignoredTests); GridTestUtils.addTestIfNeeded(suite, StoreArrayKeyTest.class, ignoredTests); diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java index d7721472b57..7a0c444bebb 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java @@ -31,7 +31,6 @@ import org.junit.Test; import static org.apache.ignite.cache.CacheMode.REPLICATED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; -import static org.apache.ignite.configuration.DeploymentMode.SHARED; /** * Test for cache swap. @@ -54,8 +53,6 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cacheCfg); - cfg.setDeploymentMode(SHARED); - return cfg; } diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java index e8a0800fe0f..a9f6e9cbb27 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java @@ -38,7 +38,6 @@ import org.junit.Test; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; -import static org.apache.ignite.configuration.DeploymentMode.SHARED; /** * Tests off heap storage when both offheaped and swapped entries exists. @@ -50,8 +49,6 @@ public class GridCacheOffheapIndexGetSelfTest extends GridCommonAbstractTest { cfg.setNetworkTimeout(2000); - cfg.setDeploymentMode(SHARED); - return cfg; }
