You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ap...@apache.org on 2018/05/07 00:32:53 UTC
atlas git commit: ATLAS-2648: Remove prefix '__' from AtlasGlossary
type names
Repository: atlas
Updated Branches:
refs/heads/master 94d0c0ab2 -> 1fc88ce30
ATLAS-2648: Remove prefix '__' from AtlasGlossary type names
Change-Id: I3b5940c9936d718b5b6e3c5d08d3cbbd173f7a51
Signed-off-by: apoorvnaik <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/1fc88ce3
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/1fc88ce3
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/1fc88ce3
Branch: refs/heads/master
Commit: 1fc88ce30110729a6a5ad34aaf0c043b5c5969f7
Parents: 94d0c0a
Author: Madhan Neethiraj <ma...@apache.org>
Authored: Sun May 6 02:10:41 2018 -0700
Committer: apoorvnaik <ap...@apache.org>
Committed: Sun May 6 16:52:00 2018 -0700
----------------------------------------------------------------------
.../models/0000-Area0/0011-glossary_model.json | 106 +++++++++----------
.../org/apache/atlas/repository/Constants.java | 2 +-
.../views/detail_page/DetailPageLayoutView.js | 4 +-
.../public/js/views/search/SearchLayoutView.js | 4 +-
.../js/views/search/SearchResultLayoutView.js | 4 +-
.../atlas/model/glossary/AtlasGlossaryTerm.java | 26 ++---
.../atlas/discovery/TermSearchProcessor.java | 2 +-
.../apache/atlas/glossary/GlossaryUtils.java | 6 +-
.../ogm/AbstractDataTransferObject.java | 22 ++--
.../ogm/glossary/AbstractGlossaryDTO.java | 8 +-
.../ogm/glossary/AtlasGlossaryCategoryDTO.java | 2 +-
.../ogm/glossary/AtlasGlossaryDTO.java | 2 +-
.../ogm/glossary/AtlasGlossaryTermDTO.java | 2 +-
.../ogm/profiles/AtlasSavedSearchDTO.java | 2 +-
.../ogm/profiles/AtlasUserProfileDTO.java | 2 +-
.../store/graph/v1/EntityGraphRetriever.java | 6 +-
.../repository/impexp/ImportServiceTest.java | 8 +-
.../src/test/resources/stocks-glossary.zip | Bin 3876 -> 4124 bytes
18 files changed, 102 insertions(+), 106 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/atlas/blob/1fc88ce3/addons/models/0000-Area0/0011-glossary_model.json
----------------------------------------------------------------------
diff --git a/addons/models/0000-Area0/0011-glossary_model.json b/addons/models/0000-Area0/0011-glossary_model.json
index ae7e5c7..2e17e81 100644
--- a/addons/models/0000-Area0/0011-glossary_model.json
+++ b/addons/models/0000-Area0/0011-glossary_model.json
@@ -1,7 +1,7 @@
{
"enumDefs": [
{
- "name": "__AtlasGlossaryTermRelationshipStatus",
+ "name": "AtlasGlossaryTermRelationshipStatus",
"description": "TermRelationshipStatus defines how reliable the relationship is between two glossary terms",
"typeVersion": "1.0",
"elementDefs": [
@@ -33,7 +33,7 @@
]
},
{
- "name": "__AtlasGlossaryTermAssignmentStatus",
+ "name": "AtlasGlossaryTermAssignmentStatus",
"description": "TermAssignmentStatus defines how much the semantic assignment should be trusted.",
"typeVersion": "1.0",
"elementDefs": [
@@ -79,7 +79,7 @@
"classificationDefs": [],
"entityDefs": [
{
- "name": "__AtlasGlossary",
+ "name": "AtlasGlossary",
"superTypes": [
"__internal"
],
@@ -136,7 +136,7 @@
]
},
{
- "name": "__AtlasGlossaryTerm",
+ "name": "AtlasGlossaryTerm",
"superTypes": [
"__internal"
],
@@ -201,7 +201,7 @@
]
},
{
- "name": "__AtlasGlossaryCategory",
+ "name": "AtlasGlossaryCategory",
"superTypes": [
"__internal"
],
@@ -244,7 +244,7 @@
],
"relationshipDefs": [
{
- "name": "__AtlasGlossarySemanticAssignment",
+ "name": "AtlasGlossarySemanticAssignment",
"description": "SemanticAssignment is a relationship used to assign a term to a referenceable object. This means that the term describes the meaning of the referenceable object. The semantic assignment needs to be a controlled relationship when glossary definitions are used to provide classifications for the data assets and hence define how the data is to be governed.",
"typeVersion": "1.0",
"attributeDefs": [
@@ -271,7 +271,7 @@
},
{
"name": "status",
- "typeName": "__AtlasGlossaryTermRelationshipStatus",
+ "typeName": "AtlasGlossaryTermRelationshipStatus",
"isOptional": true,
"cardinality": "SINGLE",
"valuesMinCount": 0,
@@ -326,7 +326,7 @@
"relationshipCategory": "ASSOCIATION",
"propagateTags": "ONE_TO_TWO",
"endDef1": {
- "type": "__AtlasGlossaryTerm",
+ "type": "AtlasGlossaryTerm",
"name": "assignedEntities",
"isContainer": false,
"cardinality": "SET"
@@ -339,36 +339,36 @@
}
},
{
- "name": "__AtlasGlossaryTermAnchor",
+ "name": "AtlasGlossaryTermAnchor",
"typeVersion": "1.0",
"description": "TermAnchor links each term to exactly one Glossary object. This means that this is its home glossary. If the Glossary object is deleted, then so are all of the terms linked to it.",
"endDef1": {
"name": "terms",
- "type": "__AtlasGlossary",
+ "type": "AtlasGlossary",
"cardinality": "SET",
"isContainer": true
},
"endDef2": {
"name": "anchor",
- "type": "__AtlasGlossaryTerm",
+ "type": "AtlasGlossaryTerm",
"cardinality": "SINGLE"
},
"relationshipCategory": "COMPOSITION",
"propagateTags": "NONE"
},
{
- "name": "__AtlasGlossaryTermCategorization",
+ "name": "AtlasGlossaryTermCategorization",
"typeVersion": "1.0",
"description": "TermCategorization is a relationship used to organize terms into categories. A term may be linked with many categories and a category may have many terms linked to it. This relationship may connect terms and categories both in the same glossary or in different glossaries.",
"endDef1": {
"name": "terms",
- "type": "__AtlasGlossaryCategory",
+ "type": "AtlasGlossaryCategory",
"cardinality": "SET",
"isContainer": true
},
"endDef2": {
"name": "categories",
- "type": "__AtlasGlossaryTerm",
+ "type": "AtlasGlossaryTerm",
"cardinality": "SET"
},
"relationshipCategory": "AGGREGATION",
@@ -384,7 +384,7 @@
},
{
"name": "status",
- "typeName": "__AtlasGlossaryTermRelationshipStatus",
+ "typeName": "AtlasGlossaryTermRelationshipStatus",
"cardinality": "SINGLE",
"isIndexable": true,
"isOptional": true,
@@ -393,53 +393,53 @@
]
},
{
- "name": "__AtlasGlossaryCategoryAnchor",
+ "name": "AtlasGlossaryCategoryAnchor",
"typeVersion": "1.0",
"description": "CategoryAnchor links each category to exactly one Glossary object. This means that this is its home glossary. If the Glossary object is deleted then so are all of the categories linked to it.",
"endDef1": {
"name": "categories",
- "type": "__AtlasGlossary",
+ "type": "AtlasGlossary",
"cardinality": "SET",
"isContainer": true
},
"endDef2": {
"name": "anchor",
- "type": "__AtlasGlossaryCategory",
+ "type": "AtlasGlossaryCategory",
"cardinality": "SINGLE"
},
"relationshipCategory": "COMPOSITION",
"propagateTags": "NONE"
},
{
- "name": "__AtlasGlossaryCategoryHierarchyLink",
+ "name": "AtlasGlossaryCategoryHierarchyLink",
"typeVersion": "1.0",
"description": "CategoryHierarchyLink is a relationship used to organize categories into a hierarchy to, for example, create a structure for a taxonomy. A category may have none or one super-categories. This super-category may be in a different glossary.",
"endDef1": {
"name": "childrenCategories",
- "type": "__AtlasGlossaryCategory",
+ "type": "AtlasGlossaryCategory",
"cardinality": "SET",
"isContainer": true
},
"endDef2": {
"name": "parentCategory",
- "type": "__AtlasGlossaryCategory",
+ "type": "AtlasGlossaryCategory",
"cardinality": "SINGLE"
},
"relationshipCategory": "AGGREGATION",
"propagateTags": "NONE"
},
{
- "name": "__AtlasGlossaryRelatedTerm",
+ "name": "AtlasGlossaryRelatedTerm",
"typeVersion": "1.0",
"description": "RelatedTerm is a relationship used to say that the linked glossary term may also be of interest. It is like a 'see also' link in a dictionary.",
"endDef1": {
"name": "seeAlso",
- "type": "__AtlasGlossaryTerm",
+ "type": "AtlasGlossaryTerm",
"cardinality": "SET"
},
"endDef2": {
"name": "seeAlso",
- "type": "__AtlasGlossaryTerm",
+ "type": "AtlasGlossaryTerm",
"cardinality": "SET"
},
"relationshipCategory": "ASSOCIATION",
@@ -462,7 +462,7 @@
},
{
"name": "status",
- "typeName": "__AtlasGlossaryTermRelationshipStatus",
+ "typeName": "AtlasGlossaryTermRelationshipStatus",
"cardinality": "SINGLE",
"isIndexable": true,
"isOptional": true
@@ -485,17 +485,17 @@
]
},
{
- "name": "__AtlasGlossarySynonym",
+ "name": "AtlasGlossarySynonym",
"typeVersion": "1.0",
"description": "Synonym is a relationship between glossary terms that have the same, or a very similar meaning in the same language. Notice that both ends of this relationship have the same name and refer to the same type; this results in one Synonym attribute being added to GlossaryTerm.",
"endDef1": {
"name": "synonyms",
- "type": "__AtlasGlossaryTerm",
+ "type": "AtlasGlossaryTerm",
"cardinality": "SET"
},
"endDef2": {
"name": "synonyms",
- "type": "__AtlasGlossaryTerm",
+ "type": "AtlasGlossaryTerm",
"cardinality": "SET"
},
"relationshipCategory": "ASSOCIATION",
@@ -518,7 +518,7 @@
},
{
"name": "status",
- "typeName": "__AtlasGlossaryTermRelationshipStatus",
+ "typeName": "AtlasGlossaryTermRelationshipStatus",
"cardinality": "SINGLE",
"isIndexable": true,
"isOptional": true
@@ -541,17 +541,17 @@
]
},
{
- "name": "__AtlasGlossaryAntonym",
+ "name": "AtlasGlossaryAntonym",
"typeVersion": "1.0",
"description": "Antonym is a relationship between glossary terms that have the opposite (or near opposite) meaning, in the same language. Notice that both ends of this relationship have the same name and refer to the same type; this results in one Antonym attribute being added to GlossaryTerm.",
"endDef1": {
"name": "antonyms",
- "type": "__AtlasGlossaryTerm",
+ "type": "AtlasGlossaryTerm",
"cardinality": "SET"
},
"endDef2": {
"name": "antonyms",
- "type": "__AtlasGlossaryTerm",
+ "type": "AtlasGlossaryTerm",
"cardinality": "SET"
},
"relationshipCategory": "ASSOCIATION",
@@ -574,7 +574,7 @@
},
{
"name": "status",
- "typeName": "__AtlasGlossaryTermRelationshipStatus",
+ "typeName": "AtlasGlossaryTermRelationshipStatus",
"cardinality": "SINGLE",
"isIndexable": true,
"isOptional": true
@@ -597,17 +597,17 @@
]
},
{
- "name": "__AtlasGlossaryPreferredTerm",
+ "name": "AtlasGlossaryPreferredTerm",
"typeVersion": "1.0",
"description": "PreferredTerm is a relationship that indicates that the preferredTerm should be used in place of the preferredToTerm. This relationship can be used to encourage adoption of newer vocabularies. This is a weaker version of ReplacementTerm.",
"endDef1": {
"name": "preferredTerms",
- "type": "__AtlasGlossaryTerm",
+ "type": "AtlasGlossaryTerm",
"cardinality": "SET"
},
"endDef2": {
"name": "preferredToTerms",
- "type": "__AtlasGlossaryTerm",
+ "type": "AtlasGlossaryTerm",
"cardinality": "SET"
},
"relationshipCategory": "ASSOCIATION",
@@ -630,7 +630,7 @@
},
{
"name": "status",
- "typeName": "__AtlasGlossaryTermRelationshipStatus",
+ "typeName": "AtlasGlossaryTermRelationshipStatus",
"cardinality": "SINGLE",
"isIndexable": true,
"isOptional": true
@@ -653,17 +653,17 @@
]
},
{
- "name": "__AtlasGlossaryReplacementTerm",
+ "name": "AtlasGlossaryReplacementTerm",
"typeVersion": "1.0",
"description": "ReplacementTerm is a relationship that indicates that the replacementTerm must be used instead of the replacedByTerm. This is stronger version of the PreferredTerm.",
"endDef1": {
"name": "replacedBy",
- "type": "__AtlasGlossaryTerm",
+ "type": "AtlasGlossaryTerm",
"cardinality": "SET"
},
"endDef2": {
"name": "replacementTerms",
- "type": "__AtlasGlossaryTerm",
+ "type": "AtlasGlossaryTerm",
"cardinality": "SET"
},
"relationshipCategory": "ASSOCIATION",
@@ -686,7 +686,7 @@
},
{
"name": "status",
- "typeName": "__AtlasGlossaryTermRelationshipStatus",
+ "typeName": "AtlasGlossaryTermRelationshipStatus",
"cardinality": "SINGLE",
"isIndexable": true,
"isOptional": true
@@ -709,17 +709,17 @@
]
},
{
- "name": "__AtlasGlossaryTranslation",
+ "name": "AtlasGlossaryTranslation",
"typeVersion": "1.0",
"description": "Translation is a relationship that defines that the related terms represent the same meaning, but each are written in a different language. Hence one is a translation of the other. The language of each term is defined in the Glossary object that anchors the term.",
"endDef1": {
"name": "translatedTerms",
- "type": "__AtlasGlossaryTerm",
+ "type": "AtlasGlossaryTerm",
"cardinality": "SET"
},
"endDef2": {
"name": "translationTerms",
- "type": "__AtlasGlossaryTerm",
+ "type": "AtlasGlossaryTerm",
"cardinality": "SET"
},
"relationshipCategory": "ASSOCIATION",
@@ -742,7 +742,7 @@
},
{
"name": "status",
- "typeName": "__AtlasGlossaryTermRelationshipStatus",
+ "typeName": "AtlasGlossaryTermRelationshipStatus",
"cardinality": "SINGLE",
"isIndexable": true,
"isOptional": true
@@ -765,17 +765,17 @@
]
},
{
- "name": "__AtlasGlossaryIsARelationship",
+ "name": "AtlasGlossaryIsARelationship",
"typeVersion": "1.0",
"description": "IsA is a relationship that defines that the 'isA' term is a more generic term than the 'isOf' term. For example, this relationship would be use to say that 'Cat' ISA 'Animal'.",
"endDef1": {
"name": "classifies",
- "type": "__AtlasGlossaryTerm",
+ "type": "AtlasGlossaryTerm",
"cardinality": "SET"
},
"endDef2": {
"name": "isA",
- "type": "__AtlasGlossaryTerm",
+ "type": "AtlasGlossaryTerm",
"cardinality": "SET"
},
"relationshipCategory": "ASSOCIATION",
@@ -798,7 +798,7 @@
},
{
"name": "status",
- "typeName": "__AtlasGlossaryTermRelationshipStatus",
+ "typeName": "AtlasGlossaryTermRelationshipStatus",
"cardinality": "SINGLE",
"isIndexable": true,
"isOptional": true
@@ -821,17 +821,17 @@
]
},
{
- "name": "__AtlasGlossaryValidValue",
+ "name": "AtlasGlossaryValidValue",
"typeVersion": "1.0",
"description": "ValidValue is a relationship that shows the validValue term represents one of the valid values that could be assigned to a data item that has the meaning described in the validValueFor term.",
"endDef1": {
"name": "validValuesFor",
- "type": "__AtlasGlossaryTerm",
+ "type": "AtlasGlossaryTerm",
"cardinality": "SET"
},
"endDef2": {
"name": "validValues",
- "type": "__AtlasGlossaryTerm",
+ "type": "AtlasGlossaryTerm",
"cardinality": "SET"
},
"relationshipCategory": "ASSOCIATION",
@@ -854,7 +854,7 @@
},
{
"name": "status",
- "typeName": "__AtlasGlossaryTermRelationshipStatus",
+ "typeName": "AtlasGlossaryTermRelationshipStatus",
"cardinality": "SINGLE",
"isIndexable": true,
"isOptional": true
http://git-wip-us.apache.org/repos/asf/atlas/blob/1fc88ce3/common/src/main/java/org/apache/atlas/repository/Constants.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/atlas/repository/Constants.java b/common/src/main/java/org/apache/atlas/repository/Constants.java
index c570be2..16a3aaa 100644
--- a/common/src/main/java/org/apache/atlas/repository/Constants.java
+++ b/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";
http://git-wip-us.apache.org/repos/asf/atlas/blob/1fc88ce3/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
index 07878e1..a1fe805 100644
--- a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
+++ b/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.
@@ -502,4 +502,4 @@ define(['require',
}
});
return DetailPageLayoutView;
-});
\ No newline at end of file
+});
http://git-wip-us.apache.org/repos/asf/atlas/blob/1fc88ce3/dashboardv2/public/js/views/search/SearchLayoutView.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/views/search/SearchLayoutView.js b/dashboardv2/public/js/views/search/SearchLayoutView.js
index 8f0e694..d68d2a9 100644
--- a/dashboardv2/public/js/views/search/SearchLayoutView.js
+++ b/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
};
@@ -680,4 +680,4 @@ define(['require',
}
});
return SearchLayoutView;
-});
\ No newline at end of file
+});
http://git-wip-us.apache.org/repos/asf/atlas/blob/1fc88ce3/dashboardv2/public/js/views/search/SearchResultLayoutView.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/views/search/SearchResultLayoutView.js b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
index 95701a7..cc99ead 100644
--- a/dashboardv2/public/js/views/search/SearchResultLayoutView.js
+++ b/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 {
@@ -1089,4 +1089,4 @@ define(['require',
}
});
return SearchResultLayoutView;
-});
\ No newline at end of file
+});
http://git-wip-us.apache.org/repos/asf/atlas/blob/1fc88ce3/intg/src/main/java/org/apache/atlas/model/glossary/AtlasGlossaryTerm.java
----------------------------------------------------------------------
diff --git a/intg/src/main/java/org/apache/atlas/model/glossary/AtlasGlossaryTerm.java b/intg/src/main/java/org/apache/atlas/model/glossary/AtlasGlossaryTerm.java
index 5919e7d..1073e33 100644
--- a/intg/src/main/java/org/apache/atlas/model/glossary/AtlasGlossaryTerm.java
+++ b/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;
http://git-wip-us.apache.org/repos/asf/atlas/blob/1fc88ce3/repository/src/main/java/org/apache/atlas/discovery/TermSearchProcessor.java
----------------------------------------------------------------------
diff --git a/repository/src/main/java/org/apache/atlas/discovery/TermSearchProcessor.java b/repository/src/main/java/org/apache/atlas/discovery/TermSearchProcessor.java
index 1f51afb..19d9bc4 100644
--- a/repository/src/main/java/org/apache/atlas/discovery/TermSearchProcessor.java
+++ b/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";
http://git-wip-us.apache.org/repos/asf/atlas/blob/1fc88ce3/repository/src/main/java/org/apache/atlas/glossary/GlossaryUtils.java
----------------------------------------------------------------------
diff --git a/repository/src/main/java/org/apache/atlas/glossary/GlossaryUtils.java b/repository/src/main/java/org/apache/atlas/glossary/GlossaryUtils.java
index ec8a1dc..de22d38 100644
--- a/repository/src/main/java/org/apache/atlas/glossary/GlossaryUtils.java
+++ b/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;
http://git-wip-us.apache.org/repos/asf/atlas/blob/1fc88ce3/repository/src/main/java/org/apache/atlas/repository/ogm/AbstractDataTransferObject.java
----------------------------------------------------------------------
diff --git a/repository/src/main/java/org/apache/atlas/repository/ogm/AbstractDataTransferObject.java b/repository/src/main/java/org/apache/atlas/repository/ogm/AbstractDataTransferObject.java
index 2afdfe1..d4f7867 100644
--- a/repository/src/main/java/org/apache/atlas/repository/ogm/AbstractDataTransferObject.java
+++ b/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;
}
http://git-wip-us.apache.org/repos/asf/atlas/blob/1fc88ce3/repository/src/main/java/org/apache/atlas/repository/ogm/glossary/AbstractGlossaryDTO.java
----------------------------------------------------------------------
diff --git a/repository/src/main/java/org/apache/atlas/repository/ogm/glossary/AbstractGlossaryDTO.java b/repository/src/main/java/org/apache/atlas/repository/ogm/glossary/AbstractGlossaryDTO.java
index 72add0e..bee88c6 100644
--- a/repository/src/main/java/org/apache/atlas/repository/ogm/glossary/AbstractGlossaryDTO.java
+++ b/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) {
http://git-wip-us.apache.org/repos/asf/atlas/blob/1fc88ce3/repository/src/main/java/org/apache/atlas/repository/ogm/glossary/AtlasGlossaryCategoryDTO.java
----------------------------------------------------------------------
diff --git a/repository/src/main/java/org/apache/atlas/repository/ogm/glossary/AtlasGlossaryCategoryDTO.java b/repository/src/main/java/org/apache/atlas/repository/ogm/glossary/AtlasGlossaryCategoryDTO.java
index 4fe048d..139b145 100644
--- a/repository/src/main/java/org/apache/atlas/repository/ogm/glossary/AtlasGlossaryCategoryDTO.java
+++ b/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
http://git-wip-us.apache.org/repos/asf/atlas/blob/1fc88ce3/repository/src/main/java/org/apache/atlas/repository/ogm/glossary/AtlasGlossaryDTO.java
----------------------------------------------------------------------
diff --git a/repository/src/main/java/org/apache/atlas/repository/ogm/glossary/AtlasGlossaryDTO.java b/repository/src/main/java/org/apache/atlas/repository/ogm/glossary/AtlasGlossaryDTO.java
index 75f3f02..918912a 100644
--- a/repository/src/main/java/org/apache/atlas/repository/ogm/glossary/AtlasGlossaryDTO.java
+++ b/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
http://git-wip-us.apache.org/repos/asf/atlas/blob/1fc88ce3/repository/src/main/java/org/apache/atlas/repository/ogm/glossary/AtlasGlossaryTermDTO.java
----------------------------------------------------------------------
diff --git a/repository/src/main/java/org/apache/atlas/repository/ogm/glossary/AtlasGlossaryTermDTO.java b/repository/src/main/java/org/apache/atlas/repository/ogm/glossary/AtlasGlossaryTermDTO.java
index cb91e8f..9fed84a 100644
--- a/repository/src/main/java/org/apache/atlas/repository/ogm/glossary/AtlasGlossaryTermDTO.java
+++ b/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
http://git-wip-us.apache.org/repos/asf/atlas/blob/1fc88ce3/repository/src/main/java/org/apache/atlas/repository/ogm/profiles/AtlasSavedSearchDTO.java
----------------------------------------------------------------------
diff --git a/repository/src/main/java/org/apache/atlas/repository/ogm/profiles/AtlasSavedSearchDTO.java b/repository/src/main/java/org/apache/atlas/repository/ogm/profiles/AtlasSavedSearchDTO.java
index f38912c..68a8744 100644
--- a/repository/src/main/java/org/apache/atlas/repository/ogm/profiles/AtlasSavedSearchDTO.java
+++ b/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
http://git-wip-us.apache.org/repos/asf/atlas/blob/1fc88ce3/repository/src/main/java/org/apache/atlas/repository/ogm/profiles/AtlasUserProfileDTO.java
----------------------------------------------------------------------
diff --git a/repository/src/main/java/org/apache/atlas/repository/ogm/profiles/AtlasUserProfileDTO.java b/repository/src/main/java/org/apache/atlas/repository/ogm/profiles/AtlasUserProfileDTO.java
index aa51cbf..620b148 100644
--- a/repository/src/main/java/org/apache/atlas/repository/ogm/profiles/AtlasUserProfileDTO.java
+++ b/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;
}
http://git-wip-us.apache.org/repos/asf/atlas/blob/1fc88ce3/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/EntityGraphRetriever.java
----------------------------------------------------------------------
diff --git a/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/EntityGraphRetriever.java b/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/EntityGraphRetriever.java
index 3b9a287..919ac9c 100644
--- a/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/EntityGraphRetriever.java
+++ b/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";
@@ -1101,4 +1101,4 @@ public final class EntityGraphRetriever {
relationship.setAttribute(attribute.getName(), attrValue);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/atlas/blob/1fc88ce3/repository/src/test/java/org/apache/atlas/repository/impexp/ImportServiceTest.java
----------------------------------------------------------------------
diff --git a/repository/src/test/java/org/apache/atlas/repository/impexp/ImportServiceTest.java b/repository/src/test/java/org/apache/atlas/repository/impexp/ImportServiceTest.java
index 14eeaa0..bb77edf 100644
--- a/repository/src/test/java/org/apache/atlas/repository/impexp/ImportServiceTest.java
+++ b/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 {
http://git-wip-us.apache.org/repos/asf/atlas/blob/1fc88ce3/repository/src/test/resources/stocks-glossary.zip
----------------------------------------------------------------------
diff --git a/repository/src/test/resources/stocks-glossary.zip b/repository/src/test/resources/stocks-glossary.zip
index dc8039f..777fd01 100644
Binary files a/repository/src/test/resources/stocks-glossary.zip and b/repository/src/test/resources/stocks-glossary.zip differ