Skip to content

Commit

Permalink
Merge pull request #8148 from mandy-chessell/oak2024
Browse files Browse the repository at this point in the history 
Valid values for metadata
  • Loading branch information
@mandy-chessell
mandy-chessell authored Apr 23, 2024
2 parents e147f2e + 0815d16 commit 245eec2
Show file tree
Hide file tree
Showing 985 changed files with 10,633 additions and 11,940 deletions.
2 changes: 1 addition & 1 deletion OpenConnectorsArchiveGUIDMap.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/OpenConnectorsArchive.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/OpenConnectorsArchive.omarchive
View file

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions open-metadata-distribution/omag-server-platform/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,8 @@ distributions {
{ include 'Egeria*.http' }
from { "$rootProject.projectDir/open-metadata-implementation/view-services/template-manager" }
{ include 'Egeria*.http' }
from { "$rootProject.projectDir/open-metadata-implementation/view-services/valid-metadata" }
{ include 'Egeria*.http' }
from { "$rootProject.projectDir/open-metadata-implementation/view-services/asset-catalog" }
{ include 'Egeria*.http' }
from { "$rootProject.projectDir/open-metadata-implementation/view-services/automated-curation" }
Expand Down
1 change: 1 addition & 0 deletions open-metadata-implementation/access-services/asset-catalog/asset-catalog-client/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ dependencies {
implementation project(':open-metadata-implementation:access-services:asset-catalog:asset-catalog-topic-connector')
implementation project(':open-metadata-implementation:frameworks:open-connector-framework')
implementation project(':open-metadata-implementation:frameworks:open-integration-framework')
implementation project(':open-metadata-implementation:frameworks:open-metadata-framework')
implementation project(':open-metadata-implementation:frameworks:governance-action-framework')
implementation project(':open-metadata-implementation:common-services:ffdc-services')
implementation project(':open-metadata-implementation:adapters:open-connectors:rest-client-connectors:rest-client-connectors-api')
Expand Down
1 change: 1 addition & 0 deletions open-metadata-implementation/access-services/asset-consumer/asset-consumer-api/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ dependencies {
compileOnly 'com.fasterxml.jackson.core:jackson-annotations'
testImplementation 'com.fasterxml.jackson.core:jackson-databind'
implementation project(':open-metadata-implementation:frameworks:audit-log-framework')
implementation project(':open-metadata-implementation:frameworks:open-metadata-framework')
implementation project(':open-metadata-implementation:frameworks:open-connector-framework')
implementation project(':open-metadata-implementation:repository-services:repository-services-apis')
implementation project(':open-metadata-implementation:common-services:ffdc-services')
Expand Down
4 changes: 2 additions & 2 deletions ...rg/odpi/openmetadata/accessservices/assetconsumer/api/AssetConsumerFeedbackInterface.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
/* Copyright Contributors to the ODPi Egeria project. */
package org.odpi.openmetadata.accessservices.assetconsumer.api;

import org.odpi.openmetadata.frameworks.connectors.properties.beans.CommentType;
import org.odpi.openmetadata.frameworks.connectors.properties.beans.StarRating;
import org.odpi.openmetadata.frameworks.connectors.ffdc.InvalidParameterException;
import org.odpi.openmetadata.frameworks.connectors.ffdc.PropertyServerException;
import org.odpi.openmetadata.frameworks.connectors.ffdc.UserNotAuthorizedException;
import org.odpi.openmetadata.frameworks.openmetadata.enums.CommentType;
import org.odpi.openmetadata.frameworks.openmetadata.enums.StarRating;


/**
Expand Down
3 changes: 1 addition & 2 deletions ...main/java/org/odpi/openmetadata/accessservices/assetconsumer/rest/CommentRequestBody.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import org.odpi.openmetadata.frameworks.openmetadata.enums.CommentType;

import java.util.Objects;

import org.odpi.openmetadata.frameworks.connectors.properties.beans.CommentType;

import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE;
import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.PUBLIC_ONLY;

Expand Down
2 changes: 1 addition & 1 deletion .../main/java/org/odpi/openmetadata/accessservices/assetconsumer/rest/RatingRequestBody.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import org.odpi.openmetadata.frameworks.openmetadata.enums.StarRating;

import java.util.Objects;
import org.odpi.openmetadata.frameworks.connectors.properties.beans.StarRating;

import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE;
import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.PUBLIC_ONLY;
Expand Down
1 change: 1 addition & 0 deletions ...metadata-implementation/access-services/asset-consumer/asset-consumer-client/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ dependencies {
implementation project(':open-metadata-implementation:admin-services:admin-services-api')
implementation project(':open-metadata-implementation:repository-services:repository-services-apis')
implementation project(':open-metadata-implementation:common-services:ffdc-services')
implementation project(':open-metadata-implementation:frameworks:open-metadata-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')
Expand Down
4 changes: 2 additions & 2 deletions ...rc/main/java/org/odpi/openmetadata/accessservices/assetconsumer/client/AssetConsumer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
import org.odpi.openmetadata.frameworks.connectors.ffdc.UserNotAuthorizedException;
import org.odpi.openmetadata.frameworks.connectors.properties.AssetUniverse;
import org.odpi.openmetadata.frameworks.connectors.properties.beans.Asset;
import org.odpi.openmetadata.frameworks.connectors.properties.beans.CommentType;
import org.odpi.openmetadata.frameworks.connectors.properties.beans.StarRating;
import org.odpi.openmetadata.frameworks.openmetadata.enums.CommentType;
import org.odpi.openmetadata.frameworks.openmetadata.enums.StarRating;
import org.odpi.openmetadata.frameworkservices.ocf.metadatamanagement.client.ConnectedAssetClientBase;

import java.util.ArrayList;
Expand Down
1 change: 1 addition & 0 deletions ...metadata-implementation/access-services/asset-consumer/asset-consumer-server/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ dependencies {
implementation project(':open-metadata-implementation:framework-services:ocf-metadata-management:ocf-metadata-api')
implementation project(':open-metadata-implementation:repository-services:repository-services-apis')
implementation project(':open-metadata-implementation:frameworks:audit-log-framework')
implementation project(':open-metadata-implementation:frameworks:open-metadata-framework')
implementation project(':open-metadata-implementation:frameworks:open-connector-framework')
implementation project(':open-metadata-implementation:frameworks:governance-action-framework')
implementation project(':open-metadata-implementation:common-services:ffdc-services')
Expand Down
2 changes: 1 addition & 1 deletion ...pi/openmetadata/accessservices/assetconsumer/outtopic/AssetConsumerOMRSTopicListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import org.odpi.openmetadata.commonservices.generichandlers.AssetHandler;
import org.odpi.openmetadata.commonservices.generichandlers.OpenMetadataAPIDummyBean;
import org.odpi.openmetadata.frameworks.auditlog.AuditLog;
import org.odpi.openmetadata.frameworks.governanceaction.mapper.OpenMetadataType;
import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataType;
import org.odpi.openmetadata.repositoryservices.connectors.omrstopic.OMRSTopicListenerBase;
import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.instances.Classification;
import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.instances.EntityDetail;
Expand Down
22 changes: 11 additions & 11 deletions .../org/odpi/openmetadata/accessservices/assetconsumer/server/AssetConsumerRESTServices.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
import org.odpi.openmetadata.commonservices.generichandlers.OpenMetadataAPIDummyBean;
import org.odpi.openmetadata.commonservices.generichandlers.RatingHandler;
import org.odpi.openmetadata.frameworks.auditlog.AuditLog;
import org.odpi.openmetadata.frameworks.connectors.properties.beans.CommentType;
import org.odpi.openmetadata.frameworks.connectors.properties.beans.StarRating;
import org.odpi.openmetadata.frameworks.governanceaction.mapper.OpenMetadataType;
import org.odpi.openmetadata.frameworks.openmetadata.enums.CommentType;
import org.odpi.openmetadata.frameworks.openmetadata.enums.StarRating;
import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataType;
import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.instances.EntityDetail;
import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.instances.InstanceStatus;
import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.repositoryconnector.OMRSRepositoryHelper;
Expand Down Expand Up @@ -561,11 +561,11 @@ public GUIDResponse addCommentToAsset(String serverName,
{
if (requestBody != null)
{
int commentType = CommentType.STANDARD_COMMENT.getOpenTypeOrdinal();
int commentType = CommentType.STANDARD_COMMENT.getOrdinal();

if (requestBody.getCommentType() != null)
{
commentType = requestBody.getCommentType().getOpenTypeOrdinal();
commentType = requestBody.getCommentType().getOrdinal();
}
CommentHandler<OpenMetadataAPIDummyBean> handler = instanceHandler.getCommentHandler(userId, serverName, methodName);

Expand Down Expand Up @@ -634,11 +634,11 @@ public GUIDResponse addCommentReply(String serverName,
{
if (requestBody != null)
{
int commentType = CommentType.STANDARD_COMMENT.getOpenTypeOrdinal();
int commentType = CommentType.STANDARD_COMMENT.getOrdinal();

if (requestBody.getCommentType() != null)
{
commentType = requestBody.getCommentType().getOpenTypeOrdinal();
commentType = requestBody.getCommentType().getOrdinal();
}

CommentHandler<OpenMetadataAPIDummyBean> handler = instanceHandler.getCommentHandler(userId, serverName, methodName);
Expand Down Expand Up @@ -708,11 +708,11 @@ public VoidResponse updateComment(String serverName,
{
if (requestBody != null)
{
int commentType = CommentType.STANDARD_COMMENT.getOpenTypeOrdinal();
int commentType = CommentType.STANDARD_COMMENT.getOrdinal();

if (requestBody.getCommentType() != null)
{
commentType = requestBody.getCommentType().getOpenTypeOrdinal();
commentType = requestBody.getCommentType().getOrdinal();
}

CommentHandler<OpenMetadataAPIDummyBean> handler = instanceHandler.getCommentHandler(userId, serverName, methodName);
Expand Down Expand Up @@ -1027,8 +1027,8 @@ public GUIDListResponse getAssetsByMeaning(String serverName,
termGUID,
guidParameterName,
OpenMetadataType.GLOSSARY_TERM_TYPE_NAME,
OpenMetadataType.REFERENCEABLE_TO_MEANING_TYPE_GUID,
OpenMetadataType.REFERENCEABLE_TO_MEANING_TYPE_NAME,
OpenMetadataType.SEMANTIC_ASSIGNMENT.typeGUID,
OpenMetadataType.SEMANTIC_ASSIGNMENT.typeName,
OpenMetadataType.REFERENCEABLE.typeName,
null,
null,
Expand Down
1 change: 1 addition & 0 deletions open-metadata-implementation/access-services/asset-lineage/asset-lineage-client/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ dependencies {
implementation project(':open-metadata-implementation:repository-services:repository-services-apis')
implementation project(':open-metadata-implementation:frameworks:audit-log-framework')
implementation project(':open-metadata-implementation:frameworks:governance-action-framework')
implementation project(':open-metadata-implementation:frameworks:open-metadata-framework')
implementation project(':open-metadata-implementation:frameworks:open-connector-framework')
implementation project(':open-metadata-implementation:frameworks:open-integration-framework')
implementation project(':open-metadata-implementation:common-services:ffdc-services')
Expand Down
1 change: 1 addition & 0 deletions open-metadata-implementation/access-services/asset-lineage/asset-lineage-server/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ dependencies {
implementation project(':open-metadata-implementation:common-services:repository-handler')
implementation project(':open-metadata-implementation:repository-services:repository-services-apis')
implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation project(':open-metadata-implementation:frameworks:open-metadata-framework')
implementation project(':open-metadata-implementation:frameworks:open-connector-framework')
implementation project(':open-metadata-implementation:frameworks:audit-log-framework')
implementation project(':open-metadata-implementation:common-services:ffdc-services')
Expand Down
1 change: 1 addition & 0 deletions open-metadata-implementation/access-services/asset-manager/asset-manager-api/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
dependencies {
implementation project(':open-metadata-implementation:repository-services:repository-services-apis')
implementation project(':open-metadata-implementation:frameworks:open-connector-framework')
implementation project(':open-metadata-implementation:frameworks:open-metadata-framework')
implementation project(':open-metadata-implementation:frameworks:audit-log-framework')
compileOnly 'com.fasterxml.jackson.core:jackson-annotations'
testImplementation 'com.fasterxml.jackson.core:jackson-databind'
Expand Down
1 change: 1 addition & 0 deletions ...odpi/openmetadata/accessservices/assetmanager/api/exchange/GlossaryExchangeInterface.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import org.odpi.openmetadata.frameworks.connectors.ffdc.InvalidParameterException;
import org.odpi.openmetadata.frameworks.connectors.ffdc.PropertyServerException;
import org.odpi.openmetadata.frameworks.connectors.ffdc.UserNotAuthorizedException;
import org.odpi.openmetadata.frameworks.openmetadata.enums.GlossaryTermRelationshipStatus;

import java.util.Date;
import java.util.List;
Expand Down
1 change: 1 addition & 0 deletions ...g/odpi/openmetadata/accessservices/assetmanager/api/exchange/SchemaExchangeInterface.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.odpi.openmetadata.frameworks.connectors.ffdc.PropertyServerException;
import org.odpi.openmetadata.frameworks.connectors.ffdc.UserNotAuthorizedException;
import org.odpi.openmetadata.frameworks.connectors.properties.beans.ElementHeader;
import org.odpi.openmetadata.frameworks.openmetadata.enums.KeyPattern;

import java.util.Date;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion .../openmetadata/accessservices/assetmanager/api/management/GlossaryManagementInterface.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import org.odpi.openmetadata.accessservices.assetmanager.properties.GlossaryTermContextDefinition;
import org.odpi.openmetadata.accessservices.assetmanager.properties.GlossaryTermProperties;
import org.odpi.openmetadata.accessservices.assetmanager.properties.GlossaryTermRelationship;
import org.odpi.openmetadata.accessservices.assetmanager.properties.GlossaryTermRelationshipStatus;
import org.odpi.openmetadata.accessservices.assetmanager.properties.GlossaryTermStatus;
import org.odpi.openmetadata.accessservices.assetmanager.properties.StagingGlossaryProperties;
import org.odpi.openmetadata.accessservices.assetmanager.properties.TaxonomyProperties;
Expand All @@ -27,6 +26,7 @@
import org.odpi.openmetadata.frameworks.connectors.ffdc.InvalidParameterException;
import org.odpi.openmetadata.frameworks.connectors.ffdc.PropertyServerException;
import org.odpi.openmetadata.frameworks.connectors.ffdc.UserNotAuthorizedException;
import org.odpi.openmetadata.frameworks.openmetadata.enums.GlossaryTermRelationshipStatus;

import java.util.Date;
import java.util.List;
Expand Down
1 change: 1 addition & 0 deletions ...pi/openmetadata/accessservices/assetmanager/properties/ActivityDescriptionProperties.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import org.odpi.openmetadata.frameworks.openmetadata.enums.GlossaryTermActivityType;

import java.util.Objects;

Expand Down
1 change: 1 addition & 0 deletions ...i/openmetadata/accessservices/assetmanager/properties/CapabilityDeploymentProperties.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import org.odpi.openmetadata.frameworks.openmetadata.enums.OperationalStatus;

import java.util.Date;
import java.util.HashMap;
Expand Down
1 change: 1 addition & 0 deletions .../java/org/odpi/openmetadata/accessservices/assetmanager/properties/CommentProperties.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import org.odpi.openmetadata.frameworks.openmetadata.enums.CommentType;

import java.util.Objects;

Expand Down
Loading

0 comments on commit 245eec2

Please sign in to comment.