Merge pull request #8328 from mandy-chessell/oak2024

Add auto-refresh to integration daemon
odpi · Aug 19, 2024 · b3734e2 · b3734e2
2 parents 673a029 + a8c0669
commit b3734e2
Show file tree

Hide file tree

Showing 112 changed files with 5,365 additions and 1,683 deletions.
diff --git a/CocoComboGUIDMap.json b/CocoComboGUIDMap.json
diff --git a/CoreContentPackGUIDMap.json b/CoreContentPackGUIDMap.json
diff --git a/content-packs/CocoBusinessSystemsArchive.omarchive b/content-packs/CocoBusinessSystemsArchive.omarchive
diff --git a/content-packs/CocoClinicalTrialsTemplatesArchive.omarchive b/content-packs/CocoClinicalTrialsTemplatesArchive.omarchive
diff --git a/content-packs/CocoComboArchive.omarchive b/content-packs/CocoComboArchive.omarchive
diff --git a/content-packs/CocoGovernanceEngineDefinitionsArchive.omarchive b/content-packs/CocoGovernanceEngineDefinitionsArchive.omarchive
diff --git a/content-packs/CocoGovernanceProgramArchive.omarchive b/content-packs/CocoGovernanceProgramArchive.omarchive
diff --git a/content-packs/CocoOrganizationArchive.omarchive b/content-packs/CocoOrganizationArchive.omarchive
diff --git a/content-packs/CocoSustainabilityArchive.omarchive b/content-packs/CocoSustainabilityArchive.omarchive
diff --git a/content-packs/CocoTypesArchive.omarchive b/content-packs/CocoTypesArchive.omarchive
diff --git a/content-packs/CoreContentPack.omarchive b/content-packs/CoreContentPack.omarchive
diff --git a/...va/org/odpi/openmetadata/accessservices/assetmanager/handlers/ProcessExchangeHandler.java b/...va/org/odpi/openmetadata/accessservices/assetmanager/handlers/ProcessExchangeHandler.java
@@ -618,11 +618,11 @@ public void setupProcessParent(String                 userId,
         invalidParameterHandler.validateGUID(parentProcessGUID, parentProcessGUIDParameterName, methodName);
         invalidParameterHandler.validateGUID(childProcessGUID, childProcessGUIDParameterName, methodName);
 
-        int containmentTypeOrdinal = ProcessContainmentType.USED.getOpenTypeOrdinal();
+        int containmentTypeOrdinal = ProcessContainmentType.USED.getOrdinal();
 
         if (containmentType != null)
         {
-            containmentTypeOrdinal = containmentType.getOpenTypeOrdinal();
+            containmentTypeOrdinal = containmentType.getOrdinal();
         }
 
         processHandler.setupProcessParent(userId,

diff --git a/...va/org/odpi/openmetadata/accessservices/communityprofile/client/ToDoActionManagement.java b/...va/org/odpi/openmetadata/accessservices/communityprofile/client/ToDoActionManagement.java
@@ -359,7 +359,7 @@ public void reassignToDo(String userId,
 
         List<RelatedMetadataElement> assignedActors = openMetadataStoreClient.getRelatedMetadataElements(userId,
                                                                                                          toDoGUID,
-                                                                                                         1,
+                                                                                                         2,
                                                                                                          OpenMetadataType.ACTION_ASSIGNMENT_RELATIONSHIP_TYPE_NAME,
                                                                                                          false,
                                                                                                          false,
@@ -385,8 +385,8 @@ public void reassignToDo(String userId,
                                                              null,
                                                              null,
                                                              OpenMetadataType.ACTION_ASSIGNMENT_RELATIONSHIP_TYPE_NAME,
-                                                             toDoGUID,
                                                              actorGUID,
+                                                             toDoGUID,
                                                              false,
                                                              false,
                                                              null,

diff --git a/...main/java/org/odpi/openmetadata/accessservices/datamanager/ffdc/DataManagerAuditCode.java b/...main/java/org/odpi/openmetadata/accessservices/datamanager/ffdc/DataManagerAuditCode.java
@@ -116,7 +116,7 @@ public enum DataManagerAuditCode implements AuditLogMessageSet
      * and type name {2} due to exception {3}.  The error message from the exception was {4}
      */
     OUTBOUND_EVENT_EXCEPTION("OMAS-DATA-MANAGER-0018",
-                             AuditLogRecordSeverityLevel.EXCEPTION,
+                             AuditLogRecordSeverityLevel.EVENT,
                              "Unable to send an outbound event of type {0} for instance with unique identifier of {1} and type name {2} due to exception {3}.  The error message from the exception was {4}",
                              "The system detected an exception whilst attempting to send an event to the out topic.  No event is sent.",
                              "Investigate and correct the source of the error.  Once fixed, events will be sent."),

diff --git a/...g/odpi/openmetadata/accessservices/governanceserver/events/GovernanceServerEventType.java b/...g/odpi/openmetadata/accessservices/governanceserver/events/GovernanceServerEventType.java
@@ -51,7 +51,7 @@ public enum GovernanceServerEventType
      */
     REFRESH_INTEGRATION_CONNECTOR_EVENT     (2,
                                           "Refresh Integration Connector Configuration",
-                                          "The configuration for am Integration Connector has changed."),
+                                          "The configuration for an Integration Connector has changed."),
 
 
     /**

diff --git a/...org/odpi/openmetadata/accessservices/governanceserver/ffdc/GovernanceServerAuditCode.java b/...org/odpi/openmetadata/accessservices/governanceserver/ffdc/GovernanceServerAuditCode.java
@@ -148,7 +148,7 @@ public enum GovernanceServerAuditCode implements AuditLogMessageSet
      * for Governance Engine {0} ({1}) has changed
      */
     REFRESH_GOVERNANCE_ENGINE("OMAS-GOVERNANCE-SERVER-0013",
-                              AuditLogRecordSeverityLevel.INFO,
+                              AuditLogRecordSeverityLevel.EVENT,
                              "The Governance Server Open Metadata Access Service (OMAS) sent notification that the configuration for Governance Engine {0} " +
                                      "({1}) has changed",
                              "The access service sends out configuration notifications to ensure listening engine hosts have the most up to-date " +

diff --git a/...nmetadata/accessservices/governanceserver/outtopic/GovernanceServerOMRSTopicListener.java b/...nmetadata/accessservices/governanceserver/outtopic/GovernanceServerOMRSTopicListener.java
@@ -345,6 +345,22 @@ private boolean processRegisteredIntegrationConnector(String       sourceName,
                 {
                     EntityProxy integrationConnectorEntityProxy = relationship.getEntityTwoProxy();
 
+                    if (integrationConnectorEntityProxy != null)
+                    {
+                        eventPublisher.publishRefreshIntegrationConnectorEvent(integrationConnectorEntityProxy.getGUID(),
+                                                                               repositoryHelper.getStringProperty(sourceName,
+                                                                                                                  OpenMetadataProperty.QUALIFIED_NAME.name,
+                                                                                                                  integrationConnectorEntityProxy.getUniqueProperties(),
+                                                                                                                  methodName));
+                        return true;
+                    }
+                }
+                else if (repositoryHelper.isTypeOf(sourceName,
+                                                   type.getTypeDefName(),
+                                                   OpenMetadataType.CATALOG_TARGET_RELATIONSHIP_TYPE_NAME))
+                {
+                    EntityProxy integrationConnectorEntityProxy = relationship.getEntityOneProxy();
+
                     if (integrationConnectorEntityProxy != null)
                     {
                         eventPublisher.publishRefreshIntegrationConnectorEvent(integrationConnectorEntityProxy.getGUID(),

diff --git a/...rs/data-manager-connectors/unity-catalog-connectors/UnityCatalog-demo-cataloguing-uc.http b/...rs/data-manager-connectors/unity-catalog-connectors/UnityCatalog-demo-cataloguing-uc.http
@@ -68,7 +68,7 @@ Content-Type: application/json
 
 ###
 
-@server1GUID=7af2f5a1-211b-4059-9e44-eb21e4093e96
+@server1GUID=281c6358-ee6f-4009-9de9-4ef92a46f393
 
 
 ###