fix: use the getEntityType() to get the URN string. (#79)

* fix: use the getEntityType() to get the URN string.
linkedin · Feb 26, 2021 · 6833bb3 · 6833bb3
1 parent 50e4192
commit 6833bb3
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 10 deletions.
diff --git a/dao-api/src/main/java/com/linkedin/metadata/dao/utils/ModelUtils.java b/dao-api/src/main/java/com/linkedin/metadata/dao/utils/ModelUtils.java
@@ -520,8 +520,7 @@ public static String getEntityTypeFromUrnClass(@Nonnull Class<? extends Urn> urn
   @Nonnull
   public static <URN extends Urn, ASPECT extends RecordTemplate> String getAspectSpecificMAETopicName(@Nonnull URN urn,
       @Nonnull ASPECT newValue) {
-    final String urnStr = urn.getClass().getSimpleName().toUpperCase();
-    return String.format("%s_%s_%s", METADATA_AUDIT_EVENT_PREFIX, urnStr.substring(0, urnStr.length() - "Urn".length()),
+    return String.format("%s_%s_%s", METADATA_AUDIT_EVENT_PREFIX, urn.getEntityType().toUpperCase(),
         newValue.getClass().getSimpleName().toUpperCase());
   }
 

diff --git a/dao-api/src/test/java/com/linkedin/metadata/dao/utils/ModelUtilsTest.java b/dao-api/src/test/java/com/linkedin/metadata/dao/utils/ModelUtilsTest.java
@@ -5,6 +5,7 @@
 import com.linkedin.common.urn.Urn;
 import com.linkedin.testing.EntityFoo;
 import com.linkedin.testing.EntityUnion;
+import com.linkedin.testing.urn.PizzaUrn;
 import com.linkedin.testing.urn.BarUrn;
 import com.linkedin.data.template.RecordTemplate;
 import com.linkedin.metadata.validator.InvalidSchemaException;
@@ -274,6 +275,10 @@ public void testGetMAETopicName() throws URISyntaxException {
     AspectFoo foo = new AspectFoo().setValue("foo");
 
     assertEquals(ModelUtils.getAspectSpecificMAETopicName(urn, foo), "METADATA_AUDIT_EVENT_FOO_ASPECTFOO");
+
+    PizzaUrn pizza = new PizzaUrn(1);
+    AspectBar bar = new AspectBar().setValue("bar");
+    assertEquals(ModelUtils.getAspectSpecificMAETopicName(pizza, bar), "METADATA_AUDIT_EVENT_PIZZA_ASPECTBAR");
   }
 
   @Test

diff --git a/dao-impl/ebean-dao/src/test/java/com/linkedin/metadata/dao/EbeanLocalDAOTest.java b/dao-impl/ebean-dao/src/test/java/com/linkedin/metadata/dao/EbeanLocalDAOTest.java
@@ -1452,7 +1452,7 @@ void testGetUrn() {
     // case 1: valid urn
     EbeanLocalDAO<EntityAspectUnion, FooUrn> dao =
         new EbeanLocalDAO<>(EntityAspectUnion.class, _mockProducer, _server, FooUrn.class);
-    String urn1 = "urn:li:entityFoo:1";
+    String urn1 = "urn:li:foo:1";
     FooUrn fooUrn = makeFooUrn(1);
 
     assertEquals(fooUrn, dao.getUrn(urn1));

diff --git a/dao-impl/ebean-dao/src/test/resources/immutable.json b/dao-impl/ebean-dao/src/test/resources/immutable.json
@@ -1,11 +1,11 @@
 {
-  "urn:li:entityFoo:1": {
+  "urn:li:foo:1": {
     "value": "1"
   },
-  "urn:li:entityFoo:2": {
+  "urn:li:foo:2": {
     "value": "2"
   },
-  "urn:li:entityFoo:3": {
+  "urn:li:foo:3": {
     "value": "3"
   }
 }
diff --git a/...l/neo4j-dao/src/test/java/com/linkedin/metadata/dao/internal/Neo4jGraphWriterDAOTest.java b/...l/neo4j-dao/src/test/java/com/linkedin/metadata/dao/internal/Neo4jGraphWriterDAOTest.java
@@ -210,7 +210,7 @@ public void testAddRelationshipRemoveAll() throws Exception {
   public void testGetNodeTypeFromUrn() {
     assertEquals(_dao.getNodeType(makeBarUrn(1)), ":`com.linkedin.testing.EntityBar`");
     assertEquals(_dao.getNodeType(makeFooUrn(1)), ":`com.linkedin.testing.EntityFoo`");
-    assertEquals(_dao.getNodeType(makeUrn(1, "entityFoo")), ":`com.linkedin.testing.EntityFoo`");
+    assertEquals(_dao.getNodeType(makeUrn(1, "foo")), ":`com.linkedin.testing.EntityFoo`");
     assertEquals(_dao.getNodeType(makeUrn("1")), ":UNKNOWN");
 
     // test consistency !!

diff --git a/testing/test-models/src/main/javaPegasus/com/linkedin/testing/urn/BarUrn.java b/testing/test-models/src/main/javaPegasus/com/linkedin/testing/urn/BarUrn.java
@@ -7,7 +7,7 @@
 
 public final class BarUrn extends Urn {
 
-  public static final String ENTITY_TYPE = "entityBar";
+  public static final String ENTITY_TYPE = "bar";
   // Can be obtained via getEntityKey, but not in open source. We need to unify the internal / external URN definitions.
   private final int _id;
 

diff --git a/testing/test-models/src/main/javaPegasus/com/linkedin/testing/urn/BazUrn.java b/testing/test-models/src/main/javaPegasus/com/linkedin/testing/urn/BazUrn.java
@@ -6,7 +6,7 @@
 
 public final class BazUrn extends Urn {
 
-  public static final String ENTITY_TYPE = "entityBaz";
+  public static final String ENTITY_TYPE = "baz";
   // Can be obtained via getEntityKey, but not in open source. We need to unify the internal / external URN definitions.
   private final int _id;
 

diff --git a/testing/test-models/src/main/javaPegasus/com/linkedin/testing/urn/FooUrn.java b/testing/test-models/src/main/javaPegasus/com/linkedin/testing/urn/FooUrn.java
@@ -6,7 +6,7 @@
 
 public final class FooUrn extends Urn {
 
-  public static final String ENTITY_TYPE = "entityFoo";
+  public static final String ENTITY_TYPE = "foo";
   // Can be obtained via getEntityKey, but not in open source. We need to unify the internal / external URN definitions.
   private final int _id;