odpi · mandy-chessell · Oct 9, 2024 · Oct 9, 2024
diff --git a/EgeriaContentPacksGUIDMap.json b/EgeriaContentPacksGUIDMap.json
diff --git a/content-packs/APIsContentPack.omarchive b/content-packs/APIsContentPack.omarchive
diff --git a/content-packs/ApacheAtlasContentPack.omarchive b/content-packs/ApacheAtlasContentPack.omarchive
diff --git a/content-packs/ApacheKafkaContentPack.omarchive b/content-packs/ApacheKafkaContentPack.omarchive
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/content-packs/ObservabilityContentPack.omarchive b/content-packs/ObservabilityContentPack.omarchive
diff --git a/content-packs/OpenMetadataTypes.omarchive b/content-packs/OpenMetadataTypes.omarchive
diff --git a/content-packs/PostgresContentPack.omarchive b/content-packs/PostgresContentPack.omarchive
diff --git a/content-packs/UnityCatalogContentPack.omarchive b/content-packs/UnityCatalogContentPack.omarchive
@@ -47,6 +47,7 @@ public DigitalServiceBuilder(String               qualifiedName,
      * @param serviceName name of this OMAS
      * @param serverName name of local server
      */
+    @SuppressWarnings(value = "deprecation")
     public DigitalServiceBuilder(String                                 displayName,
                                  String                                 description,
                                  String                                 versionNumber,

@@ -691,6 +691,7 @@ private File getFileBasedKeystore(boolean generateIfNotExists) {
      *
      * @return File
      */
+    @SuppressWarnings(value = "deprecation")
     private File createKeyStore() {
 
         final String methodName = "createKeyStore";

@@ -173,7 +173,7 @@ public InstanceProperties getInstanceProperties(String  methodName) throws Inval
 
         properties = repositoryHelper.addStringPropertyToInstance(serviceName,
                                                                   properties,
-                                                                  OpenMetadataType.SUPPORTED_ASSET_TYPE_NAME,
+                                                                  OpenMetadataProperty.SUPPORTED_ASSET_TYPE_NAME.name,
                                                                   supportedAssetTypeName,
                                                                   methodName);
 
@@ -185,7 +185,7 @@ public InstanceProperties getInstanceProperties(String  methodName) throws Inval
 
         properties = repositoryHelper.addStringPropertyToInstance(serviceName,
                                                                   properties,
-                                                                  OpenMetadataType.EXPECTED_DATA_FORMAT,
+                                                                  OpenMetadataProperty.EXPECTED_DATA_FORMAT.name,
                                                                   expectedDataFormat,
                                                                   methodName);
 
@@ -197,43 +197,43 @@ public InstanceProperties getInstanceProperties(String  methodName) throws Inval
 
         properties = repositoryHelper.addStringPropertyToInstance(serviceName,
                                                                   properties,
-                                                                  OpenMetadataType.CONNECTOR_FRAMEWORK_NAME,
+                                                                  OpenMetadataProperty.CONNECTOR_FRAMEWORK_NAME.name,
                                                                   connectorFrameworkName,
                                                                   methodName);
 
         properties = repositoryHelper.addStringPropertyToInstance(serviceName,
                                                                   properties,
-                                                                  OpenMetadataType.CONNECTOR_INTERFACE_LANGUAGE,
+                                                                  OpenMetadataProperty.CONNECTOR_INTERFACE_LANGUAGE.name,
                                                                   connectorInterfaceLanguage,
                                                                   methodName);
 
         properties = repositoryHelper.addStringArrayPropertyToInstance(serviceName,
                                                                        properties,
-                                                                       OpenMetadataType.CONNECTOR_INTERFACES,
+                                                                       OpenMetadataProperty.CONNECTOR_INTERFACES.name,
                                                                        connectorInterfaces,
                                                                        methodName);
 
         properties = repositoryHelper.addStringPropertyToInstance(serviceName,
                                                                   properties,
-                                                                  OpenMetadataType.TARGET_TECHNOLOGY_SOURCE,
+                                                                  OpenMetadataProperty.TARGET_TECHNOLOGY_SOURCE.name,
                                                                   targetTechnologySource,
                                                                   methodName);
 
         properties = repositoryHelper.addStringPropertyToInstance(serviceName,
                                                                   properties,
-                                                                  OpenMetadataType.TARGET_TECHNOLOGY_NAME,
+                                                                  OpenMetadataProperty.TARGET_TECHNOLOGY_NAME.name,
                                                                   targetTechnologyName,
                                                                   methodName);
 
         properties = repositoryHelper.addStringArrayPropertyToInstance(serviceName,
                                                                        properties,
-                                                                       OpenMetadataType.TARGET_TECHNOLOGY_INTERFACES,
+                                                                       OpenMetadataProperty.TARGET_TECHNOLOGY_INTERFACES.name,
                                                                        targetTechnologyInterfaces,
                                                                        methodName);
 
         properties = repositoryHelper.addStringArrayPropertyToInstance(serviceName,
                                                                        properties,
-                                                                       OpenMetadataType.TARGET_TECHNOLOGY_VERSIONS,
+                                                                       OpenMetadataProperty.TARGET_TECHNOLOGY_VERSIONS.name,
                                                                        targetTechnologyVersions,
                                                                        methodName);
 

@@ -517,7 +517,7 @@ public String getConnectorTypeForAsset(String  userId,
 
         List<String> specificMatchPropertyNames = new ArrayList<>();
 
-        specificMatchPropertyNames.add(OpenMetadataType.SUPPORTED_ASSET_TYPE_NAME);
+        specificMatchPropertyNames.add(OpenMetadataProperty.SUPPORTED_ASSET_TYPE_NAME.name);
 
         List<EntityDetail> connectorTypes = this.getEntitiesByValue(userId,
                                                                     supportedAssetTypeName,
@@ -553,11 +553,11 @@ public String getConnectorTypeForAsset(String  userId,
                 if (connectorType != null)
                 {
                     String framework = repositoryHelper.getStringProperty(serviceName,
-                                                                          OpenMetadataType.CONNECTOR_FRAMEWORK_NAME,
+                                                                          OpenMetadataProperty.CONNECTOR_FRAMEWORK_NAME.name,
                                                                           connectorType.getProperties(),
                                                                           methodName);
                     String language  = repositoryHelper.getStringProperty(serviceName,
-                                                                          OpenMetadataType.CONNECTOR_INTERFACE_LANGUAGE,
+                                                                          OpenMetadataProperty.CONNECTOR_INTERFACE_LANGUAGE.name,
                                                                           connectorType.getProperties(),
                                                                           methodName);
 

@@ -588,6 +588,7 @@ public String initiateGovernanceActionProcess(String                userId,
         final String governanceActionProcessGUIDParameterName  = "governanceActionProcessEntity.getGUID()";
         final String governanceActionProcessInstanceGUIDParameterName  = "governanceActionProcessInstanceGUID";
         final String governanceActionProcessStepGUIDParameterName  = "governanceActionProcessFlowRelationship.getEntityTwoProxy().getGUID()";
+        final String engineActionGUIDParameterName = "engineActionGUID";
 
         /*
          * Effective time is set to "now" so that the process definition that is active now is
@@ -780,31 +781,56 @@ public String initiateGovernanceActionProcess(String                userId,
                                                    false,
                                                    serviceSupportedZones,
                                                    OpenMetadataType.PROCESS_HIERARCHY_TYPE_GUID,
-                                                   OpenMetadataType.PROCESS_HIERARCHY_TYPE_GUID,
+                                                   OpenMetadataType.PROCESS_HIERARCHY_TYPE_NAME,
                                                    processBuilder.getProcessHierarchyProperties(ProcessContainmentType.OWNED.getOrdinal()),
                                                    effectiveTime,
                                                    methodName);
 
-                prepareEngineActionFromProcessStep(userId,
-                                                   processInstanceGUID,
-                                                   governanceActionProcessStepGUID,
-                                                   governanceActionProcessStepGUIDParameterName,
-                                                   guard,
-                                                   false,
-                                                   requestedStartDate,
-                                                   null,
-                                                   userId,
-                                                   combinedRequestParameters,
-                                                   requestSourceGUIDs,
-                                                   newTargetsForAction,
-                                                   processInstanceQualifiedName,
-                                                   processQualifiedName,
-                                                   originatorServiceName,
-                                                   originatorEngineName,
-                                                   serviceSupportedZones,
-                                                   methodName);
+                String engineActionGUID = prepareEngineActionFromProcessStep(userId,
+                                                                             processInstanceGUID,
+                                                                             governanceActionProcessStepGUID,
+                                                                             governanceActionProcessStepGUIDParameterName,
+                                                                             guard,
+                                                                             false,
+                                                                             requestedStartDate,
+                                                                             null,
+                                                                             userId,
+                                                                             combinedRequestParameters,
+                                                                             requestSourceGUIDs,
+                                                                             newTargetsForAction,
+                                                                             processInstanceQualifiedName,
+                                                                             processQualifiedName,
+                                                                             originatorServiceName,
+                                                                             originatorEngineName,
+                                                                             serviceSupportedZones,
+                                                                             methodName);
+
+                if (engineActionGUID != null)
+                {
+                    this.uncheckedLinkElementToElement(userId,
+                                                       null,
+                                                       null,
+                                                       processInstanceGUID,
+                                                       governanceActionProcessInstanceGUIDParameterName,
+                                                       OpenMetadataType.GOVERNANCE_ACTION_PROCESS_INSTANCE.typeName,
+                                                       engineActionGUID,
+                                                       engineActionGUIDParameterName,
+                                                       OpenMetadataType.ENGINE_ACTION.typeName,
+                                                       false,
+                                                       false,
+                                                       serviceSupportedZones,
+                                                       OpenMetadataType.ENGINE_ACTION_REQUEST_SOURCE.typeGUID,
+                                                       OpenMetadataType.ENGINE_ACTION_REQUEST_SOURCE.typeName,
+                                                       repositoryHelper.addStringPropertyToInstance(serviceName,
+                                                                                                    null,
+                                                                                                    OpenMetadataType.REQUEST_SOURCE_NAME_PROPERTY_NAME,
+                                                                                                    processInstanceName,
+                                                                                                    methodName),
+                                                       effectiveTime,
+                                                       methodName);
+                }
 
-                 return processInstanceGUID;
+                return processInstanceGUID;
             }
             else
             {