Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Survey Action Framework (SAF) #7999

Merged
merged 5 commits into from
Jan 10, 2024
Merged

Survey Action Framework (SAF) #7999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
829f3c8
Update verion to 4.3
mandy-chessell Sep 4, 2023
71d53e2
Merge branch 'main' of https://github.com/odpi/egeria
mandy-chessell Jan 5, 2024
7ddbb1e
Add fat jar for XTDB
mandy-chessell Jan 5, 2024
b6b986b
Fix miscellaneous warnings
mandy-chessell Jan 5, 2024
6f853fa
Add the Survey Action Framework
mandy-chessell Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion open-metadata-distribution/omag-server-platform/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ dependencies {
implementation project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:openapi-integration-connector')
implementation project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:openlineage-integration-connectors')
implementation project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:elasticsearch-integration-connector')
implementation project(':open-metadata-implementation:adapters:open-connectors:survey-action-connectors')
implementation project(':open-metadata-implementation:adapters:open-connectors:discovery-service-connectors')
implementation project(':open-metadata-implementation:adapters:open-connectors:dynamic-archiver-connectors')
implementation project(':open-metadata-implementation:adapters:open-connectors:governance-action-connectors')
Expand Down Expand Up @@ -189,14 +190,15 @@ distributions {
from { project(':open-metadata-implementation:adapters:open-connectors:repository-services-connectors:open-metadata-archive-connectors:open-metadata-archive-directory-connector').jar }
from { project(':open-metadata-implementation:adapters:open-connectors:repository-services-connectors:open-metadata-collection-store-connectors:inmemory-repository-connector').jar }
from { project(':open-metadata-implementation:adapters:open-connectors:repository-services-connectors:open-metadata-collection-store-connectors:graph-repository-connector').fatJar }
from { project(':open-metadata-implementation:adapters:open-connectors:repository-services-connectors:open-metadata-collection-store-connectors:xtdb-repository-connector').jar }
from { project(':open-metadata-implementation:adapters:open-connectors:repository-services-connectors:open-metadata-collection-store-connectors:xtdb-repository-connector').shadowJar }
from { project(':open-metadata-implementation:adapters:open-connectors:repository-services-connectors:open-metadata-collection-store-connectors:omrs-rest-repository-connector').jar }
from { project(':open-metadata-implementation:adapters:open-connectors:data-store-connectors:file-connectors:basic-file-connector').jar }
from { project(':open-metadata-implementation:adapters:open-connectors:data-store-connectors:file-connectors:csv-file-connector').jar }
from { project(':open-metadata-implementation:adapters:open-connectors:data-store-connectors:file-connectors:data-folder-connector').jar }
from { project(':open-metadata-implementation:adapters:open-connectors:data-store-connectors:jdbc-resource-connector').jar }
from { project(':open-metadata-implementation:adapters:open-connectors:configuration-store-connectors:configuration-encrypted-file-store-connector').jar }
from { project(':open-metadata-implementation:adapters:open-connectors:configuration-store-connectors:configuration-file-store-connector').jar }
from { project(':open-metadata-implementation:adapters:open-connectors:survey-action-connectors').jar }
from { project(':open-metadata-implementation:adapters:open-connectors:discovery-service-connectors').jar }
from { project(':open-metadata-implementation:adapters:open-connectors:dynamic-archiver-connectors').jar }
from { project(':open-metadata-implementation:adapters:open-connectors:governance-action-connectors').jar }
Expand Down
2 changes: 2 additions & 0 deletions open-metadata-distribution/open-metadata-assemblies/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ dependencies {
implementation project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:openlineage-integration-connectors')
implementation project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:elasticsearch-integration-connector')
implementation project(':open-metadata-implementation:adapters:open-connectors:discovery-service-connectors')
implementation project(':open-metadata-implementation:adapters:open-connectors:survey-action-connectors')
implementation project(':open-metadata-implementation:adapters:open-connectors:dynamic-archiver-connectors')
implementation project(':open-metadata-implementation:adapters:open-connectors:governance-action-connectors')
implementation project(':open-metadata-implementation:adapters:open-connectors:event-bus-connectors:open-metadata-topic-connectors:inmemory-open-metadata-topic-connector')
Expand Down Expand Up @@ -144,6 +145,7 @@ distributions {
from { project(':open-metadata-implementation:adapters:open-connectors:configuration-store-connectors:configuration-encrypted-file-store-connector').jar }
from { project(':open-metadata-implementation:adapters:open-connectors:configuration-store-connectors:configuration-file-store-connector').jar }
from { project(':open-metadata-implementation:adapters:open-connectors:discovery-service-connectors').jar }
from { project(':open-metadata-implementation:adapters:open-connectors:survey-action-connectors').jar }
from { project(':open-metadata-implementation:adapters:open-connectors:dynamic-archiver-connectors').jar }
from { project(':open-metadata-implementation:adapters:open-connectors:governance-action-connectors').jar }
from { project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:files-integration-connectors').jar }
Expand Down
7 changes: 4 additions & 3 deletions .../org/odpi/openmetadata/accessservices/assetmanager/handlers/DataAssetExchangeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.odpi.openmetadata.commonservices.ffdc.InvalidParameterHandler;
import org.odpi.openmetadata.commonservices.generichandlers.AssetHandler;
import org.odpi.openmetadata.commonservices.generichandlers.FilesAndFoldersHandler;
import org.odpi.openmetadata.frameworks.governanceaction.mapper.OpenMetadataProperty;
import org.odpi.openmetadata.frameworks.governanceaction.mapper.OpenMetadataType;
import org.odpi.openmetadata.commonservices.repositoryhandler.RepositoryHandler;
import org.odpi.openmetadata.frameworks.auditlog.AuditLog;
Expand Down Expand Up @@ -238,7 +239,7 @@ public String createDataAsset(String userId,

if (assetProperties instanceof DataStoreProperties dataStoreProperties)
{
assetExtendedProperties.put(OpenMetadataType.PATH_NAME_PROPERTY_NAME, dataStoreProperties.getPathName());
assetExtendedProperties.put(OpenMetadataProperty.PATH_NAME.name, dataStoreProperties.getPathName());
assetExtendedProperties.put(OpenMetadataType.STORE_CREATE_TIME_PROPERTY_NAME, dataStoreProperties.getCreateTime());
assetExtendedProperties.put(OpenMetadataType.STORE_UPDATE_TIME_PROPERTY_NAME, dataStoreProperties.getModifiedTime());
}
Expand Down Expand Up @@ -332,7 +333,7 @@ public String createDataAsset(String userId,
if (((repositoryHelper.isTypeOf(serviceName, typeName, OpenMetadataType.DATA_FILE_TYPE_NAME)) ||
(repositoryHelper.isTypeOf(serviceName, typeName, OpenMetadataType.DATA_FOLDER_TYPE_NAME))) &&
(assetExtendedProperties != null) &&
(assetExtendedProperties.get(OpenMetadataType.PATH_NAME_PROPERTY_NAME) != null))
(assetExtendedProperties.get(OpenMetadataProperty.PATH_NAME.name) != null))
{
final String pathNameParameterName = "assetProperties.getExtendedProperties().get(parameterName)";
filesAndFoldersHandler.addFileAssetPath(userId,
Expand All @@ -341,7 +342,7 @@ public String createDataAsset(String userId,
assetGUID,
assetGUIDParameterName,
typeName,
assetProperties.getExtendedProperties().get(OpenMetadataType.PATH_NAME_PROPERTY_NAME).toString(),
assetProperties.getExtendedProperties().get(OpenMetadataProperty.PATH_NAME.name).toString(),
pathNameParameterName,
forLineage,
forDuplicateProcessing,
Expand Down
4 changes: 2 additions & 2 deletions ...rg/odpi/openmetadata/accessservices/dataengine/server/service/DataEngineRESTServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1714,11 +1714,11 @@ private HashMap<String, Object> getExtendedProperties(DataFile file) {

if (file instanceof CSVFile) {
CSVFile csvFile = (CSVFile) file;
extendedProperties.put(OpenMetadataType.FILE_TYPE_PROPERTY_NAME, csvFile.getFileType());
extendedProperties.put(OpenMetadataProperty.FILE_TYPE.name, csvFile.getFileType());
extendedProperties.put(OpenMetadataType.DELIMITER_CHARACTER_PROPERTY_NAME, csvFile.getDelimiterCharacter());
extendedProperties.put(OpenMetadataType.QUOTE_CHARACTER_PROPERTY_NAME, csvFile.getQuoteCharacter());
} else {
extendedProperties.put(OpenMetadataType.FILE_TYPE_PROPERTY_NAME, file.getFileType());
extendedProperties.put(OpenMetadataProperty.FILE_TYPE.name, file.getFileType());
}
return extendedProperties;
}
Expand Down
2 changes: 1 addition & 1 deletion ...g/odpi/openmetadata/accessservices/datamanager/listener/DataManagerOMRSTopicListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ private void processRelationshipEvent(DataManagerOutboundEventType eventType,
(repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.API_REQUEST_RELATIONSHIP_TYPE_NAME)) ||
(repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.API_RESPONSE_RELATIONSHIP_TYPE_NAME)) ||
(repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.API_OPERATIONS_RELATIONSHIP_TYPE_NAME)) ||
(repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.GRAPH_EDGE_LINK_RELATIONSHIP_TYPE_NAME)) ||
(repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.GRAPH_EDGE_LINK_RELATIONSHIP.typeName)) ||
(repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.FOREIGN_KEY_RELATIONSHIP_TYPE_NAME)) ||
(repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.NESTED_FILE_TYPE_NAME)) ||
(repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.LINKED_FILE_TYPE_NAME)) ||
Expand Down
5 changes: 3 additions & 2 deletions ...tadata/accessservices/discoveryengine/converters/RegisteredDiscoveryServiceConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
/* Copyright Contributors to the ODPi Egeria project. */
package org.odpi.openmetadata.accessservices.discoveryengine.converters;

import org.odpi.openmetadata.frameworks.governanceaction.mapper.OpenMetadataProperty;
import org.odpi.openmetadata.frameworks.governanceaction.mapper.OpenMetadataType;
import org.odpi.openmetadata.frameworks.discovery.properties.DiscoveryServiceProperties;
import org.odpi.openmetadata.frameworks.discovery.properties.RegisteredDiscoveryService;
Expand Down Expand Up @@ -69,11 +70,11 @@ public RegisteredDiscoveryService getBean(DiscoveryServiceProperties discoverySe
if (instanceProperties != null)
{
String requestType = repositoryHelper.getStringProperty(serviceName,
OpenMetadataType.REQUEST_TYPE_PROPERTY_NAME,
OpenMetadataProperty.REQUEST_TYPE.name,
instanceProperties,
methodName);
Map<String, String> analysisParameters = repositoryHelper.getStringMapFromProperty(serviceName,
OpenMetadataType.REQUEST_PARAMETERS_PROPERTY_NAME,
OpenMetadataProperty.REQUEST_PARAMETERS.name,
instanceProperties,
methodName);

Expand Down
7 changes: 4 additions & 3 deletions ...data/accessservices/governanceengine/converters/RegisteredGovernanceServiceConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import org.odpi.openmetadata.accessservices.governanceengine.metadataelements.RegisteredGovernanceServiceElement;
import org.odpi.openmetadata.accessservices.governanceengine.properties.RegisteredGovernanceService;
import org.odpi.openmetadata.accessservices.governanceengine.properties.RegisteredGovernanceServiceProperties;
import org.odpi.openmetadata.frameworks.governanceaction.mapper.OpenMetadataProperty;
import org.odpi.openmetadata.frameworks.governanceaction.mapper.OpenMetadataType;
import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.instances.InstanceProperties;
import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.instances.Relationship;
Expand Down Expand Up @@ -70,14 +71,14 @@ public RegisteredGovernanceServiceElement getBean(GovernanceServiceElement gover
if (instanceProperties != null)
{
String requestType = repositoryHelper.getStringProperty(serviceName,
OpenMetadataType.REQUEST_TYPE_PROPERTY_NAME,
OpenMetadataProperty.REQUEST_TYPE.name,
instanceProperties,
methodName);

RegisteredGovernanceServiceProperties registeredGovernanceServiceProperties = new RegisteredGovernanceServiceProperties();

String serviceRequestType = repositoryHelper.getStringProperty(serviceName,
OpenMetadataType.SERVICE_REQUEST_TYPE_PROPERTY_NAME,
OpenMetadataProperty.SERVICE_REQUEST_TYPE.name,
instanceProperties,
methodName);

Expand All @@ -93,7 +94,7 @@ public RegisteredGovernanceServiceElement getBean(GovernanceServiceElement gover
registeredGovernanceServiceProperties.setServiceRequestType(serviceRequestType);
}
registeredGovernanceServiceProperties.setRequestParameters(repositoryHelper.getStringMapFromProperty(serviceName,
OpenMetadataType.REQUEST_PARAMETERS_PROPERTY_NAME,
OpenMetadataProperty.REQUEST_PARAMETERS.name,
instanceProperties,
methodName));

Expand Down
Loading
Loading