Merge pull request #8371 from mandy-chessell/oak2024

Fix karma point collection and open lineage publication
odpi · Sep 2, 2024 · 5580a37 · 5580a37
2 parents d8297d8 + 4ae052f
commit 5580a37
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 34 deletions.
diff --git a/CoreContentPackGUIDMap.json b/CoreContentPackGUIDMap.json
diff --git a/content-packs/CoreContentPack.omarchive b/content-packs/CoreContentPack.omarchive
diff --git a/...s/connectors/integration/openlineage/GovernanceActionOpenLineageIntegrationConnector.java b/...s/connectors/integration/openlineage/GovernanceActionOpenLineageIntegrationConnector.java
@@ -103,7 +103,7 @@ public void processEvent(AssetManagerOutTopicEvent event)
             try
             {
                 String previousActionStatus = getActionStatus(event.getPreviousElementProperties());
-                String currentActionStatus = getActionStatus(event.getPreviousElementProperties());
+                String currentActionStatus = getActionStatus(event.getElementProperties());
 
                 /*
                  * Only output an event if the status has changed.

diff --git a/...main/java/org/odpi/openmetadata/commonservices/generichandlers/ActorProfileConverter.java b/...main/java/org/odpi/openmetadata/commonservices/generichandlers/ActorProfileConverter.java
@@ -114,7 +114,7 @@ public B getNewComplexBean(Class<B>           beanClass,
                                     UserIdentityElement    userBean       = new UserIdentityElement();
                                     UserIdentityProperties userProperties = new UserIdentityProperties();
 
-                                    bean.setElementHeader(this.getMetadataElementHeader(beanClass, entity, methodName));
+                                    userBean.setElementHeader(this.getMetadataElementHeader(beanClass, entity, methodName));
 
                                     InstanceProperties entityProperties = new InstanceProperties(entity.getProperties());
 

diff --git a/...c/main/java/org/odpi/openmetadata/commonservices/generichandlers/ActorProfileHandler.java b/...c/main/java/org/odpi/openmetadata/commonservices/generichandlers/ActorProfileHandler.java
@@ -968,16 +968,16 @@ public B getActorProfileByGUID(String  userId,
      * @throws UserNotAuthorizedException the user is not authorized to issue this request
      * @throws PropertyServerException    there is a problem reported in the open metadata server(s)
      */
-    public B getActorProfileForUser(String  userId,
-                                    String  profileUserId,
-                                    String  profileUserIdParameterName,
-                                    String  typeName,
-                                    boolean forLineage,
-                                    boolean forDuplicateProcessing,
-                                    Date    effectiveTime,
-                                    String  methodName) throws InvalidParameterException,
-                                                               UserNotAuthorizedException,
-                                                               PropertyServerException
+    public EntityDetail getActorProfileEntityForUser(String  userId,
+                                                     String  profileUserId,
+                                                     String  profileUserIdParameterName,
+                                                     String  typeName,
+                                                     boolean forLineage,
+                                                     boolean forDuplicateProcessing,
+                                                     Date    effectiveTime,
+                                                     String  methodName) throws InvalidParameterException,
+                                                                                UserNotAuthorizedException,
+                                                                                PropertyServerException
     {
         final String userGUIDParameterName = "userIdentity.getGUID";
 
@@ -997,36 +997,79 @@ public B getActorProfileForUser(String  userId,
 
         if (userIdentity != null)
         {
-            EntityDetail entity = this.getAttachedEntity(userId,
-                                                         userIdentity.getGUID(),
-                                                         userGUIDParameterName,
-                                                         OpenMetadataType.USER_IDENTITY_TYPE_NAME,
-                                                         OpenMetadataType.PROFILE_IDENTITY_RELATIONSHIP_TYPE_GUID,
-                                                         OpenMetadataType.PROFILE_IDENTITY_RELATIONSHIP_TYPE_NAME,
-                                                         typeName,
-                                                         1,
-                                                         forLineage,
-                                                         forDuplicateProcessing,
-                                                         supportedZones,
-                                                         effectiveTime,
-                                                         methodName);
-
-            if (entity != null)
-            {
-                return getFullProfileBean(userId,
-                                          entity,
+            return this.getAttachedEntity(userId,
+                                          userIdentity.getGUID(),
+                                          userGUIDParameterName,
+                                          OpenMetadataType.USER_IDENTITY_TYPE_NAME,
+                                          OpenMetadataType.PROFILE_IDENTITY_RELATIONSHIP_TYPE_GUID,
+                                          OpenMetadataType.PROFILE_IDENTITY_RELATIONSHIP_TYPE_NAME,
                                           typeName,
+                                          1,
                                           forLineage,
                                           forDuplicateProcessing,
+                                          supportedZones,
                                           effectiveTime,
                                           methodName);
-            }
         }
 
         return null;
     }
 
 
+    /**
+     * Retrieve the profile metadata element with the supplied unique identifier.
+     *
+     * @param userId calling user
+     * @param profileUserId unique name of the linked user id
+     * @param profileUserIdParameterName parameter name of profileUserId
+     * @param typeName unique name of the type of the profile to retrieve
+     * @param forLineage the request is to support lineage retrieval this means entities with the Memento classification can be returned
+     * @param forDuplicateProcessing the request is for duplicate processing and so must not deduplicate
+     * @param effectiveTime the time that the retrieved elements must be effective for (null for any time, new Date() for now)
+     * @param methodName calling method
+     *
+     * @return matching metadata element
+     *
+     * @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)
+     */
+    public B getActorProfileForUser(String  userId,
+                                    String  profileUserId,
+                                    String  profileUserIdParameterName,
+                                    String  typeName,
+                                    boolean forLineage,
+                                    boolean forDuplicateProcessing,
+                                    Date    effectiveTime,
+                                    String  methodName) throws InvalidParameterException,
+                                                               UserNotAuthorizedException,
+                                                               PropertyServerException
+    {
+        EntityDetail entity = this.getActorProfileEntityForUser(userId,
+                                                                profileUserId,
+                                                                profileUserIdParameterName,
+                                                                typeName,
+                                                                forLineage,
+                                                                forDuplicateProcessing,
+                                                                effectiveTime,
+                                                                methodName);
+
+        if (entity != null)
+        {
+            return getFullProfileBean(userId,
+                                      entity,
+                                      typeName,
+                                      forLineage,
+                                      forDuplicateProcessing,
+                                      effectiveTime,
+                                      methodName);
+        }
+
+        return null;
+    }
+
+
+
     /**
      * Retrieve the profile metadata element with the supplied unique identifier.
      *

diff --git a/...org/odpi/openmetadata/archiveutilities/openconnectors/IntegrationConnectorDefinition.java b/...org/odpi/openmetadata/archiveutilities/openconnectors/IntegrationConnectorDefinition.java
@@ -179,7 +179,7 @@ public enum IntegrationConnectorDefinition
                                "OpenLineageFilePublisher",
                                "olfilepubnpa",
                                null,
-                               null,
+                               "logs/openlineage",
                                null,
                                60,
                                new DeployedImplementationType[]{DeployedImplementationType.FILE_FOLDER, DeployedImplementationType.DATA_FOLDER}),