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

Update valid statuses for ControlledGlossaryTerms #7550

Merged
merged 2 commits into from
Mar 21, 2023
Merged

Update valid statuses for ControlledGlossaryTerms #7550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1d7169
Update valid statuses for ControlledGlossaryTerms
mandy-chessell Mar 21, 2023
f421a80
Merge branch 'main' of https://github.com/odpi/egeria into code2023
mandy-chessell Mar 21, 2023
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
5 changes: 4 additions & 1 deletion .../openmetadata/accessservices/assetmanager/metadataelements/MetadataCorrelationHeader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.fasterxml.jackson.annotation.JsonInclude;
import org.odpi.openmetadata.accessservices.assetmanager.properties.MetadataCorrelationProperties;

import java.io.Serial;
import java.util.Date;
import java.util.Objects;

Expand All @@ -24,7 +25,9 @@
@JsonIgnoreProperties(ignoreUnknown = true)
public class MetadataCorrelationHeader extends MetadataCorrelationProperties
{
private Date lastSynchronized = null;
@Serial
private static final long serialVersionUID = 1L;
private Date lastSynchronized = null;


/**
Expand Down
14 changes: 9 additions & 5 deletions ...java/org/odpi/openmetadata/accessservices/assetmanager/properties/GlossaryTermStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,15 @@
@JsonIgnoreProperties(ignoreUnknown=true)
public enum GlossaryTermStatus implements Serializable
{
UNKNOWN (0,0, "<Unknown>","Unknown term status."),
DRAFT (1,1, "Draft", "The content is incomplete."),
PROPOSED (2,3, "Proposed", "The content is in review."),
APPROVED (3,4, "Approved", "The content is approved."),
ACTIVE (4,15, "Active", "The term is approved and in use.");
DRAFT (1,1, "Draft", "The term is incomplete."),
PREPARED (2,2, "Prepared", "The term is ready for review."),
PROPOSED (3,3, "Proposed", "The term is in review."),
APPROVED (4,4, "Approved", "The term is approved and ready to be activated."),
REJECTED (5,5, "Rejected", "The term is rejected and should not be used."),
ACTIVE (6,15, "Active", "The term is approved and in use."),
DEPRECATED(7,30, "Deprecated","The term is out of date and should not be used."),
OTHER (8,50, "Other", "The term is in a locally defined state."),
;


private final int ordinal;
Expand Down
19 changes: 16 additions & 3 deletions ...a/org/odpi/openmetadata/accessservices/assetmanager/handlers/GlossaryExchangeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1647,14 +1647,27 @@ private InstanceStatus getInstanceStatus(GlossaryTermStatus status)
case DRAFT:
return InstanceStatus.DRAFT;

case APPROVED:
return InstanceStatus.APPROVED;
case PREPARED:
return InstanceStatus.PREPARED;

case PROPOSED:
return InstanceStatus.PROPOSED;

case ACTIVE:
case APPROVED:
return InstanceStatus.APPROVED;

case REJECTED:
return InstanceStatus.REJECTED;

case ACTIVE:
return InstanceStatus.ACTIVE;

case DEPRECATED:
return InstanceStatus.DEPRECATED;

case OTHER:
return InstanceStatus.OTHER;

}
}

Expand Down
2 changes: 1 addition & 1 deletion open-metadata-implementation/framework-services/oif-metadata-management/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ The *Open Integration Service* supports the governance of [integration connector

## Design Information

The module structure for the Metadata Store Service is as follows:
The module structure for the Open Integration Service is as follows:

* [oif-metadata-client](oif-metadata-client) supports the client library.
* [oif-metadata-api](oif-metadata-api) supports the common Java classes that are used both by the client and the server.
Expand Down
6 changes: 3 additions & 3 deletions ...rvices/connectors/stores/metadatacollectionstore/properties/instances/InstanceStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ public enum InstanceStatus implements Serializable

private static final long serialVersionUID = 1L;

private int ordinal;
private String name;
private String description;
private final int ordinal;
private final String name;
private final String description;


/**
Expand Down
85 changes: 70 additions & 15 deletions ...ain/java/org/odpi/openmetadata/repositoryservices/archiveutilities/OMRSArchiveHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,11 +278,29 @@ public EntityDef getDefaultEntityDef(String guid,
/*
* Set default valid instance statuses
*/
ArrayList<InstanceStatus> validInstanceStatusList = new ArrayList<>();
validInstanceStatusList.add(InstanceStatus.ACTIVE);
validInstanceStatusList.add(InstanceStatus.DELETED);
entityDef.setValidInstanceStatusList(validInstanceStatusList);
entityDef.setInitialStatus(InstanceStatus.ACTIVE);
TypeDef superTypeDef = null;
if (superType != null)
{
superTypeDef = this.archiveBuilder.getTypeDefByName(superType.getName());
}

if (superTypeDef != null)
{
entityDef.setValidInstanceStatusList(superTypeDef.getValidInstanceStatusList());
entityDef.setInitialStatus(superTypeDef.getInitialStatus());
}
else
{
/*
* These are the standard valid instance statuses used by entities
*/
ArrayList<InstanceStatus> validInstanceStatusList = new ArrayList<>();
validInstanceStatusList.add(InstanceStatus.ACTIVE);
validInstanceStatusList.add(InstanceStatus.DELETED);

entityDef.setValidInstanceStatusList(validInstanceStatusList);
entityDef.setInitialStatus(InstanceStatus.ACTIVE);
}

entityDef.setStatus(TypeDefStatus.ACTIVE_TYPEDEF);

Expand Down Expand Up @@ -885,11 +903,29 @@ public RelationshipDef getBasicRelationshipDef(String gui
/*
* Set default valid instance statuses
*/
ArrayList<InstanceStatus> validInstanceStatusList = new ArrayList<>();
validInstanceStatusList.add(InstanceStatus.ACTIVE);
validInstanceStatusList.add(InstanceStatus.DELETED);
relationshipDef.setValidInstanceStatusList(validInstanceStatusList);
relationshipDef.setInitialStatus(InstanceStatus.ACTIVE);
TypeDef superTypeDef = null;
if (superType != null)
{
superTypeDef = this.archiveBuilder.getTypeDefByName(superType.getName());
}

if (superTypeDef != null)
{
relationshipDef.setValidInstanceStatusList(superTypeDef.getValidInstanceStatusList());
relationshipDef.setInitialStatus(superTypeDef.getInitialStatus());
}
else
{
/*
* These are the standard valid instance statuses used by entities
*/
ArrayList<InstanceStatus> validInstanceStatusList = new ArrayList<>();
validInstanceStatusList.add(InstanceStatus.ACTIVE);
validInstanceStatusList.add(InstanceStatus.DELETED);

relationshipDef.setValidInstanceStatusList(validInstanceStatusList);
relationshipDef.setInitialStatus(InstanceStatus.ACTIVE);
}

/*
* Use the supplied propagation rule.
Expand Down Expand Up @@ -1008,11 +1044,30 @@ public ClassificationDef getClassificationDef(String guid
/*
* Set default valid instance statuses
*/
ArrayList<InstanceStatus> validInstanceStatusList = new ArrayList<>();
validInstanceStatusList.add(InstanceStatus.ACTIVE);
validInstanceStatusList.add(InstanceStatus.DELETED);
classificationDef.setValidInstanceStatusList(validInstanceStatusList);
classificationDef.setInitialStatus(InstanceStatus.ACTIVE);
TypeDef superTypeDef = null;
if (superType != null)
{
superTypeDef = this.archiveBuilder.getTypeDefByName(superType.getName());
}

if (superTypeDef != null)
{
classificationDef.setValidInstanceStatusList(superTypeDef.getValidInstanceStatusList());
classificationDef.setInitialStatus(superTypeDef.getInitialStatus());
}
else
{
/*
* These are the standard valid instance statuses used by entities
*/
ArrayList<InstanceStatus> validInstanceStatusList = new ArrayList<>();
validInstanceStatusList.add(InstanceStatus.ACTIVE);
validInstanceStatusList.add(InstanceStatus.DELETED);

classificationDef.setValidInstanceStatusList(validInstanceStatusList);
classificationDef.setInitialStatus(InstanceStatus.ACTIVE);
}


/*
* Set up the supplied validEntityTypes and propagatable flag.
Expand Down
61 changes: 61 additions & 0 deletions ...etadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import org.odpi.openmetadata.repositoryservices.archiveutilities.OMRSArchiveHelper;
import org.odpi.openmetadata.repositoryservices.connectors.stores.archivestore.properties.OpenMetadataArchive;
import org.odpi.openmetadata.repositoryservices.connectors.stores.archivestore.properties.OpenMetadataArchiveType;
import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.instances.InstanceStatus;
import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.typedefs.ClassificationPropagationRule;
import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.typedefs.EntityDef;
import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.typedefs.EnumDef;
Expand Down Expand Up @@ -168,6 +169,7 @@ public void getOriginalTypes()
add0220DataFileCollectionDataSet();
add0224TableDataSet();
add0239DeployedReportType();
update0385ControlledGlossaries();
update0462GovernanceActionType();
create0464DynamicIntegrationGroups();
update0470IncidentClassifierSet();
Expand All @@ -176,6 +178,65 @@ public void getOriginalTypes()
addFormulaTypeAttribute();
}

/*
* -------------------------------------------------------------------------------------------------------
*/

private void update0385ControlledGlossaries()
{
this.archiveBuilder.addTypeDefPatch(updateControlledGlossaryTermEntity());
}


private TypeDefPatch updateControlledGlossaryTermEntity()
{
/*
* Create the Patch
*/
final String typeName = "ControlledGlossaryTerm";

TypeDefPatch typeDefPatch = archiveBuilder.getPatchForType(typeName);

typeDefPatch.setUpdatedBy(originatorName);
typeDefPatch.setUpdateTime(creationDate);

/*
* Build the attributes
*/
List<TypeDefAttribute> properties = new ArrayList<>();
TypeDefAttribute property;

final String attribute1Name = "userDefinedStatus";
final String attribute1Description = "Extend or replace the valid instance statuses with additional statuses controlled through valid metadata values.";
final String attribute1DescriptionGUID = null;

property = archiveHelper.getStringTypeDefAttribute(attribute1Name,
attribute1Description,
attribute1DescriptionGUID);
properties.add(property);

typeDefPatch.setPropertyDefinitions(properties);

/*
* Update the valid instance statuses
*/
ArrayList<InstanceStatus> validInstanceStatusList = new ArrayList<>();

validInstanceStatusList.add(InstanceStatus.DRAFT);
validInstanceStatusList.add(InstanceStatus.PREPARED);
validInstanceStatusList.add(InstanceStatus.PROPOSED);
validInstanceStatusList.add(InstanceStatus.APPROVED);
validInstanceStatusList.add(InstanceStatus.REJECTED);
validInstanceStatusList.add(InstanceStatus.ACTIVE);
validInstanceStatusList.add(InstanceStatus.DEPRECATED);
validInstanceStatusList.add(InstanceStatus.OTHER);
validInstanceStatusList.add(InstanceStatus.DELETED);

typeDefPatch.setValidInstanceStatusList(validInstanceStatusList);

return typeDefPatch;
}

/*
* -------------------------------------------------------------------------------------------------------
*/
Expand Down
Loading