From a2185164e7a9bf513d2e3c17b32350964b16e936 Mon Sep 17 00:00:00 2001 From: Dmitry Werner Date: Sat, 1 Aug 2026 10:57:44 +0500 Subject: [PATCH 1/2] IGNITE-28943 Cleanup in SecurityBasicPermissionSetSerializationTest and MessageProcessorTest --- .../apache/ignite/internal/codegen/MessageProcessorTest.java | 2 +- .../security/SecurityBasicPermissionSetSerializationTest.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/codegen/MessageProcessorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/codegen/MessageProcessorTest.java index 24b8232cdd114..8fa7bc91c6b2f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/codegen/MessageProcessorTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/codegen/MessageProcessorTest.java @@ -298,7 +298,7 @@ public void testCustomMapperCannotBeUsedOnArrayField() { */ @Test public void testCustomMapperCannotBeUsedOnNonEnumCollection() { - Compilation compilation = compile("CustomEnumMapperOnArrayFieldMessage.java"); + Compilation compilation = compile("CustomEnumMapperOnNonEnumCollectionMessage.java"); assertThat(compilation).failed(); assertThat(compilation).hadErrorContaining(CUSTOM_MAPPER_ERROR); diff --git a/modules/core/src/test/java/org/apache/ignite/plugin/security/SecurityBasicPermissionSetSerializationTest.java b/modules/core/src/test/java/org/apache/ignite/plugin/security/SecurityBasicPermissionSetSerializationTest.java index 5d94d4e88476f..5a4d07113ce87 100644 --- a/modules/core/src/test/java/org/apache/ignite/plugin/security/SecurityBasicPermissionSetSerializationTest.java +++ b/modules/core/src/test/java/org/apache/ignite/plugin/security/SecurityBasicPermissionSetSerializationTest.java @@ -65,7 +65,6 @@ public void testWriteAndReadBack() throws Exception { src.setServicePermissions(Map.of("service", Set.of(SERVICE_INVOKE, SERVICE_CANCEL))); src.setCachePermissions(Map.of("cache", Set.of(CACHE_CREATE, CACHE_PUT))); - src.setCachePermissions(Map.of("cache", Set.of(CACHE_CREATE, CACHE_PUT))); SecurityBasicPermissionSet res = writeAndReadBack(src); assertTrue("Permission sets are not equal [src=" + src + ", res=" + res + "]", deepEquals(src, res)); @@ -115,7 +114,7 @@ public static boolean deepEquals(SecurityPermissionSet lhs, SecurityPermissionSe return lhs != null && rhs != null && lhs.defaultAllowAll() == rhs.defaultAllowAll() - && (F.isEmpty(rhs.systemPermissions()) && F.isEmpty(rhs.systemPermissions()) + && (F.isEmpty(rhs.systemPermissions()) && F.isEmpty(lhs.systemPermissions()) || F.eqNotOrdered(rhs.systemPermissions(), lhs.systemPermissions())) && eqNotOrdered(rhs.taskPermissions(), lhs.taskPermissions()) && eqNotOrdered(rhs.servicePermissions(), lhs.servicePermissions()) From 2117ae23b9891d0fb2199ad192b1be9ae608b1ef Mon Sep 17 00:00:00 2001 From: Dmitry Werner Date: Mon, 3 Aug 2026 11:11:53 +0500 Subject: [PATCH 2/2] revert SecurityBasicPermissionSetSerializationTest --- .../security/SecurityBasicPermissionSetSerializationTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/core/src/test/java/org/apache/ignite/plugin/security/SecurityBasicPermissionSetSerializationTest.java b/modules/core/src/test/java/org/apache/ignite/plugin/security/SecurityBasicPermissionSetSerializationTest.java index 5a4d07113ce87..5d94d4e88476f 100644 --- a/modules/core/src/test/java/org/apache/ignite/plugin/security/SecurityBasicPermissionSetSerializationTest.java +++ b/modules/core/src/test/java/org/apache/ignite/plugin/security/SecurityBasicPermissionSetSerializationTest.java @@ -65,6 +65,7 @@ public void testWriteAndReadBack() throws Exception { src.setServicePermissions(Map.of("service", Set.of(SERVICE_INVOKE, SERVICE_CANCEL))); src.setCachePermissions(Map.of("cache", Set.of(CACHE_CREATE, CACHE_PUT))); + src.setCachePermissions(Map.of("cache", Set.of(CACHE_CREATE, CACHE_PUT))); SecurityBasicPermissionSet res = writeAndReadBack(src); assertTrue("Permission sets are not equal [src=" + src + ", res=" + res + "]", deepEquals(src, res)); @@ -114,7 +115,7 @@ public static boolean deepEquals(SecurityPermissionSet lhs, SecurityPermissionSe return lhs != null && rhs != null && lhs.defaultAllowAll() == rhs.defaultAllowAll() - && (F.isEmpty(rhs.systemPermissions()) && F.isEmpty(lhs.systemPermissions()) + && (F.isEmpty(rhs.systemPermissions()) && F.isEmpty(rhs.systemPermissions()) || F.eqNotOrdered(rhs.systemPermissions(), lhs.systemPermissions())) && eqNotOrdered(rhs.taskPermissions(), lhs.taskPermissions()) && eqNotOrdered(rhs.servicePermissions(), lhs.servicePermissions())