updates

Author: omursahin

jdk_21_maven/cs/rest/redis-sample/pom.xml

@@ -84,7 +84,6 @@
             <scope>test</scope>
         </dependency>
         <!--          MODIFIED-->
-        <!-- EvoMaster needs an OpenAPI schema; the SUT had none. -->
         <dependency>
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
@@ -116,7 +115,7 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
                     <!--          MODIFIED-->
-                    <!-- EMB expects a single self-contained "redis-sample-sut.jar". The classifier keeps
+                    <!-- WFD expects a single self-contained "redis-sample-sut.jar". The classifier keeps
                          the plain jar as the main artifact, which the embedded driver depends on. -->
                     <finalName>redis-sample</finalName>
                     <classifier>sut</classifier>

jdk_21_maven/em/embedded/rest/redis-sample/pom.xml

@@ -41,6 +41,11 @@
             <artifactId>testcontainers</artifactId>
             <scope>compile</scope>
         </dependency>
+
+        <dependency>
+            <groupId>io.lettuce</groupId>
+            <artifactId>lettuce-core</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

jdk_21_maven/em/embedded/rest/redis-sample/src/main/java/em/embedded/redis/sample/EmbeddedEvoMasterController.java

@@ -11,6 +11,8 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.testcontainers.containers.GenericContainer;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.api.StatefulRedisConnection;
 
 import java.util.List;
 import java.util.Map;
@@ -33,6 +35,8 @@ public class EmbeddedEvoMasterController extends EmbeddedSutController {
 
     private static final int RATING_STARS = 5;
 
+    private static final String CACHE_KEY_PATTERN = "id.my.hendisantika.springbootredissample.*Cache::*";
+
     private static final GenericContainer redis = new GenericContainer("redis:" + REDIS_VERSION)
             .withCommand("redis-server", "--requirepass", REDIS_PASSWORD)
             .withExposedPorts(REDIS_PORT);
@@ -54,6 +58,10 @@ public static void main(String[] args) {
 
     private ConfigurableApplicationContext ctx;
 
+    private RedisClient redisClient;
+
+    private StatefulRedisConnection<String, String> redisConnection;
+
     public EmbeddedEvoMasterController() {
         this(0);
     }
@@ -67,6 +75,9 @@ public EmbeddedEvoMasterController(int port) {
     public String startSut() {
 
         redis.start();
+        redisClient = RedisClient.create("redis://:" + REDIS_PASSWORD + "@"
+                + redis.getHost() + ":" + redis.getMappedPort(REDIS_PORT));
+        redisConnection = redisClient.connect();
 
         ctx = SpringApplication.run(SpringBootRedisSampleApplication.class, new String[]{
                 "--server.port=0",
@@ -102,6 +113,13 @@ public void stopSut() {
             ctx = null;
         }
 
+        if (redisConnection != null) {
+            redisConnection.close();
+            redisClient.shutdown();
+            redisConnection = null;
+            redisClient = null;
+        }
+
         redis.stop();
     }
 
@@ -110,8 +128,19 @@ public String getPackagePrefixesToCover() {
         return "id.my.hendisantika.springbootredissample.";
     }
 
+    /*
+        Only the Spring Cache entries accumulate: the API is read-only, and the seeded data is
+        written once at startup by runners guarded on an empty repository, so it must survive.
+     */
     @Override
     public void resetStateOfSUT() {
+        if (redisConnection == null) {
+            return;
+        }
+        List<String> keys = redisConnection.sync().keys(CACHE_KEY_PATTERN);
+        if (!keys.isEmpty()) {
+            redisConnection.sync().del(keys.toArray(new String[0]));
+        }
     }
 
 

jdk_21_maven/em/external/rest/redis-sample/pom.xml

@@ -21,6 +21,12 @@
             <artifactId>testcontainers</artifactId>
             <scope>compile</scope>
         </dependency>
+
+        <dependency>
+            <groupId>io.lettuce</groupId>
+            <artifactId>lettuce-core</artifactId>
+            <version>7.5.2.RELEASE</version>
+        </dependency>
     </dependencies>
 
 

jdk_21_maven/em/external/rest/redis-sample/src/main/java/em/external/redis/sample/ExternalEvoMasterController.java

@@ -9,6 +9,8 @@
 import org.evomaster.client.java.controller.problem.ProblemInfo;
 import org.evomaster.client.java.controller.problem.RestProblem;
 import org.testcontainers.containers.GenericContainer;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.api.StatefulRedisConnection;
 
 import java.util.List;
 
@@ -31,6 +33,8 @@ public class ExternalEvoMasterController extends ExternalSutController {
 
     private static final int RATING_STARS = 5;
 
+    private static final String CACHE_KEY_PATTERN = "id.my.hendisantika.springbootredissample.*Cache::*";
+
     private static final GenericContainer redis = new GenericContainer("redis:" + REDIS_VERSION)
             .withCommand("redis-server", "--requirepass", REDIS_PASSWORD)
             .withExposedPorts(REDIS_PORT);
@@ -81,6 +85,10 @@ public static void main(String[] args) {
 
     private String jarLocation;
 
+    private RedisClient redisClient;
+
+    private StatefulRedisConnection<String, String> redisConnection;
+
     public ExternalEvoMasterController() {
         this(DEFAULT_CONTROLLER_PORT, "../target/redis-sample-sut.jar", DEFAULT_SUT_PORT, 120, "java");
     }
@@ -146,6 +154,9 @@ public long getMaxAwaitForInitializationInSeconds() {
     @Override
     public void preStart() {
         redis.start();
+        redisClient = RedisClient.create("redis://:" + REDIS_PASSWORD + "@"
+                + redis.getHost() + ":" + redis.getMappedPort(REDIS_PORT));
+        redisConnection = redisClient.connect();
     }
 
     @Override
@@ -158,6 +169,13 @@ public void preStop() {
 
     @Override
     public void postStop() {
+        if (redisConnection != null) {
+            redisConnection.close();
+            redisClient.shutdown();
+            redisConnection = null;
+            redisClient = null;
+        }
+
         redis.stop();
     }
 
@@ -184,8 +202,19 @@ public List<AuthenticationDto> getInfoForAuthentication() {
         return null;
     }
 
+    /*
+        Only the Spring Cache entries accumulate: the API is read-only, and the seeded data is
+        written once at startup by runners guarded on an empty repository, so it must survive.
+     */
     @Override
     public void resetStateOfSUT() {
+        if (redisConnection == null) {
+            return;
+        }
+        List<String> keys = redisConnection.sync().keys(CACHE_KEY_PATTERN);
+        if (!keys.isEmpty()) {
+            redisConnection.sync().del(keys.toArray(new String[0]));
+        }
     }
 
     @Override