Updating mixin definitions, rewiring AwsCloudWatchConfiguration,AwsCloudWatchEventListener AwsCloudWatchEventListenerTest

Author: vchag

runtime/service/src/main/java/org/apache/polaris/service/events/json/serde/TableIdentifierToStringSerializer.java renamed to runtime/service/src/main/java/org/apache/polaris/service/config/PolarisAWSCloudWatchObjectMapper.java

@@ -17,24 +17,12 @@
  * under the License.
  */
 
-package org.apache.polaris.service.events.json.serde;
+package org.apache.polaris.service.config;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import java.io.IOException;
-import org.apache.iceberg.catalog.TableIdentifier;
+import jakarta.inject.Qualifier;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 
-public class TableIdentifierToStringSerializer extends JsonSerializer<TableIdentifier> {
-
-  @Override
-  public void serialize(TableIdentifier value, JsonGenerator gen, SerializerProvider serializers)
-      throws IOException {
-
-    if (value == null) {
-      gen.writeNull();
-      return;
-    }
-    gen.writeString(value.toString());
-  }
-}
+@Qualifier
+@Retention(RetentionPolicy.RUNTIME)
+public @interface PolarisAWSCloudWatchObjectMapper {}

runtime/service/src/main/java/org/apache/polaris/service/config/PolarisAWSCloudWatchObjectMapperProducer.java

@@ -0,0 +1,82 @@
+/*
+ * 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.polaris.service.config;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.core.StreamReadConstraints;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import io.quarkus.runtime.configuration.MemorySize;
+import io.quarkus.runtime.configuration.MemorySizeConverter;
+import io.smallrye.config.WithConverter;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+import org.apache.polaris.service.events.PolarisEvent;
+import org.apache.polaris.service.events.json.mixins.IcebergMixins;
+import org.apache.polaris.service.events.json.mixins.PolarisEventBaseMixin;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** This mapper is isolated and used exclusively for CloudWatch event serializations */
+public class PolarisAWSCloudWatchObjectMapperProducer {
+  private static final Logger LOGGER =
+      LoggerFactory.getLogger(PolarisAWSCloudWatchObjectMapperProducer.class);
+
+  private final long maxBodySize;
+
+  @Inject
+  public PolarisAWSCloudWatchObjectMapperProducer(
+      @ConfigProperty(name = "polaris.aws.cloudwatch.max-body-size", defaultValue = "16M")
+          @WithConverter(MemorySizeConverter.class)
+          MemorySize maxBodySize) {
+    this.maxBodySize = maxBodySize.asLongValue();
+  }
+
+  @Produces
+  @Singleton
+  @PolarisAWSCloudWatchObjectMapper
+  public ObjectMapper produce() {
+
+    // Use Snake_case for these such
+    ObjectMapper mapper = new ObjectMapper();
+    mapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY);
+    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    mapper.setPropertyNamingStrategy(new PropertyNamingStrategies.KebabCaseStrategy());
+    // Register Iceberg/Polaris specific mixins
+    mapper.addMixIn(PolarisEvent.class, PolarisEventBaseMixin.class);
+    mapper.addMixIn(
+        org.apache.iceberg.catalog.TableIdentifier.class, IcebergMixins.TableIdentifierMixin.class);
+    mapper.addMixIn(org.apache.iceberg.catalog.Namespace.class, IcebergMixins.NamespaceMixin.class);
+
+    // Size Constraint
+    mapper
+        .getFactory()
+        .setStreamReadConstraints(
+            StreamReadConstraints.builder().maxDocumentLength(maxBodySize).build());
+
+    LOGGER.info(
+        "Produced PolarisIcebergAWSCloudWatchObjectMapper (max body size: {} bytes)", maxBodySize);
+    return mapper;
+  }
+}

runtime/service/src/main/java/org/apache/polaris/service/events/json/mixins/AfterRefreshTableEventMixin.java

@@ -19,24 +19,39 @@
 
 package org.apache.polaris.service.events.json.mixins;
 
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.iceberg.catalog.Namespace;
 
-/**
- * Mixins for Iceberg classes we don't control, to keep JSON concise. The @JsonValue marks
- * toString() as the value to serialize.
- */
-public class IcebergThirdPartyMixins {
-  private IcebergThirdPartyMixins() {}
+/** Mixins for Iceberg classes we don't control, to keep JSON concise. */
+public final class IcebergMixins {
+
+  // Private constructor to prevent instantiation
+  private IcebergMixins() {}
 
+  /** Serializes Namespace as an object like: "namespace": ["sales", "north.america"] */
   public abstract static class NamespaceMixin {
+    @JsonProperty("namespace")
+    public abstract String[] levels();
+
     @Override
-    @JsonValue
-    public abstract String toString(); // serializes "namespace" as "db.sales"
+    @JsonIgnore
+    public abstract String toString();
   }
 
+  /**
+   * Serializes TableIdentifier as a scalar string like: {"namespace": ["sales", "north.america"],
+   * "name": "transactions"}
+   */
   public abstract static class TableIdentifierMixin {
+    @JsonProperty("namespace")
+    public abstract Namespace namespace();
+
+    @JsonProperty("name")
+    public abstract String name();
+
     @Override
-    @JsonValue
-    public abstract String toString(); // serializes "table_identifier" as "db.sales.orders"
+    @JsonIgnore
+    public abstract String toString();
   }
 }

runtime/service/src/main/java/org/apache/polaris/service/events/json/mixins/IcebergThirdPartyMixins.java renamed to runtime/service/src/main/java/org/apache/polaris/service/events/json/mixins/IcebergMixins.java

@@ -20,14 +20,9 @@
 package org.apache.polaris.service.events.json.mixins;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
-@JsonTypeInfo(
-    use = JsonTypeInfo.Id.NAME,
-    include = JsonTypeInfo.As.EXTERNAL_PROPERTY,
-    property = "event_type")
 public abstract class PolarisEventBaseMixin {}