Merge remote-tracking branch 'origin/master' into regex-support-extension

# Conflicts:
#	core-tests/e2e-tests/spring/emb-json/src/test/java/org/evomaster/e2etests/emb/json/language/LanguageServerExampleEMTest.java
#	core/src/main/antlr4/org/evomaster/core/parser/RegexJava.g4
#	core/src/main/kotlin/org/evomaster/core/parser/GeneRegexJavaVisitor.kt
#	core/src/main/kotlin/org/evomaster/core/search/gene/regex/CharacterClassEscapeRxGene.kt
#	core/src/main/kotlin/org/evomaster/core/search/gene/regex/CharacterRangeRxGene.kt
#	core/src/main/kotlin/org/evomaster/core/search/service/Randomness.kt

Author: lmasroca

.github/workflows/ci.yml

@@ -31,7 +31,7 @@ on:
 #      - "**"
 
 env:
-  evomaster-version: 5.0.3
+  evomaster-version: 5.1.1
   # Unfortunately, to use JPackage we need JDK 17 or above :(
   # Which is really bad due to the madness of --add-opens.
   # Even if hunt down all cases of reflections in EM, there is still the problem of

.github/workflows/release.yml

@@ -8,7 +8,7 @@ on:
       - "v*"
 
 env:
-  evomaster-version: 5.0.3
+  evomaster-version: 5.1.1
   jdk-jar: 17
   jdk-jpackage: 21
   retention-days: 1
@@ -55,11 +55,16 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v4
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v4
       - name: Build and push Docker
         uses: docker/build-push-action@v5
         with:
           context: .
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
 

README.md

@@ -1,7 +1,7 @@
 # EvoMaster: A Tool For Automatically Generating System-Level Test Cases
 
 
-![](docs/img/carl-cerstrand-136810_compressed.jpg  "Photo by Carl Cerstrand on Unsplash")
+[//]: # (![](docs/img/carl-cerstrand-136810_compressed.jpg  "Photo by Carl Cerstrand on Unsplash"))
 
 [![Maven Central](https://img.shields.io/maven-central/v/org.evomaster/evomaster-client-java.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/org.evomaster/evomaster-client-java)
 [![javadoc](https://javadoc.io/badge2/org.evomaster/evomaster-client-java-controller/javadoc.svg)](https://javadoc.io/doc/org.evomaster/evomaster-client-java-controller)
@@ -12,8 +12,14 @@
 [![Github All Releases](https://img.shields.io/github/downloads/WebFuzzing/evomaster/total.svg)](https://github.com/WebFuzzing/EvoMaster/releases)
 
 
+
 ### Summary
 
+[//]: # (<div style="float: left; margin-right: 15px; margin-bottom: 10px;">)
+<img align="left" src="docs/img/em_mascot.png" alt="AI-generated mascot, with Bing" width="100" />
+
+[//]: # (</div>)
+
 _EvoMaster_ ([www.evomaster.org](http://evomaster.org)) is the first (2016) open-source AI-driven tool
 that automatically *generates* system-level test cases
 for web/enterprise applications.
@@ -123,10 +129,9 @@ Note, since version 4.0.0, now _EvoMaster_ by default also creates an interactiv
 
 * _State-of-the-art_: an [independent study (2022)](https://arxiv.org/abs/2204.08348), comparing 10 fuzzers on 20 RESTful APIs, shows that _EvoMaster_ gives the best results. Another [independent study (2024)](https://arxiv.org/abs/2410.12547) done by a different research group confirms these results.
 
-* _Schema_: REST APIs must provide a schema in [OpenAPI/Swagger](https://swagger.io)
-  format (either _v2_ or _v3_).
+* _Schema_: REST APIs must provide a schema in [OpenAPI format](https://www.openapis.org/). We support versions _2.0_, _3.0_ and _3.1_. Unfortunately, support for version _3.2_ is currently on hold due to [swagger-parser](https://github.com/swagger-api/swagger-parser/issues/2248).
 
-* _Output_: the tool generates _JUnit_ (version 4 or 5) tests, written in either Java or Kotlin, as well as test suites in Python and JavaScript. For a complete list, see the documentation for the CLI parameter [--outputFormat](docs/options.md). 
+* _Output_: the tool generates _JUnit_ (version 4 or 5) tests, written in either _Java_ or _Kotlin_, as well as test suites in _Python_ and _JavaScript_. For a complete list, see the documentation for the CLI parameter [--outputFormat](docs/options.md). 
   Some examples are: PYTHON_UNITTEST, KOTLIN_JUNIT_5, JAVA_JUNIT_4 and JS_JEST.
   Note that the generated tests rely on third-party libraries (e.g., to make HTTP calls). 
   These will need to be setup in your projects, [see documentation](docs/library_dependencies.md).

client-java/ci-utils/pom.xml

@@ -13,7 +13,7 @@
     <parent>
         <artifactId>evomaster-client-java</artifactId>
         <groupId>org.evomaster</groupId>
-        <version>5.0.3-SNAPSHOT</version>
+        <version>5.1.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>evomaster-ci-utils</artifactId>

client-java/client-util/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.evomaster</groupId>
         <artifactId>evomaster-client-java</artifactId>
-        <version>5.0.3-SNAPSHOT</version>
+        <version>5.1.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>evomaster-client-java-util</artifactId>

client-java/controller-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.evomaster</groupId>
         <artifactId>evomaster-client-java</artifactId>
-        <version>5.0.3-SNAPSHOT</version>
+        <version>5.1.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>evomaster-client-java-controller-api</artifactId>

client-java/controller/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.evomaster</groupId>
         <artifactId>evomaster-client-java</artifactId>
-        <version>5.0.3-SNAPSHOT</version>
+        <version>5.1.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>evomaster-client-java-controller</artifactId>

client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/redis/RedisHandler.java

@@ -1,9 +1,10 @@
 package org.evomaster.client.java.controller.internal.db.redis;
 
 import org.evomaster.client.java.controller.internal.TaintHandlerExecutionTracer;
+import org.evomaster.client.java.controller.redis.RedisKeyValueStore;
 import org.evomaster.client.java.controller.redis.ReflectionBasedRedisClient;
 import org.evomaster.client.java.controller.redis.RedisHeuristicsCalculator;
-import org.evomaster.client.java.controller.redis.RedisInfo;
+import org.evomaster.client.java.controller.redis.RedisValueData;
 import org.evomaster.client.java.instrumentation.RedisCommand;
 import org.evomaster.client.java.utils.SimpleLogger;
 
@@ -82,35 +83,34 @@ private RedisDistanceWithMetrics computeDistance(RedisCommand redisCommand, Refl
             switch (type) {
                 case KEYS:
                 case EXISTS: {
-                    List<RedisInfo> redisInfo = createRedisInfoForAllKeys(redisClient);
-                    return calculator.computeDistance(redisCommand, redisInfo);
+                    RedisKeyValueStore redisKeyValueStore = createRedisInfoForAllKeys(redisClient);
+                    return calculator.computeDistance(redisCommand, redisKeyValueStore);
                 }
 
                 case GET: {
-                    List<RedisInfo> redisInfo = createRedisInfoForKeysByType(REDIS_STRING_TYPE, redisClient);
-                    return calculator.computeDistance(redisCommand, redisInfo);
+                    RedisKeyValueStore redisKeyValueStore = createRedisInfoForKeysByType(REDIS_STRING_TYPE, redisClient);
+                    return calculator.computeDistance(redisCommand, redisKeyValueStore);
                 }
 
                 case HGET: {
-                    String field = redisCommand.extractArgs().get(1);
-                    List<RedisInfo> redisInfo = createRedisInfoForKeysByField(field, redisClient);
-                    return calculator.computeDistance(redisCommand, redisInfo);
+                    RedisKeyValueStore redisKeyValueStore = createRedisInfoForKeysByField(redisClient);
+                    return calculator.computeDistance(redisCommand, redisKeyValueStore);
                 }
 
                 case HGETALL: {
-                    List<RedisInfo> redisInfo = createRedisInfoForKeysByType(REDIS_HASH_TYPE, redisClient);
-                    return calculator.computeDistance(redisCommand, redisInfo);
+                    RedisKeyValueStore redisKeyValueStore = createRedisInfoForKeysByType(REDIS_HASH_TYPE, redisClient);
+                    return calculator.computeDistance(redisCommand, redisKeyValueStore);
                 }
 
                 case SMEMBERS: {
-                    List<RedisInfo> redisInfo = createRedisInfoForKeysByType(REDIS_SET_TYPE, redisClient);
-                    return calculator.computeDistance(redisCommand, redisInfo);
+                    RedisKeyValueStore redisKeyValueStore = createRedisInfoForKeysByType(REDIS_SET_TYPE, redisClient);
+                    return calculator.computeDistance(redisCommand, redisKeyValueStore);
                 }
 
                 case SINTER: {
                     List<String> keys = redisCommand.extractArgs();
-                    List<RedisInfo> redisInfo = createRedisInfoForIntersection(keys, redisClient);
-                    return calculator.computeDistance(redisCommand, redisInfo);
+                    RedisKeyValueStore redisKeyValueStore = createRedisInfoForIntersection(keys, redisClient);
+                    return calculator.computeDistance(redisCommand, redisKeyValueStore);
                 }
 
                 default:
@@ -122,35 +122,48 @@ private RedisDistanceWithMetrics computeDistance(RedisCommand redisCommand, Refl
         }
     }
 
-    private List<RedisInfo> createRedisInfoForIntersection(List<String> keys, ReflectionBasedRedisClient redisClient) {
-        List<RedisInfo> redisData = new ArrayList<>();
-        keys.forEach(
-                key -> redisData.add(new RedisInfo(key, redisClient.getType(key), redisClient.getSetMembers(key))
+    private RedisKeyValueStore createRedisInfoForIntersection(List<String> commandKeys, ReflectionBasedRedisClient redisClient) {
+        Set<String> keySet = redisClient.getKeysByType(REDIS_SET_TYPE);
+
+        //A Map structure is introduced here using the same keys that are stored in REDIS.
+        //The value for each one, since each key represents a SET, correspond to the members of that given set.
+        Map<String, RedisValueData> redisData = new HashMap<>();
+        keySet.forEach(
+                key -> redisData.put(key, new RedisValueData(redisClient.getSetMembers(key))
         ));
-        return redisData;
+        return new RedisKeyValueStore(redisData);
     }
 
-    private List<RedisInfo> createRedisInfoForAllKeys(ReflectionBasedRedisClient redisClient) {
+    private RedisKeyValueStore createRedisInfoForAllKeys(ReflectionBasedRedisClient redisClient) {
         Set<String> keys = redisClient.getAllKeys();
-        List<RedisInfo> redisData = new ArrayList<>();
+
+        //A Map structure is introduced here using the same keys that are stored in REDIS.
+        //No value is needed in this case.
+        Map<String, RedisValueData> redisData = new HashMap<>();
         keys.forEach(
-                key -> redisData.add(new RedisInfo(key))
+                key -> redisData.put(key, null)
         );
-        return redisData;
+        return new RedisKeyValueStore(redisData);
     }
 
-    private List<RedisInfo> createRedisInfoForKeysByType(String type, ReflectionBasedRedisClient redisClient) {
+    private RedisKeyValueStore createRedisInfoForKeysByType(String type, ReflectionBasedRedisClient redisClient) {
         Set<String> keys = redisClient.getKeysByType(type);
-        List<RedisInfo> redisData = new ArrayList<>();
-        keys.forEach(key -> redisData.add(new RedisInfo(key)));
-        return redisData;
+
+        //A Map structure is introduced here using the same keys that are stored in REDIS.
+        //No value is needed in this case.
+        Map<String, RedisValueData> redisData = new HashMap<>();
+        keys.forEach(key -> redisData.put(key, null));
+        return new RedisKeyValueStore(redisData);
     }
 
-    private List<RedisInfo> createRedisInfoForKeysByField(String field, ReflectionBasedRedisClient redisClient) {
+    private RedisKeyValueStore createRedisInfoForKeysByField(ReflectionBasedRedisClient redisClient) {
         Set<String> keys = redisClient.getKeysByType(REDIS_HASH_TYPE);
-        List<RedisInfo> redisData = new ArrayList<>();
-        keys.forEach(key -> redisData.add(new RedisInfo(key, redisClient.getHashFields(key))));
-        return redisData;
+
+        //A Map structure is introduced here using the same keys that are stored in REDIS.
+        //The value for each one, since each key is of type HASH, correspond to the fields stored for that given key.
+        Map<String, RedisValueData> redisData = new HashMap<>();
+        keys.forEach(key -> redisData.put(key, new RedisValueData(redisClient.getHashFields(key))));
+        return new RedisKeyValueStore(redisData);
     }
 
     public void setRedisClient(ReflectionBasedRedisClient redisClient) {