Merge branch 'main' of https://github.com/odpi/egeria into feature/ne…

…w-server-config Signed-off-by: Ljupcho Palashevski <[email protected]> # Conflicts: # open-metadata-implementation/server-chassis/server-chassis-spring/src/main/java/org/odpi/openmetadata/serverchassis/springboot/OMAGServer.java # open-metadata-implementation/server-chassis/server-chassis-spring/src/main/java/org/odpi/openmetadata/serverchassis/springboot/config/OMAGServerProperties.java # open-metadata-implementation/server-chassis/server-chassis-spring/src/main/java/org/odpi/openmetadata/serverchassis/springboot/config/OMAGServicesConfiguration.java
lpalashevski · Aug 15, 2023 · 24daa4f · 24daa4f
2 parents abe4d4d + f9c3081
commit 24daa4f
Show file tree

Hide file tree

Showing 202 changed files with 20,367 additions and 4,316 deletions.
diff --git a/open-metadata-distribution/open-metadata-assemblies/build.gradle b/open-metadata-distribution/open-metadata-assemblies/build.gradle
@@ -31,11 +31,13 @@ dependencies {
     implementation project(':open-metadata-implementation:adapters:open-connectors:data-store-connectors:file-connectors:basic-file-connector')
     implementation project(':open-metadata-implementation:adapters:open-connectors:data-store-connectors:file-connectors:csv-file-connector')
     implementation project(':open-metadata-implementation:adapters:open-connectors:data-store-connectors:file-connectors:data-folder-connector')
+    implementation project(':open-metadata-implementation:adapters:open-connectors:data-store-connectors:jdbc-resource-connector')
     implementation project(':open-metadata-implementation:adapters:open-connectors:configuration-store-connectors:configuration-encrypted-file-store-connector')
     implementation project(':open-metadata-implementation:adapters:open-connectors:configuration-store-connectors:configuration-file-store-connector')
     implementation project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:files-integration-connectors')
     implementation project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:kafka-integration-connector')
     implementation project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:atlas-integration-connector')
+    implementation project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:jdbc-integration-connector')
     implementation project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:openapi-integration-connector')
     implementation project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:openlineage-integration-connectors')
     implementation project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:elasticsearch-integration-connector')
@@ -134,13 +136,15 @@ distributions {
                 from { project(':open-metadata-implementation:adapters:open-connectors:data-store-connectors:file-connectors:basic-file-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:data-store-connectors:file-connectors:csv-file-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:data-store-connectors:file-connectors:data-folder-connector').jar }
+                from { project(':open-metadata-implementation:adapters:open-connectors:data-store-connectors:jdbc-resource-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:configuration-store-connectors:configuration-encrypted-file-store-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:configuration-store-connectors:configuration-file-store-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:discovery-service-connectors').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:dynamic-archiver-connectors').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:governance-action-connectors').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:files-integration-connectors').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:atlas-integration-connector').jar }
+                from { project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:jdbc-integration-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:kafka-integration-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:openapi-integration-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:openlineage-integration-connectors').jar }
@@ -177,6 +181,7 @@ distributions {
                 from { project(':open-metadata-implementation:adapters:open-connectors:data-store-connectors:file-connectors:basic-file-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:data-store-connectors:file-connectors:csv-file-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:data-store-connectors:file-connectors:data-folder-connector').jar }
+                from { project(':open-metadata-implementation:adapters:open-connectors:data-store-connectors:jdbc-resource-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:configuration-store-connectors:configuration-encrypted-file-store-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:configuration-store-connectors:configuration-file-store-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:discovery-service-connectors').jar }
@@ -185,6 +190,7 @@ distributions {
                 from { project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:files-integration-connectors').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:atlas-integration-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:kafka-integration-connector').jar }
+                from { project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:jdbc-integration-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:openapi-integration-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:openlineage-integration-connectors').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:elasticsearch-integration-connector').jar }

diff --git a/...odpi/openmetadata/accessservices/assetmanager/api/exchange/GlossaryExchangeInterface.java b/...odpi/openmetadata/accessservices/assetmanager/api/exchange/GlossaryExchangeInterface.java
@@ -2032,6 +2032,7 @@ List<GlossaryTermElement>    getTermsForGlossaryCategory(String
      * @param assetManagerGUID unique identifier of software capability representing the caller
      * @param assetManagerName unique name of software capability representing the caller
      * @param glossaryTermGUID unique identifier of the glossary term of interest
+     * @param limitResultsByStatus list of statuses that the term must have
      * @param startFrom paging start point
      * @param pageSize maximum results that can be returned
      * @param effectiveTime the time that the retrieved elements must be effective for

diff --git a/.../odpi/openmetadata/accessservices/assetmanager/api/exchange/LineageExchangeInterface.java b/.../odpi/openmetadata/accessservices/assetmanager/api/exchange/LineageExchangeInterface.java
@@ -1556,6 +1556,7 @@ List<ProcessCallElement> getProcessCallers(String  userId,
      * @param forLineage return elements marked with the Memento classification?
      * @param forDuplicateProcessing do not merge elements marked as duplicates?
      *
+     * @return unique identifier of the relationship
      * @throws InvalidParameterException  one of the parameters is invalid
      * @throws UserNotAuthorizedException the user is not authorized to issue this request
      * @throws PropertyServerException    there is a problem reported in the open metadata server(s)

diff --git a/.../java/org/odpi/openmetadata/accessservices/assetmanager/events/AssetManagerEventType.java b/.../java/org/odpi/openmetadata/accessservices/assetmanager/events/AssetManagerEventType.java
@@ -20,17 +20,64 @@
 @JsonIgnoreProperties(ignoreUnknown=true)
 public enum AssetManagerEventType implements Serializable
 {
+    /**
+     * An event that is not recognized by the local server.
+     */
     UNKNOWN_EVENT          (0,  "Unknown Event",         "An event that is not recognized by the local server."),
+
+    /**
+     * An element has been distributed around the cohort - could be for the first time.
+     */
     REFRESH_ELEMENT_EVENT  (1,  "Refresh Element",       "An element has been distributed around the cohort - could be for the first time."),
+
+    /**
+     * A new element has been created.
+     */
     NEW_ELEMENT_CREATED    (2,  "New Element",           "A new element has been created."),
+
+    /**
+     * An element's properties has been updated.
+     */
     ELEMENT_UPDATED        (3,  "Element Updated",       "An element's properties has been updated."),
+
+    /**
+     * An element and all its anchored elements have been deleted.
+     */
     ELEMENT_DELETED        (4,  "Element Deleted",       "An element and all its anchored elements have been deleted."),
+
+    /**
+     * A classification has been added to an element.
+     */
     ELEMENT_CLASSIFIED     (5,  "Element Classified",    "A classification has been added to an element."),
+
+    /**
+     * The properties for a classification attached to an element have been updated.
+     */
     ELEMENT_RECLASSIFIED   (6,  "Element Reclassified",  "The properties for a classification attached to an element have been updated."),
+
+    /**
+     * A classification has been removed from an element.
+     */
     ELEMENT_DECLASSIFIED   (7,  "Element Declassified",  "A classification has been removed from an element."),
+
+    /**
+     * An element that was once deleted has been restored.
+     */
     ELEMENT_RESTORED       (8,  "Element Restored",      "An element that was once deleted has been restored."),
+
+    /**
+     * An element's GUID has changed.
+     */
     ELEMENT_GUID_CHANGED   (9,  "Element GUID Changed",  "An element's GUID has changed."),
+
+    /**
+     * An element's type has changed.
+     */
     ELEMENT_TYPE_CHANGED   (10, "Element Type Changed",  "An element's type has changed."),
+
+    /**
+     * An element's home has changed.
+     */
     ELEMENT_HOME_CHANGED   (11, "Element Home Changed",  "An element's home has changed."),
     ;
 

diff --git a/.../openmetadata/accessservices/assetmanager/metadataelements/MetadataCorrelationHeader.java b/.../openmetadata/accessservices/assetmanager/metadataelements/MetadataCorrelationHeader.java
@@ -25,8 +25,6 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class MetadataCorrelationHeader extends MetadataCorrelationProperties
 {
-    @Serial
-    private static final long serialVersionUID = 1L;
     private              Date lastSynchronized = null;
 
 
@@ -91,13 +89,18 @@ public String toString()
                        "lastSynchronized=" + lastSynchronized +
                        ", assetManagerGUID='" + getAssetManagerGUID() + '\'' +
                        ", assetManagerName='" + getAssetManagerName() + '\'' +
-                       ", permittedSynchronization=" + getSynchronizationDirection() +
+                       ", synchronizationDirection=" + getSynchronizationDirection() +
                        ", synchronizationDescription='" + getSynchronizationDescription() + '\'' +
                        ", externalIdentifier='" + getExternalIdentifier() + '\'' +
                        ", externalIdentifierName='" + getExternalIdentifierName() + '\'' +
                        ", externalIdentifierUsage='" + getExternalIdentifierUsage() + '\'' +
                        ", externalIdentifierSource='" + getExternalIdentifierSource() + '\'' +
                        ", keyPattern=" + getKeyPattern() +
+                       ", externalInstanceCreatedBy='" + getExternalInstanceCreatedBy() + '\'' +
+                       ", externalInstanceCreationTime=" + getExternalInstanceCreationTime() +
+                       ", externalInstanceLastUpdatedBy='" + getExternalInstanceLastUpdatedBy() + '\'' +
+                       ", externalInstanceLastUpdateTime=" + getExternalInstanceLastUpdateTime() +
+                       ", externalInstanceVersion=" + getExternalInstanceVersion() +
                        ", mappingProperties=" + getMappingProperties() +
                        '}';
     }

diff --git a/...ava/org/odpi/openmetadata/accessservices/assetmanager/properties/DataAssetProperties.java b/...ava/org/odpi/openmetadata/accessservices/assetmanager/properties/DataAssetProperties.java
@@ -27,7 +27,8 @@
         })
 public class DataAssetProperties extends AssetProperties
 {
-    private boolean isReferenceAsset = false;
+    private boolean isReferenceAsset           = false;
+    private String  deployedImplementationType = null;
 
 
     /**
@@ -50,6 +51,7 @@ public DataAssetProperties(DataAssetProperties template)
         if (template != null)
         {
             isReferenceAsset = template.getIsReferenceAsset();
+            deployedImplementationType = template.getDeployedImplementationType();
         }
     }
 
@@ -76,6 +78,28 @@ public void setIsReferenceAsset(boolean referenceAsset)
     }
 
 
+    /**
+     * Retrieve the name of the technology used for this data asset.
+     *
+     * @return string name
+     */
+    public String getDeployedImplementationType()
+    {
+        return deployedImplementationType;
+    }
+
+
+    /**
+     * Set up the name of the technology used for this data asset.
+     *
+     * @param deployedImplementationType string name
+     */
+    public void setDeployedImplementationType(String deployedImplementationType)
+    {
+        this.deployedImplementationType = deployedImplementationType;
+    }
+
+
     /**
      * Standard toString method.
      *
@@ -89,6 +113,7 @@ public String toString()
                        ", versionIdentifier='" + getVersionIdentifier() + '\'' +
                        ", technicalDescription='" + getTechnicalDescription() + '\'' +
                        ", isReferenceAsset=" + isReferenceAsset +
+                       ", deployedImplementationType=" + deployedImplementationType +
                        ", qualifiedName='" + getQualifiedName() + '\'' +
                        ", additionalProperties=" + getAdditionalProperties() +
                        ", effectiveFrom=" + getEffectiveFrom() +

diff --git a/.../java/org/odpi/openmetadata/accessservices/assetmanager/properties/DataSetProperties.java b/.../java/org/odpi/openmetadata/accessservices/assetmanager/properties/DataSetProperties.java
@@ -107,6 +107,7 @@ public String toString()
                        ", versionIdentifier='" + getVersionIdentifier() + '\'' +
                        ", technicalDescription='" + getTechnicalDescription() + '\'' +
                        ", isReferenceAsset=" + getIsReferenceAsset() +
+                       ", deployedImplementationType=" + getDeployedImplementationType() +
                        ", formula='" + formula + '\'' +
                        ", formulaType='" + formulaType + '\'' +
                        ", qualifiedName='" + getQualifiedName() + '\'' +

diff --git a/...ava/org/odpi/openmetadata/accessservices/assetmanager/properties/DataStoreProperties.java b/...ava/org/odpi/openmetadata/accessservices/assetmanager/properties/DataStoreProperties.java
@@ -252,6 +252,7 @@ public String toString()
                        ", encodingDescription='" + encodingDescription + '\'' +
                        ", encodingProperties=" + encodingProperties +
                        ", isReferenceAsset=" + getIsReferenceAsset() +
+                       ", deployedImplementationType=" + getDeployedImplementationType() +
                        ", technicalName='" + getTechnicalName() + '\'' +
                        ", versionIdentifier='" + getVersionIdentifier() + '\'' +
                        ", technicalDescription='" + getTechnicalDescription() + '\'' +