Merge pull request #8326 from mandy-chessell/oak2024

Enable an integration connector to initiate a governance action
odpi · Aug 8, 2024 · 673a029 · 673a029
2 parents fa06f39 + cd5b0bd
commit 673a029
Show file tree

Hide file tree

Showing 107 changed files with 1,712 additions and 1,234 deletions.
diff --git a/CocoComboGUIDMap.json b/CocoComboGUIDMap.json
diff --git a/CoreContentPackGUIDMap.json b/CoreContentPackGUIDMap.json
diff --git a/application.properties b/application.properties
@@ -15,8 +15,8 @@ server.port=9443
 ### The values below will set up the clear text config document store
 ### (the default is the encrypted config document store).
 ################################################
-#platform.configstore.provider=org.odpi.openmetadata.adapters.adminservices.configurationstore.file.FileBasedServerConfigStoreProvider
-#platform.configstore.endpoint=data/servers/{0}/config/{0}.config
+platform.configstore.provider=org.odpi.openmetadata.adapters.adminservices.configurationstore.file.FileBasedServerConfigStoreProvider
+platform.configstore.endpoint=data/servers/{0}/config/{0}.config
 
 ###############################################
 ### Set up the platform metadata security connector that provides authorization
@@ -25,8 +25,8 @@ server.port=9443
 ### The values below are for a sample platform metadata security connector where the only userId
 ### that is permitted to use the administration and platform services is `garygeeke`.
 ###############################################
-#platform.security.provider=org.odpi.openmetadata.metadatasecurity.samples.CocoPharmaPlatformSecurityProvider
-#platform.security.name=Coco Pharmaceuticals Platform
+platform.security.provider=org.odpi.openmetadata.metadatasecurity.samples.CocoPharmaPlatformSecurityProvider
+platform.security.name=Coco Pharmaceuticals Platform
 
 ###############################################
 ### Set up the default configuration document for any new OMAG Server configurations.
@@ -69,7 +69,7 @@ platform.placeholder.variables=\
 #userId used to start up the list of configured servers default is 'system'
 startup.user=system
 # Comma separated names of servers to be started.  The server names should be unquoted.
-#startup.server.list=active-metadata-store,engine-host,integration-daemon,view-server,simple-metadata-store
+startup.server.list=active-metadata-store,engine-host,integration-daemon,view-server,simple-metadata-store
 
 ################################################
 ### SSL security.

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/...n/java/org/odpi/openmetadata/accessservices/assetowner/api/AssetOnboardingFileSystem.java b/...n/java/org/odpi/openmetadata/accessservices/assetowner/api/AssetOnboardingFileSystem.java
@@ -2,8 +2,8 @@
 /* Copyright Contributors to the ODPi Egeria project. */
 package org.odpi.openmetadata.accessservices.assetowner.api;
 
+import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.FileFolderElement;
 import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.FileSystemElement;
-import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.FolderElement;
 import org.odpi.openmetadata.frameworks.connectors.ffdc.InvalidParameterException;
 import org.odpi.openmetadata.frameworks.connectors.ffdc.PropertyServerException;
 import org.odpi.openmetadata.frameworks.connectors.ffdc.UserNotAuthorizedException;
@@ -320,19 +320,19 @@ List<String> getFileSystems(String  userId,
 
 
     /**
-     * Retrieve a FolderProperties asset by its unique identifier (GUID).
+     * Retrieve a FileFolderProperties asset by its unique identifier (GUID).
      *
      * @param userId calling user
      * @param folderGUID unique identifier used to locate the folder
      *
-     * @return FolderProperties properties
+     * @return FileFolderProperties properties
      *
      * @throws InvalidParameterException one of the parameters is null or invalid
      * @throws PropertyServerException problem accessing property server
      * @throws UserNotAuthorizedException security access problem
      */
-    FolderElement getFolderByGUID(String   userId,
-                                  String   folderGUID) throws InvalidParameterException,
+    FileFolderElement getFolderByGUID(String   userId,
+                                      String   folderGUID) throws InvalidParameterException,
                                                               UserNotAuthorizedException,
                                                               PropertyServerException;
 
@@ -343,16 +343,16 @@ FolderElement getFolderByGUID(String   userId,
      * @param userId calling user
      * @param pathName path name
      *
-     * @return FolderProperties properties
+     * @return FileFolderProperties properties
      *
      * @throws InvalidParameterException one of the parameters is null or invalid
      * @throws PropertyServerException problem accessing property server
      * @throws UserNotAuthorizedException security access problem
      */
-    FolderElement getFolderByPathName(String   userId,
-                                      String   pathName) throws InvalidParameterException,
-                                                                UserNotAuthorizedException,
-                                                                PropertyServerException;
+    FileFolderElement getFolderByPathName(String   userId,
+                                          String   pathName) throws InvalidParameterException,
+                                                                    UserNotAuthorizedException,
+                                                                    PropertyServerException;
 
 
     /**

diff --git a/...ain/java/org/odpi/openmetadata/accessservices/assetowner/client/FileSystemAssetOwner.java b/...ain/java/org/odpi/openmetadata/accessservices/assetowner/client/FileSystemAssetOwner.java
@@ -5,8 +5,8 @@
 import org.odpi.openmetadata.accessservices.assetowner.api.AssetOnboardingFileSystem;
 import org.odpi.openmetadata.accessservices.assetowner.client.rest.AssetOwnerRESTClient;
 import org.odpi.openmetadata.commonservices.ffdc.rest.*;
+import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.FileFolderElement;
 import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.FileSystemElement;
-import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.FolderElement;
 import org.odpi.openmetadata.frameworks.auditlog.AuditLog;
 import org.odpi.openmetadata.frameworks.connectors.ffdc.InvalidParameterException;
 import org.odpi.openmetadata.frameworks.connectors.ffdc.PropertyServerException;
@@ -702,20 +702,20 @@ public List<String> getFileSystems(String  userId,
 
 
     /**
-     * Retrieve a FolderProperties asset by its unique identifier (GUID).
+     * Retrieve a FileFolderProperties asset by its unique identifier (GUID).
      *
      * @param userId calling user
      * @param folderGUID unique identifier used to locate the folder
      *
-     * @return FolderProperties properties
+     * @return FileFolderProperties properties
      *
      * @throws InvalidParameterException one of the parameters is null or invalid
      * @throws PropertyServerException problem accessing property server
      * @throws UserNotAuthorizedException security access problem
      */
     @Override
-    public FolderElement getFolderByGUID(String   userId,
-                                         String   folderGUID) throws InvalidParameterException,
+    public FileFolderElement getFolderByGUID(String   userId,
+                                             String   folderGUID) throws InvalidParameterException,
                                                                      UserNotAuthorizedException,
                                                                      PropertyServerException
     {
@@ -726,11 +726,11 @@ public FolderElement getFolderByGUID(String   userId,
         invalidParameterHandler.validateUserId(userId, methodName);
         invalidParameterHandler.validateGUID(folderGUID, folderGUIDParameter, methodName);
 
-        FolderResponse restResult = restClient.callFolderGetRESTCall(methodName,
-                                                                     urlTemplate,
-                                                                     serverName,
-                                                                     userId,
-                                                                     folderGUID);
+        FileFolderResponse restResult = restClient.callFolderGetRESTCall(methodName,
+                                                                         urlTemplate,
+                                                                         serverName,
+                                                                         userId,
+                                                                         folderGUID);
 
         return restResult.getElement();
     }
@@ -742,17 +742,17 @@ public FolderElement getFolderByGUID(String   userId,
      * @param userId calling user
      * @param pathName path name
      *
-     * @return FolderProperties properties
+     * @return FileFolderProperties properties
      *
      * @throws InvalidParameterException one of the parameters is null or invalid
      * @throws PropertyServerException problem accessing property server
      * @throws UserNotAuthorizedException security access problem
      */
     @Override
-    public FolderElement getFolderByPathName(String   userId,
-                                             String   pathName) throws InvalidParameterException,
-                                                                       UserNotAuthorizedException,
-                                                                       PropertyServerException
+    public FileFolderElement getFolderByPathName(String   userId,
+                                                 String   pathName) throws InvalidParameterException,
+                                                                           UserNotAuthorizedException,
+                                                                           PropertyServerException
     {
         final String   methodName = "getFileSystemByUniqueName";
         final String   nameParameter = "pathName";
@@ -761,11 +761,11 @@ public FolderElement getFolderByPathName(String   userId,
         invalidParameterHandler.validateUserId(userId, methodName);
         invalidParameterHandler.validateName(pathName, nameParameter, methodName);
 
-        FolderResponse restResult = restClient.callFolderGetRESTCall(methodName,
-                                                                     urlTemplate,
-                                                                     serverName,
-                                                                     userId,
-                                                                     pathName);
+        FileFolderResponse restResult = restClient.callFolderGetRESTCall(methodName,
+                                                                        urlTemplate,
+                                                                        serverName,
+                                                                        userId,
+                                                                        pathName);
 
         return restResult.getElement();
     }

diff --git a/...ava/org/odpi/openmetadata/accessservices/assetowner/server/AssetOwnerInstanceHandler.java b/...ava/org/odpi/openmetadata/accessservices/assetowner/server/AssetOwnerInstanceHandler.java
@@ -2,10 +2,7 @@
 /* Copyright Contributors to the ODPi Egeria project. */
 package org.odpi.openmetadata.accessservices.assetowner.server;
 
-import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.AssetElement;
-import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.ConnectionElement;
-import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.ConnectorTypeElement;
-import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.EndpointElement;
+
 import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceDescription;
 import org.odpi.openmetadata.commonservices.generichandlers.*;
 import org.odpi.openmetadata.commonservices.multitenant.OMASServiceInstanceHandler;
@@ -166,7 +163,7 @@ SchemaTypeHandler<SchemaTypeElement> getSchemaTypeHandler(String userId,
      * @throws UserNotAuthorizedException user does not have access to the requested server
      * @throws PropertyServerException error in the requested server
      */
-    FilesAndFoldersHandler<FileSystemElement, FolderElement, FileElement> getFilesAndFoldersHandler(String userId,
+    FilesAndFoldersHandler<FileSystemElement, FileFolderElement, DataFileElement> getFilesAndFoldersHandler(String userId,
                                                                                                     String serverName,
                                                                                                     String serviceOperationName) throws InvalidParameterException,
                                                                                                                                         UserNotAuthorizedException,

diff --git a/...va/org/odpi/openmetadata/accessservices/assetowner/server/AssetOwnerServicesInstance.java b/...va/org/odpi/openmetadata/accessservices/assetowner/server/AssetOwnerServicesInstance.java
@@ -3,10 +3,6 @@
 package org.odpi.openmetadata.accessservices.assetowner.server;
 
 
-import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.AssetElement;
-import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.ConnectionElement;
-import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.ConnectorTypeElement;
-import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.EndpointElement;
 import org.odpi.openmetadata.commonservices.generichandlers.ConnectionConverter;
 import org.odpi.openmetadata.accessservices.assetowner.ffdc.AssetOwnerErrorCode;
 import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceDescription;
@@ -37,8 +33,8 @@ public class AssetOwnerServicesInstance extends OMASServiceInstance
     private final ReferenceableHandler<ReferenceableElement> referenceableHandler;
 
     private final FilesAndFoldersHandler<FileSystemElement,
-                                         FolderElement,
-                                         FileElement> filesAndFoldersHandler;
+                                         FileFolderElement,
+                                         DataFileElement> filesAndFoldersHandler;
 
     private final ValidValuesHandler<ValidValueElement> validValuesHandler;
 
@@ -152,9 +148,9 @@ public AssetOwnerServicesInstance(OMRSRepositoryConnector repositoryConnector,
         this.filesAndFoldersHandler = new FilesAndFoldersHandler<>(new FileSystemConverter<>(repositoryHelper, serviceName, serverName),
                                                                    FileSystemElement.class,
                                                                    new FileFolderConverter<>(repositoryHelper, serviceName, serverName),
-                                                                   FolderElement.class,
+                                                                   FileFolderElement.class,
                                                                    new DataFileConverter<>(repositoryHelper, serviceName, serverName),
-                                                                   FileElement.class,
+                                                                   DataFileElement.class,
                                                                    serviceName,
                                                                    serverName,
                                                                    invalidParameterHandler,
@@ -382,7 +378,7 @@ SchemaTypeHandler<SchemaTypeElement> getSchemaTypeHandler() throws PropertyServe
      * @return  handler object
      * @throws PropertyServerException the instance has not been initialized successfully
      */
-    FilesAndFoldersHandler<FileSystemElement, FolderElement, FileElement> getFilesAndFoldersHandler() throws PropertyServerException
+    FilesAndFoldersHandler<FileSystemElement, FileFolderElement, DataFileElement> getFilesAndFoldersHandler() throws PropertyServerException
     {
         final String methodName = "getFilesAndFoldersHandler";