[ignite] branch master updated: Revert "IGNITE-17916 Deprecate IGNITE_ALLOW_ATOMIC_OPS_IN_TX (#10327)"

[timoninmaxim]

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

timoninmaxim 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 875d550698a Revert "IGNITE-17916 Deprecate 
IGNITE_ALLOW_ATOMIC_OPS_IN_TX (#10327)"
875d550698a is described below

commit 875d550698a9a8f8f3e49702c258fa37d48fb80a
Author: Maksim Timonin <timonin.ma...@gmail.com>
AuthorDate: Wed Nov 2 12:47:43 2022 +0300

    Revert "IGNITE-17916 Deprecate IGNITE_ALLOW_ATOMIC_OPS_IN_TX (#10327)"
    
    This reverts commit fe7dada84d18ec1ded30296ecc993d2e9acd4d36.
---
 .../src/main/java/org/apache/ignite/IgniteSystemProperties.java    | 4 ----
 .../ignite/internal/processors/cache/CacheOperationContext.java    | 7 +------
 2 files changed, 1 insertion(+), 10 deletions(-)

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 94cf595f0eb..3c61822fefa 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
@@ -605,13 +605,9 @@ public final class IgniteSystemProperties {
 
     /**
      * Flag indicating whether atomic operations allowed for use inside 
transactions.
-     *
-     * @deprecated Since version 2.15.0. To be deleted since version 2.16.0.
-     * Since version 2.16.0 all atomic operations within transactions will be 
forbidden.
      */
     @SystemProperty(value = "Allows atomic operations inside transactions",
         defaults = "true")
-    @Deprecated
     public static final String IGNITE_ALLOW_ATOMIC_OPS_IN_TX = 
"IGNITE_ALLOW_ATOMIC_OPS_IN_TX";
 
     /**
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java
index 0c5c70de5c9..7f22f538643 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java
@@ -31,13 +31,8 @@ import static 
org.apache.ignite.IgniteSystemProperties.IGNITE_ALLOW_ATOMIC_OPS_I
  * Cache operation context.
  */
 public class CacheOperationContext implements Serializable {
-
+    /** */
     //TODO IGNITE-8801 remove this and set default as `false`.
-    /**
-     * @deprecated Since version 2.15.0. To be deleted since version 2.16.0.
-     * Since version 2.16.0 all atomic operations within transactions will be 
forbidden.
-     */
-    @Deprecated
     public static final boolean DFLT_ALLOW_ATOMIC_OPS_IN_TX =
         IgniteSystemProperties.getBoolean(IGNITE_ALLOW_ATOMIC_OPS_IN_TX, true);