fix(openapi): fix structured properties mapping (#10260)

Author: david-leifker

metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/util/MappingUtil.java

@@ -9,6 +9,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.linkedin.avro2pegasus.events.KafkaAuditHeader;
@@ -43,6 +44,7 @@
 import io.datahubproject.openapi.generated.OneOfEnvelopedAspectValue;
 import io.datahubproject.openapi.generated.OneOfGenericAspectValue;
 import io.datahubproject.openapi.generated.Status;
+import io.datahubproject.openapi.generated.StructuredProperties;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.HashMap;
@@ -274,8 +276,47 @@ public static OneOfEnvelopedAspectValue mapAspectValue(
         ENVELOPED_ASPECT_TYPE_MAP.get(aspectName);
     DataMap wrapper = insertDiscriminator(aspectClass, aspect.data());
     try {
-      String dataMapAsJson = objectMapper.writeValueAsString(wrapper);
-      return objectMapper.readValue(dataMapAsJson, aspectClass);
+      if (aspectClass.equals(StructuredProperties.class)) {
+        return mapStructuredPropertyValues(wrapper, objectMapper);
+      } else {
+        String dataMapAsJson = objectMapper.writeValueAsString(wrapper);
+        return objectMapper.readValue(dataMapAsJson, aspectClass);
+      }
+    } catch (JsonProcessingException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  public static OneOfEnvelopedAspectValue mapStructuredPropertyValues(
+      DataMap dataMap, ObjectMapper objectMapper) {
+    try {
+      String dataMapAsJson = objectMapper.writeValueAsString(dataMap);
+      JsonNode jsonObject = objectMapper.readTree(dataMapAsJson);
+      ArrayNode properties = (ArrayNode) jsonObject.get("properties");
+
+      if (properties.isEmpty()) {
+        return objectMapper.readValue(dataMapAsJson, StructuredProperties.class);
+      }
+
+      properties.forEach(
+          property -> {
+            ArrayNode values = (ArrayNode) property.get("values");
+            ArrayNode newValues = JsonNodeFactory.instance.arrayNode();
+            values.forEach(
+                value -> {
+                  if (value.has("string")) {
+                    newValues.add(value.get("string").textValue());
+                  } else if (value.has("double")) {
+                    newValues.add(value.get("double").doubleValue());
+                  }
+                });
+            if (!newValues.isEmpty()) {
+              values.removeAll();
+              values.addAll(newValues);
+            }
+          });
+      return objectMapper.readValue(
+          objectMapper.writeValueAsString(jsonObject), StructuredProperties.class);
     } catch (JsonProcessingException e) {
       throw new RuntimeException(e);
     }