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.

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

Add placholder support and survey reports #8016

Merged
merged 2 commits into from
Jan 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ egeria-lineage-repositories/**

# Ignore report output
component-id-report.md
survey-report*.md
valid-values-report*.md

# Ignore any json files generated during junit
open-metadata-resources/open-metadata-archives/design-model-archives/*.json
Expand Down Expand Up @@ -165,6 +167,10 @@ jitdump*dmp
# License files (generated)
THIRD_PARTY*.txt

# Local test files
extra/**
lib/**

# gradle
!gradle/**
.gradle/
Expand Down
24 changes: 19 additions & 5 deletions application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,32 +19,46 @@ server.port=9443
#platform.configstore.endpoint=data/servers/{0}/config/{0}.config

###############################################
### Set up the default configuration document for any new OMAG Server configurations
### Set up the default configuration document for any new OMAG Server configurations.
###############################################
#platform.default.config.document=\
# {\
# "class": "OMAGServerConfig",\
# "organizationName": "myOrg",\
# "maxPageSize": 600,\
# "maxPageSize": 1200,\
# "eventBusConfig": \
# {\
# "class": "EventBusConfig",\
# "topicURLRoot": "egeria.omag",\
# "configurationProperties":\
# {\
# "producer": {"bootstrap.servers": "localhost:9092"},\
# "consumer": {"bootstrap.servers": "localhost:9092"}\
# "producer": {"bootstrap.servers": "{{kafkaep}}"},\
# "consumer": {"bootstrap.servers": "{{kafkaep}}"}\
# }\
# }\
# }

################################################
### Placeholder variables are added to field values in the configuration document
### when the server is being configured using double curly braces. They are replaced by
### the values specified in platform.placeholder.variables each time the server starts up.
###
### The "kafkaep" value is the Apache Kafka endpoint, and it is used in the active-metadata-store
### sample configuration. If your Apache Kafka broker is listening on a different endpoint
### and you want to use active-metadata-store, change this variable to your Apache Kafka's address.
################################################
platform.placeholder.variables=\
{\
"kafkaep" : "localhost:9092"\
}

################################################
### startup servers configuration
################################################
#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
#startup.server.list=active-metadata-store,engine-host,integration-daemon,view-server,simple-metadata-store

################################################
### SSL security.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class ConnectedAssetClient extends ConnectedAssetClientBase
public ConnectedAssetClient(String serverName,
String serverPlatformURLRoot) throws InvalidParameterException
{
super(serviceURLMarker, serverName, serverPlatformURLRoot);
super(serverName, serverPlatformURLRoot, serviceURLMarker);
}


Expand All @@ -46,6 +46,6 @@ public ConnectedAssetClient(String serverName,
String serverUserId,
String serverPassword) throws InvalidParameterException
{
super(serviceURLMarker, serverName, serverPlatformURLRoot, serverUserId, serverPassword);
super(serverName, serverPlatformURLRoot, serviceURLMarker, serverUserId, serverPassword);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class ConnectedAssetClient extends ConnectedAssetClientBase
public ConnectedAssetClient(String serverName,
String serverPlatformURLRoot) throws InvalidParameterException
{
super(serviceURLMarker, serverName, serverPlatformURLRoot);
super(serverName, serverPlatformURLRoot, serviceURLMarker);
}


Expand All @@ -46,6 +46,6 @@ public ConnectedAssetClient(String serverName,
String serverUserId,
String serverPassword) throws InvalidParameterException
{
super(serviceURLMarker, serverName, serverPlatformURLRoot, serverUserId, serverPassword);
super(serverName, serverPlatformURLRoot, serviceURLMarker, serverUserId, serverPassword);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class ConnectedAssetClient extends ConnectedAssetClientBase
public ConnectedAssetClient(String serverName,
String serverPlatformURLRoot) throws InvalidParameterException
{
super(serviceURLMarker, serverName, serverPlatformURLRoot);
super(serverName, serverPlatformURLRoot, serviceURLMarker);
}


Expand All @@ -46,6 +46,6 @@ public ConnectedAssetClient(String serverName,
String serverUserId,
String serverPassword) throws InvalidParameterException
{
super(serviceURLMarker, serverName, serverPlatformURLRoot, serverUserId, serverPassword);
super(serverName, serverPlatformURLRoot, serviceURLMarker, serverUserId, serverPassword);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@ dependencies {
implementation project(':open-metadata-implementation:access-services:asset-owner:asset-owner-api')
implementation project(':open-metadata-implementation:access-services:asset-owner:asset-owner-topic-connectors')
implementation project(':open-metadata-implementation:repository-services:repository-services-apis')
implementation project(':open-metadata-implementation:admin-services:admin-services-api')
implementation project(':open-metadata-implementation:common-services:ffdc-services')
implementation project(':open-metadata-implementation:frameworks:audit-log-framework')
implementation project(':open-metadata-implementation:frameworks:open-connector-framework')
implementation project(':open-metadata-implementation:frameworks:open-integration-framework')
implementation project(':open-metadata-implementation:frameworks:governance-action-framework')
implementation project(':open-metadata-implementation:frameworks:survey-action-framework')
implementation project(':open-metadata-implementation:frameworks:open-discovery-framework')
implementation project(':open-metadata-implementation:framework-services:ocf-metadata-management:ocf-metadata-api')
implementation project(':open-metadata-implementation:framework-services:ocf-metadata-management:ocf-metadata-client')
Expand Down
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.assetowner.client;

import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceDescription;
import org.odpi.openmetadata.frameworks.connectors.ffdc.InvalidParameterException;
import org.odpi.openmetadata.frameworkservices.ocf.metadatamanagement.client.ConnectedAssetClientBase;

Expand All @@ -11,7 +12,7 @@
*/
public class ConnectedAssetClient extends ConnectedAssetClientBase
{
private final static String serviceURLMarker = "community-profile";
private final static String serviceURLMarker = AccessServiceDescription.ASSET_OWNER_OMAS.getAccessServiceURLMarker();

/**
* Create a new client with no authentication embedded in the HTTP request.
Expand All @@ -25,7 +26,7 @@ public class ConnectedAssetClient extends ConnectedAssetClientBase
public ConnectedAssetClient(String serverName,
String serverPlatformURLRoot) throws InvalidParameterException
{
super(serviceURLMarker, serverName, serverPlatformURLRoot);
super(serverName, serverPlatformURLRoot, serviceURLMarker);
}


Expand All @@ -46,6 +47,6 @@ public ConnectedAssetClient(String serverName,
String serverUserId,
String serverPassword) throws InvalidParameterException
{
super(serviceURLMarker, serverName, serverPlatformURLRoot, serverUserId, serverPassword);
super(serverName, serverPlatformURLRoot, serviceURLMarker, serverUserId, serverPassword);
}
}
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
/* SPDX-License-Identifier: Apache-2.0 */
/* Copyright Contributors to the ODPi Egeria project. */
package org.odpi.openmetadata.accessservices.datascience.client;
package org.odpi.openmetadata.accessservices.assetowner.client;

import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceDescription;
import org.odpi.openmetadata.frameworks.connectors.ffdc.InvalidParameterException;
import org.odpi.openmetadata.frameworkservices.gaf.client.OpenGovernanceClientBase;
import org.odpi.openmetadata.frameworkservices.gaf.client.OpenMetadataClientBase;

/**
* OpenMetadataStoreClient provides an interface to the open metadata store. This is part of the Governance Action Framework (GAF)
* and provides a comprehensive interface for working with all types of metadata, subject to the user's (and this OMAS's) security permissions.
* The interface supports search, maintenance of metadata elements, classifications and relationships plus the ability to raise incident reports
* and todos along with the ability to work with metadata valid values and translations.
* OpenGovernanceClientBase provides an interface to the services that build, monitor and trigger governance actions.
* This is part of the Governance Action Framework (GAF).
*/
public class OpenMetadataStoreClient extends OpenMetadataClientBase
public class OpenGovernanceClient extends OpenGovernanceClientBase
{
private final static String serviceURLMarker = "data-science";
private final static String serviceURLMarker = AccessServiceDescription.ASSET_OWNER_OMAS.getAccessServiceURLMarker();

/**
* Create a new client with no authentication embedded in the HTTP request.
Expand All @@ -24,8 +24,8 @@ public class OpenMetadataStoreClient extends OpenMetadataClientBase
* @throws InvalidParameterException there is a problem creating the client-side components to issue any
* REST API calls.
*/
public OpenMetadataStoreClient(String serverName,
String serverPlatformURLRoot) throws InvalidParameterException
public OpenGovernanceClient(String serverName,
String serverPlatformURLRoot) throws InvalidParameterException
{
super(serviceURLMarker, serverName, serverPlatformURLRoot);
}
Expand All @@ -43,10 +43,10 @@ public OpenMetadataStoreClient(String serverName,
* @throws InvalidParameterException there is a problem creating the client-side components to issue any
* REST API calls.
*/
public OpenMetadataStoreClient(String serverName,
String serverPlatformURLRoot,
String serverUserId,
String serverPassword) throws InvalidParameterException
public OpenGovernanceClient(String serverName,
String serverPlatformURLRoot,
String serverUserId,
String serverPassword) throws InvalidParameterException
{
super(serviceURLMarker, serverName, serverPlatformURLRoot, serverUserId, serverPassword);
}
Expand Down
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.assetowner.client;

import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceDescription;
import org.odpi.openmetadata.frameworks.connectors.ffdc.InvalidParameterException;
import org.odpi.openmetadata.frameworkservices.oif.client.OpenIntegrationServiceBase;

Expand All @@ -11,7 +12,7 @@
*/
public class OpenIntegrationServiceClient extends OpenIntegrationServiceBase
{
private final static String serviceURLMarker = "asset-owner";
private final static String serviceURLMarker = AccessServiceDescription.ASSET_OWNER_OMAS.getAccessServiceURLMarker();

/**
* Create a new client with no authentication embedded in the HTTP request.
Expand Down
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.assetowner.client;

import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceDescription;
import org.odpi.openmetadata.frameworks.connectors.ffdc.InvalidParameterException;
import org.odpi.openmetadata.frameworkservices.gaf.client.OpenMetadataClientBase;

Expand All @@ -13,7 +14,7 @@
*/
public class OpenMetadataStoreClient extends OpenMetadataClientBase
{
private final static String serviceURLMarker = "asset-owner";
private final static String serviceURLMarker = AccessServiceDescription.ASSET_OWNER_OMAS.getAccessServiceURLMarker();

/**
* Create a new client with no authentication embedded in the HTTP request.
Expand Down
Loading
Loading