From e01d5857e1de92b1b35889d72cfc2c27cb823fc0 Mon Sep 17 00:00:00 2001
From: Nikolay Izhikov <nizhikov@apache.org>
Date: Sun, 22 Dec 2024 16:14:57 +0300
Subject: [PATCH] IGNITE-24076 WIP

---
 .../ignite/internal/commandline/CliIgniteClientInvoker.java  | 2 +-
 .../processors/odbc/ClientListenerConnectionContext.java     | 5 ++---
 .../internal/processors/odbc/ClientListenerNioListener.java  | 4 +++-
 .../apache/ignite/plugin/security/SecurityPermission.java    | 4 ++--
 .../apache/ignite/internal/client/thin/RecoveryModeTest.java | 2 +-
 .../internal/processors/cache/warmup/WarmUpSelfTest.java     | 2 +-
 .../security/client/ThinClientPermissionCheckTest.java       | 2 +-
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/CliIgniteClientInvoker.java b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/CliIgniteClientInvoker.java
index 91cccd75b4eeb..637b4dd7b1db2 100644
--- a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/CliIgniteClientInvoker.java
+++ b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/CliIgniteClientInvoker.java
@@ -33,7 +33,7 @@
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.jetbrains.annotations.Nullable;
 
-import static org.apache.ignite.internal.processors.odbc.ClientListenerConnectionContext.MANAGEMENT_CLIENT_ATTR;
+import static org.apache.ignite.internal.processors.odbc.ClientListenerNioListener.MANAGEMENT_CLIENT_ATTR;
 
 /**
  * Adapter of new management API command for {@code control.sh} execution flow.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerConnectionContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerConnectionContext.java
index 6e193b97921a9..fbed11610296f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerConnectionContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerConnectionContext.java
@@ -24,13 +24,12 @@
 import org.apache.ignite.internal.util.nio.GridNioSession;
 import org.jetbrains.annotations.Nullable;
 
+import static org.apache.ignite.internal.processors.odbc.ClientListenerNioListener.MANAGEMENT_CLIENT_ATTR;
+
 /**
  * SQL listener connection context.
  */
 public interface ClientListenerConnectionContext {
-    /** {@code True} if a management client. Internal operations will be available. */
-    String MANAGEMENT_CLIENT_ATTR = "ignite.internal.management-client";
-
     /**
      * @return Client type.
      */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java
index 45355d31dd25c..5547a9f860250 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java
@@ -42,7 +42,6 @@
 import org.apache.ignite.internal.processors.platform.client.ClientConnectionContext;
 import org.apache.ignite.internal.processors.platform.client.ClientStatus;
 import org.apache.ignite.internal.processors.security.OperationSecurityContext;
-import org.apache.ignite.internal.processors.security.SecurityContext;
 import org.apache.ignite.internal.util.GridSpinBusyLock;
 import org.apache.ignite.internal.util.nio.GridNioFuture;
 import org.apache.ignite.internal.util.nio.GridNioServerListenerAdapter;
@@ -76,6 +75,9 @@ public class ClientListenerNioListener extends GridNioServerListenerAdapter<Clie
     /** Connection-related metadata key. */
     public static final int CONN_CTX_META_KEY = GridNioSessionMetaKey.nextUniqueKey();
 
+    /** {@code True} if a management client. Internal operations will be available. */
+    public static final String MANAGEMENT_CLIENT_ATTR = "ignite.internal.management-client";
+
     /** Connection shifted ID for management clients. */
     public static final long MANAGEMENT_CONNECTION_SHIFTED_ID = -1;
 
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermission.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermission.java
index faea56294d5f5..c69efca39ecc3 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermission.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermission.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.plugin.security;
 
 import org.apache.ignite.cluster.ClusterState;
-import org.apache.ignite.internal.processors.odbc.ClientListenerConnectionContext;
+import org.apache.ignite.internal.processors.odbc.ClientListenerNioListener;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -122,7 +122,7 @@ public enum SecurityPermission {
 
     /**
      * Connect as a management client.
-     * @see ClientListenerConnectionContext#MANAGEMENT_CLIENT_ATTR
+     * @see ClientListenerNioListener#MANAGEMENT_CLIENT_ATTR
      */
     CONNECT_AS_MAMAGEMENT_CLIENT;
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/RecoveryModeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/RecoveryModeTest.java
index 9116553c050f0..ad9eab11ea27a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/RecoveryModeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/RecoveryModeTest.java
@@ -41,7 +41,7 @@
 
 import static org.apache.ignite.internal.GridKernalState.STARTED;
 import static org.apache.ignite.internal.IgnitionEx.gridx;
-import static org.apache.ignite.internal.processors.odbc.ClientListenerConnectionContext.MANAGEMENT_CLIENT_ATTR;
+import static org.apache.ignite.internal.processors.odbc.ClientListenerNioListener.MANAGEMENT_CLIENT_ATTR;
 import static org.apache.ignite.internal.processors.odbc.ClientListenerNioListener.MANAGEMENT_CONNECTION_SHIFTED_ID;
 import static org.apache.ignite.internal.processors.odbc.ClientListenerProcessor.CLI_CONN_VIEW;
 import static org.apache.ignite.testframework.GridTestUtils.assertThrowsWithCause;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/warmup/WarmUpSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/warmup/WarmUpSelfTest.java
index 77d3661ad261e..89ef3410a3128 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/warmup/WarmUpSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/warmup/WarmUpSelfTest.java
@@ -45,7 +45,7 @@
 import static java.util.function.Function.identity;
 import static java.util.stream.Collectors.toMap;
 import static org.apache.ignite.client.Config.SERVER;
-import static org.apache.ignite.internal.processors.odbc.ClientListenerConnectionContext.MANAGEMENT_CLIENT_ATTR;
+import static org.apache.ignite.internal.processors.odbc.ClientListenerNioListener.MANAGEMENT_CLIENT_ATTR;
 import static org.apache.ignite.testframework.GridTestUtils.assertThrowsAnyCause;
 
 /**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/security/client/ThinClientPermissionCheckTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/security/client/ThinClientPermissionCheckTest.java
index ff57d44ef3242..aaba9d628fe3d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/security/client/ThinClientPermissionCheckTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/security/client/ThinClientPermissionCheckTest.java
@@ -68,7 +68,7 @@
 import static java.util.Collections.singletonMap;
 import static org.apache.ignite.configuration.DataPageEvictionMode.RANDOM_LRU;
 import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_EXPIRED;
-import static org.apache.ignite.internal.processors.odbc.ClientListenerConnectionContext.MANAGEMENT_CLIENT_ATTR;
+import static org.apache.ignite.internal.processors.odbc.ClientListenerNioListener.MANAGEMENT_CLIENT_ATTR;
 import static org.apache.ignite.internal.util.lang.GridFunc.t;
 import static org.apache.ignite.plugin.security.SecurityPermission.CACHE_CREATE;
 import static org.apache.ignite.plugin.security.SecurityPermission.CACHE_DESTROY;