Merge branch 'master' into enable-new-security

Author: arcuri82

client-java/controller/pom.xml

@@ -204,6 +204,12 @@
             <artifactId>lettuce-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- Bringing Netty dependency explicitly as it was excluded from spring-boot-starter-data-redis to avoid version conflict -->
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>netty-nio-client</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <!--gRPC RPC test-->
         <dependency>

client-java/instrumentation-shared/src/main/java/org/evomaster/client/java/instrumentation/shared/ReplacementCategory.java

@@ -50,6 +50,11 @@ public enum ReplacementCategory {
     /**
      * Replacements to handle NEO4J command interceptions
      */
-    NEO4J
+    NEO4J,
+
+    /**
+     * Replacements to handle DYNAMODB command interceptions
+     */
+    DYNAMODB
 }
 

client-java/instrumentation/pom.xml

@@ -12,7 +12,6 @@
     <packaging>jar</packaging>
     <name>${project.groupId}:${project.artifactId}</name>
 
-
     <dependencies>
         <dependency>
             <groupId>org.evomaster</groupId>
@@ -72,6 +71,13 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
             <version>${springboot.version}</version>
+            <!-- Need to exclude Netty from this package to avoid a clash of versions with AWS SDK -->
+            <exclusions>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
             <scope>test</scope>
         </dependency>
         <!--        <dependency>-->
@@ -87,6 +93,17 @@
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
         </dependency>
+        <!--  DynamoDB, need to bring Netty explicitly to avoid conflicts from the version coming from Lettuce -->
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>dynamodb</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>netty-nio-client</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <!-- Dependencies for Java Regex distances -->
         <dependency>

client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/AdditionalInfo.java

@@ -112,6 +112,8 @@ public StatementDescription(String line, String method) {
 
     private final Set<RedisCommand> redisCommandData = new CopyOnWriteArraySet<>();
 
+    private final Set<DynamoDbCommand> dynamoDbInfoData = new CopyOnWriteArraySet<>();
+
     private final Set<MongoCollectionSchema> mongoCollectionSchemaData = new CopyOnWriteArraySet<>();
 
     public Set<ExecutedSqlCommand> getSqlInfoData(){
@@ -134,6 +136,10 @@ public Set<RedisCommand> getRedisCommandData(){
         return Collections.unmodifiableSet(redisCommandData);
     }
 
+    public Set<DynamoDbCommand> getDynamoDbInfoData(){
+        return Collections.unmodifiableSet(dynamoDbInfoData);
+    }
+
     public Set<MongoCollectionSchema> getMongoCollectionTypeData(){
         return Collections.unmodifiableSet(mongoCollectionSchemaData);
     }
@@ -158,6 +164,10 @@ public void addRedisCommand(RedisCommand info){
         redisCommandData.add(info);
     }
 
+    public void addDynamoDbInfo(DynamoDbCommand info){
+        dynamoDbInfoData.add(info);
+    }
+
     public void addMongoCollectionType(MongoCollectionSchema mongoCollectionSchema){
         mongoCollectionSchemaData.add(mongoCollectionSchema);
     }

client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/DynamoDbCommand.java

@@ -0,0 +1,64 @@
+package org.evomaster.client.java.instrumentation;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Info related to DynamoDB command execution.
+ */
+public class DynamoDbCommand implements Serializable {
+
+
+    /**
+     * Names of the tables the operation was applied to (with Batch operations, more than one table is possible)
+     */
+    private final List<String> tableNames;
+    /**
+     * Name of the operation that was executed
+     */
+    private final String operationName;
+    /**
+     * Actual executed operation
+     */
+    private final Object request;
+    /**
+     * If the operation was successfully executed
+     */
+    private final boolean successfullyExecuted;
+    /**
+     * Elapsed execution time
+     */
+    private final long executionTime;
+
+    public DynamoDbCommand(List<String> tableNames, String operationName, Object request, boolean successfullyExecuted, long executionTime) {
+        this.tableNames = tableNames == null
+                ? Collections.emptyList()
+                : Collections.unmodifiableList(new ArrayList<>(tableNames));
+        this.operationName = operationName;
+        this.request = request;
+        this.successfullyExecuted = successfullyExecuted;
+        this.executionTime = executionTime;
+    }
+
+    public List<String> getTableNames() {
+        return tableNames;
+    }
+
+    public String getOperationName() {
+        return operationName;
+    }
+
+    public Object getRequest() {
+        return request;
+    }
+
+    public boolean isSuccessfullyExecuted() {
+        return successfullyExecuted;
+    }
+
+    public long getExecutionTime() {
+        return executionTime;
+    }
+}

client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/coverage/methodreplacement/ReplacementList.java

@@ -36,6 +36,8 @@ public static List<MethodReplacementClass> getList() {
                     new DateFormatClassReplacement(),
                     new DocumentClassReplacement(),
                     new DoubleClassReplacement(),
+                    new DynamoDbClassReplacement.Sync(),
+                    new DynamoDbClassReplacement.Async(),
                     new EnumClassReplacement(),
                     new FloatClassReplacement(),
                     new GsonClassReplacement(),