Merge pull request #7827 from mandy-chessell/code2023

Upgrade JDBC and Atlas connectors

open-metadata-distribution/README.md

@@ -3,11 +3,10 @@
 
 # Open Metadata Distribution
 
-This module collects together the Egeria artifacts that are designed for
-used by external consuming websites and technologies.  This includes:
+This module collects together the Egeria artifacts for different scenarios.  This includes:
 
-* The **[Maven packages](open-metadata-packages)** used to embed Egeria into different technologies.
-* The **[assemblies](open-metadata-assemblies)** that provide executables for servers and tool kits.
+* The **[OMAG Server Platform Assembly](omag-server-platform)** assembles the libraries and files for the OMAG Server Platform plus optional resources for use with the platform.
+* The **[Open Metadata Assembly](open-metadata-assemblies)** provides a combination of the OMAG Server Platform and the Egeria UI Application.  This is a legacy and is being replaced with the more specialized assemblies described above.
 
 
 

open-metadata-distribution/omag-server-platform/README.md

@@ -0,0 +1,16 @@
+<!-- SPDX-License-Identifier: CC-BY-4.0 -->
+<!-- Copyright Contributors to the ODPi Egeria project. -->
+
+# OMAG Server Platform Distribution TAR file
+
+The **OMAG Server Platform** module creates a distribution **tar** file that can be copied
+and used to install Egeria's OMAG Server Platform.   For further information see
+[Installing Egeria Tutorial](https://egeria-project.org/education/tutorials/installing-egeria-tutorial).
+
+----
+License: [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/),
+Copyright Contributors to the ODPi Egeria project.
+
+
+
+

open-metadata-distribution/omag-server-platform/docs/extraREADME.md

@@ -0,0 +1,14 @@
+<!-- SPDX-License-Identifier: CC-BY-4.0 -->
+<!-- Copyright Contributors to the ODPi Egeria project. -->
+
+# Extra Libraries
+
+Use this directory to add jar files to the platform's classpath.
+
+----
+License: [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/),
+Copyright Contributors to the ODPi Egeria project.
+
+
+
+

open-metadata-implementation/access-services/asset-lineage/asset-lineage-server/src/main/java/org/odpi/openmetadata/accessservices/assetlineage/listeners/AssetLineageOMRSTopicListener.java

@@ -383,7 +383,7 @@ private boolean isProcessStatusChangedToActive(EntityDetail entityDetail, Entity
     private void logExceptionToAudit(OMRSInstanceEvent instanceEvent, Exception e) {
         String actionDescription = "Asset Lineage OMAS is unable to process an OMRSTopic event.";
 
-        auditLog.logException(actionDescription,
-                AssetLineageAuditCode.EVENT_PROCESSING_EXCEPTION.getMessageDefinition(e.getMessage(), serverName, instanceEvent.getInstanceEventType().getName()), instanceEvent.toString(), e);
+        auditLog.logMessage(actionDescription,
+                AssetLineageAuditCode.EVENT_PROCESSING_EXCEPTION.getMessageDefinition(e.getMessage(), serverName, instanceEvent.getInstanceEventType().getName()), instanceEvent.toString());
     }
 }

open-metadata-implementation/access-services/asset-lineage/asset-lineage-server/src/main/java/org/odpi/openmetadata/accessservices/assetlineage/server/AssetLineageInstanceHandler.java

@@ -156,29 +156,4 @@ public AssetLineagePublisher getAssetLineagePublisher(String userId, String serv
 
         return null;
     }
-
-
-    /**
-     * Retrieve the AuditLog from the service instance.
-     *
-     * @param userId               calling userId
-     * @param serverName           name of the server tied to the request
-     * @param serviceOperationName name of the REST API call (typically the top-level methodName)
-     * @return
-     * @throws org.odpi.openmetadata.commonservices.ffdc.exceptions.InvalidParameterException
-     * @throws org.odpi.openmetadata.commonservices.ffdc.exceptions.PropertyServerException
-     * @throws org.odpi.openmetadata.commonservices.ffdc.exceptions.UserNotAuthorizedException
-     */
-    @Override
-    public AuditLog getAuditLog(String userId, String serverName, String serviceOperationName)
-            throws org.odpi.openmetadata.commonservices.ffdc.exceptions.InvalidParameterException,
-            org.odpi.openmetadata.commonservices.ffdc.exceptions.PropertyServerException,
-            org.odpi.openmetadata.commonservices.ffdc.exceptions.UserNotAuthorizedException {
-
-        AssetLineageServicesInstance instance = (AssetLineageServicesInstance) super.getServerServiceInstance(userId, serverName, serviceOperationName);
-        if (instance != null) {
-            return instance.getAuditLog();
-        }
-        return null;
-    }
 }

open-metadata-implementation/access-services/asset-lineage/asset-lineage-server/src/main/java/org/odpi/openmetadata/accessservices/assetlineage/server/AssetLineageServicesInstance.java

@@ -135,11 +135,6 @@ public AssetLineagePublisher getAssetLineagePublisher() {
     public void setAssetLineagePublisher(AssetLineagePublisher assetLineagePublisher) {
         this.assetLineagePublisher = assetLineagePublisher;
     }
-
-    @Override
-    public AuditLog getAuditLog() {
-        return super.getAuditLog();
-    }
 }
 
 

open-metadata-implementation/access-services/asset-manager/asset-manager-api/src/main/java/org/odpi/openmetadata/accessservices/assetmanager/rest/DataAssetElementsResponse.java

@@ -9,7 +9,6 @@
 import org.odpi.openmetadata.accessservices.assetmanager.metadataelements.DataAssetElement;
 
 import java.io.Serial;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -63,18 +62,7 @@ public DataAssetElementsResponse(DataAssetElementsResponse template)
      */
     public List<DataAssetElement> getElementList()
     {
-        if (elementList == null)
-        {
-            return null;
-        }
-        else if (elementList.isEmpty())
-        {
-            return null;
-        }
-        else
-        {
-            return new ArrayList<>(elementList);
-        }
+        return elementList;
     }
 
 

open-metadata-implementation/access-services/governance-engine/governance-engine-server/src/main/java/org/odpi/openmetadata/accessservices/governanceengine/converters/RelatedElementConverter.java

@@ -5,14 +5,12 @@
 import org.odpi.openmetadata.frameworks.connectors.ffdc.PropertyServerException;
 import org.odpi.openmetadata.frameworks.governanceaction.properties.OpenMetadataElement;
 import org.odpi.openmetadata.frameworks.governanceaction.properties.RelatedMetadataElement;
-import org.odpi.openmetadata.frameworks.governanceaction.search.ElementProperties;
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.instances.EntityDetail;
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.instances.InstanceProperties;
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.instances.Relationship;
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.repositoryconnector.OMRSRepositoryHelper;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.Map;
 
 
 /**
@@ -82,7 +80,7 @@ public B getNewBean(Class<B>     beanClass,
 
                 super.fillOpenMetadataElement(relatedBean, entity);
 
-                bean.setElementProperties(relatedBean);
+                bean.setElement(relatedBean);
             }
 
             return returnBean;

open-metadata-implementation/access-services/governance-engine/governance-engine-server/src/main/java/org/odpi/openmetadata/accessservices/governanceengine/converters/RelatedElementsConverter.java

@@ -8,6 +8,7 @@
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.instances.EntityProxy;
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.instances.InstanceProperties;
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.instances.Relationship;
+import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.typedefs.RelationshipDef;
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.repositoryconnector.OMRSRepositoryHelper;
 
 import java.lang.reflect.InvocationTargetException;
@@ -82,6 +83,12 @@ public B getNewRelationshipBean(Class<B>     beanClass,
                 entityProxy = relationship.getEntityTwoProxy();
 
                 bean.setElementGUIDAtEnd2(entityProxy.getGUID());
+
+                if (repositoryHelper.getTypeDefByName(serviceName, relationship.getType().getTypeDefName()) instanceof RelationshipDef relationshipDef)
+                {
+                    bean.setLabelAtEnd1(relationshipDef.getEndDef1().getAttributeName());
+                    bean.setLabelAtEnd2(relationshipDef.getEndDef2().getAttributeName());
+                }
             }
 
             return returnBean;

open-metadata-implementation/access-services/governance-engine/governance-engine-server/src/main/java/org/odpi/openmetadata/accessservices/governanceengine/outtopic/GovernanceEngineOMRSTopicListener.java

@@ -27,6 +27,7 @@
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.instances.EntitySummary;
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.instances.InstanceType;
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.instances.Relationship;
+import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.typedefs.RelationshipDef;
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.typedefs.TypeDefSummary;
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.repositoryconnector.OMRSRepositoryHelper;
 
@@ -440,6 +441,12 @@ private RelatedMetadataElements getRelatedElements(Relationship relationship)
                 relatedMetadataElements.setElementGUIDAtEnd2(relationship.getEntityTwoProxy().getGUID());
             }
 
+            if (repositoryHelper.getTypeDefByName(serviceName, relationship.getType().getTypeDefName()) instanceof RelationshipDef relationshipDef)
+            {
+                relatedMetadataElements.setLabelAtEnd1(relationshipDef.getEndDef1().getAttributeName());
+                relatedMetadataElements.setLabelAtEnd2(relationshipDef.getEndDef2().getAttributeName());
+            }
+
             return relatedMetadataElements;
         }