fix: wrong transformation of object properties

Signed-off-by: Pascal Krause <[email protected]>

Author: pk-work

src/main/java/io/vertx/openapi/validation/transformer/ParameterTransformer.java

@@ -24,6 +24,7 @@
 import io.vertx.core.json.JsonObject;
 import io.vertx.json.schema.common.dsl.SchemaType;
 import io.vertx.openapi.contract.Parameter;
+import java.util.function.Supplier;
 
 public abstract class ParameterTransformer {
 
@@ -118,18 +119,30 @@ public Object transformObject(Parameter parameter, String rawValue) {
     }
     JsonObject object = new JsonObject();
     for (int i = 0; i < keysAndValues.length; i = i + 2) {
-      object.put(keysAndValues[i], transformPrimitive(parameter.getSchemaType(), keysAndValues[i + 1]));
+      String propertyName = keysAndValues[i];
+      SchemaType propertySchema = getObjectPropertySchemaType(parameter, propertyName);
+      object.put(propertyName, transformPrimitive(propertySchema, keysAndValues[i + 1]));
     }
     return object;
   }
 
   // VisibleForTesting
-  public SchemaType getArrayItemSchemaType(Parameter parameter) {
-    String itemsType = parameter.getSchema().get("items", new JsonObject()).getString("type");
-    if (itemsType == null) {
+  public SchemaType getArrayItemSchemaType(Parameter arrayParameter) {
+    return getSchemaType(() -> arrayParameter.getSchema().get("items", new JsonObject()).getString("type"));
+  }
+
+  public SchemaType getObjectPropertySchemaType(Parameter objectParameter, String propertyName) {
+    String propertyType = objectParameter.getSchema().get("properties", new JsonObject())
+        .getJsonObject(propertyName, new JsonObject()).getString("type");
+    return getSchemaType(() -> propertyType);
+  }
+
+  private SchemaType getSchemaType(Supplier<String> getType) {
+    String type = getType.get();
+    if (type == null) {
       // This allows everything
       return SchemaType.OBJECT;
     }
-    return SchemaType.valueOf(itemsType.toUpperCase());
+    return SchemaType.valueOf(type.toUpperCase());
   }
 }

src/test/java/io/vertx/tests/validation/transformer/FormTransformerTest.java

@@ -13,6 +13,8 @@
 package io.vertx.tests.validation.transformer;
 
 import static com.google.common.truth.Truth.assertThat;
+import static io.vertx.json.schema.common.dsl.Schemas.objectSchema;
+import static io.vertx.json.schema.common.dsl.Schemas.stringSchema;
 import static io.vertx.openapi.contract.Location.COOKIE;
 import static io.vertx.openapi.contract.Style.FORM;
 import static io.vertx.openapi.impl.Utils.EMPTY_JSON_ARRAY;
@@ -74,14 +76,20 @@ private static Stream<Arguments> provideValidArrayValues() {
   private static Stream<Arguments> provideValidObjectValues() {
     String complexRaw = "string,foo,number,13.37,integer,42,boolean,true";
     String complexExplodedRaw = "string=foo&number=13.37&integer=42&boolean=true";
-    JsonObject expected =
+    JsonObject expectedComplex =
         new JsonObject().put("string", "foo").put("integer", 42).put("boolean", true).put("number", 13.37);
 
+    String stringWithIntValue = "string,42";
+    JsonObject expectedStringWithIntValue = new JsonObject().put("string", "42");
+    JsonSchema stringWithIntSchema = JsonSchema.of(objectSchema().property("string", stringSchema()).toJson());
+    Parameter stringWIthIntParam = mockFormParameter(stringWithIntSchema, false);
+
     return Stream.of(
         Arguments.of("empty", OBJECT_PARAM, "", EMPTY_JSON_OBJECT),
         Arguments.of("empty (exploded)", OBJECT_PARAM_EXPLODE, "", EMPTY_JSON_OBJECT),
-        Arguments.of(complexRaw, OBJECT_PARAM, complexRaw, expected),
-        Arguments.of(complexExplodedRaw + " (exploded)", OBJECT_PARAM_EXPLODE, complexExplodedRaw, expected));
+        Arguments.of(complexRaw, OBJECT_PARAM, complexRaw, expectedComplex),
+        Arguments.of(stringWithIntValue, stringWIthIntParam, stringWithIntValue, expectedStringWithIntValue),
+        Arguments.of(complexExplodedRaw + " (exploded)", OBJECT_PARAM_EXPLODE, complexExplodedRaw, expectedComplex));
   }
 
   @ParameterizedTest(name = "{index} Transform \"Cookie\" parameter of style \"from\" with primitive value: {0}")

src/test/java/io/vertx/tests/validation/transformer/ParameterTransformerTest.java

@@ -1,7 +1,7 @@
 package io.vertx.tests.validation.transformer;
 
 import static com.google.common.truth.Truth.assertThat;
-import static io.vertx.json.schema.common.dsl.SchemaType.STRING;
+import static io.vertx.json.schema.common.dsl.SchemaType.*;
 import static io.vertx.json.schema.common.dsl.Schemas.arraySchema;
 import static io.vertx.json.schema.common.dsl.Schemas.booleanSchema;
 import static io.vertx.json.schema.common.dsl.Schemas.intSchema;
@@ -18,6 +18,7 @@
 
 import io.vertx.core.json.DecodeException;
 import io.vertx.json.schema.JsonSchema;
+import io.vertx.json.schema.common.dsl.ObjectSchemaBuilder;
 import io.vertx.json.schema.common.dsl.SchemaBuilder;
 import io.vertx.json.schema.common.dsl.SchemaType;
 import io.vertx.openapi.contract.Parameter;
@@ -92,4 +93,19 @@ void testGetArrayItemSchemaType() {
     Parameter arrayParam = buildSimplePathParameter(arraySchema().items(stringSchema()));
     assertThat(TRANSFORMER.getArrayItemSchemaType(arrayParam)).isEqualTo(STRING);
   }
+
+  @Test
+  void testGetObjectPropertySchemaType() {
+    ObjectSchemaBuilder schema = objectSchema()
+        .property("string", stringSchema())
+        .property("number", numberSchema())
+        .property("integer", intSchema())
+        .property("boolean", booleanSchema());
+    Parameter objectParam = buildSimplePathParameter(schema);
+
+    assertThat(TRANSFORMER.getObjectPropertySchemaType(objectParam, "string")).isEqualTo(STRING);
+    assertThat(TRANSFORMER.getObjectPropertySchemaType(objectParam, "number")).isEqualTo(NUMBER);
+    assertThat(TRANSFORMER.getObjectPropertySchemaType(objectParam, "integer")).isEqualTo(INTEGER);
+    assertThat(TRANSFORMER.getObjectPropertySchemaType(objectParam, "boolean")).isEqualTo(BOOLEAN);
+  }
 }