From 19e0b48539601a5b277490a7ae58d3991ed38cdf Mon Sep 17 00:00:00 2001 From: Steven van Beelen Date: Wed, 8 Nov 2023 10:51:40 +0100 Subject: [PATCH 1/2] Drop validation on the properties in equals Drop validation on the properties in equals. This was accidentally reintroduced during a boy scouting task throughout the project, but this was incorrect. The functionality of the multi-tenancy extension expects to match on the tenantId ONLY, as properties may differ wildly during the flow of the extension as they can be created by the extensions and/or users themselves. In those cases, a automated creation and user creation of the TenantDescriptor should simply match on the tenantId to provide the desired functionality. #bug/tenant-descriptor-equals-without-properties --- .../components/TenantDescriptor.java | 2 +- .../components/TenantDescriptorTest.java | 65 +++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 multitenancy/src/test/java/org/axonframework/extensions/multitenancy/components/TenantDescriptorTest.java diff --git a/multitenancy/src/main/java/org/axonframework/extensions/multitenancy/components/TenantDescriptor.java b/multitenancy/src/main/java/org/axonframework/extensions/multitenancy/components/TenantDescriptor.java index c1c4982..71851be 100644 --- a/multitenancy/src/main/java/org/axonframework/extensions/multitenancy/components/TenantDescriptor.java +++ b/multitenancy/src/main/java/org/axonframework/extensions/multitenancy/components/TenantDescriptor.java @@ -87,7 +87,7 @@ public boolean equals(Object o) { return false; } TenantDescriptor that = (TenantDescriptor) o; - return Objects.equals(tenantId, that.tenantId) && Objects.equals(properties, that.properties); + return Objects.equals(tenantId, that.tenantId); } @Override diff --git a/multitenancy/src/test/java/org/axonframework/extensions/multitenancy/components/TenantDescriptorTest.java b/multitenancy/src/test/java/org/axonframework/extensions/multitenancy/components/TenantDescriptorTest.java new file mode 100644 index 0000000..b7b6906 --- /dev/null +++ b/multitenancy/src/test/java/org/axonframework/extensions/multitenancy/components/TenantDescriptorTest.java @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2010-2023. Axon Framework + * + * Licensed 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.axonframework.extensions.multitenancy.components; + +import org.junit.jupiter.api.*; + +import java.util.HashMap; + +import static org.junit.jupiter.api.Assertions.*; + +/** + * Test class validating the {@link TenantDescriptor}. + * + * @author Steven van Beelen + */ +class TenantDescriptorTest { + + private static final String TENANT_ID_ONE = "me"; + private static final String TENANT_ID_TWO = "you"; + + @Test + void equalsOnlyValidatesTenantId() { + HashMap testPropertiesOne = new HashMap<>(); + testPropertiesOne.put("key", "value"); + testPropertiesOne.put("key1", "value2"); + HashMap testPropertiesTwo = new HashMap<>(); + testPropertiesOne.put("value", "key"); + testPropertiesOne.put("value2", "key1"); + + TenantDescriptor testSubjectOne = TenantDescriptor.tenantWithId(TENANT_ID_ONE); + TenantDescriptor testSubjectTwo = TenantDescriptor.tenantWithId(TENANT_ID_TWO); + TenantDescriptor testSubjectThree = new TenantDescriptor(TENANT_ID_ONE, testPropertiesOne); + TenantDescriptor testSubjectFour = new TenantDescriptor(TENANT_ID_TWO, testPropertiesTwo); + TenantDescriptor testSubjectFive = new TenantDescriptor(TENANT_ID_ONE, testPropertiesTwo); + + // Validate test subject one, only matching on tenant id + assertNotEquals(testSubjectOne, testSubjectTwo); + assertEquals(testSubjectOne, testSubjectThree); + assertNotEquals(testSubjectOne, testSubjectFour); + assertEquals(testSubjectOne, testSubjectFive); + // Validate test subject two, only matching on tenant id + assertNotEquals(testSubjectTwo, testSubjectThree); + assertEquals(testSubjectTwo, testSubjectFour); + assertNotEquals(testSubjectTwo, testSubjectFive); + // Validate test subject three, only matching on tenant id + assertNotEquals(testSubjectThree, testSubjectFour); + assertEquals(testSubjectThree, testSubjectFive); + // Validate test subject four, only matching on tenant id + assertNotEquals(testSubjectFour, testSubjectFive); + } +} \ No newline at end of file From 479201ae42b055cd2053f52764e8cfed9a8aa31e Mon Sep 17 00:00:00 2001 From: Steven van Beelen Date: Wed, 8 Nov 2023 11:58:34 +0100 Subject: [PATCH 2/2] Drop properties from hashCode too Drop properties from hashCode too #bug/tenant-descriptor-equals-without-properties --- .../components/TenantDescriptor.java | 2 +- .../components/TenantDescriptorTest.java | 44 ++++++++++++++----- 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/multitenancy/src/main/java/org/axonframework/extensions/multitenancy/components/TenantDescriptor.java b/multitenancy/src/main/java/org/axonframework/extensions/multitenancy/components/TenantDescriptor.java index 71851be..ab9e3f6 100644 --- a/multitenancy/src/main/java/org/axonframework/extensions/multitenancy/components/TenantDescriptor.java +++ b/multitenancy/src/main/java/org/axonframework/extensions/multitenancy/components/TenantDescriptor.java @@ -92,7 +92,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(tenantId, properties); + return Objects.hash(tenantId); } @Override diff --git a/multitenancy/src/test/java/org/axonframework/extensions/multitenancy/components/TenantDescriptorTest.java b/multitenancy/src/test/java/org/axonframework/extensions/multitenancy/components/TenantDescriptorTest.java index b7b6906..a1f3474 100644 --- a/multitenancy/src/test/java/org/axonframework/extensions/multitenancy/components/TenantDescriptorTest.java +++ b/multitenancy/src/test/java/org/axonframework/extensions/multitenancy/components/TenantDescriptorTest.java @@ -32,21 +32,27 @@ class TenantDescriptorTest { private static final String TENANT_ID_ONE = "me"; private static final String TENANT_ID_TWO = "you"; - @Test - void equalsOnlyValidatesTenantId() { - HashMap testPropertiesOne = new HashMap<>(); + private HashMap testPropertiesOne; + private HashMap testPropertiesTwo; + + private final TenantDescriptor testSubjectOne = TenantDescriptor.tenantWithId(TENANT_ID_ONE); + private final TenantDescriptor testSubjectTwo = TenantDescriptor.tenantWithId(TENANT_ID_TWO); + private final TenantDescriptor testSubjectThree = new TenantDescriptor(TENANT_ID_ONE, testPropertiesOne); + private final TenantDescriptor testSubjectFour = new TenantDescriptor(TENANT_ID_TWO, testPropertiesTwo); + private final TenantDescriptor testSubjectFive = new TenantDescriptor(TENANT_ID_ONE, testPropertiesTwo); + + @BeforeEach + void setUp() { + testPropertiesOne = new HashMap<>(); testPropertiesOne.put("key", "value"); testPropertiesOne.put("key1", "value2"); - HashMap testPropertiesTwo = new HashMap<>(); + testPropertiesTwo = new HashMap<>(); testPropertiesOne.put("value", "key"); testPropertiesOne.put("value2", "key1"); + } - TenantDescriptor testSubjectOne = TenantDescriptor.tenantWithId(TENANT_ID_ONE); - TenantDescriptor testSubjectTwo = TenantDescriptor.tenantWithId(TENANT_ID_TWO); - TenantDescriptor testSubjectThree = new TenantDescriptor(TENANT_ID_ONE, testPropertiesOne); - TenantDescriptor testSubjectFour = new TenantDescriptor(TENANT_ID_TWO, testPropertiesTwo); - TenantDescriptor testSubjectFive = new TenantDescriptor(TENANT_ID_ONE, testPropertiesTwo); - + @Test + void equalsOnlyValidatesTenantId() { // Validate test subject one, only matching on tenant id assertNotEquals(testSubjectOne, testSubjectTwo); assertEquals(testSubjectOne, testSubjectThree); @@ -62,4 +68,22 @@ void equalsOnlyValidatesTenantId() { // Validate test subject four, only matching on tenant id assertNotEquals(testSubjectFour, testSubjectFive); } + + @Test + void hashOnlyHashesTenantId() { + // Validate test subject one, only matching on tenant id + assertNotEquals(testSubjectOne.hashCode(), testSubjectTwo.hashCode()); + assertEquals(testSubjectOne.hashCode(), testSubjectThree.hashCode()); + assertNotEquals(testSubjectOne.hashCode(), testSubjectFour.hashCode()); + assertEquals(testSubjectOne.hashCode(), testSubjectFive.hashCode()); + // Validate test subject two, only matching on tenant id + assertNotEquals(testSubjectTwo.hashCode(), testSubjectThree.hashCode()); + assertEquals(testSubjectTwo.hashCode(), testSubjectFour.hashCode()); + assertNotEquals(testSubjectTwo.hashCode(), testSubjectFive.hashCode()); + // Validate test subject three, only matching on tenant id + assertNotEquals(testSubjectThree.hashCode(), testSubjectFour.hashCode()); + assertEquals(testSubjectThree.hashCode(), testSubjectFive.hashCode()); + // Validate test subject four, only matching on tenant id + assertNotEquals(testSubjectFour.hashCode(), testSubjectFive.hashCode()); + } } \ No newline at end of file