Merge pull request #1035 from atlanhq/FT-772

Adds application typedefs and further data model typedef enhancements
atlanhq · Nov 21, 2024 · 2b64179 · 2b64179
2 parents 69dbbae + ff8f72d
commit 2b64179
Show file tree

Hide file tree

Showing 722 changed files with 8,337 additions and 3,684 deletions.
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -140,7 +140,7 @@ jobs:
           java-version: 17
           distribution: temurin
       - name: Set Gradle heap memory
-        run: echo "GRADLE_OPTS=-Xmx2g" >> $GITHUB_ENV
+        run: echo "GRADLE_OPTS=-Xmx4g" >> $GITHUB_ENV
       - name: Publish Javadoc
         run: |
           ./gradlew gitPublishPush --stacktrace --info

diff --git a/...lone/sdk-extension/src/main/java/com/probable/guacamole/model/assets/GuacamoleColumn.java b/...lone/sdk-extension/src/main/java/com/probable/guacamole/model/assets/GuacamoleColumn.java
@@ -12,7 +12,6 @@
 import com.atlan.model.assets.Attribute;
 import com.atlan.model.assets.Connection;
 import com.atlan.model.assets.IAirflowTask;
-import com.atlan.model.assets.IApplicationContainer;
 import com.atlan.model.assets.IAsset;
 import com.atlan.model.assets.IAtlanQuery;
 import com.atlan.model.assets.ICalculationView;
@@ -28,6 +27,7 @@
 import com.atlan.model.assets.ILineageProcess;
 import com.atlan.model.assets.IMaterializedView;
 import com.atlan.model.assets.IMetric;
+import com.atlan.model.assets.IModelAttribute;
 import com.atlan.model.assets.IModelEntity;
 import com.atlan.model.assets.IReferenceable;
 import com.atlan.model.assets.ISQL;
@@ -77,14 +77,6 @@ public class GuacamoleColumn extends Asset
     @Builder.Default
     String typeName = TYPE_NAME;
 
-    /** ApplicationContainer asset containing this Catalog asset. */
-    @Attribute
-    IApplicationContainer applicationContainer;
-
-    /** Qualified name of the Application Container that contains this asset. */
-    @Attribute
-    String assetApplicationQualifiedName;
-
     /** Calculate view in which this column exists. */
     @Attribute
     ICalculationView calculationView;
@@ -347,9 +339,13 @@ public class GuacamoleColumn extends Asset
     /** Entities implemented by this asset. */
     @Attribute
     @Singular
-    @JsonProperty("modelEntityImplemented")
     SortedSet<IModelEntity> modelImplementedEntities;
 
+    /** Attributes implemented by this asset. */
+    @Attribute
+    @Singular
+    SortedSet<IModelAttribute> modelImplementedAttributes;
+
     /** Materialized view in which this column exists. */
     @Attribute
     @JsonProperty("materialisedView")

diff --git a/...alone/sdk-extension/src/main/java/com/probable/guacamole/model/assets/GuacamoleTable.java b/...alone/sdk-extension/src/main/java/com/probable/guacamole/model/assets/GuacamoleTable.java
@@ -12,7 +12,6 @@
 import com.atlan.model.assets.Attribute;
 import com.atlan.model.assets.Connection;
 import com.atlan.model.assets.IAirflowTask;
-import com.atlan.model.assets.IApplicationContainer;
 import com.atlan.model.assets.IAsset;
 import com.atlan.model.assets.IAtlanQuery;
 import com.atlan.model.assets.ICatalog;
@@ -22,6 +21,7 @@
 import com.atlan.model.assets.IDbtTest;
 import com.atlan.model.assets.IGlossaryTerm;
 import com.atlan.model.assets.ILineageProcess;
+import com.atlan.model.assets.IModelAttribute;
 import com.atlan.model.assets.IModelEntity;
 import com.atlan.model.assets.IReferenceable;
 import com.atlan.model.assets.ISQL;
@@ -69,14 +69,6 @@ public class GuacamoleTable extends Asset implements IGuacamoleTable, ITable, IS
     @Builder.Default
     String typeName = TYPE_NAME;
 
-    /** ApplicationContainer asset containing this Catalog asset. */
-    @Attribute
-    IApplicationContainer applicationContainer;
-
-    /** Qualified name of the Application Container that contains this asset. */
-    @Attribute
-    String assetApplicationQualifiedName;
-
     /** TBC */
     @Attribute
     String alias;
@@ -226,9 +218,13 @@ public class GuacamoleTable extends Asset implements IGuacamoleTable, ITable, IS
     /** Entities implemented by this asset. */
     @Attribute
     @Singular
-    @JsonProperty("modelEntityImplemented")
     SortedSet<IModelEntity> modelImplementedEntities;
 
+    /** Attributes implemented by this asset. */
+    @Attribute
+    @Singular
+    SortedSet<IModelAttribute> modelImplementedAttributes;
+
     /** TBC */
     @Attribute
     @Singular

diff --git a/samples/typedefs/src/main/resources/DataModel.pkl b/samples/typedefs/src/main/resources/DataModel.pkl
@@ -264,10 +264,10 @@ customTypes {
             type = "Catalog"
             attribute = "\(a)ImplementedEntities"
             description = "Entities implemented by this asset."
-          }    
+          }
         }
       }
-    ["data_model_entity_generalization_specialization"] {
+      ["data_model_entity_generalization_specialization"] {
         description = "Represents the generalization-specialization relationship between a general entity (parent) and specialized entities (children)."
         parent {
           type = "\(t)\(dmEntity)"
@@ -290,25 +290,55 @@ customTypes {
     attributes {
       ["\(a)\(dmEntityAssociation)Cardinality"] {
         label = "cardinality"
-        description = "Cardinality of the data entity association."
+        description = "(Deprecated) Cardinality of the data entity association."
         type = "enum"
         enumName = "\(t)CardinalityType"
       }
       ["\(a)\(dmEntityAssociation)Label"] {
         label = "label"
-        description = "Label of the data entity association."
+        description = "(Deprecated) Label of the data entity association."
         type = "string"
       }
       ["\(a)\(dmEntityAssociation)ToQualifiedName"] {
         type = "string"
         indexAs = "keyword"
         description = "Unique name of the association to which this entity is related."
       }
+      ["\(a)\(dmEntityAssociation)ToLabel"] {
+        label = "to label"
+        description = "Label when read from the association to which this entity is related."
+        type = "string"
+      }
+      ["\(a)\(dmEntityAssociation)ToMinCardinality"] {
+        label = "to minimum cardinality"
+        description = "Minimum cardinality of the data entity to which the association exists."
+        type = "long"
+      }
+      ["\(a)\(dmEntityAssociation)ToMaxCardinality"] {
+        label = "to maximum cardinality"
+        description = "Maximum cardinality of the data entity to which the association exists."
+        type = "long"
+      }
       ["\(a)\(dmEntityAssociation)FromQualifiedName"] {
         type = "string"
         indexAs = "keyword"
         description = "Unique name of the association from which this entity is related."
       }
+      ["\(a)\(dmEntityAssociation)FromLabel"] {
+        label = "from label"
+        description = "Label when read from the association from which this entity is related."
+        type = "string"
+      }
+      ["\(a)\(dmEntityAssociation)FromMinCardinality"] {
+        label = "from minimum cardinality"
+        description = "Minimum cardinality of the data entity from which the association exists."
+        type = "long"
+      }
+      ["\(a)\(dmEntityAssociation)FromMaxCardinality"] {
+        label = "from maximum cardinality"
+        description = "Maximum cardinality of the data entity from which the association exists."
+        type = "long"
+      }
     }
     enums {
       ["\(t)CardinalityType"] {
@@ -431,6 +461,21 @@ customTypes {
           }
         }
       }
+      ["data_model_attribute_implemented_assets"] {
+        description = "Relationship between model attributes and their implementing assets."
+        peers {
+          new {
+            type = "\(t)\(dmAttribute)"
+            attribute = "\(a)\(dmAttribute)ImplementedByAssets"
+            description = "Assets that implement this attribute."
+          }
+          new {
+            type = "Catalog"
+            attribute = "\(a)ImplementedAttributes"
+            description = "Attributes implemented by this asset."
+          }
+        }
+      }
     }
   }
 
@@ -441,25 +486,55 @@ customTypes {
     attributes {
       ["\(a)\(dmAttributeAssociation)Cardinality"] {
         label = "cardinality"
-        description = "Cardinality of the data attribute association."
+        description = "(Deprecated) Cardinality of the data attribute association."
         type = "enum"
         enumName = "\(t)CardinalityType"
       }
       ["\(a)\(dmAttributeAssociation)Label"] {
         label = "label"
-        description = "Label of the data attribute association."
+        description = "(Deprecated) Label of the data attribute association."
         type = "string"
       }
       ["\(a)\(dmAttributeAssociation)ToQualifiedName"] {
         type = "string"
         indexAs = "keyword"
         description = "Unique name of the association to which this attribute is related."
       }
+      ["\(a)\(dmAttributeAssociation)ToLabel"] {
+        label = "to label"
+        description = "Label when read from the association to which this attribute is related."
+        type = "string"
+      }
+      ["\(a)\(dmAttributeAssociation)ToMinCardinality"] {
+        label = "to minimum cardinality"
+        description = "Minimum cardinality of the attribute to which the association exists."
+        type = "long"
+      }
+      ["\(a)\(dmAttributeAssociation)ToMaxCardinality"] {
+        label = "to maximum cardinality"
+        description = "Maximum cardinality of the attribute to which the association exists."
+        type = "long"
+      }
       ["\(a)\(dmAttributeAssociation)FromQualifiedName"] {
         type = "string"
         indexAs = "keyword"
         description = "Unique name of the association from which this attribute is related."
       }
+      ["\(a)\(dmAttributeAssociation)FromLabel"] {
+        label = "from label"
+        description = "Label when read from the association from which this attribute is related."
+        type = "string"
+      }
+      ["\(a)\(dmAttributeAssociation)FromMinCardinality"] {
+        label = "from minimum cardinality"
+        description = "Minimum cardinality of the attribute from which the association exists."
+        type = "long"
+      }
+      ["\(a)\(dmAttributeAssociation)FromMaxCardinality"] {
+        label = "from maximum cardinality"
+        description = "Maximum cardinality of the attribute from which the association exists."
+        type = "long"
+      }
       ["\(a)\(dmEntityAssociation)QualifiedName"] {
         type = "string"
         indexAs = "keyword"

diff --git a/sdk/src/main/java/com/atlan/model/assets/ADLSAccount.java b/sdk/src/main/java/com/atlan/model/assets/ADLSAccount.java
@@ -107,14 +107,6 @@ public class ADLSAccount extends Asset
     @Attribute
     ADLSAccountStatus adlsPrimaryDiskState;
 
-    /** ApplicationContainer asset containing this Catalog asset. */
-    @Attribute
-    IApplicationContainer applicationContainer;
-
-    /** Qualified name of the Application Container that contains this asset. */
-    @Attribute
-    String assetApplicationQualifiedName;
-
     /** Location of this asset in Azure. */
     @Attribute
     String azureLocation;
@@ -143,6 +135,11 @@ public class ADLSAccount extends Asset
     @Singular
     SortedSet<ISparkJob> inputToSparkJobs;
 
+    /** Attributes implemented by this asset. */
+    @Attribute
+    @Singular
+    SortedSet<IModelAttribute> modelImplementedAttributes;
+
     /** Entities implemented by this asset. */
     @Attribute
     @Singular

diff --git a/sdk/src/main/java/com/atlan/model/assets/ADLSContainer.java b/sdk/src/main/java/com/atlan/model/assets/ADLSContainer.java
@@ -90,14 +90,6 @@ public class ADLSContainer extends Asset
     @Singular
     SortedSet<IADLSObject> adlsObjects;
 
-    /** ApplicationContainer asset containing this Catalog asset. */
-    @Attribute
-    IApplicationContainer applicationContainer;
-
-    /** Qualified name of the Application Container that contains this asset. */
-    @Attribute
-    String assetApplicationQualifiedName;
-
     /** Location of this asset in Azure. */
     @Attribute
     String azureLocation;
@@ -126,6 +118,11 @@ public class ADLSContainer extends Asset
     @Singular
     SortedSet<ISparkJob> inputToSparkJobs;
 
+    /** Attributes implemented by this asset. */
+    @Attribute
+    @Singular
+    SortedSet<IModelAttribute> modelImplementedAttributes;
+
     /** Entities implemented by this asset. */
     @Attribute
     @Singular

diff --git a/sdk/src/main/java/com/atlan/model/assets/ADLSObject.java b/sdk/src/main/java/com/atlan/model/assets/ADLSObject.java
@@ -135,14 +135,6 @@ public class ADLSObject extends Asset
     @Attribute
     Boolean adlsObjectVersionLevelImmutabilitySupport;
 
-    /** ApplicationContainer asset containing this Catalog asset. */
-    @Attribute
-    IApplicationContainer applicationContainer;
-
-    /** Qualified name of the Application Container that contains this asset. */
-    @Attribute
-    String assetApplicationQualifiedName;
-
     /** Location of this asset in Azure. */
     @Attribute
     String azureLocation;
@@ -171,6 +163,11 @@ public class ADLSObject extends Asset
     @Singular
     SortedSet<ISparkJob> inputToSparkJobs;
 
+    /** Attributes implemented by this asset. */
+    @Attribute
+    @Singular
+    SortedSet<IModelAttribute> modelImplementedAttributes;
+
     /** Entities implemented by this asset. */
     @Attribute
     @Singular

diff --git a/sdk/src/main/java/com/atlan/model/assets/APIField.java b/sdk/src/main/java/com/atlan/model/assets/APIField.java
@@ -99,14 +99,6 @@ public class APIField extends Asset implements IAPIField, IAPI, ICatalog, IAsset
     @Attribute
     String apiSpecVersion;
 
-    /** ApplicationContainer asset containing this Catalog asset. */
-    @Attribute
-    IApplicationContainer applicationContainer;
-
-    /** Qualified name of the Application Container that contains this asset. */
-    @Attribute
-    String assetApplicationQualifiedName;
-
     /** Tasks to which this asset provides input. */
     @Attribute
     @Singular
@@ -122,6 +114,11 @@ public class APIField extends Asset implements IAPIField, IAPI, ICatalog, IAsset
     @Singular
     SortedSet<ISparkJob> inputToSparkJobs;
 
+    /** Attributes implemented by this asset. */
+    @Attribute
+    @Singular
+    SortedSet<IModelAttribute> modelImplementedAttributes;
+
     /** Entities implemented by this asset. */
     @Attribute
     @Singular

diff --git a/sdk/src/main/java/com/atlan/model/assets/APIObject.java b/sdk/src/main/java/com/atlan/model/assets/APIObject.java
@@ -87,14 +87,6 @@ public class APIObject extends Asset implements IAPIObject, IAPI, ICatalog, IAss
     @Attribute
     String apiSpecVersion;
 
-    /** ApplicationContainer asset containing this Catalog asset. */
-    @Attribute
-    IApplicationContainer applicationContainer;
-
-    /** Qualified name of the Application Container that contains this asset. */
-    @Attribute
-    String assetApplicationQualifiedName;
-
     /** Tasks to which this asset provides input. */
     @Attribute
     @Singular
@@ -110,6 +102,11 @@ public class APIObject extends Asset implements IAPIObject, IAPI, ICatalog, IAss
     @Singular
     SortedSet<ISparkJob> inputToSparkJobs;
 
+    /** Attributes implemented by this asset. */
+    @Attribute
+    @Singular
+    SortedSet<IModelAttribute> modelImplementedAttributes;
+
     /** Entities implemented by this asset. */
     @Attribute
     @Singular