fix(QTDI-2567) prevent CacheMap eviction issue

component-runtime-testing/component-runtime-junit/pom.xml

@@ -147,6 +147,18 @@
               <method>*get*</method>
               <justification>we don't need this method</justification>
             </difference>
+            <difference>
+              <className>org/talend/sdk/component/junit5/ComponentExtension</className>
+              <differenceType>4001</differenceType>
+              <to>org/junit/jupiter/api/extension/TestInstantiationAwareExtension</to>
+              <justification>org.junit.jupiter.api.extension.TestInstantiationAwareExtension has been removed by junit5, not by our code</justification>
+            </difference>
+            <difference>
+              <className>org/talend/sdk/component/junit5/MavenDecrypterExtension</className>
+              <differenceType>4001</differenceType>
+              <to>org/junit/jupiter/api/extension/TestInstantiationAwareExtension</to>
+              <justification>org.junit.jupiter.api.extension.TestInstantiationAwareExtension has been removed by junit5, not by our code</justification>
+            </difference>
           </ignored>
         </configuration>
         <executions>

component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/lang/MapCache.java

@@ -16,26 +16,25 @@
 package org.talend.sdk.component.server.lang;
 
 import java.util.Iterator;
-import java.util.Map;
 import java.util.concurrent.ConcurrentMap;
 
 import javax.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
 public class MapCache {
 
-    // simple - but enough - protection against too much entries in the cache
-    // this mainly targets ?query king of parameters
+    // simple - but enough - protection against too many entries in the cache
+    // this mainly targets ?query kind of parameters
     public <A, B> void evictIfNeeded(final ConcurrentMap<A, B> cache, final int maxSize) {
-        if (maxSize < 0) {
+        if (maxSize <= 0) {
             cache.clear();
             return;
         }
-        while (cache.size() > maxSize) {
-            final Iterator<Map.Entry<A, B>> iterator = cache.entrySet().iterator();
-            if (iterator.hasNext()) {
-                iterator.remove();
-            }
+        final Iterator<A> it = cache.keySet().iterator();
+        int excess = cache.size() - maxSize;
+        while (excess-- > 0 && it.hasNext()) {
+            it.next();
+            it.remove();
         }
     }
 }

component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/lang/MapCacheTest.java

@@ -0,0 +1,85 @@
+/**
+ * Copyright (C) 2006-2026 Talend Inc. - www.talend.com
+ *
+ * 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.talend.sdk.component.server.lang;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.stream.Stream;
+
+import org.jspecify.annotations.NonNull;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class MapCacheTest {
+
+    @ParameterizedTest
+    @MethodSource("emptyCacheTestCases")
+    void shouldEmptyCache(final ConcurrentMap<String, Object> cache, final int maxSize) {
+        new MapCache().evictIfNeeded(cache, maxSize);
+        assertTrue(cache.isEmpty());
+    }
+
+    public static Stream<Arguments> emptyCacheTestCases() {
+        return Stream.of(
+                Arguments.of(newMapWithNEntries(1), 0),
+                Arguments.of(newMapWithNEntries(1), -1),
+                Arguments.of(newMapWithNEntries(2), 0)
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("updatedCacheTestCases")
+    void shouldKeepTheExpectedNumberOfItems(final ConcurrentMap<String, Object> cache, final int maxSize) {
+        new MapCache().evictIfNeeded(cache, maxSize);
+        assertEquals(maxSize, cache.size());
+    }
+
+    public static Stream<Arguments> updatedCacheTestCases() {
+        return Stream.of(
+                Arguments.of(newMapWithNEntries(6), 1),
+                Arguments.of(newMapWithNEntries(6), 2)
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("unmodifiedCacheTestCases")
+    void shouldNotUpdateTheCache(final ConcurrentMap<String, Object> cache, final int maxSize) {
+        final int initialSize = cache.size();
+        new MapCache().evictIfNeeded(cache, maxSize);
+        assertEquals(initialSize, cache.size());
+    }
+
+    public static Stream<Arguments> unmodifiedCacheTestCases() {
+        return Stream.of(
+                Arguments.of(newMapWithNEntries(2), 3),
+                Arguments.of(newMapWithNEntries(20), 21),
+                Arguments.of(newMapWithNEntries(1), 4)
+        );
+    }
+
+    private static @NonNull ConcurrentHashMap<String, String> newMapWithNEntries(int nbEntries) {
+        final ConcurrentHashMap<String, String> map = new ConcurrentHashMap<>();
+        for (int i = 0; i < nbEntries; i++) {
+            map.put("key" + i, "value" + i);
+        }
+        return map;
+    }
+
+}