dimas-b commented on code in PR #955:
URL: https://github.com/apache/polaris/pull/955#discussion_r1945271749
##########
api/management-model/build.gradle.kts:
##########
@@ -54,12 +57,37 @@ openApiGenerate {
serverVariables = mapOf("basePath" to "api/v1")
}
+sourceSets {
+ main {
+ java {
+
srcDir(project.layout.buildDirectory.dir("generated/src/main/java"))
Review Comment:
Why is this required? I believe gradle should handle that by default.
##########
api/management-model/src/test/java/org/apache/polaris/core/admin/model/CatalogSerializationTest.java:
##########
@@ -0,0 +1,259 @@
+package org.apache.polaris.core.admin.model;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import java.util.Collections;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import java.util.Arrays;
+
+public class CatalogSerializationTest {
+
+ private ObjectMapper mapper;
+ private static final String TEST_LOCATION = "s3://test/";
+ private static final String TEST_CATALOG_NAME = "test-catalog";
+ private static final String TEST_ROLE_ARN =
"arn:aws:iam::123456789012:role/test-role";
+
+ @BeforeEach
+ public void setUp() {
+ mapper = new ObjectMapper();
+ mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES,
false);
+ }
+
+ @Test
+ public void testCatalogSerialization() throws JsonProcessingException {
+ CatalogProperties properties = new CatalogProperties(TEST_LOCATION);
+
+ StorageConfigInfo storageConfig = new StorageConfigInfo(
+ StorageConfigInfo.StorageTypeEnum.S3,
+ Collections.emptyList());
+
+ Catalog catalog = new Catalog(
+ Catalog.TypeEnum.INTERNAL,
+ TEST_CATALOG_NAME,
+ properties,
+ storageConfig);
+
+ String json = mapper.writeValueAsString(catalog);
+ JsonNode jsonNode = mapper.readTree(json);
+
+ assertEquals(1, countTypeFields(jsonNode));
Review Comment:
I'd prefer to assert exact JSON text. I believe Jackson produces stable
output, given the same input, so we can be sure the JSON string will not change
from run to run.
##########
api/management-model/src/test/java/org/apache/polaris/core/admin/model/CatalogSerializationTest.java:
##########
@@ -0,0 +1,259 @@
+package org.apache.polaris.core.admin.model;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import java.util.Collections;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import java.util.Arrays;
+
+public class CatalogSerializationTest {
+
+ private ObjectMapper mapper;
+ private static final String TEST_LOCATION = "s3://test/";
+ private static final String TEST_CATALOG_NAME = "test-catalog";
+ private static final String TEST_ROLE_ARN =
"arn:aws:iam::123456789012:role/test-role";
+
+ @BeforeEach
+ public void setUp() {
+ mapper = new ObjectMapper();
+ mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES,
false);
+ }
+
+ @Test
+ public void testCatalogSerialization() throws JsonProcessingException {
+ CatalogProperties properties = new CatalogProperties(TEST_LOCATION);
+
+ StorageConfigInfo storageConfig = new StorageConfigInfo(
+ StorageConfigInfo.StorageTypeEnum.S3,
+ Collections.emptyList());
+
+ Catalog catalog = new Catalog(
+ Catalog.TypeEnum.INTERNAL,
+ TEST_CATALOG_NAME,
+ properties,
+ storageConfig);
+
+ String json = mapper.writeValueAsString(catalog);
+ JsonNode jsonNode = mapper.readTree(json);
+
+ assertEquals(1, countTypeFields(jsonNode));
+ assertEquals("INTERNAL", jsonNode.get("type").asText());
+ }
+
+ @Test
+ public void testCatalogDeserialization() throws JsonProcessingException {
+ String json = "{"
+ + "\"type\": \"INTERNAL\","
+ + "\"name\": \"test-catalog\","
+ + "\"properties\": {"
+ + " \"default-base-location\": \"s3://test/\""
+ + "},"
+ + "\"storageConfigInfo\": {"
+ + " \"storageType\": \"S3\","
+ + " \"roleArn\":
\"arn:aws:iam::123456789012:role/test-role\","
+ + " \"allowedLocations\": []"
+ + "}"
+ + "}";
+
+ Catalog catalog = mapper.readValue(json, Catalog.class);
+
+ assertEquals(Catalog.TypeEnum.INTERNAL, catalog.getType());
+ assertEquals(TEST_CATALOG_NAME, catalog.getName());
+ assertEquals(TEST_LOCATION,
catalog.getProperties().getDefaultBaseLocation());
+ }
+
+ @Test
+ public void testCatalogWithNullFields() throws JsonProcessingException {
+ // Create catalog with null fields except type (required)
+ Catalog catalog = new Catalog(
+ Catalog.TypeEnum.INTERNAL, // type cannot be null for
polymorphic deserialization
+ null, // null name
+ null, // null properties
+ null // null storage config
+ );
+
+ // Test serialization
+ String json = mapper.writeValueAsString(catalog);
+
+ // Test deserialization
+ Catalog deserializedCatalog = mapper.readValue(json, Catalog.class);
+
+ // Verify fields
+ assertEquals(Catalog.TypeEnum.INTERNAL, deserializedCatalog.getType());
+ assertNull(deserializedCatalog.getName());
+ assertNull(deserializedCatalog.getProperties());
+ assertNull(deserializedCatalog.getStorageConfigInfo());
+ }
+
+ @Test
+ public void testInvalidJsonDeserialization() {
+ String invalidJson = "{ invalid json }";
+ assertThrows(JsonProcessingException.class, () ->
mapper.readValue(invalidJson, Catalog.class));
+ }
+
+ @Test
+ public void testCatalogWithEmptyFields() throws JsonProcessingException {
+ StringBuilder json = new StringBuilder();
+ json.append("{")
+ .append("\"type\": \"INTERNAL\",")
+ .append("\"name\": \"\",")
+ .append("\"properties\": {")
+ .append(" \"default-base-location\": \"\"")
+ .append("},")
+ .append("\"storageConfigInfo\": {")
+ .append(" \"storageType\": \"S3\",")
+ .append(" \"roleArn\":
\"arn:aws:iam::123456789012:role/empty\",")
+ .append(" \"allowedLocations\": []")
+ .append("}")
+ .append("}");
+
+ Catalog catalog = mapper.readValue(json.toString(), Catalog.class);
+ assertEquals("", catalog.getName());
+ assertEquals("", catalog.getProperties().getDefaultBaseLocation());
+ }
+
+ @Test
+ public void testSpecialCharacters() throws JsonProcessingException {
+ StorageConfigInfo storageConfig = new AwsStorageConfigInfo(
+ TEST_ROLE_ARN,
+ StorageConfigInfo.StorageTypeEnum.S3);
+
+ String specialName = "test\"catalog";
+ Catalog catalog = new Catalog(
+ Catalog.TypeEnum.INTERNAL,
+ specialName,
+ new CatalogProperties(TEST_LOCATION),
+ storageConfig);
+
+ String json = mapper.writeValueAsString(catalog);
+ JsonNode node = mapper.readTree(json);
+ assertEquals(specialName, node.get("name").asText());
+ }
+
+ @Test
+ public void testCatalogWithEmptyStrings() throws JsonProcessingException {
+ String json = "{"
+ + "\"type\": \"INTERNAL\","
Review Comment:
Do strings with `"""` work?
--
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]
