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

Jump to bottom

Remove support for supplementary properties from SchemaElements #7238

Merged
merged 2 commits into from
Dec 8, 2022
Merged

Remove support for supplementary properties from SchemaElements #7238

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
319adb1
Remove support for supplementary properties from SchemaElements (#356…
mandy-chessell Dec 8, 2022
16f2d08
Merge branch 'main' of https://github.com/odpi/egeria into egeria-code
mandy-chessell Dec 8, 2022
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: 0 additions & 5 deletions ...odpi/openmetadata/accessservices/assetmanager/properties/ComplexSchemaTypeProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,8 @@ public String toString()
", formula='" + getFormula() + '\'' +
", queries=" + getQueries() +
", isDeprecated=" + getIsDeprecated() +
", technicalName='" + getTechnicalName() + '\'' +
", technicalDescription='" + getTechnicalDescription() + '\'' +
", displayName='" + getDisplayName() + '\'' +
", summary='" + getSummary() + '\'' +
", description='" + getDescription() + '\'' +
", abbreviation='" + getAbbreviation() + '\'' +
", usage='" + getUsage() + '\'' +
", qualifiedName='" + getQualifiedName() + '\'' +
", additionalProperties=" + getAdditionalProperties() +
", effectiveFrom=" + getEffectiveFrom() +
Expand Down
5 changes: 0 additions & 5 deletions ...rg/odpi/openmetadata/accessservices/assetmanager/properties/EnumSchemaTypeProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,8 @@ public String toString()
", formula='" + getFormula() + '\'' +
", queries=" + getQueries() +
", isDeprecated=" + getIsDeprecated() +
", technicalName='" + getTechnicalName() + '\'' +
", technicalDescription='" + getTechnicalDescription() + '\'' +
", displayName='" + getDisplayName() + '\'' +
", summary='" + getSummary() + '\'' +
", description='" + getDescription() + '\'' +
", abbreviation='" + getAbbreviation() + '\'' +
", usage='" + getUsage() + '\'' +
", qualifiedName='" + getQualifiedName() + '\'' +
", additionalProperties=" + getAdditionalProperties() +
", effectiveFrom=" + getEffectiveFrom() +
Expand Down
7 changes: 1 addition & 6 deletions ...dpi/openmetadata/accessservices/assetmanager/properties/ExternalSchemaTypeProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,14 +116,9 @@ public String toString()
", formula='" + getFormula() + '\'' +
", queries=" + getQueries() +
", isDeprecated=" + getIsDeprecated() +
", technicalName='" + getTechnicalName() + '\'' +
", technicalDescription='" + getTechnicalDescription() + '\'' +
", displayName='" + getDisplayName() + '\'' +
", summary='" + getSummary() + '\'' +
", description='" + getDescription() + '\'' +
", abbreviation='" + getAbbreviation() + '\'' +
", usage='" + getUsage() + '\'' +
", qualifiedName='" + getQualifiedName() + '\'' +
", qualifiedName='" + getQualifiedName() + '\'' +
", additionalProperties=" + getAdditionalProperties() +
", vendorProperties=" + getVendorProperties() +
", typeName='" + getTypeName() + '\'' +
Expand Down
7 changes: 1 addition & 6 deletions ...odpi/openmetadata/accessservices/assetmanager/properties/LiteralSchemaTypeProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public LiteralSchemaTypeProperties()

/**
* Copy/clone Constructor - the parentAsset is passed separately to the template because it is also
* likely to be being cloned in the same operation and we want the definitions clone to point to the
* likely to be being cloned in the same operation, and we want the definitions clone to point to the
* asset clone and not the original asset.
*
* @param template template object to copy.
Expand Down Expand Up @@ -110,13 +110,8 @@ public String toString()
", formula='" + getFormula() + '\'' +
", queries=" + getQueries() +
", isDeprecated=" + getIsDeprecated() +
", technicalName='" + getTechnicalName() + '\'' +
", technicalDescription='" + getTechnicalDescription() + '\'' +
", displayName='" + getDisplayName() + '\'' +
", summary='" + getSummary() + '\'' +
", description='" + getDescription() + '\'' +
", abbreviation='" + getAbbreviation() + '\'' +
", usage='" + getUsage() + '\'' +
", qualifiedName='" + getQualifiedName() + '\'' +
", additionalProperties=" + getAdditionalProperties() +
", vendorProperties=" + getVendorProperties() +
Expand Down
5 changes: 0 additions & 5 deletions ...org/odpi/openmetadata/accessservices/assetmanager/properties/MapSchemaTypeProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,8 @@ public String toString()
", formula='" + getFormula() + '\'' +
", queries=" + getQueries() +
", isDeprecated=" + getIsDeprecated() +
", technicalName='" + getTechnicalName() + '\'' +
", technicalDescription='" + getTechnicalDescription() + '\'' +
", displayName='" + getDisplayName() + '\'' +
", summary='" + getSummary() + '\'' +
", description='" + getDescription() + '\'' +
", abbreviation='" + getAbbreviation() + '\'' +
", usage='" + getUsage() + '\'' +
", qualifiedName='" + getQualifiedName() + '\'' +
", additionalProperties=" + getAdditionalProperties() +
", vendorProperties=" + getVendorProperties() +
Expand Down
5 changes: 0 additions & 5 deletions ...pi/openmetadata/accessservices/assetmanager/properties/PrimitiveSchemaTypeProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,8 @@ public String toString()
", formula='" + getFormula() + '\'' +
", queries=" + getQueries() +
", isDeprecated=" + getIsDeprecated() +
", technicalName='" + getTechnicalName() + '\'' +
", technicalDescription='" + getTechnicalDescription() + '\'' +
", displayName='" + getDisplayName() + '\'' +
", summary='" + getSummary() + '\'' +
", description='" + getDescription() + '\'' +
", abbreviation='" + getAbbreviation() + '\'' +
", usage='" + getUsage() + '\'' +
", qualifiedName='" + getQualifiedName() + '\'' +
", additionalProperties=" + getAdditionalProperties() +
", vendorProperties=" + getVendorProperties() +
Expand Down
49 changes: 25 additions & 24 deletions ...g/odpi/openmetadata/accessservices/assetmanager/properties/SchemaAttributeProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,30 +398,31 @@ public void setSchemaType(SchemaTypeProperties schemaType)
public String toString()
{
return "SchemaAttributeProperties{" +
"elementPosition=" + elementPosition +
", minCardinality=" + minCardinality +
", maxCardinality=" + maxCardinality +
", allowsDuplicateValues=" + allowsDuplicateValues +
", orderedValues=" + orderedValues +
", defaultValueOverride='" + defaultValueOverride + '\'' +
", sortOrder=" + sortOrder +
", minimumLength=" + minimumLength +
", length=" + length +
", significantDigits=" + precision +
", isNullable=" + isNullable +
", nativeJavaClass='" + nativeJavaClass + '\'' +
", aliases=" + aliases +
", schemaType=" + schemaType +
", nullable=" + getIsNullable() +
", deprecated=" + getIsDeprecated() +
", displayName='" + getTechnicalName() + '\'' +
", description='" + getTechnicalDescription() + '\'' +
", qualifiedName='" + getQualifiedName() + '\'' +
", additionalProperties=" + getAdditionalProperties() +
", vendorProperties=" + getVendorProperties() +
", typeName='" + getTypeName() + '\'' +
", extendedProperties=" + getExtendedProperties() +
'}';
"qualifiedName='" + getQualifiedName() + '\'' +
", additionalProperties=" + getAdditionalProperties() +
", effectiveFrom=" + getEffectiveFrom() +
", effectiveTo=" + getEffectiveTo() +
", vendorProperties=" + getVendorProperties() +
", typeName='" + getTypeName() + '\'' +
", extendedProperties=" + getExtendedProperties() +
", elementPosition=" + elementPosition +
", minCardinality=" + minCardinality +
", maxCardinality=" + maxCardinality +
", allowsDuplicateValues=" + allowsDuplicateValues +
", orderedValues=" + orderedValues +
", defaultValueOverride='" + defaultValueOverride + '\'' +
", sortOrder=" + sortOrder +
", minimumLength=" + minimumLength +
", length=" + length +
", precision=" + precision +
", isNullable=" + isNullable +
", nativeJavaClass='" + nativeJavaClass + '\'' +
", aliases=" + aliases +
", schemaType=" + schemaType +
", isDeprecated=" + getIsDeprecated() +
", displayName='" + getDisplayName() + '\'' +
", description='" + getDescription() + '\'' +
'}';
}


Expand Down
43 changes: 19 additions & 24 deletions ...n/java/org/odpi/openmetadata/accessservices/assetmanager/properties/SchemaProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
@JsonSubTypes.Type(value = SchemaAttributeProperties.class, name = "SchemaAttributeProperties"),
@JsonSubTypes.Type(value = SchemaTypeProperties.class, name = "SchemaTypeProperties"),
})
public class SchemaProperties extends SupplementaryProperties
public class SchemaProperties extends ReferenceableProperties
{
private static final long serialVersionUID = 1L;

private boolean isDeprecated = false;
private String technicalName = null;
private String technicalDescription = null;
private boolean isDeprecated = false;
private String displayName = null;
private String description = null;

/**
* Default constructor
Expand All @@ -53,8 +53,8 @@ public SchemaProperties(SchemaProperties template)
if (template != null)
{
isDeprecated = template.getIsDeprecated();
technicalName = template.getTechnicalName();
technicalDescription = template.getTechnicalDescription();
displayName = template.getDisplayName();
description = template.getDescription();
}
}

Expand Down Expand Up @@ -86,17 +86,17 @@ public void setIsDeprecated(boolean deprecated)
*
* @return string name
*/
public String getTechnicalName() { return technicalName; }
public String getDisplayName() { return displayName; }


/**
* Set up the simple name of the schema element.
*
* @param name String display name
*/
public void setTechnicalName(String name)
public void setDisplayName(String name)
{
this.technicalName = name;
this.displayName = name;
}


Expand All @@ -105,20 +105,20 @@ public void setTechnicalName(String name)
*
* @return string technicalDescription
*/
public String getTechnicalDescription()
public String getDescription()
{
return technicalDescription;
return description;
}


/**
* Set up the stored technicalDescription property for the schema element.
*
* @param technicalDescription string technicalDescription
* @param description string technicalDescription
*/
public void setTechnicalDescription(String technicalDescription)
public void setDescription(String description)
{
this.technicalDescription = technicalDescription;
this.description = description;
}


Expand All @@ -132,13 +132,8 @@ public String toString()
{
return "SchemaProperties{" +
"isDeprecated=" + isDeprecated +
", technicalName='" + technicalName + '\'' +
", technicalDescription='" + technicalDescription + '\'' +
", displayName='" + getDisplayName() + '\'' +
", summary='" + getSummary() + '\'' +
", description='" + getDescription() + '\'' +
", abbreviation='" + getAbbreviation() + '\'' +
", usage='" + getUsage() + '\'' +
", displayName='" + displayName + '\'' +
", description='" + description + '\'' +
", qualifiedName='" + getQualifiedName() + '\'' +
", additionalProperties=" + getAdditionalProperties() +
", vendorProperties=" + getVendorProperties() +
Expand Down Expand Up @@ -171,8 +166,8 @@ public boolean equals(Object objectToCompare)
}
SchemaProperties that = (SchemaProperties) objectToCompare;
return isDeprecated == that.isDeprecated &&
Objects.equals(technicalName, that.technicalName) &&
Objects.equals(technicalDescription, that.technicalDescription);
Objects.equals(displayName, that.displayName) &&
Objects.equals(description, that.description);
}


Expand All @@ -184,6 +179,6 @@ public boolean equals(Object objectToCompare)
@Override
public int hashCode()
{
return Objects.hash(super.hashCode(), isDeprecated, technicalName, technicalDescription);
return Objects.hash(super.hashCode(), isDeprecated, displayName, description);
}
}
7 changes: 1 addition & 6 deletions .../odpi/openmetadata/accessservices/assetmanager/properties/SchemaTypeChoiceProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public SchemaTypeChoiceProperties()

/**
* Copy/clone Constructor - the parentAsset is passed separately to the template because it is also
* likely to be being cloned in the same operation and we want the definitions clone to point to the
* likely to be being cloned in the same operation, and we want the definitions clone to point to the
* asset clone and not the original asset.
*
* @param template template object to copy.
Expand Down Expand Up @@ -127,13 +127,8 @@ public String toString()
", formula='" + getFormula() + '\'' +
", queries=" + getQueries() +
", isDeprecated=" + getIsDeprecated() +
", technicalName='" + getTechnicalName() + '\'' +
", technicalDescription='" + getTechnicalDescription() + '\'' +
", displayName='" + getDisplayName() + '\'' +
", summary='" + getSummary() + '\'' +
", description='" + getDescription() + '\'' +
", abbreviation='" + getAbbreviation() + '\'' +
", usage='" + getUsage() + '\'' +
", qualifiedName='" + getQualifiedName() + '\'' +
", additionalProperties=" + getAdditionalProperties() +
", vendorProperties=" + getVendorProperties() +
Expand Down
47 changes: 34 additions & 13 deletions ...va/org/odpi/openmetadata/accessservices/assetmanager/properties/SchemaTypeProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public class SchemaTypeProperties extends SchemaProperties
private String author = null;
private String encodingStandard = null;
private String namespace = null;
private String usage = null;

/*
* Values for when the schemaType is derived from other values rather than stored
Expand Down Expand Up @@ -65,6 +66,7 @@ public SchemaTypeProperties(SchemaTypeProperties template)
{
versionNumber = template.getVersionNumber();
author = template.getAuthor();
usage = template.getUsage();
encodingStandard = template.getEncodingStandard();
namespace = template.getNamespace();
formula = template.getFormula();
Expand Down Expand Up @@ -111,6 +113,28 @@ public void setAuthor(String author)
}


/**
* Return details of the expected usage of this technical element.
*
* @return string text
*/
public String getUsage()
mandy-chessell marked this conversation as resolved.
Show resolved Hide resolved
{
return usage;
}


/**
* Set up details of the expected usage of this technical element.
*
* @param usage string text
*/
public void setUsage(String usage)
{
this.usage = usage;
}


/**
* Return the format (encoding standard) used for this schema. It may be XML, JSON, SQL DDL or something else.
* Null means the encoding standard is unknown or there are many choices.
Expand Down Expand Up @@ -226,19 +250,15 @@ public String toString()
", typeName='" + getTypeName() + '\'' +
", extendedProperties=" + getExtendedProperties() +
", isDeprecated=" + getIsDeprecated() +
", technicalName='" + getTechnicalName() + '\'' +
", technicalDescription='" + getTechnicalDescription() + '\'' +
", displayName='" + getDisplayName() + '\'' +
", description='" + getDescription() + '\'' +
", versionNumber='" + versionNumber + '\'' +
", author='" + author + '\'' +
", usage='" + usage + '\'' +
", encodingStandard='" + encodingStandard + '\'' +
", namespace='" + namespace + '\'' +
", formula='" + formula + '\'' +
", queries=" + queries +
", displayName='" + getDisplayName() + '\'' +
", summary='" + getSummary() + '\'' +
", description='" + getDescription() + '\'' +
", abbreviation='" + getAbbreviation() + '\'' +
", usage='" + getUsage() + '\'' +
'}';
}

Expand Down Expand Up @@ -266,11 +286,12 @@ public boolean equals(Object objectToCompare)
}
SchemaTypeProperties that = (SchemaTypeProperties) objectToCompare;
return Objects.equals(versionNumber, that.versionNumber) &&
Objects.equals(author, that.author) &&
Objects.equals(encodingStandard, that.encodingStandard) &&
Objects.equals(namespace, that.namespace) &&
Objects.equals(formula, that.formula) &&
Objects.equals(queries, that.queries);
Objects.equals(author, that.author) &&
Objects.equals(usage, that.usage) &&
Objects.equals(encodingStandard, that.encodingStandard) &&
Objects.equals(namespace, that.namespace) &&
Objects.equals(formula, that.formula) &&
Objects.equals(queries, that.queries);
}


Expand All @@ -282,6 +303,6 @@ public boolean equals(Object objectToCompare)
@Override
public int hashCode()
{
return Objects.hash(super.hashCode(), versionNumber, author, encodingStandard, namespace, formula, queries);
return Objects.hash(super.hashCode(), versionNumber, author, usage, encodingStandard, namespace, formula, queries);
}
}
4 changes: 0 additions & 4 deletions .../odpi/openmetadata/accessservices/assetmanager/properties/SimpleSchemaTypeProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,8 @@ public String toString()
", formula='" + getFormula() + '\'' +
", queries=" + getQueries() +
", isDeprecated=" + getIsDeprecated() +
", technicalName='" + getTechnicalName() + '\'' +
", technicalDescription='" + getTechnicalDescription() + '\'' +
", displayName='" + getDisplayName() + '\'' +
", summary='" + getSummary() + '\'' +
", description='" + getDescription() + '\'' +
", abbreviation='" + getAbbreviation() + '\'' +
", usage='" + getUsage() + '\'' +
", qualifiedName='" + getQualifiedName() + '\'' +
", additionalProperties=" + getAdditionalProperties() +
Expand Down
Loading