Pass in empty allowlist to parser (#373)

* Pass in empty allowlist to parser * fix * fix * fix --------- Co-authored-by: Jesse Jia <[email protected]>
linkedin · Mar 20, 2024 · b3c21a8 · b3c21a8
1 parent a64d0ca
commit b3c21a8
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 27 deletions.
diff --git a/dao-api/src/main/java/com/linkedin/metadata/dao/utils/IngestionUtils.java b/dao-api/src/main/java/com/linkedin/metadata/dao/utils/IngestionUtils.java
@@ -7,6 +7,7 @@
 import com.linkedin.data.schema.RecordDataSchema;
 import com.linkedin.data.template.DataTemplateUtil;
 import com.linkedin.data.template.RecordTemplate;
+import com.linkedin.metadata.annotations.AlwaysAllowList;
 import com.linkedin.metadata.annotations.AspectIngestionAnnotation;
 import com.linkedin.metadata.annotations.AspectIngestionAnnotationArray;
 import com.linkedin.metadata.annotations.GmaAnnotation;
@@ -61,7 +62,7 @@ public static <ASPECT extends RecordTemplate> AspectIngestionAnnotationArray par
 
     try {
       final RecordDataSchema schema = (RecordDataSchema) DataTemplateUtil.getSchema(aspectClass);
-      final Optional<GmaAnnotation> gmaAnnotation = new GmaAnnotationParser().parse(schema);
+      final Optional<GmaAnnotation> gmaAnnotation = new GmaAnnotationParser(new AlwaysAllowList()).parse(schema);
 
       // Return empty array if user did not specify any ingestion annotation on the aspect.
       if (!gmaAnnotation.isPresent() || !gmaAnnotation.get().hasAspect() || !gmaAnnotation.get().getAspect().hasIngestion()) {

diff --git a/dao-impl/ebean-dao/src/main/java/com/linkedin/metadata/dao/utils/EBeanDAOUtils.java b/dao-impl/ebean-dao/src/main/java/com/linkedin/metadata/dao/utils/EBeanDAOUtils.java
@@ -3,10 +3,7 @@
 import com.linkedin.data.schema.RecordDataSchema;
 import com.linkedin.data.template.DataTemplateUtil;
 import com.linkedin.data.template.RecordTemplate;
-import com.linkedin.metadata.annotations.AspectIngestionAnnotationArray;
 import com.linkedin.metadata.annotations.DeltaEntityAnnotationArrayMap;
-import com.linkedin.metadata.annotations.GmaAnnotation;
-import com.linkedin.metadata.annotations.GmaAnnotationParser;
 import com.linkedin.metadata.aspect.AuditedAspect;
 import com.linkedin.metadata.aspect.SoftDeletedAspect;
 import com.linkedin.metadata.dao.EbeanMetadataAspect;
@@ -28,7 +25,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -57,26 +53,6 @@ private EBeanDAOUtils() {
     // Utils class
   }
 
-  /**
-   * Parse the ingestion mode annotation given an aspect class.
-   */
-  @Nonnull
-  public static AspectIngestionAnnotationArray parseIngestionModeFromAnnotation(@Nonnull final String aspectCanonicalName) {
-    try {
-      final RecordDataSchema schema = (RecordDataSchema) DataTemplateUtil.getSchema(ClassUtils.loadClass(aspectCanonicalName));
-      final Optional<GmaAnnotation> gmaAnnotation = new GmaAnnotationParser().parse(schema);
-
-      // Return empty array if user did not specify any ingestion annotation on the aspect.
-      if (!gmaAnnotation.isPresent() || !gmaAnnotation.get().hasAspect() || !gmaAnnotation.get().getAspect().hasIngestion()) {
-        return new AspectIngestionAnnotationArray();
-      }
-
-      return gmaAnnotation.get().getAspect().getIngestion();
-    } catch (Exception e) {
-      throw new RuntimeException(String.format("Failed to parse the annotations for aspect %s", aspectCanonicalName), e);
-    }
-  }
-
   /**
    * Parse the delta annotation given an aspect class.
    * @param aspectCanonicalName canonical name of an aspect

diff --git a/...data-annotations-lib/src/main/java/com/linkedin/metadata/annotations/AlwaysAllowList.java b/...data-annotations-lib/src/main/java/com/linkedin/metadata/annotations/AlwaysAllowList.java
@@ -1,11 +1,9 @@
 package com.linkedin.metadata.annotations;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.linkedin.data.schema.DataSchema;
 import javax.annotation.Nonnull;
 
 
-@VisibleForTesting
 public class AlwaysAllowList implements GmaEntitiesAnnotationAllowList {
   @Override
   public void check(@Nonnull DataSchema schema, @Nonnull AspectAnnotation aspectAnnotation) {