fix(server, engine): Move MixIn, fix PR comments

Author: DelaunayAlex

chutney/engine/src/main/java/com/chutneytesting/engine/api/execution/StepExecutionReportMapper.java

@@ -17,6 +17,7 @@
 package com.chutneytesting.engine.api.execution;
 
 import static java.util.Collections.EMPTY_MAP;
+import static java.util.Optional.ofNullable;
 
 import com.chutneytesting.engine.domain.execution.report.Status;
 import com.chutneytesting.engine.domain.execution.report.StepExecutionReport;
@@ -51,9 +52,9 @@ static class StepContextMapper {
         @SuppressWarnings("unchecked")
         static StepExecutionReportDto.StepContextDto toDto(Map<String, Object> scenarioContext, Map<String, Object> evaluatedInputSnapshot, Map<String, Object> stepResultsSnapshot) {
             return new StepExecutionReportDto.StepContextDto(
-                scenarioContext != null ? scenarioContext : EMPTY_MAP,
-                evaluatedInputSnapshot != null ? evaluatedInputSnapshot : EMPTY_MAP,
-                stepResultsSnapshot != null ? stepResultsSnapshot : EMPTY_MAP
+                ofNullable(scenarioContext).orElse(EMPTY_MAP),
+                ofNullable(evaluatedInputSnapshot).orElse(EMPTY_MAP),
+                ofNullable(stepResultsSnapshot).orElse(EMPTY_MAP)
             );
         }
 

chutney/engine/src/main/java/com/chutneytesting/engine/domain/execution/engine/step/StepContext.java

@@ -24,10 +24,7 @@
 import com.chutneytesting.engine.domain.execution.engine.evaluation.EvaluationException;
 import com.chutneytesting.engine.domain.execution.engine.scenario.ScenarioContext;
 import com.chutneytesting.engine.domain.execution.engine.scenario.ScenarioContextImpl;
-import com.chutneytesting.engine.domain.execution.engine.step.jackson.ReportObjectMapperConfiguration;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.google.common.collect.Maps;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 

chutney/engine/src/main/java/com/chutneytesting/engine/domain/execution/engine/step/jackson/engine/domain/execution/engine/step/jackson/JDomElementSerializer.java renamed to chutney/engine/src/main/java/com/chutneytesting/engine/domain/execution/engine/step/jackson/JDomElementSerializer.java

@@ -17,14 +17,13 @@
 
 package com.chutneytesting.engine.domain.execution.engine.step.jackson;
 
+import com.chutneytesting.tools.MyMixInForIgnoreType;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import org.jdom2.Element;
 import org.springframework.core.io.Resource;
-import com.chutneytesting.engine.domain.execution.engine.step.jackson.MyMixInForIgnoreType;
-import com.chutneytesting.engine.domain.execution.engine.step.jackson.JDomElementSerializer;
 
 public class ReportObjectMapperConfiguration {
 

chutney/engine/src/main/java/com/chutneytesting/engine/domain/execution/engine/step/jackson/ReportObjectMapperConfiguration.java

@@ -18,6 +18,7 @@
 
 import static java.util.Collections.emptyList;
 import static java.util.Collections.emptyMap;
+import static java.util.Optional.ofNullable;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -100,11 +101,11 @@ public StepExecutionReport(Long executionId,
         this.targetName = targetName;
         this.targetUrl = targetUrl;
         this.strategy = strategy;
-        this.evaluatedInputs = evaluatedInputs != null ? evaluatedInputs : emptyMap();
-        this.evaluatedInputsSnapshot = evaluatedInputsSnapshot != null ? evaluatedInputsSnapshot : emptyMap();
-        this.stepResults = stepResults != null ? stepResults : emptyMap();
-        this.stepResultsSnapshot = stepResultsSnapshot != null ? stepResultsSnapshot : emptyMap();
-        this.scenarioContext = scenarioContext != null ? scenarioContext : emptyMap();
+        this.evaluatedInputs = ofNullable(evaluatedInputs).orElse(emptyMap());
+        this.evaluatedInputsSnapshot = ofNullable(evaluatedInputsSnapshot).orElse(emptyMap());
+        this.stepResults = ofNullable(stepResults).orElse(emptyMap());
+        this.stepResultsSnapshot = ofNullable(stepResultsSnapshot).orElse(emptyMap());
+        this.scenarioContext = ofNullable(scenarioContext).orElse(emptyMap());
     }
 
     @Override

chutney/engine/src/main/java/com/chutneytesting/engine/domain/execution/report/StepExecutionReport.java

@@ -31,7 +31,7 @@ public class StepContextSnapshotTest {
     public void should_serialize_and_deserialize_simple_input_and_output_in_report() throws JsonProcessingException {
         // Given
         ObjectMapper objectMapper = ReportObjectMapperConfiguration.reportObjectMapper();
-        Map<String, Object> mapStringObject = Map.of("TUTU", "TITI");
+        Map<String, Object> mapStringObject = Map.of("inputObject", "inputValue");
 
         StepContextSnapshot stepContextSnapshot = new StepContextSnapshot(mapStringObject, mapStringObject);
 
@@ -40,15 +40,15 @@ public void should_serialize_and_deserialize_simple_input_and_output_in_report()
         String serializedOutput = objectMapper.writeValueAsString(stepContextSnapshot.getInputsSnapshot());
 
         // Then
-        assertThat(serializedInput).isEqualTo("{\"TUTU\":\"TITI\"}");
-        assertThat(serializedOutput).isEqualTo("{\"TUTU\":\"TITI\"}");
+        assertThat(serializedInput).isEqualTo("{\"inputObject\":\"inputValue\"}");
+        assertThat(serializedOutput).isEqualTo("{\"inputObject\":\"inputValue\"}");
 
     }
     @Test
     public void should_serialize_and_deserialize_complex_input_and_output_in_report() throws JsonProcessingException {
         // Given
         ObjectMapper objectMapper = ReportObjectMapperConfiguration.reportObjectMapper();
-        Map<String, Object> mapStringObject = Map.of("TUTU", Map.of("TOTO", Map.of("BUBU",Map.of("VIVI","LALA"))));
+        Map<String, Object> mapStringObject = Map.of("inputObject", Map.of("inputValue1", Map.of("inputValue2",Map.of("inputValue3","value"))));
 
         StepContextSnapshot stepContextSnapshot = new StepContextSnapshot(mapStringObject, mapStringObject);
 
@@ -57,7 +57,7 @@ public void should_serialize_and_deserialize_complex_input_and_output_in_report(
         String serializedOutput = objectMapper.writeValueAsString(stepContextSnapshot.getInputsSnapshot());
 
         // Then
-        assertThat(serializedInput).isEqualTo("{\"TUTU\":{\"TOTO\":{\"BUBU\":{\"VIVI\":\"LALA\"}}}}");
-        assertThat(serializedOutput).isEqualTo("{\"TUTU\":{\"TOTO\":{\"BUBU\":{\"VIVI\":\"LALA\"}}}}");
+        assertThat(serializedInput).isEqualTo("{\"inputObject\":{\"inputValue1\":{\"inputValue2\":{\"inputValue3\":\"value\"}}}}");
+        assertThat(serializedOutput).isEqualTo("{\"inputObject\":{\"inputValue1\":{\"inputValue2\":{\"inputValue3\":\"value\"}}}}");
     }
 }

chutney/engine/src/test/java/com/chutneytesting/engine/domain/execution/engine/step/StepContextSnapshotTest.java

@@ -70,7 +70,6 @@
 import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
 import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.core.io.Resource;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.core.task.support.ExecutorServiceAdapter;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;

chutney/server/src/main/java/com/chutneytesting/ServerConfiguration.java

@@ -16,7 +16,7 @@
 
 package com.chutneytesting;
 
-import com.chutneytesting.engine.domain.execution.engine.step.jackson.MyMixInForIgnoreType;
+import com.chutneytesting.tools.MyMixInForIgnoreType;
 import com.chutneytesting.security.AuditHandler;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;

chutney/server/src/main/java/com/chutneytesting/WebConfiguration.java

@@ -31,7 +31,7 @@
 import com.chutneytesting.agent.infra.storage.JsonFileAgentNetworkDao;
 import com.chutneytesting.engine.domain.delegation.ConnectionChecker;
 import com.chutneytesting.environment.api.environment.EmbeddedEnvironmentApi;
-import com.chutneytesting.engine.domain.execution.engine.step.jackson.MyMixInForIgnoreType;
+import com.chutneytesting.tools.MyMixInForIgnoreType;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
@@ -43,7 +43,6 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.Resource;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.client.RestTemplate;
 
@@ -55,7 +54,6 @@ public class NodeNetworkSpringConfiguration {
     @Bean
     public ObjectMapper agentNetworkObjectMapper() {
         return new ObjectMapper()
-            .addMixIn(Resource.class, MyMixInForIgnoreType.class)
             .setSerializationInclusion(JsonInclude.Include.NON_NULL)
             .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
             .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS)

chutney/server/src/main/java/com/chutneytesting/agent/NodeNetworkSpringConfiguration.java

@@ -17,5 +17,9 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>
+        </dependency>
     </dependencies>
 </project>