fix: validate entity type for an urn

li-utils/src/main/java/com/linkedin/common/urn/AzkabanFlowUrn.java

@@ -38,6 +38,7 @@ public String getFlowIdEntity() {
   }
 
   public static AzkabanFlowUrn createFromString(String rawUrn) throws URISyntaxException {
+    validateUrn(rawUrn, ENTITY_TYPE);
     String content = new Urn(rawUrn).getContent();
     String[] parts = content.substring(1, content.length() - 1).split(",");
     return new AzkabanFlowUrn(parts[0], parts[1], parts[2]);

li-utils/src/main/java/com/linkedin/common/urn/AzkabanJobUrn.java

@@ -31,6 +31,7 @@ public String getJobIdEntity() {
   }
 
   public static AzkabanJobUrn createFromString(String rawUrn) throws URISyntaxException {
+    validateUrn(rawUrn, ENTITY_TYPE);
     String content = new Urn(rawUrn).getContent();
     String flowParts = content.substring(1, content.lastIndexOf(",") + 1);
     String[] parts = content.substring(1, content.length() - 1).split(",");

li-utils/src/main/java/com/linkedin/common/urn/ChartUrn.java

@@ -31,9 +31,8 @@ public String getChartIdEntity() {
   }
 
   public static ChartUrn createFromString(String rawUrn) throws URISyntaxException {
-    Urn urn = new Urn(rawUrn);
-    validateUrn(urn, ENTITY_TYPE);
-    String[] urnParts = urn.getContent().split(",");
+    validateUrn(rawUrn, ENTITY_TYPE);
+    String[] urnParts = new Urn(rawUrn).getContent().split(",");
     return new ChartUrn(urnParts[0], urnParts[1]);
   }
 

li-utils/src/main/java/com/linkedin/common/urn/CorpGroupUrn.java

@@ -25,14 +25,13 @@ public String getGroupNameEntity() {
   }
 
   public static CorpGroupUrn createFromString(String rawUrn) throws URISyntaxException {
+    validateUrn(rawUrn, ENTITY_TYPE);
     String groupName = new Urn(rawUrn).getContent();
     return new CorpGroupUrn(groupName);
   }
 
   public static CorpGroupUrn createFromUrn(Urn urn) throws URISyntaxException {
-    if (!ENTITY_TYPE.equals(urn.getEntityType())) {
-      throw new URISyntaxException(urn.toString(), "Can't cast URN to CorpGroupUrn, not same ENTITY");
-    }
+    validateUrn(urn, ENTITY_TYPE);
 
     Matcher matcher = URN_PATTERN.matcher(urn.toString());
     if (matcher.find()) {

li-utils/src/main/java/com/linkedin/common/urn/CorpuserUrn.java

@@ -26,14 +26,13 @@ public String getUsernameEntity() {
   }
 
   public static CorpuserUrn createFromString(String rawUrn) throws URISyntaxException {
+    validateUrn(rawUrn, ENTITY_TYPE);
     String username = new Urn(rawUrn).getContent();
     return new CorpuserUrn(username);
   }
 
   public static CorpuserUrn createFromUrn(Urn urn) throws URISyntaxException {
-    if (!ENTITY_TYPE.equals(urn.getEntityType())) {
-      throw new URISyntaxException(urn.toString(), "Can't cast URN to CorpuserUrn, not same ENTITY");
-    }
+    validateUrn(urn, ENTITY_TYPE);
 
     Matcher matcher = URN_PATTERN.matcher(urn.toString());
     if (matcher.find()) {

li-utils/src/main/java/com/linkedin/common/urn/DashboardUrn.java

@@ -31,9 +31,8 @@ public String getDashboardIdEntity() {
   }
 
   public static DashboardUrn createFromString(String rawUrn) throws URISyntaxException {
-    Urn urn = new Urn(rawUrn);
-    validateUrn(urn, ENTITY_TYPE);
-    String[] urnParts = urn.getContent().split(",");
+    validateUrn(rawUrn, ENTITY_TYPE);
+    String[] urnParts = new Urn(rawUrn).getContent().split(",");
     return new DashboardUrn(urnParts[0], urnParts[1]);
   }
 

li-utils/src/main/java/com/linkedin/common/urn/DataPlatformUrn.java

@@ -23,6 +23,7 @@ public String getPlatformNameEntity() {
   }
 
   public static DataPlatformUrn createFromString(String rawUrn) throws URISyntaxException {
+    validateUrn(rawUrn, ENTITY_TYPE);
     String platformName = new Urn(rawUrn).getContent();
     return new DataPlatformUrn(platformName);
   }

li-utils/src/main/java/com/linkedin/common/urn/DataProcessUrn.java

@@ -40,6 +40,7 @@ public FabricType getOriginEntity() {
     }
 
     public static DataProcessUrn createFromString(String rawUrn) throws URISyntaxException {
+        validateUrn(rawUrn, ENTITY_TYPE);
         String content = new Urn(rawUrn).getContent();
         String[] parts = content.substring(1, content.length() - 1).split(",");
         return new DataProcessUrn(parts[0], parts[1], toFabricType(parts[2]));

li-utils/src/main/java/com/linkedin/common/urn/DatasetUrn.java

@@ -41,6 +41,7 @@ public FabricType getOriginEntity() {
   }
 
   public static DatasetUrn createFromString(String rawUrn) throws URISyntaxException {
+    validateUrn(rawUrn, ENTITY_TYPE);
     String content = new Urn(rawUrn).getContent();
     String[] parts = content.substring(1, content.length() - 1).split(",");
     return new DatasetUrn(DataPlatformUrn.createFromString(parts[0]), parts[1], toFabricType(parts[2]));

li-utils/src/main/java/com/linkedin/common/urn/MLModelUrn.java

@@ -39,6 +39,7 @@ public FabricType getOriginEntity() {
   }
 
   public static MLModelUrn createFromString(String rawUrn) throws URISyntaxException {
+    validateUrn(rawUrn, ENTITY_TYPE);
     String content = new Urn(rawUrn).getContent();
     String[] parts = content.substring(1, content.length() - 1).split(",");
     return new MLModelUrn(DataPlatformUrn.createFromString(parts[0]), parts[1], toFabricType(parts[2]));

li-utils/src/main/java/com/linkedin/common/urn/Urn.java

@@ -91,6 +91,12 @@ public static Urn deserialize(String rawUrn) throws URISyntaxException {
     return createFromString(rawUrn);
   }
 
+  public static void validateUrn(@Nonnull String rawUrn, @Nonnull String entityType)
+      throws URISyntaxException {
+    final Urn urn = new Urn(rawUrn);
+    validateUrn(urn, entityType);
+  }
+
   public static void validateUrn(@Nonnull Urn urn, @Nonnull String entityType)
       throws URISyntaxException {
     if (!entityType.equals(urn.getEntityType())) {