This is an automated email from the ASF dual-hosted git repository.

NSAmelchev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new 9d60ea6f978 IGNITE-29265 Code cleanup: remove references to Ignite 3 
(#13807)
9d60ea6f978 is described below

commit 9d60ea6f978c54751936c76e4d96dcbc1796f887
Author: Vladimir Steshin <[email protected]>
AuthorDate: Wed Nov 11 18:50:55 2026 +0300

    IGNITE-29265 Code cleanup: remove references to Ignite 3 (#13807)
---
 README.md                                          |   5 -
 .../ignite/IgniteCommonsSystemProperties.java      |   2 -
 .../ignite/internal/util/lang/ClusterNodeFunc.java |   5 -
 .../org/apache/ignite/IgniteSystemProperties.java  |   2 +-
 .../java/org/apache/ignite/internal/GridTopic.java |   2 +-
 .../cache/query/GridCacheQueryResponseEntry.java   | 118 ---------------------
 .../internal/processors/job/GridJobProcessor.java  |   4 -
 .../processors/rest/GridRestProcessor.java         |   2 +-
 .../apache/ignite/spi/discovery/DiscoverySpi.java  |   2 +-
 .../main/resources/META-INF/classnames.properties  |   1 -
 .../distributed/GridCacheMixedModeSelfTest.java    |  80 --------------
 .../ignite/testsuites/IgniteCacheTestSuite3.java   |   3 -
 .../protocols/http/jetty/GridJettyRestHandler.java |   2 +-
 13 files changed, 5 insertions(+), 223 deletions(-)

diff --git a/README.md b/README.md
index 96163324305..d064174c870 100644
--- a/README.md
+++ b/README.md
@@ -8,11 +8,6 @@
 ![GitHub commit 
activity](https://img.shields.io/github/commit-activity/m/apache/ignite)
 [![Twitter 
Follow](https://img.shields.io/twitter/follow/ApacheIgnite?style=social)](https://twitter.com/ApacheIgnite)
 
-## Ignite 2.x and 3.x
-
-* This repository is Ignite 2
-* See [apache/ignite-3](https://github.com/apache/ignite-3) for Ignite 3
-
 ## What is Apache Ignite?
 
 Apache Ignite is a distributed database for high-performance computing with 
in-memory speed.
diff --git 
a/modules/commons/src/main/java/org/apache/ignite/IgniteCommonsSystemProperties.java
 
b/modules/commons/src/main/java/org/apache/ignite/IgniteCommonsSystemProperties.java
index 62e4b5f8318..4d9c165e2f5 100644
--- 
a/modules/commons/src/main/java/org/apache/ignite/IgniteCommonsSystemProperties.java
+++ 
b/modules/commons/src/main/java/org/apache/ignite/IgniteCommonsSystemProperties.java
@@ -149,8 +149,6 @@ public class IgniteCommonsSystemProperties {
     /**
      * When set to {@code true} fields are written by BinaryMarshaller in 
sorted order. Otherwise
      * the natural order is used.
-     * <p>
-     * NOTICE: Should be the default in Apache Ignite 3.0
      */
     @SystemProperty("Enables fields to be written by BinaryMarshaller in 
sorted order. " +
         "By default, the natural order is used")
diff --git 
a/modules/commons/src/main/java/org/apache/ignite/internal/util/lang/ClusterNodeFunc.java
 
b/modules/commons/src/main/java/org/apache/ignite/internal/util/lang/ClusterNodeFunc.java
index 8529f1e3e7e..1923f237992 100644
--- 
a/modules/commons/src/main/java/org/apache/ignite/internal/util/lang/ClusterNodeFunc.java
+++ 
b/modules/commons/src/main/java/org/apache/ignite/internal/util/lang/ClusterNodeFunc.java
@@ -162,11 +162,6 @@ public class ClusterNodeFunc {
     /**
      * Compares two {@link org.apache.ignite.cluster.ClusterNode} instances 
for equality.
      * <p>
-     * Since introduction of {@link org.apache.ignite.cluster.ClusterNode} in 
Apache Ignite 3.0 the semantic of equality between
-     * grid nodes has changed. Since rich node wraps thin node instance and in 
the same time
-     * implements {@link org.apache.ignite.cluster.ClusterNode} interface, the 
proper semantic of comparing two grid node is
-     * to ignore their runtime types and compare only by their IDs. This 
method implements this logic.
-     * <p>
      * End users rarely, if ever, need to directly compare two grid nodes for 
equality. This method is
      * intended primarily for discovery SPI developers that provide 
implementations of {@link org.apache.ignite.cluster.ClusterNode}
      * interface.
diff --git 
a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java 
b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
index 611195665f1..53ce8e0c269 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
@@ -274,7 +274,7 @@ public final class IgniteSystemProperties extends 
IgniteCommonsSystemProperties
      * This property changes output format of {@link 
GridRestCommand#CACHE_GET_ALL} from {k: v, ...}
      * to [{"key": k, "value": v}, ...] to allow non-string keys output.
      *
-     * @deprecated Should be made default in Apache Ignite 3.0.
+     * @deprecated Should be default in future releases.
      */
     @Deprecated
     @SystemProperty("If true output format of GridRestCommand.CACHE_GET_ALL 
will change from " +
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java 
b/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java
index b02498c6601..9638e65fcf9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java
@@ -87,7 +87,7 @@ public enum GridTopic {
     TOPIC_CONTINUOUS,
 
     /**
-     * @deprecated Should be removed in Apache Ignite 3.0.
+     * @deprecated Component was removed. Enum can't be removed because enum 
ordinal is important.
      */
     @Deprecated
     TOPIC_MONGO,
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponseEntry.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponseEntry.java
deleted file mode 100644
index 5c63eaadcb0..00000000000
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponseEntry.java
+++ /dev/null
@@ -1,118 +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.query;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.Map;
-import org.apache.ignite.internal.util.tostring.GridToStringInclude;
-
-/**
- * Class to store query results returned by remote nodes. It's required to 
fully
- * control serialization process. Local entries can be returned to user as is.
- * <p>
- * @deprecated Should be removed in Apache Ignite 3.0.
- */
-@Deprecated
-public class GridCacheQueryResponseEntry<K, V> implements Map.Entry<K, V>, 
Externalizable {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /** */
-    @GridToStringInclude
-    private K key;
-
-    /** */
-    @GridToStringInclude
-    private V val;
-
-    /**
-     * Required by {@link Externalizable}.
-     */
-    public GridCacheQueryResponseEntry() {
-        // No-op.
-    }
-
-    /**
-     * @param key Key.
-     * @param val Value.
-     */
-    public GridCacheQueryResponseEntry(K key, V val) {
-        this.key = key;
-        this.val = val;
-    }
-
-    /** @return Key. */
-    @Override public K getKey() {
-        return key;
-    }
-
-    /**
-     * @return Value.
-     */
-    @Override public V getValue() {
-        return val;
-    }
-
-    /**
-     * @param val Value
-     */
-    @Override public V setValue(V val) {
-        this.val = val;
-
-        return val;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeExternal(ObjectOutput out) throws IOException {
-        out.writeObject(key);
-        out.writeObject(val);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void readExternal(ObjectInput in) throws IOException, 
ClassNotFoundException {
-        key = (K)in.readObject();
-        val = (V)in.readObject();
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean equals(Object o) {
-        if (this == o)
-            return true;
-
-        if (o == null || getClass() != o.getClass())
-            return false;
-
-        GridCacheQueryResponseEntry entry = (GridCacheQueryResponseEntry)o;
-
-        return key.equals(entry.key);
-
-    }
-
-    /** {@inheritDoc} */
-    @Override public int hashCode() {
-        return key.hashCode();
-    }
-
-    /** {@inheritDoc} */
-    @Override public String toString() {
-        return "[" + key + "=" + val + "]";
-    }
-}
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
index 127814406bd..af2324306bd 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
@@ -1083,8 +1083,6 @@ public class GridJobProcessor extends 
GridProcessorAdapter {
     }
 
     /**
-     * This method should be removed in Ignite 3.0.
-     *
      * @deprecated Metrics calculated via new subsystem.
      * @see #startedJobsMetric
      * @see #activeJobsMetric
@@ -1106,8 +1104,6 @@ public class GridJobProcessor extends 
GridProcessorAdapter {
     }
 
     /**
-     * This method should be removed in Ignite 3.0.
-     *
      * @deprecated Metrics calculated via new subsystem.
      * @see #startedJobsMetric
      * @see #activeJobsMetric
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
index e417ede2f6e..58daba5a955 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
@@ -416,7 +416,7 @@ public class GridRestProcessor extends GridProcessorAdapter 
implements IgniteRes
 
         while (true) {
             if (F.isEmpty(sesTok) && clientId == null) {
-                // TODO: In IGNITE 3.0 we should check credentials only for 
AUTHENTICATE command.
+                // TODO: We should check credentials only for AUTHENTICATE 
command.
                 if (securityEnabled && req.command() != AUTHENTICATE && 
req.credentials() == null)
                     throw new IgniteAuthenticationException("Failed to handle 
request - session token not found or invalid");
 
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java
index c9492bb0b86..2952129afa0 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java
@@ -99,7 +99,7 @@ public interface DiscoverySpi extends IgniteSpi {
      * {@link org.apache.ignite.events.DiscoveryEvent} for a set of all 
possible
      * discovery events.
      * <p>
-     * TODO: This method should be removed from public API in Apache Ignite 3.0
+     * TODO: Should be removed in future releases.
      *
      * @param lsnr Listener to discovery events or {@code null} to unset the 
listener.
      */
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties 
b/modules/core/src/main/resources/META-INF/classnames.properties
index daec0c4d8a7..1754637c47e 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -1355,7 +1355,6 @@ 
org.apache.ignite.internal.processors.cache.query.GridCacheQueryMetricsAdapter$Q
 org.apache.ignite.internal.processors.cache.query.GridCacheQueryMetricsKey
 org.apache.ignite.internal.processors.cache.query.GridCacheQueryRequest
 org.apache.ignite.internal.processors.cache.query.GridCacheQueryResponse
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryResponseEntry
 
org.apache.ignite.internal.processors.cache.query.GridCacheQuerySqlMetadataJobV2
 
org.apache.ignite.internal.processors.cache.query.GridCacheQuerySqlMetadataJobV2$1
 
org.apache.ignite.internal.processors.cache.query.GridCacheQuerySqlMetadataJobV2$2
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMixedModeSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMixedModeSelfTest.java
deleted file mode 100644
index be5234ec65d..00000000000
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMixedModeSelfTest.java
+++ /dev/null
@@ -1,80 +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.distributed;
-
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheMode;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import org.junit.Test;
-
-/**
- * Tests cache puts in mixed mode.
- *
- * TODO IGNITE-10345: Remove test in ignite 3.0.
- */
-public class GridCacheMixedModeSelfTest extends GridCommonAbstractTest {
-    /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String 
igniteInstanceName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
-
-        cfg.setCacheConfiguration(cacheConfiguration(igniteInstanceName));
-
-        return cfg;
-    }
-
-    /**
-     * @param igniteInstanceName Ignite instance name.
-     * @return Cache configuration.
-     */
-    private CacheConfiguration cacheConfiguration(String igniteInstanceName) {
-        CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
-
-        cfg.setCacheMode(CacheMode.PARTITIONED);
-
-        return cfg;
-    }
-
-    /** {@inheritDoc} */
-    @Override protected void beforeTestsStarted() throws Exception {
-        startGrids(3);
-
-        startClientGrid(3);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    @Test
-    public void testBasicOps() throws Exception {
-        IgniteCache<Object, Object> cache = grid(3).cache(DEFAULT_CACHE_NAME);
-
-        for (int i = 0; i < 1000; i++)
-            cache.put(i, i);
-
-        for (int i = 0; i < 1000; i++)
-            assertEquals(i, cache.get(i));
-
-        for (int i = 0; i < 1000; i++)
-            assertEquals(i, cache.getAndRemove(i));
-
-        for (int i = 0; i < 1000; i++)
-            assertNull(cache.get(i));
-    }
-}
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
index 77cc91f7b0e..fa0619f848e 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
@@ -38,7 +38,6 @@ import 
org.apache.ignite.internal.processors.cache.IgniteCacheInterceptorSelfTes
 import 
org.apache.ignite.internal.processors.cache.IgniteCacheScanPredicateDeploymentSelfTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.CacheAsyncOperationsTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.CacheLockChangingTopologyTest;
-import 
org.apache.ignite.internal.processors.cache.distributed.GridCacheMixedModeSelfTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.IgniteTxGetAfterStopTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.IgniteTxRemoveTimeoutObjectsNearTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.IgniteTxRemoveTimeoutObjectsTest;
@@ -181,8 +180,6 @@ public class IgniteCacheTestSuite3 {
         GridTestUtils.addTestIfNeeded(suite, 
GridCacheReferenceCleanupSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, GridCacheReloadSelfTest.class, 
ignoredTests);
 
-        GridTestUtils.addTestIfNeeded(suite, GridCacheMixedModeSelfTest.class, 
ignoredTests);
-
         // Cache interceptor tests.
         suite.addAll(IgniteCacheInterceptorSelfTestSuite.suite(ignoredTests));
 
diff --git 
a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
 
b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
index e40f43535ce..3ba0d8449c4 100644
--- 
a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
+++ 
b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
@@ -802,7 +802,7 @@ public class GridJettyRestHandler extends HttpServlet {
         if (certs instanceof X509Certificate[])
             restReq.certificates((X509Certificate[])certs);
 
-        // TODO: In IGNITE 3.0 we should check credentials only for 
AUTHENTICATE command.
+        // TODO: We should check credentials only for AUTHENTICATE command.
         if (!credentials(params, IGNITE_LOGIN, IGNITE_PASSWORD, restReq))
             credentials(params, USER_PARAM, PWD_PARAM, restReq);
 

Reply via email to