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

Fix createIntegrationConnector and update ComponentIdReport #8017

Merged
merged 1 commit into from
Jan 31, 2024
Merged

Fix createIntegrationConnector and update ComponentIdReport #8017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ egeria-lineage-repositories/**
component-id-report.md
survey-report*.md
valid-values-report*.md
surveys/*

# Ignore any json files generated during junit
open-metadata-resources/open-metadata-archives/design-model-archives/*.json
Expand Down
8 changes: 6 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@ subprojects {
options.compilerArgs << "-Xlint:all" << "-Xmaxerrs" << "1000" << "-Xmaxwarns" << "1000"
}

tasks.withType(Javadoc).configureEach {
options.addStringOption('Xdoclint:-missing', '-quiet')
}

// javadoc
javadoc {
options
Expand All @@ -115,7 +119,7 @@ subprojects {
// Code
license {
name = 'The Apache License, Version 2.0'
url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
url = 'https://www.apache.org/licenses/LICENSE-2.0.txt'
}
// Docs
license {
Expand Down Expand Up @@ -143,7 +147,7 @@ subprojects {
scm {
connection = 'scm:git:git://github.com/odpi/egeria.git'
developerConnection = 'scm:git:ssh://github.com/odpi/egeria/egeria.git'
url = 'http://github.com/odpi/egeria'
url = 'https://github.com/odpi/egeria'
}
organization {
name = 'LF AI & Data Foundation'
Expand Down
1 change: 1 addition & 0 deletions ...n/java/org/odpi/openmetadata/accessservices/assetowner/server/AssetOwnerRESTServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3627,6 +3627,7 @@ public VoidResponse addConnectionToAsset(String serverName,
assetGUID,
assetGUIDParameterName,
OpenMetadataType.ASSET.typeName,
null,
connection,
assetSummary,
false,
Expand Down
1 change: 0 additions & 1 deletion ...c/main/java/org/odpi/openmetadata/accessservices/dataengine/ffdc/DataEngineAuditCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ public enum DataEngineAuditCode {
*
* @return message definition object
*/
@Getter
private final AuditLogMessageDefinition messageDefinition;

/**
Expand Down
431 changes: 33 additions & 398 deletions ...openmetadata/accessservices/governanceengine/handlers/GovernanceConfigurationHandler.java
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...n/java/org/odpi/openmetadata/accessservices/subjectarea/client/SubjectAreaRestClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public class SubjectAreaRestClient extends FFDCRESTClient {
private final String serverPlatformURLRoot;

/**
* {@inheritDoc}
* Constructor
*/
public SubjectAreaRestClient(String serverName, String serverPlatformURLRoot) throws InvalidParameterException {
super(serverName, serverPlatformURLRoot);
Expand All @@ -43,7 +43,7 @@ public SubjectAreaRestClient(String serverName, String serverPlatformURLRoot) th
}

/**
* {@inheritDoc}
* Constructor
*/
public SubjectAreaRestClient(String serverName,
String serverPlatformURLRoot,
Expand Down
34 changes: 30 additions & 4 deletions ...org/odpi/openmetadata/adapters/connectors/datastore/basicfile/BasicFileStoreProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

package org.odpi.openmetadata.adapters.connectors.datastore.basicfile;

import org.odpi.openmetadata.frameworks.auditlog.AuditLogReportingComponent;
import org.odpi.openmetadata.frameworks.auditlog.ComponentDevelopmentStatus;
import org.odpi.openmetadata.frameworks.connectors.ConnectorProviderBase;
import org.odpi.openmetadata.frameworks.connectors.properties.beans.ConnectorType;
import org.odpi.openmetadata.frameworks.governanceaction.mapper.OpenMetadataType;
Expand All @@ -13,9 +15,22 @@
*/
public class BasicFileStoreProvider extends ConnectorProviderBase
{
/*
* Unique identifier of the connector for the audit log.
*/
private static final int connectorComponentId = 94;

/*
* Unique identifier for the connector type.
*/
private static final String connectorTypeGUID = "ba213761-f5f5-4cf5-a95f-6150aef09e0b";
private static final String connectorQualifiedName = "Egeria:ResourceConnector:DataFile";
private static final String connectorTypeName = "Basic File Store Connector";
private static final String connectorTypeDescription = "Connector supports reading of Files.";
private static final String connectorWikiPage = "https://egeria-project.org/connectors/resource/basic-file-resource-connector/";

private static final String connectorClass = "org.odpi.openmetadata.adapters.connectors.datastore.basicfile.BasicFileStoreConnector";

private static final String assetTypeName = OpenMetadataType.DATA_FILE.typeName;

/**
Expand All @@ -26,22 +41,33 @@ public BasicFileStoreProvider()
{
super();

Class<BasicFileStoreConnector> connectorClass = BasicFileStoreConnector.class;

super.setConnectorClassName(connectorClass.getName());
super.setConnectorClassName(connectorClass);

connectorInterfaces.add(BasicFileStore.class.getName());

ConnectorType connectorType = new ConnectorType();
connectorType.setType(ConnectorType.getConnectorTypeType());
connectorType.setGUID(connectorTypeGUID);
connectorType.setQualifiedName(connectorTypeName);
connectorType.setQualifiedName(connectorQualifiedName);
connectorType.setDisplayName(connectorTypeName);
connectorType.setDescription(connectorTypeDescription);
connectorType.setSupportedAssetTypeName(assetTypeName);
connectorType.setConnectorInterfaces(connectorInterfaces);
connectorType.setConnectorProviderClassName(this.getClass().getName());

super.connectorTypeBean = connectorType;

/*
* Set up the component description used in the connector's audit log messages.
*/
AuditLogReportingComponent componentDescription = new AuditLogReportingComponent();

componentDescription.setComponentId(connectorComponentId);
componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.STABLE);
componentDescription.setComponentName(connectorTypeName);
componentDescription.setComponentDescription(connectorTypeDescription);
componentDescription.setComponentWikiURL(connectorWikiPage);

super.setConnectorComponentDescription(componentDescription);
}
}
33 changes: 30 additions & 3 deletions ...va/org/odpi/openmetadata/adapters/connectors/datastore/basicfile/BasicFolderProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

package org.odpi.openmetadata.adapters.connectors.datastore.basicfile;

import org.odpi.openmetadata.frameworks.auditlog.AuditLogReportingComponent;
import org.odpi.openmetadata.frameworks.auditlog.ComponentDevelopmentStatus;
import org.odpi.openmetadata.frameworks.connectors.ConnectorProviderBase;
import org.odpi.openmetadata.frameworks.connectors.properties.beans.ConnectorType;
import org.odpi.openmetadata.frameworks.governanceaction.mapper.OpenMetadataType;
Expand All @@ -14,9 +16,22 @@
*/
public class BasicFolderProvider extends ConnectorProviderBase
{
/*
* Unique identifier of the connector for the audit log.
*/
private static final int connectorComponentId = 95;

/*
* Unique identifier for the connector type.
*/
private static final String connectorTypeGUID = "a9fc9231-f04a-40c4-99b1-4a1058063f5e";
private static final String connectorQualifiedName = "Egeria:ResourceConnector:FileFolder";
private static final String connectorTypeName = "Basic Folder Connector";
private static final String connectorTypeDescription = "Connector supports reading of files in a directory (folder).";
private static final String connectorWikiPage = "https://egeria-project.org/connectors/resource/basic-folder-resource-connector/";

private static final String connectorClass = "org.odpi.openmetadata.adapters.connectors.datastore.basicfile.BasicFolderConnector";

private static final String assetTypeName = OpenMetadataType.FILE_FOLDER.typeName;

/**
Expand All @@ -27,22 +42,34 @@ public BasicFolderProvider()
{
super();

Class<BasicFolderConnector> connectorClass = BasicFolderConnector.class;

super.setConnectorClassName(connectorClass.getName());
super.setConnectorClassName(connectorClass);

connectorInterfaces.add(BasicFileStore.class.getName());

ConnectorType connectorType = new ConnectorType();
connectorType.setType(ConnectorType.getConnectorTypeType());
connectorType.setGUID(connectorTypeGUID);
connectorType.setQualifiedName(connectorTypeName);
connectorType.setQualifiedName(connectorQualifiedName);
connectorType.setDisplayName(connectorTypeName);
connectorType.setDescription(connectorTypeDescription);
connectorType.setSupportedAssetTypeName(assetTypeName);
connectorType.setConnectorInterfaces(connectorInterfaces);
connectorType.setConnectorProviderClassName(this.getClass().getName());

super.connectorTypeBean = connectorType;

/*
* Set up the component description used in the connector's audit log messages.
*/
AuditLogReportingComponent componentDescription = new AuditLogReportingComponent();

componentDescription.setComponentId(connectorComponentId);
componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.STABLE);
componentDescription.setComponentName(connectorTypeName);
componentDescription.setComponentDescription(connectorTypeDescription);
componentDescription.setComponentWikiURL(connectorWikiPage);

super.setConnectorComponentDescription(componentDescription);
}
}
35 changes: 31 additions & 4 deletions ...ava/org/odpi/openmetadata/adapters/connectors/datastore/csvfile/CSVFileStoreProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

package org.odpi.openmetadata.adapters.connectors.datastore.csvfile;

import org.odpi.openmetadata.frameworks.auditlog.AuditLogReportingComponent;
import org.odpi.openmetadata.frameworks.auditlog.ComponentDevelopmentStatus;
import org.odpi.openmetadata.frameworks.connectors.ConnectorProviderBase;
import org.odpi.openmetadata.frameworks.connectors.properties.beans.ConnectorType;

Expand All @@ -15,9 +17,23 @@
*/
public class CSVFileStoreProvider extends ConnectorProviderBase
{
/*
* Unique identifier of the connector for the audit log.
*/
private static final int connectorComponentId = 96;

/*
* Unique identifier for the connector type.
*/
private static final String connectorTypeGUID = "108b85fe-d7b8-45c3-9fb8-742ac4e4fb14";
private static final String connectorQualifiedName = "Egeria:ResourceConnector:CSVFile";
private static final String connectorTypeName = "CSV File Connector";
private static final String connectorTypeDescription = "Connector supports reading of structured (CSV) files.";
private static final String connectorWikiPage = "https://egeria-project.org/connectors/resource/csv-file-resource-connector/";


private static final String connectorClass = "org.odpi.openmetadata.adapters.connectors.datastore.csvfile.CSVFileStoreConnector";


private static final String expectedDataFormat = "csv";
private static final String assetTypeName = "CSVFile";
Expand Down Expand Up @@ -46,16 +62,14 @@ public CSVFileStoreProvider()
{
super();

Class<?> connectorClass = CSVFileStoreConnector.class;

super.setConnectorClassName(connectorClass.getName());
super.setConnectorClassName(connectorClass);

connectorInterfaces.add(CSVFileStore.class.getName());

ConnectorType connectorType = new ConnectorType();
connectorType.setType(ConnectorType.getConnectorTypeType());
connectorType.setGUID(connectorTypeGUID);
connectorType.setQualifiedName(connectorTypeName);
connectorType.setQualifiedName(connectorQualifiedName);
connectorType.setDisplayName(connectorTypeName);
connectorType.setDescription(connectorTypeDescription);
connectorType.setConnectorProviderClassName(this.getClass().getName());
Expand All @@ -71,5 +85,18 @@ public CSVFileStoreProvider()
connectorType.setRecognizedConfigurationProperties(recognizedConfigurationProperties);

super.connectorTypeBean = connectorType;

/*
* Set up the component description used in the connector's audit log messages.
*/
AuditLogReportingComponent componentDescription = new AuditLogReportingComponent();

componentDescription.setComponentId(connectorComponentId);
componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.STABLE);
componentDescription.setComponentName(connectorTypeName);
componentDescription.setComponentDescription(connectorTypeDescription);
componentDescription.setComponentWikiURL(connectorWikiPage);

super.setConnectorComponentDescription(componentDescription);
}
}
41 changes: 34 additions & 7 deletions ...va/org/odpi/openmetadata/adapters/connectors/datastore/datafolder/DataFolderProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
package org.odpi.openmetadata.adapters.connectors.datastore.datafolder;

import org.odpi.openmetadata.adapters.connectors.datastore.basicfile.BasicFileStore;
import org.odpi.openmetadata.frameworks.auditlog.AuditLogReportingComponent;
import org.odpi.openmetadata.frameworks.auditlog.ComponentDevelopmentStatus;
import org.odpi.openmetadata.frameworks.connectors.ConnectorProviderBase;
import org.odpi.openmetadata.frameworks.connectors.properties.beans.ConnectorType;

Expand All @@ -13,9 +15,23 @@
*/
public class DataFolderProvider extends ConnectorProviderBase
{
static final String connectorTypeGUID = "1ef9cbe2-9119-4ac0-b9ac-d838f0ed9caf";
static final String connectorTypeName = "Data Folder Connector";
static final String connectorTypeDescription = "Connector supports reading of data files grouped under a single folder.";
/*
* Unique identifier of the connector for the audit log.
*/
private static final int connectorComponentId = 97;

/*
* Unique identifier for the connector type.
*/
private static final String connectorTypeGUID = "1ef9cbe2-9119-4ac0-b9ac-d838f0ed9caf";
private static final String connectorQualifiedName = "Egeria:ResourceConnector:DataFolder";
private static final String connectorTypeName = "Data Folder Connector";
private static final String connectorTypeDescription = "Connector supports reading of data files grouped under a single folder.";
private static final String connectorWikiPage = "https://egeria-project.org/connectors/resource/data-folder-resource-connector/";


private static final String connectorClass = "org.odpi.openmetadata.adapters.connectors.datastore.datafolder.DataFolderConnector";


private static final String assetTypeName = "DataFolder";

Expand All @@ -26,22 +42,33 @@ public DataFolderProvider()
{
super();

Class<?> connectorClass = DataFolderConnector.class;

super.setConnectorClassName(connectorClass.getName());
super.setConnectorClassName(connectorClass);

connectorInterfaces.add(BasicFileStore.class.getName());

ConnectorType connectorType = new ConnectorType();
connectorType.setType(ConnectorType.getConnectorTypeType());
connectorType.setGUID(connectorTypeGUID);
connectorType.setQualifiedName(connectorTypeName);
connectorType.setQualifiedName(connectorQualifiedName);
connectorType.setDisplayName(connectorTypeName);
connectorType.setDescription(connectorTypeDescription);
connectorType.setSupportedAssetTypeName(assetTypeName);
connectorType.setConnectorProviderClassName(this.getClass().getName());
connectorType.setConnectorInterfaces(connectorInterfaces);

super.connectorTypeBean = connectorType;

/*
* Set up the component description used in the connector's audit log messages.
*/
AuditLogReportingComponent componentDescription = new AuditLogReportingComponent();

componentDescription.setComponentId(connectorComponentId);
componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.STABLE);
componentDescription.setComponentName(connectorTypeName);
componentDescription.setComponentDescription(connectorTypeDescription);
componentDescription.setComponentWikiURL(connectorWikiPage);

super.setConnectorComponentDescription(componentDescription);
}
}
4 changes: 2 additions & 2 deletions ...rg/odpi/openmetadata/adapters/connectors/resource/jdbc/JDBCResourceConnectorProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class JDBCResourceConnectorProvider extends ConnectorProviderBase
/*
* Unique identifier of the connector for the audit log.
*/
private static final int connectorComponentId = 662;
private static final int connectorComponentId = 93;

/*
* Unique identifier for the connector type.
Expand Down Expand Up @@ -105,7 +105,7 @@ public JDBCResourceConnectorProvider()

componentDescription.setComponentId(connectorComponentId);
componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.STABLE);
componentDescription.setComponentName(connectorQualifiedName);
componentDescription.setComponentName(connectorDisplayName);
componentDescription.setComponentDescription(connectorTypeDescription);
componentDescription.setComponentWikiURL(connectorWikiPage);

Expand Down
4 changes: 2 additions & 2 deletions ...data/adapters/connectors/discoveryservices/discoveratlas/DiscoverApacheAtlasProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class DiscoverApacheAtlasProvider extends DiscoveryServiceProvider
* Descriptive information about the connector for the connector type and audit log.
*/
private static final String connectorQualifiedName = "Egeria:OpenDiscoveryService:DiscoverApacheAtlas";
private static final String connectorDisplayName = "DiscoverApacheAtlas Open Discovery Service";
private static final String connectorDisplayName = "Discover Apache Atlas Open Discovery Service";
private static final String connectorDescription = "Connector publishes insights about a deployment of Apache Atlas.";
private static final String connectorWikiPage = "https://egeria-project.org/connectors/discovery/apache-atlas-discovery-service/";

Expand Down Expand Up @@ -99,7 +99,7 @@ public DiscoverApacheAtlasProvider()

componentDescription.setComponentId(connectorComponentId);
componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.TECHNICAL_PREVIEW);
componentDescription.setComponentName(connectorQualifiedName);
componentDescription.setComponentName(connectorDisplayName);
componentDescription.setComponentDescription(connectorDescription);
componentDescription.setComponentWikiURL(connectorWikiPage);

Expand Down
Loading
Loading