Skip to content

A
atlas
Commit 1fc88ce3 by Madhan Neethiraj Committed by apoorvnaik
Options

ATLAS-2648: Remove prefix '__' from AtlasGlossary type names

Change-Id: I3b5940c9936d718b5b6e3c5d08d3cbbd173f7a51 Signed-off-by: 's avatarapoorvnaik <apoorvnaik@apache.org>
parent 94d0c0ab
Showing with 45 additions and 49 deletions
common/src/main/java/org/apache/atlas/repository/Constants.java
......@@ -125,7 +125,7 @@ public final class Constants {
public static final String CLASSIFICATION_EDGE_IS_PROPAGATED_PROPERTY_KEY = INTERNAL_PROPERTY_KEY_PREFIX + "isPropagated";
public static final String CLASSIFICATION_EDGE_STATE_PROPERTY_KEY = STATE_PROPERTY_KEY;
public static final String CLASSIFICATION_LABEL = "classifiedAs";
public static final String TERM_ASSIGNMENT_LABEL = "r:__AtlasGlossarySemanticAssignment";
public static final String TERM_ASSIGNMENT_LABEL = "r:AtlasGlossarySemanticAssignment";
public static final String VERTEX_ID_IN_IMPORT_KEY = "__vIdInImport";
public static final String EDGE_ID_IN_IMPORT_KEY = "__eIdInImport";
......
dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
......@@ -126,7 +126,7 @@ define(['require',
this.entityObject = this.collection.first().toJSON();
var collectionJSON = this.entityObject.entity;
if (collectionJSON && collectionJSON.typeName.startsWith("__AtlasGlossary")) {
if (collectionJSON && collectionJSON.typeName.startsWith("AtlasGlossary")) {
this.$(".termBox").hide();
}
// MergerRefEntity.
......
dashboardv2/public/js/views/search/SearchLayoutView.js
......@@ -485,7 +485,7 @@ define(['require',
data: function(params) {
return {
attrValuePrefix: params.term, // search term
typeName: "__AtlasGlossaryTerm",
typeName: "AtlasGlossaryTerm",
limit: 10,
offset: 0
};
......
dashboardv2/public/js/views/search/SearchResultLayoutView.js
......@@ -851,7 +851,7 @@ define(['require',
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
var obj = model.toJSON();
if (!(obj.typeName.startsWith("__AtlasGlossary"))) {
if (!(obj.typeName.startsWith("AtlasGlossary"))) {
if (obj.status && Enums.entityStateReadOnly[obj.status]) {
return '<div class="readOnly">' + CommonViewFunction.termForTable(obj); + '</div>';
} else {
......
intg/src/main/java/org/apache/atlas/model/glossary/AtlasGlossaryTerm.java
......@@ -437,19 +437,19 @@ public class AtlasGlossaryTerm extends AtlasGlossaryBaseObject {
}
public enum Relation {
SEE_ALSO("__AtlasGlossaryRelatedTerm", "seeAlso"),
SYNONYMS("__AtlasGlossarySynonym", "synonyms"),
ANTONYMS("__AtlasGlossaryAntonym", "antonyms"),
PREFERRED_TERMS("__AtlasGlossaryPreferredTerm", "preferredTerms"),
PREFERRED_TO_TERMS("__AtlasGlossaryPreferredTerm", "preferredToTerms"),
REPLACEMENT_TERMS("__AtlasGlossaryReplacementTerm", "replacementTerms"),
REPLACED_BY("__AtlasGlossaryReplacementTerm", "replacedBy"),
TRANSLATION_TERMS("__AtlasGlossaryTranslation", "translationTerms"),
TRANSLATED_TERMS("__AtlasGlossaryTranslation", "translatedTerms"),
ISA("__AtlasGlossaryIsARelationship", "isA"),
CLASSIFIES("__AtlasGlossaryIsARelationship", "classifies"),
VALID_VALUES("__AtlasGlossaryValidValue", "validValues"),
VALID_VALUES_FOR("__AtlasGlossaryValidValue", "validValuesFor"),
SEE_ALSO("AtlasGlossaryRelatedTerm", "seeAlso"),
SYNONYMS("AtlasGlossarySynonym", "synonyms"),
ANTONYMS("AtlasGlossaryAntonym", "antonyms"),
PREFERRED_TERMS("AtlasGlossaryPreferredTerm", "preferredTerms"),
PREFERRED_TO_TERMS("AtlasGlossaryPreferredTerm", "preferredToTerms"),
REPLACEMENT_TERMS("AtlasGlossaryReplacementTerm", "replacementTerms"),
REPLACED_BY("AtlasGlossaryReplacementTerm", "replacedBy"),
TRANSLATION_TERMS("AtlasGlossaryTranslation", "translationTerms"),
TRANSLATED_TERMS("AtlasGlossaryTranslation", "translatedTerms"),
ISA("AtlasGlossaryIsARelationship", "isA"),
CLASSIFIES("AtlasGlossaryIsARelationship", "classifies"),
VALID_VALUES("AtlasGlossaryValidValue", "validValues"),
VALID_VALUES_FOR("AtlasGlossaryValidValue", "validValuesFor"),
;
private String relationName;
......
repository/src/main/java/org/apache/atlas/discovery/TermSearchProcessor.java
......@@ -33,7 +33,7 @@ public class TermSearchProcessor extends SearchProcessor {
private static final Logger LOG = LoggerFactory.getLogger(TermSearchProcessor.class);
private static final Logger PERF_LOG = AtlasPerfTracer.getPerfLogger("TermSearchProcessor");
public static final String ATLAS_GLOSSARY_TERM_ENTITY_TYPE = "__AtlasGlossaryTerm";
public static final String ATLAS_GLOSSARY_TERM_ENTITY_TYPE = "AtlasGlossaryTerm";
public static final String ATLAS_GLOSSARY_TERM_ATTR_QNAME = "qualifiedName";
public static final String ATLAS_GLOSSARY_TERM_ATTR_ASSIGNED_ENTITIES = "assignedEntities";
......
repository/src/main/java/org/apache/atlas/glossary/GlossaryUtils.java
......@@ -36,9 +36,9 @@ public abstract class GlossaryUtils {
public static final String TERM_ASSIGNMENT_ATTR_STEWARD = "steward";
public static final String TERM_ASSIGNMENT_ATTR_SOURCE = "source";
static final String ATLAS_GLOSSARY_TYPENAME = "__AtlasGlossary";
static final String ATLAS_GLOSSARY_TERM_TYPENAME = "__AtlasGlossaryTerm";
static final String ATLAS_GLOSSARY_CATEGORY_TYPENAME = "__AtlasGlossaryCategory";
static final String ATLAS_GLOSSARY_TYPENAME = "AtlasGlossary";
static final String ATLAS_GLOSSARY_TERM_TYPENAME = "AtlasGlossaryTerm";
static final String ATLAS_GLOSSARY_CATEGORY_TYPENAME = "AtlasGlossaryCategory";
// Relation name constants
protected static final String ATLAS_GLOSSARY_PREFIX = ATLAS_GLOSSARY_TYPENAME;
......
repository/src/main/java/org/apache/atlas/repository/ogm/AbstractDataTransferObject.java
......@@ -27,24 +27,18 @@ import org.apache.commons.lang3.StringUtils;
public abstract class AbstractDataTransferObject<T extends AtlasBaseModelObject> implements DataTransferObject<T> {
private static final String DEFAULT_PREFIX = "Atlas";
private final AtlasTypeRegistry typeRegistry;
private final Class<T> objectType;
private final String entityTypeName;
private final String alternateEntityTypeName;
protected AbstractDataTransferObject(AtlasTypeRegistry typeRegistry, Class<T> tClass, boolean isInternal) {
protected AbstractDataTransferObject(AtlasTypeRegistry typeRegistry, Class<T> tClass) {
this(typeRegistry, tClass, tClass.getSimpleName());
}
protected AbstractDataTransferObject(AtlasTypeRegistry typeRegistry, Class<T> tClass, String entityTypeName) {
this.typeRegistry = typeRegistry;
this.objectType = tClass;
if (isInternal) {
this.entityTypeName = Constants.INTERNAL_PROPERTY_KEY_PREFIX + objectType.getSimpleName();
this.alternateEntityTypeName = null;
} else {
this.entityTypeName = objectType.getSimpleName();
this.alternateEntityTypeName = entityTypeName.startsWith(DEFAULT_PREFIX) ? entityTypeName.substring(DEFAULT_PREFIX.length()) : null;
}
this.entityTypeName = entityTypeName;
}
@Override
......@@ -55,9 +49,7 @@ public abstract class AbstractDataTransferObject<T extends AtlasBaseModelObject>
@Override
public AtlasEntityType getEntityType() {
AtlasEntityType ret = typeRegistry.getEntityTypeByName(entityTypeName);
if (ret == null) {
ret = typeRegistry.getEntityTypeByName(alternateEntityTypeName);
}
return ret;
}
......
repository/src/main/java/org/apache/atlas/repository/ogm/glossary/AbstractGlossaryDTO.java
......@@ -33,8 +33,12 @@ import java.util.HashSet;
import java.util.Set;
public abstract class AbstractGlossaryDTO<T extends AtlasBaseModelObject> extends AbstractDataTransferObject<T> {
protected AbstractGlossaryDTO(final AtlasTypeRegistry typeRegistry, final Class<T> tClass, final boolean isInternal) {
super(typeRegistry, tClass, isInternal);
protected AbstractGlossaryDTO(final AtlasTypeRegistry typeRegistry, final Class<T> tClass) {
super(typeRegistry, tClass);
}
protected AbstractGlossaryDTO(final AtlasTypeRegistry typeRegistry, final Class<T> tClass, final String entityTypeName) {
super(typeRegistry, tClass, entityTypeName);
}
protected AtlasRelatedTermHeader constructRelatedTermId(AtlasRelatedObjectId relatedObjectId) {
......
repository/src/main/java/org/apache/atlas/repository/ogm/glossary/AtlasGlossaryCategoryDTO.java
......@@ -39,7 +39,7 @@ public class AtlasGlossaryCategoryDTO extends AbstractGlossaryDTO<AtlasGlossaryC
@Inject
protected AtlasGlossaryCategoryDTO(final AtlasTypeRegistry typeRegistry) {
super(typeRegistry, AtlasGlossaryCategory.class, true);
super(typeRegistry, AtlasGlossaryCategory.class);
}
@Override
......
repository/src/main/java/org/apache/atlas/repository/ogm/glossary/AtlasGlossaryDTO.java
......@@ -38,7 +38,7 @@ public class AtlasGlossaryDTO extends AbstractGlossaryDTO<AtlasGlossary> {
@Inject
public AtlasGlossaryDTO(AtlasTypeRegistry typeRegistry) {
super(typeRegistry, AtlasGlossary.class, true);
super(typeRegistry, AtlasGlossary.class);
}
@Override
......
repository/src/main/java/org/apache/atlas/repository/ogm/glossary/AtlasGlossaryTermDTO.java
......@@ -40,7 +40,7 @@ public class AtlasGlossaryTermDTO extends AbstractGlossaryDTO<AtlasGlossaryTerm>
@Inject
protected AtlasGlossaryTermDTO(final AtlasTypeRegistry typeRegistry) {
super(typeRegistry, AtlasGlossaryTerm.class, true);
super(typeRegistry, AtlasGlossaryTerm.class);
}
@Override
......
repository/src/main/java/org/apache/atlas/repository/ogm/profiles/AtlasSavedSearchDTO.java
......@@ -44,7 +44,7 @@ public class AtlasSavedSearchDTO extends AbstractDataTransferObject<AtlasUserSav
@Inject
public AtlasSavedSearchDTO(AtlasTypeRegistry typeRegistry) {
super(typeRegistry, AtlasUserSavedSearch.class, true);
super(typeRegistry, AtlasUserSavedSearch.class, "__AtlasUserSavedSearch");
}
@Override
......
repository/src/main/java/org/apache/atlas/repository/ogm/profiles/AtlasUserProfileDTO.java
......@@ -40,7 +40,7 @@ public class AtlasUserProfileDTO extends AbstractDataTransferObject<AtlasUserPro
@Inject
public AtlasUserProfileDTO(AtlasTypeRegistry typeRegistry, AtlasSavedSearchDTO savedSearchDTO) {
super(typeRegistry, AtlasUserProfile.class, true);
super(typeRegistry, AtlasUserProfile.class, "__AtlasUserProfile");
this.savedSearchDTO = savedSearchDTO;
}
......
repository/src/main/java/org/apache/atlas/repository/store/graph/v1/EntityGraphRetriever.java
......@@ -120,8 +120,8 @@ import static org.apache.atlas.type.AtlasStructType.AtlasAttribute.AtlasRelation
public final class EntityGraphRetriever {
private static final Logger LOG = LoggerFactory.getLogger(EntityGraphRetriever.class);
private static final String TERM_RELATION_NAME = "__AtlasGlossarySemanticAssignment";
private static final String GLOSSARY_TERM_DISPLAY_NAME_ATTR = "__AtlasGlossaryTerm.displayName";
private static final String TERM_RELATION_NAME = "AtlasGlossarySemanticAssignment";
private static final String GLOSSARY_TERM_DISPLAY_NAME_ATTR = "AtlasGlossaryTerm.displayName";
private final String NAME = "name";
private final String DISPLAY_NAME = "displayName";
......
repository/src/test/java/org/apache/atlas/repository/impexp/ImportServiceTest.java
......@@ -246,10 +246,10 @@ public class ImportServiceTest {
loadGlossary();
runImportWithNoParameters(importService, zipSource);
assertEntityCount("__AtlasGlossary", "40c80052-3129-4f7c-8f2f-391677935416", 1);
assertEntityCount("__AtlasGlossaryTerm", "e93ac426-de04-4d54-a7c9-d76c1e96369b", 1);
assertEntityCount("__AtlasGlossaryTerm", "93ad3bf6-23dc-4e3f-b70e-f8fad6438203", 1);
assertEntityCount("__AtlasGlossaryTerm", "105533b6-c125-4a87-bed5-cdf67fb68c39", 1);
assertEntityCount("AtlasGlossary", "40c80052-3129-4f7c-8f2f-391677935416", 1);
assertEntityCount("AtlasGlossaryTerm", "e93ac426-de04-4d54-a7c9-d76c1e96369b", 1);
assertEntityCount("AtlasGlossaryTerm", "93ad3bf6-23dc-4e3f-b70e-f8fad6438203", 1);
assertEntityCount("AtlasGlossaryTerm", "105533b6-c125-4a87-bed5-cdf67fb68c39", 1);
}
private List<AtlasEntityHeader> getImportedEntities(String query, String guid) throws AtlasBaseException {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment