Merge pull request #7408 from mandy-chessell/code2023

Add new helper classes to archive builder
odpi · Feb 13, 2023 · 437b687 · 437b687
2 parents 5000ea5 + 9aa4a72
commit 437b687
Show file tree

Hide file tree

Showing 3 changed files with 206 additions and 64 deletions.
diff --git a/...n/java/org/odpi/openmetadata/commonservices/gaf/server/OpenMetadataStoreRESTServices.java b/...n/java/org/odpi/openmetadata/commonservices/gaf/server/OpenMetadataStoreRESTServices.java
@@ -2850,17 +2850,31 @@ public ValidMetadataValueListResponse getValidMetadataValues(String serverName,
                                                                                   handler,
                                                                                   methodName);
 
-                        List<ValidMetadataValue> mapDetails = handler.getValidValueSetMembers(userId,
-                                                                                              detailElement.getGUID(),
-                                                                                              "detail.getGUID()",
-                                                                                              0,
-                                                                                              0,
-                                                                                              false,
-                                                                                              false,
-                                                                                              null,
-                                                                                              methodName);
-
-                        detail.setValidMapNameValues(mapDetails);
+                        if (detailElement == null)
+                        {
+                            detailElement = this.getValidMetadataElement(userId,
+                                                                         this.constructValidValueQualifiedName(typeName,
+                                                                                                               propertyName,
+                                                                                                               detail.getPreferredValue(),
+                                                                                                               null),
+                                                                         handler,
+                                                                         methodName);
+                        }
+
+                        if (detailElement != null)
+                        {
+                            List<ValidMetadataValue> mapDetails = handler.getValidValueSetMembers(userId,
+                                                                                                  detailElement.getGUID(),
+                                                                                                  "detail.getGUID()",
+                                                                                                  0,
+                                                                                                  0,
+                                                                                                  false,
+                                                                                                  false,
+                                                                                                  null,
+                                                                                                  methodName);
+
+                            detail.setValidMapNameValues(mapDetails);
+                        }
                     }
                 }
 

diff --git a/...src/main/java/org/odpi/openmetadata/samples/archiveutilities/GovernanceArchiveHelper.java b/...src/main/java/org/odpi/openmetadata/samples/archiveutilities/GovernanceArchiveHelper.java
@@ -285,7 +285,45 @@ public void addSupportedGovernanceService(String              engineGUID,
      *
      * @param typeName name of process subtype to use - default is GovernanceActionProcess
      * @param qualifiedName unique name for the capability
-     * @param displayName display name for the capability
+     * @param name display name for the capability
+     * @param description description about the capability
+     * @param formula logic for the process
+     * @param domainIdentifier which governance domain - 0=all
+     * @param additionalProperties any other properties
+     * @param extendedProperties properties for subtype
+     * @param classifications list of classifications (if any)
+     *
+     * @return id for the new entity
+     */
+    public String addGovernanceActionProcess(String               typeName,
+                                             String               qualifiedName,
+                                             String               name,
+                                             String               description,
+                                             String               formula,
+                                             int                  domainIdentifier,
+                                             Map<String, String>  additionalProperties,
+                                             Map<String, Object>  extendedProperties,
+                                             List<Classification> classifications)
+    {
+        return this.addGovernanceActionProcess(typeName,
+                                               qualifiedName,
+                                               name,
+                                               null,
+                                               description,
+                                               formula,
+                                               domainIdentifier,
+                                               additionalProperties,
+                                               extendedProperties,
+                                               classifications);
+    }
+
+
+    /**
+     * Create a governance action process.
+     *
+     * @param typeName name of process subtype to use - default is GovernanceActionProcess
+     * @param qualifiedName unique name for the capability
+     * @param name display name for the capability
      * @param description description about the capability
      * @param formula logic for the process
      * @param domainIdentifier which governance domain - 0=all
@@ -297,7 +335,8 @@ public void addSupportedGovernanceService(String              engineGUID,
      */
     public String addGovernanceActionProcess(String               typeName,
                                              String               qualifiedName,
-                                             String               displayName,
+                                             String               name,
+                                             String               versionIdentifier,
                                              String               description,
                                              String               formula,
                                              int                  domainIdentifier,
@@ -323,7 +362,8 @@ public String addGovernanceActionProcess(String               typeName,
 
         return super.addProcess(processTypeName,
                                 qualifiedName,
-                                displayName,
+                                name,
+                                versionIdentifier,
                                 description,
                                 formula,
                                 additionalProperties,