Revert "fix: properly validate that aspects can only be of type record (

#144)" (#149) This reverts commit d2d88bb.
linkedin · Mar 3, 2022 · 1f7ce0a · 1f7ce0a
1 parent 881a45e
commit 1f7ce0a
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 76 deletions.
diff --git a/dao-api/src/main/pegasus/com/linkedin/metadata/dummy/DummyAspect.pdl b/dao-api/src/main/pegasus/com/linkedin/metadata/dummy/DummyAspect.pdl
@@ -1,6 +1,8 @@
 namespace com.linkedin.metadata.dummy
 
+import com.linkedin.common.Urn
+
 /**
  * Not to be used
  */
-typeref DummyAspect = union[DummyRecord]
+typeref DummyAspect = union[Urn]
diff --git a/dao-api/src/main/pegasus/com/linkedin/metadata/dummy/DummyRecord.pdl b/dao-api/src/main/pegasus/com/linkedin/metadata/dummy/DummyRecord.pdl
diff --git a/testing/test-models/src/main/pegasus/com/linkedin/testing/PizzaArrayAspect.pdl b/testing/test-models/src/main/pegasus/com/linkedin/testing/PizzaArrayAspect.pdl
diff --git a/testing/test-models/src/main/pegasus/com/linkedin/testing/PizzaEnumAspect.pdl b/testing/test-models/src/main/pegasus/com/linkedin/testing/PizzaEnumAspect.pdl
diff --git a/testing/test-models/src/main/pegasus/com/linkedin/testing/PizzaMapAspect.pdl b/testing/test-models/src/main/pegasus/com/linkedin/testing/PizzaMapAspect.pdl
diff --git a/testing/test-models/src/main/pegasus/com/linkedin/testing/PizzaStringAspect.pdl b/testing/test-models/src/main/pegasus/com/linkedin/testing/PizzaStringAspect.pdl
diff --git a/validators/build.gradle b/validators/build.gradle
@@ -12,5 +12,4 @@ dependencies {
   annotationProcessor externalDependency.lombok
 
   testCompile externalDependency.guava
-  testCompile project(':testing:test-models')
 }
diff --git a/validators/src/main/java/com/linkedin/metadata/validator/AspectValidator.java b/validators/src/main/java/com/linkedin/metadata/validator/AspectValidator.java
@@ -28,7 +28,7 @@ private AspectValidator() {
    */
   public static void validateAspectUnionSchema(@Nonnull UnionDataSchema schema, @Nonnull String aspectClassName) {
 
-    if (!ValidationUtils.isUnionWithOnlyRecordMembers(schema)) {
+    if (!ValidationUtils.isUnionWithOnlyComplexMembers(schema)) {
       ValidationUtils.invalidSchema("Aspect '%s' must be a union containing only record type members", aspectClassName);
     }
   }
@@ -47,7 +47,7 @@ public static void validateAspectUnionSchema(@Nonnull Class<? extends UnionTempl
 
   private static boolean isValidMetadataField(RecordDataSchema.Field field) {
     return field.getName().equals("metadata") && !field.getOptional()
-        && field.getType().getType() == DataSchema.Type.UNION && ValidationUtils.isUnionWithOnlyRecordMembers(
+        && field.getType().getType() == DataSchema.Type.UNION && ValidationUtils.isUnionWithOnlyComplexMembers(
         (UnionDataSchema) field.getType());
   }
 }
diff --git a/validators/src/main/java/com/linkedin/metadata/validator/EntityValidator.java b/validators/src/main/java/com/linkedin/metadata/validator/EntityValidator.java
@@ -89,7 +89,7 @@ public static void validateEntityUnionSchema(@Nonnull Class<? extends UnionTempl
    */
   public static void validateEntityUnionSchema(@Nonnull UnionDataSchema schema, @Nonnull String entityClassName) {
 
-    if (!ValidationUtils.isUnionWithOnlyRecordMembers(schema)) {
+    if (!ValidationUtils.isUnionWithOnlyComplexMembers(schema)) {
       ValidationUtils.invalidSchema("Entity '%s' must be a union containing only record type members", entityClassName);
     }
   }

diff --git a/validators/src/main/java/com/linkedin/metadata/validator/RelationshipValidator.java b/validators/src/main/java/com/linkedin/metadata/validator/RelationshipValidator.java
@@ -94,7 +94,7 @@ public static void validateRelationshipUnionSchema(@Nonnull Class<? extends Unio
    */
   public static void validateRelationshipUnionSchema(@Nonnull UnionDataSchema schema, @Nonnull String relationshipClassName) {
 
-    if (!ValidationUtils.isUnionWithOnlyRecordMembers(schema)) {
+    if (!ValidationUtils.isUnionWithOnlyComplexMembers(schema)) {
       ValidationUtils.invalidSchema("Relationship '%s' must be a union containing only record type members", relationshipClassName);
     }
   }

diff --git a/validators/src/main/java/com/linkedin/metadata/validator/ValidationUtils.java b/validators/src/main/java/com/linkedin/metadata/validator/ValidationUtils.java
@@ -157,9 +157,8 @@ public static List<RecordDataSchema.Field> fieldsUsingInvalidType(@Nonnull Recor
         .collect(Collectors.toList());
   }
 
-  public static boolean isUnionWithOnlyRecordMembers(UnionDataSchema unionDataSchema) {
-    return unionDataSchema.getMembers().stream().allMatch(member -> member.getType().getDereferencedDataSchema().getType().equals(
-        DataSchema.Type.RECORD));
+  public static boolean isUnionWithOnlyComplexMembers(UnionDataSchema unionDataSchema) {
+    return unionDataSchema.getMembers().stream().allMatch(member -> member.getType().isComplex());
   }
 
   @Nonnull

diff --git a/validators/src/test/java/com/linkedin/metadata/validator/ValidationUtilsTest.java b/validators/src/test/java/com/linkedin/metadata/validator/ValidationUtilsTest.java