mchades commented on code in PR #13571: URL: https://github.com/apache/gravitino/pull/13571#discussion_r4141114444
########## core/src/main/java/org/apache/gravitino/semantic/OssieSemanticModelDocumentConverter.java: ########## @@ -0,0 +1,715 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.gravitino.semantic; + +import static org.apache.gravitino.semantic.SemanticModel.DEFAULT_OSSIE_VERSION; +import static org.apache.gravitino.semantic.SemanticModel.PROPERTY_OSSIE_VERSION; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.StreamReadConstraints; +import com.fasterxml.jackson.core.StreamReadFeature; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.json.JsonMapper; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; +import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import javax.annotation.Nullable; +import org.apache.commons.lang3.StringUtils; +import org.apache.gravitino.dto.requests.SemanticModelCreateRequest; +import org.apache.gravitino.dto.semantic.SemanticModelDefinitionDTO; +import org.apache.gravitino.exceptions.IllegalSemanticModelException; + +/** Converts between standalone Apache Ossie documents and Gravitino Semantic Models. */ +public final class OssieSemanticModelDocumentConverter { + + /** Maximum accepted document length in characters. */ + public static final int MAX_DOCUMENT_LENGTH = 4 * 1024 * 1024; + + private static final String GRAVITINO_VENDOR = "GRAVITINO"; + private static final String INTERCHANGE_MARKER = "_apache_gravitino_interchange"; + private static final int INTERCHANGE_MARKER_VERSION = 1; + private static final int MAX_NESTING_DEPTH = 100; + + private static final Set<String> ROOT_PROPERTIES = + Set.of( + "version", + "name", + "description", + "ai_context", + "datasets", + "relationships", + "metrics", + "custom_extensions"); + private static final Set<String> DATASET_PROPERTIES = + Set.of( + "name", + "source", + "primary_key", + "unique_keys", + "description", + "ai_context", + "fields", + "custom_extensions"); + private static final Set<String> FIELD_PROPERTIES = + Set.of( + "name", + "expression", + "dimension", + "label", + "description", + "datatype", + "ai_context", + "custom_extensions"); + private static final Set<String> RELATIONSHIP_PROPERTIES = + Set.of("name", "from", "to", "from_columns", "to_columns", "ai_context", "custom_extensions"); + private static final Set<String> METRIC_PROPERTIES = + Set.of("name", "expression", "description", "datatype", "ai_context", "custom_extensions"); + private static final Set<String> EXPRESSION_PROPERTIES = Set.of("dialects"); + private static final Set<String> DIALECT_EXPRESSION_PROPERTIES = Set.of("dialect", "expression"); + private static final Set<String> DIMENSION_PROPERTIES = Set.of("is_time"); + private static final Set<String> CUSTOM_EXTENSION_PROPERTIES = Set.of("vendor_name", "data"); + private static final Set<String> OSSIE_DIALECTS = + Set.of( + "ANSI_SQL", + "SNOWFLAKE", + "MDX", + "TABLEAU", + "DATABRICKS", + "MAQL", + "BIGQUERY", + "SIGMA", + "THOUGHTSPOT", + "DAX", + "OSSIE_SQL_2026"); + + private static final ObjectMapper JSON_MAPPER = createJsonMapper(); + private static final ObjectMapper YAML_MAPPER = createYamlMapper(); + + /** Supported Ossie document serialization formats. */ + public enum Format { + /** YAML serialization. */ + YAML, + /** JSON serialization. */ + JSON + } + + private OssieSemanticModelDocumentConverter() {} + + /** + * Converts one standalone Apache Ossie YAML or JSON document into a create request. + * + * @param document The standalone Ossie document. + * @return The converted Semantic Model create request. + * @throws IllegalSemanticModelException If the document cannot be parsed or represented by + * Gravitino. + */ + public static SemanticModelCreateRequest importDocument(String document) { + ObjectNode root = parseDocument(document); + return toCreateRequest(root); + } + + /** + * Exports one Gravitino Semantic Model as a standalone Apache Ossie document. + * + * @param semanticModel The Semantic Model to export. + * @param format The requested serialization format. + * @return The serialized Ossie document. + * @throws IllegalSemanticModelException If the model cannot be represented as a valid Ossie + * document. + */ + public static String exportDocument(SemanticModel semanticModel, Format format) { + Objects.requireNonNull(semanticModel, "semanticModel must not be null"); + Objects.requireNonNull(format, "format must not be null"); + + ObjectNode definition = + JSON_MAPPER.valueToTree( + SemanticModelDefinitionDTO.fromDefinition(semanticModel.definition())); + transformNativeDefinition(definition); + + ObjectNode root = JSON_MAPPER.createObjectNode(); + root.put("version", ossieVersion(semanticModel.properties())); + root.put("name", semanticModel.name()); + if (semanticModel.comment() != null) { + root.put("description", semanticModel.comment()); + } + definition.fields().forEachRemaining(entry -> root.set(entry.getKey(), entry.getValue())); + stashProperties(root, semanticModel.properties()); + + // Validate the generated document through the same conversion path used for imports. + toCreateRequest(root.deepCopy()); + + try { + if (format == Format.JSON) { + return JSON_MAPPER.writerWithDefaultPrettyPrinter().writeValueAsString(root) + "\n"; + } + return YAML_MAPPER.writeValueAsString(root); + } catch (JsonProcessingException e) { + throw new IllegalSemanticModelException( + e, "Cannot serialize Apache Ossie document: %s", e.getOriginalMessage()); + } + } + + private static ObjectMapper createJsonMapper() { + return JsonMapper.builder() + .enable(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS) + .enable(DeserializationFeature.USE_BIG_INTEGER_FOR_INTS) + .build() + .setSerializationInclusion(JsonInclude.Include.NON_NULL); + } + + private static ObjectMapper createYamlMapper() { + YAMLFactory factory = + YAMLFactory.builder() + .enable(StreamReadFeature.STRICT_DUPLICATE_DETECTION) + .disable(YAMLGenerator.Feature.WRITE_DOC_START_MARKER) + .build(); + factory.setStreamReadConstraints( + StreamReadConstraints.builder() + .maxNestingDepth(MAX_NESTING_DEPTH) + .maxStringLength(MAX_DOCUMENT_LENGTH) + .build()); + return new ObjectMapper(factory) + .enable(DeserializationFeature.FAIL_ON_TRAILING_TOKENS) + .enable(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS) + .enable(DeserializationFeature.USE_BIG_INTEGER_FOR_INTS) + .setSerializationInclusion(JsonInclude.Include.NON_NULL); + } + + private static ObjectNode parseDocument(String document) { + if (StringUtils.isBlank(document)) { + throw new IllegalSemanticModelException("Apache Ossie document must not be empty"); + } + if (document.length() > MAX_DOCUMENT_LENGTH) { + throw new IllegalSemanticModelException( + "Apache Ossie document exceeds the maximum length of %s characters", MAX_DOCUMENT_LENGTH); + } + + try { + JsonNode parsed = YAML_MAPPER.readTree(document); + if (!(parsed instanceof ObjectNode)) { + throw invalid("$", "document root must be an object"); + } + return (ObjectNode) parsed; + } catch (JsonProcessingException e) { + throw new IllegalSemanticModelException( + e, "Cannot parse Apache Ossie YAML or JSON: %s", e.getOriginalMessage()); + } + } + + private static SemanticModelCreateRequest toCreateRequest(ObjectNode root) { + validateObject(root, "$", ROOT_PROPERTIES); + String ossieVersion = validateVersion(root.get("version")); + + Map<String, String> properties = new LinkedHashMap<>(extractProperties(root)); + String extensionVersion = properties.get(PROPERTY_OSSIE_VERSION); + if (extensionVersion != null && !extensionVersion.equals(ossieVersion)) { + throw invalid( + "$.custom_extensions", + "Gravitino property '" + PROPERTY_OSSIE_VERSION + "' conflicts with $.version"); + } + properties.put(PROPERTY_OSSIE_VERSION, ossieVersion); + ObjectNode definition = JSON_MAPPER.createObjectNode(); + copy(root, definition, "ai_context"); + copy(root, definition, "datasets"); + copy(root, definition, "relationships"); + copy(root, definition, "metrics"); + copy(root, definition, "custom_extensions"); + transformOssieDefinition(definition, "$"); + + ObjectNode requestNode = JSON_MAPPER.createObjectNode(); + copy(root, requestNode, "name"); + if (root.has("description")) { + requestNode.set("comment", root.get("description")); + } + requestNode.set("definition", definition); + requestNode.set("properties", JSON_MAPPER.valueToTree(properties)); + + try { + SemanticModelCreateRequest request = + JSON_MAPPER.treeToValue(requestNode, SemanticModelCreateRequest.class); + request.validate(); + request.toDefinition(); + return request; + } catch (JsonProcessingException | IllegalArgumentException e) { + throw new IllegalSemanticModelException( + e, + "Cannot convert Apache Ossie document to a Gravitino Semantic Model: %s", + originalMessage(e)); + } + } + + private static String validateVersion(@Nullable JsonNode version) { + if (version == null || !version.isTextual() || StringUtils.isBlank(version.textValue())) { + throw invalid("$.version", "must be a non-empty string"); + } + return version.textValue(); + } + + private static String ossieVersion(Map<String, String> properties) { + String version = properties.getOrDefault(PROPERTY_OSSIE_VERSION, DEFAULT_OSSIE_VERSION); + if (StringUtils.isBlank(version)) { + throw invalid( + "$.version", + "Semantic Model property '" + PROPERTY_OSSIE_VERSION + "' must not be blank"); + } + return version; + } + + private static void transformOssieDefinition(ObjectNode definition, String path) { + validateAIContext(definition.get("ai_context"), path + ".ai_context"); + transformObjectArray( + definition.get("datasets"), + path + ".datasets", + OssieSemanticModelDocumentConverter::transformOssieDataset); + transformObjectArray( + definition.get("relationships"), + path + ".relationships", + OssieSemanticModelDocumentConverter::transformOssieRelationship); + transformObjectArray( + definition.get("metrics"), + path + ".metrics", + OssieSemanticModelDocumentConverter::transformOssieMetric); + transformOssieCustomExtensions( + definition.get("custom_extensions"), path + ".custom_extensions"); + rename(definition, "ai_context", "aiContext"); + rename(definition, "custom_extensions", "customExtensions"); + } + + private static void transformOssieDataset(ObjectNode dataset, String path) { + validateObject(dataset, path, DATASET_PROPERTIES); + JsonNode source = dataset.get("source"); + if (source != null) { + if (!source.isTextual()) { + throw invalid(path + ".source", "must be a string"); + } + String sourceValue = source.textValue(); + String[] parts = sourceValue.split("\\.", -1); + if (parts.length != 3 || StringUtils.isAnyBlank(parts)) { + throw invalid( + path + ".source", + "must be a three-part catalog.schema.entity identifier; query sources are not supported"); + } + ObjectNode identifier = JSON_MAPPER.createObjectNode(); + identifier.putArray("namespace").add(parts[0]).add(parts[1]); + identifier.put("name", parts[2]); + dataset.set("source", identifier); + } + + validateAIContext(dataset.get("ai_context"), path + ".ai_context"); + transformObjectArray( + dataset.get("fields"), + path + ".fields", + OssieSemanticModelDocumentConverter::transformOssieField); + transformOssieCustomExtensions(dataset.get("custom_extensions"), path + ".custom_extensions"); + rename(dataset, "primary_key", "primaryKey"); + rename(dataset, "unique_keys", "uniqueKeys"); + rename(dataset, "ai_context", "aiContext"); + rename(dataset, "custom_extensions", "customExtensions"); + } + + private static void transformOssieField(ObjectNode field, String path) { + validateObject(field, path, FIELD_PROPERTIES); + transformOssieExpression(field.get("expression"), path + ".expression"); + JsonNode dimension = field.get("dimension"); + if (dimension instanceof ObjectNode) { + validateObject((ObjectNode) dimension, path + ".dimension", DIMENSION_PROPERTIES); + rename((ObjectNode) dimension, "is_time", "isTime"); + } + validateAIContext(field.get("ai_context"), path + ".ai_context"); + transformOssieCustomExtensions(field.get("custom_extensions"), path + ".custom_extensions"); + rename(field, "ai_context", "aiContext"); + rename(field, "custom_extensions", "customExtensions"); + } + + private static void transformOssieRelationship(ObjectNode relationship, String path) { + validateObject(relationship, path, RELATIONSHIP_PROPERTIES); + validateAIContext(relationship.get("ai_context"), path + ".ai_context"); + transformOssieCustomExtensions( + relationship.get("custom_extensions"), path + ".custom_extensions"); + rename(relationship, "from_columns", "fromColumns"); + rename(relationship, "to_columns", "toColumns"); + rename(relationship, "ai_context", "aiContext"); + rename(relationship, "custom_extensions", "customExtensions"); + } + + private static void transformOssieMetric(ObjectNode metric, String path) { + validateObject(metric, path, METRIC_PROPERTIES); + transformOssieExpression(metric.get("expression"), path + ".expression"); + validateAIContext(metric.get("ai_context"), path + ".ai_context"); + transformOssieCustomExtensions(metric.get("custom_extensions"), path + ".custom_extensions"); + rename(metric, "ai_context", "aiContext"); + rename(metric, "custom_extensions", "customExtensions"); + } + + private static void transformOssieExpression(@Nullable JsonNode expression, String path) { + if (!(expression instanceof ObjectNode)) { + return; + } + ObjectNode expressionObject = (ObjectNode) expression; + validateObject(expressionObject, path, EXPRESSION_PROPERTIES); + transformObjectArray( + expressionObject.get("dialects"), + path + ".dialects", + (dialectExpression, dialectPath) -> { + validateObject(dialectExpression, dialectPath, DIALECT_EXPRESSION_PROPERTIES); + JsonNode dialect = dialectExpression.get("dialect"); + if (dialect != null + && dialect.isTextual() + && !OSSIE_DIALECTS.contains(dialect.textValue())) { + throw invalid( + dialectPath + ".dialect", + "unsupported Apache Ossie dialect '" + dialect.textValue() + "'"); + } + }); + } + + private static void transformOssieCustomExtensions(@Nullable JsonNode extensions, String path) { + transformObjectArray( + extensions, + path, + (extension, extensionPath) -> { + validateObject(extension, extensionPath, CUSTOM_EXTENSION_PROPERTIES); + rename(extension, "vendor_name", "vendorName"); + }); + } + + private static void validateAIContext(@Nullable JsonNode context, String path) { + if (context == null) { + return; + } + if (context.isTextual()) { + return; + } + if (!(context instanceof ObjectNode)) { + throw invalid(path, "must be a string or object"); + } + + ObjectNode object = (ObjectNode) context; + validateOptionalText(object, "instructions", path); + validateOptionalStringArray(object, "synonyms", path); + validateOptionalStringArray(object, "examples", path); + } + + private static void transformNativeDefinition(ObjectNode definition) { + transformObjectArray( + definition.get("datasets"), + "$.datasets", + OssieSemanticModelDocumentConverter::transformNativeDataset); + transformObjectArray( + definition.get("relationships"), + "$.relationships", + OssieSemanticModelDocumentConverter::transformNativeRelationship); + transformObjectArray( + definition.get("metrics"), + "$.metrics", + OssieSemanticModelDocumentConverter::transformNativeMetric); + transformNativeCustomExtensions(definition.get("customExtensions"), "$.custom_extensions"); + rename(definition, "aiContext", "ai_context"); + rename(definition, "customExtensions", "custom_extensions"); + } + + private static void transformNativeDataset(ObjectNode dataset, String path) { + JsonNode source = dataset.get("source"); + if (!(source instanceof ObjectNode)) { + throw invalid(path + ".source", "must be a Gravitino source identifier"); + } + JsonNode namespace = source.get("namespace"); + JsonNode name = source.get("name"); + if (!(namespace instanceof ArrayNode) + || namespace.size() != 2 + || !namespace.get(0).isTextual() + || !namespace.get(1).isTextual() + || name == null + || !name.isTextual()) { + throw invalid(path + ".source", "must contain exactly catalog.schema.name"); + } Review Comment: The create path already enforces this invariant before persistence: SemanticModelOperationDispatcher passes SemanticModelValidator.validateDefinition into ManagedSemanticModelOperations, and validateSource requires exactly two namespace levels. TestSemanticModelValidator covers a shorter source. I also replaced the dot split with quote-aware parsing and formatting, with round-trip coverage for dots and escaped backticks in all three source segments. ########## core/src/main/java/org/apache/gravitino/semantic/OssieSemanticModelDocumentConverter.java: ########## @@ -0,0 +1,715 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.gravitino.semantic; + +import static org.apache.gravitino.semantic.SemanticModel.DEFAULT_OSSIE_VERSION; +import static org.apache.gravitino.semantic.SemanticModel.PROPERTY_OSSIE_VERSION; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.StreamReadConstraints; +import com.fasterxml.jackson.core.StreamReadFeature; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.json.JsonMapper; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; +import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import javax.annotation.Nullable; +import org.apache.commons.lang3.StringUtils; +import org.apache.gravitino.dto.requests.SemanticModelCreateRequest; +import org.apache.gravitino.dto.semantic.SemanticModelDefinitionDTO; +import org.apache.gravitino.exceptions.IllegalSemanticModelException; + +/** Converts between standalone Apache Ossie documents and Gravitino Semantic Models. */ +public final class OssieSemanticModelDocumentConverter { + + /** Maximum accepted document length in characters. */ + public static final int MAX_DOCUMENT_LENGTH = 4 * 1024 * 1024; + + private static final String GRAVITINO_VENDOR = "GRAVITINO"; + private static final String INTERCHANGE_MARKER = "_apache_gravitino_interchange"; + private static final int INTERCHANGE_MARKER_VERSION = 1; + private static final int MAX_NESTING_DEPTH = 100; + + private static final Set<String> ROOT_PROPERTIES = + Set.of( + "version", + "name", + "description", + "ai_context", + "datasets", + "relationships", + "metrics", + "custom_extensions"); + private static final Set<String> DATASET_PROPERTIES = + Set.of( + "name", + "source", + "primary_key", + "unique_keys", + "description", + "ai_context", + "fields", + "custom_extensions"); + private static final Set<String> FIELD_PROPERTIES = + Set.of( + "name", + "expression", + "dimension", + "label", + "description", + "datatype", + "ai_context", + "custom_extensions"); + private static final Set<String> RELATIONSHIP_PROPERTIES = + Set.of("name", "from", "to", "from_columns", "to_columns", "ai_context", "custom_extensions"); + private static final Set<String> METRIC_PROPERTIES = + Set.of("name", "expression", "description", "datatype", "ai_context", "custom_extensions"); + private static final Set<String> EXPRESSION_PROPERTIES = Set.of("dialects"); + private static final Set<String> DIALECT_EXPRESSION_PROPERTIES = Set.of("dialect", "expression"); + private static final Set<String> DIMENSION_PROPERTIES = Set.of("is_time"); + private static final Set<String> CUSTOM_EXTENSION_PROPERTIES = Set.of("vendor_name", "data"); + private static final Set<String> OSSIE_DIALECTS = + Set.of( + "ANSI_SQL", + "SNOWFLAKE", + "MDX", + "TABLEAU", + "DATABRICKS", + "MAQL", + "BIGQUERY", + "SIGMA", + "THOUGHTSPOT", + "DAX", + "OSSIE_SQL_2026"); + + private static final ObjectMapper JSON_MAPPER = createJsonMapper(); + private static final ObjectMapper YAML_MAPPER = createYamlMapper(); + + /** Supported Ossie document serialization formats. */ + public enum Format { + /** YAML serialization. */ + YAML, + /** JSON serialization. */ + JSON + } + + private OssieSemanticModelDocumentConverter() {} + + /** + * Converts one standalone Apache Ossie YAML or JSON document into a create request. + * + * @param document The standalone Ossie document. + * @return The converted Semantic Model create request. + * @throws IllegalSemanticModelException If the document cannot be parsed or represented by + * Gravitino. + */ + public static SemanticModelCreateRequest importDocument(String document) { + ObjectNode root = parseDocument(document); + return toCreateRequest(root); + } + + /** + * Exports one Gravitino Semantic Model as a standalone Apache Ossie document. + * + * @param semanticModel The Semantic Model to export. + * @param format The requested serialization format. + * @return The serialized Ossie document. + * @throws IllegalSemanticModelException If the model cannot be represented as a valid Ossie + * document. + */ + public static String exportDocument(SemanticModel semanticModel, Format format) { + Objects.requireNonNull(semanticModel, "semanticModel must not be null"); + Objects.requireNonNull(format, "format must not be null"); + + ObjectNode definition = + JSON_MAPPER.valueToTree( + SemanticModelDefinitionDTO.fromDefinition(semanticModel.definition())); + transformNativeDefinition(definition); + + ObjectNode root = JSON_MAPPER.createObjectNode(); + root.put("version", ossieVersion(semanticModel.properties())); + root.put("name", semanticModel.name()); + if (semanticModel.comment() != null) { + root.put("description", semanticModel.comment()); + } + definition.fields().forEachRemaining(entry -> root.set(entry.getKey(), entry.getValue())); + stashProperties(root, semanticModel.properties()); + + // Validate the generated document through the same conversion path used for imports. + toCreateRequest(root.deepCopy()); + + try { + if (format == Format.JSON) { + return JSON_MAPPER.writerWithDefaultPrettyPrinter().writeValueAsString(root) + "\n"; + } + return YAML_MAPPER.writeValueAsString(root); + } catch (JsonProcessingException e) { + throw new IllegalSemanticModelException( + e, "Cannot serialize Apache Ossie document: %s", e.getOriginalMessage()); + } + } + + private static ObjectMapper createJsonMapper() { + return JsonMapper.builder() + .enable(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS) + .enable(DeserializationFeature.USE_BIG_INTEGER_FOR_INTS) + .build() + .setSerializationInclusion(JsonInclude.Include.NON_NULL); + } + + private static ObjectMapper createYamlMapper() { + YAMLFactory factory = + YAMLFactory.builder() + .enable(StreamReadFeature.STRICT_DUPLICATE_DETECTION) + .disable(YAMLGenerator.Feature.WRITE_DOC_START_MARKER) + .build(); + factory.setStreamReadConstraints( + StreamReadConstraints.builder() + .maxNestingDepth(MAX_NESTING_DEPTH) + .maxStringLength(MAX_DOCUMENT_LENGTH) + .build()); Review Comment: The asymmetry was not intentional. Both JSON_MAPPER and YAML_MAPPER now use one shared StreamReadConstraints instance with nesting depth 100 and string length 4 MiB. A regression test verifies that an over-deep JSON custom-extension payload is not parsed as the reserved Gravitino marker. ########## server/src/main/java/org/apache/gravitino/server/web/rest/SemanticModelOperations.java: ########## @@ -116,6 +115,53 @@ public Response createSemanticModel( } } + /** + * Imports a standalone Apache Ossie YAML or JSON document as a Semantic Model. + * + * @param metalake The metalake name. + * @param catalog The catalog name. + * @param schema The schema name. + * @param document The standalone Ossie document. + * @return A native response containing the created Semantic Model. + */ + @POST + @Path("ossie") + @Consumes({MediaType.APPLICATION_JSON, OSSIE_YAML_MEDIA_TYPE, OSSIE_X_YAML_MEDIA_TYPE}) Review Comment: Added text/yaml to @Consumes with REST coverage. I kept text/plain and application/x-www-form-urlencoded unsupported: text/plain does not cover the default form content type used by curl --data-binary, so curl callers still need to send an explicit YAML Content-Type. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
