Merge branch 'master' into vulnerability-analyser

Author: seran

client-java/controller/src/main/java/org/evomaster/client/java/controller/problem/rpc/schema/params/NamedTypedValue.java

@@ -1,11 +1,13 @@
 package org.evomaster.client.java.controller.problem.rpc.schema.params;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.evomaster.client.java.controller.api.dto.problem.rpc.ParamDto;
 import org.evomaster.client.java.controller.problem.rpc.schema.types.AccessibleSchema;
 import org.evomaster.client.java.controller.problem.rpc.schema.types.PrimitiveOrWrapperType;
 import org.evomaster.client.java.controller.problem.rpc.schema.types.TypeSchema;
+import org.evomaster.client.java.utils.SimpleLogger;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -21,6 +23,9 @@ public abstract class NamedTypedValue<T extends TypeSchema, V> {
 
     protected final static ObjectMapper objectMaper = new ObjectMapper();
 
+    protected final static ObjectMapper mapperAllowUnkownFields = new ObjectMapper()
+            .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+
     /**
      * name of the instance, eg param name
      */
@@ -225,7 +230,27 @@ else if (PrimitiveOrWrapperType.isPrimitiveOrTypes(json.getClass())){
     }
 
     public Object parseValueWithJson(String json) throws JsonProcessingException {
-        return objectMaper.readValue(json, getType().getClazz());
+        try{
+            return objectMaper.readValue(json, getType().getClazz());
+        }catch (JsonProcessingException e) {
+            /*
+                In the seeded tests of the industrial case study, there are cases where
+                unrecognized fields appear in the JSON input, such as:
+                {
+                    "setType": true // Note: there is no corresponding 'setType' field in the target class
+                }
+
+                To handle such cases while still capturing the error message,
+                attempt to parse the JSON again with a configuration that allows unknown fields.
+            */
+            if (e.getMessage().contains("Unrecognized field")) {
+                SimpleLogger.recordErrorMessage(
+                        String.format("Try once to fix issues in json: %s", e.getMessage()));
+                return mapperAllowUnkownFields.readValue(json, getType().getClazz());
+            }
+            throw e;
+        }
+
     }
 
     /**

core/src/main/kotlin/org/evomaster/core/problem/rest/builder/CreateResourceUtils.kt

@@ -50,13 +50,22 @@ object CreateResourceUtils {
                 POST /x
                 POST /x/{id}/y
                 GET  /x/{id}/y
-                not going to save the position of last POST, as same as target
+                not need to save the position of last POST, as same as target
 
                 however, might also be in the case of:
                 PUT /x/{id}
                 GET /x/{id}
              */
-            before.saveCreatedResourceLocation = false
+            /*
+                removing the flag here was a mistake.
+                even if after is not using the resource path, between "before" and "after"
+                there could be other calls that need it, eg:
+
+                PUT    /x/{a}
+                PUT    /x/{a}/y/{b}
+                DELETE /x/{a}
+             */
+            //before.saveCreatedResourceLocation = false
 
             // the target (eg GET) needs to use the location of first POST, or more correctly
             // the same location used for the last POST (in case there is a deeper chain)

e2e-tests/spring-rpc/spring-rpc-thrift/src/test/java/com/foo/rpc/examples/spring/fakemockobject/FakeMockObjectController.java

@@ -181,7 +181,30 @@ public List<SeededRPCTestDto> seedRPCTests() {
                                 descriptiveInfo = "a scheduled task for invoking executeFlag";
                             }}
                     );
+                }},
+                new SeededRPCTestDto() {{
+                    testName = "test_7";
+                    rpcFunctions = Arrays.asList(
+                            new SeededRPCActionDto() {{
+                                interfaceName = FakeMockObjectService.Iface.class.getName();
+                                functionName = "getFooFromExternalService";
+                                inputParams = Arrays.asList("0");
+                                inputParamTypes = Arrays.asList(int.class.getName());
+                                mockRPCExternalServiceDtos = Arrays.asList(
+                                        new MockRPCExternalServiceDto() {{
+                                            appKey = "fake.app";
+                                            interfaceFullName = "com.foo.rpc.examples.spring.fakemockobject.external.fake.api.GetApiData";
+                                            functionName = "one";
+                                            responses = Arrays.asList("{\"exName\":\"abc\",\"exId\":0,\"exInfo\":[\"2025-05-28\"],\"unknownField\":\"unknown\"}");
+                                            responseTypes = Arrays.asList(
+                                                    "com.foo.rpc.examples.spring.fakemockobject.external.fake.api.ExApiDto"
+                                            );
+                                        }}
+                                );
+                            }}
+                    );
                 }}
+
         );
     }