diff --git a/api/management-model/build.gradle.kts b/api/management-model/build.gradle.kts index ec78abe5d5..c6c808f810 100644 --- a/api/management-model/build.gradle.kts +++ b/api/management-model/build.gradle.kts @@ -56,6 +56,10 @@ openApiGenerate { additionalProperties.put("apiNamePrefix", "Polaris") additionalProperties.put("apiNameSuffix", "Api") additionalProperties.put("metricsPrefix", "polaris") + additionalProperties.put( + "additionalModelTypeAnnotations", + "@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)", + ) serverVariables = mapOf("basePath" to "api/v1") } diff --git a/api/management-model/src/test/java/org/apache/polaris/core/admin/model/CatalogSerializationTest.java b/api/management-model/src/test/java/org/apache/polaris/core/admin/model/CatalogSerializationTest.java index 4648567bf0..3620da4178 100644 --- a/api/management-model/src/test/java/org/apache/polaris/core/admin/model/CatalogSerializationTest.java +++ b/api/management-model/src/test/java/org/apache/polaris/core/admin/model/CatalogSerializationTest.java @@ -66,14 +66,8 @@ public void testJsonFormat() throws JsonProcessingException { "{\"type\":\"INTERNAL\"," + "\"name\":\"test-catalog\"," + "\"properties\":{\"default-base-location\":\"s3://test/\"}," - + "\"createTimestamp\":null," - + "\"lastUpdateTimestamp\":null," - + "\"entityVersion\":null," + "\"storageConfigInfo\":{" + "\"roleArn\":\"arn:aws:iam::123456789012:role/test-role\"," - + "\"externalId\":null," - + "\"userArn\":null," - + "\"region\":null," + "\"storageType\":\"S3\"," + "\"allowedLocations\":[]" + "}}");