ATLAS-2655: Restrict child category to be within the same glossary

intg/src/main/java/org/apache/atlas/AtlasErrorCode.java

@@ -141,7 +141,7 @@ public enum AtlasErrorCode {
     GLOSSARY_CATEGORY_QUALIFIED_NAME_CANT_BE_DERIVED(400, "ATLAS-400-00-07B", "Attributes qualifiedName, displayName & glossary name are missing. Failed to derive a unique name for Glossary category"),
     RELATIONSHIP_END_IS_NULL(400, "ATLAS-400-00-07D", "Relationship end is invalid. Expected {0} but is NULL"),
     INVALID_TERM_RELATION_TO_SELF(400, "ATLAS-400-00-07E", "Invalid Term relationship: Term can't have a relationship with self"),
-    INVALID_CHILD_CATEGORY_DIFFERENT_GLOSSARY(400, "ATLAS-400-00-07F", "Invalid child category relationship: Child category belongs to different glossary"),
+    INVALID_CHILD_CATEGORY_DIFFERENT_GLOSSARY(400, "ATLAS-400-00-07F", "Invalid child category relationship: Child category (guid = {0}) belongs to different glossary"),
 
     UNAUTHORIZED_ACCESS(403, "ATLAS-403-00-001", "{0} is not authorized to perform {1}"),
 

repository/src/main/java/org/apache/atlas/glossary/GlossaryCategoryUtils.java

@@ -25,6 +25,7 @@ import org.apache.atlas.model.glossary.relations.AtlasRelatedTermHeader;
 import org.apache.atlas.model.instance.AtlasObjectId;
 import org.apache.atlas.model.instance.AtlasRelationship;
 import org.apache.atlas.model.instance.AtlasStruct;
+import org.apache.atlas.repository.ogm.DataAccess;
 import org.apache.atlas.repository.store.graph.AtlasRelationshipStore;
 import org.apache.atlas.type.AtlasRelationshipType;
 import org.apache.atlas.type.AtlasTypeRegistry;
@@ -46,8 +47,8 @@ public class GlossaryCategoryUtils extends GlossaryUtils {
     private static final Logger  LOG           = LoggerFactory.getLogger(GlossaryCategoryUtils.class);
     private static final boolean DEBUG_ENABLED = LOG.isDebugEnabled();
 
-    protected GlossaryCategoryUtils(AtlasRelationshipStore relationshipStore, AtlasTypeRegistry typeRegistry) {
-        super(relationshipStore, typeRegistry);
+    protected GlossaryCategoryUtils(AtlasRelationshipStore relationshipStore, AtlasTypeRegistry typeRegistry, DataAccess dataAccess) {
+        super(relationshipStore, typeRegistry, dataAccess);
     }
 
     public void processCategoryRelations(AtlasGlossaryCategory updatedCategory, AtlasGlossaryCategory existing, RelationshipOperation op) throws AtlasBaseException {
@@ -347,9 +348,7 @@ public class GlossaryCategoryUtils extends GlossaryUtils {
             Map<String, AtlasRelatedCategoryHeader> map = new HashMap<>();
             for (AtlasRelatedCategoryHeader c : category.getChildrenCategories()) {
                 AtlasRelatedCategoryHeader header = map.get(c.getCategoryGuid());
-                if (header == null) {
-                    map.put(c.getCategoryGuid(), c);
-                } else if (StringUtils.isEmpty(header.getRelationGuid()) && StringUtils.isNotEmpty(c.getRelationGuid())) {
+                if (header == null || (StringUtils.isEmpty(header.getRelationGuid()) && StringUtils.isNotEmpty(c.getRelationGuid()))) {
                     map.put(c.getCategoryGuid(), c);
                 }
             }
@@ -368,10 +367,24 @@ public class GlossaryCategoryUtils extends GlossaryUtils {
                     }
                     continue;
                 }
+
                 if (DEBUG_ENABLED) {
-                    LOG.debug("Creating new child, category = {}, child = {}", existing.getDisplayName(), child.getDisplayText());
+                    LOG.debug("Loading the child category to perform glossary check");
+                }
+
+                AtlasGlossaryCategory childCategory = new AtlasGlossaryCategory();
+                childCategory.setGuid(child.getCategoryGuid());
+                childCategory = dataAccess.load(childCategory);
+
+                if (StringUtils.equals(existing.getAnchor().getGlossaryGuid(), childCategory.getAnchor().getGlossaryGuid())) {
+                    if (DEBUG_ENABLED) {
+                        LOG.debug("Creating new child, category = {}, child = {}", existing.getDisplayName(), child.getDisplayText());
+                    }
+                    createRelationship(defineCategoryHierarchyLink(existing.getGuid(), child));
+                } else {
+                    throw new AtlasBaseException(AtlasErrorCode.INVALID_CHILD_CATEGORY_DIFFERENT_GLOSSARY, child.getCategoryGuid());
                 }
-                createRelationship(defineCategoryHierarchyLink(existing.getGuid(), child));
+
             }
         }
     }

repository/src/main/java/org/apache/atlas/glossary/GlossaryService.java

@@ -66,8 +66,8 @@ public class GlossaryService {
     public GlossaryService(DataAccess dataAccess, final AtlasRelationshipStore relationshipStore, final AtlasTypeRegistry typeRegistry) {
         this.dataAccess = dataAccess;
         this.atlasTypeRegistry = typeRegistry;
-        glossaryTermUtils = new GlossaryTermUtils(relationshipStore, typeRegistry);
-        glossaryCategoryUtils = new GlossaryCategoryUtils(relationshipStore, typeRegistry);
+        glossaryTermUtils = new GlossaryTermUtils(relationshipStore, typeRegistry, dataAccess);
+        glossaryCategoryUtils = new GlossaryCategoryUtils(relationshipStore, typeRegistry, dataAccess);
     }
 
     /**

repository/src/main/java/org/apache/atlas/glossary/GlossaryTermUtils.java

@@ -27,6 +27,7 @@ import org.apache.atlas.model.instance.AtlasObjectId;
 import org.apache.atlas.model.instance.AtlasRelatedObjectId;
 import org.apache.atlas.model.instance.AtlasRelationship;
 import org.apache.atlas.model.instance.AtlasStruct;
+import org.apache.atlas.repository.ogm.DataAccess;
 import org.apache.atlas.repository.store.graph.AtlasRelationshipStore;
 import org.apache.atlas.type.AtlasRelationshipType;
 import org.apache.atlas.type.AtlasTypeRegistry;
@@ -46,8 +47,8 @@ public class GlossaryTermUtils extends GlossaryUtils {
     private static final Logger  LOG           = LoggerFactory.getLogger(GlossaryTermUtils.class);
     private static final boolean DEBUG_ENABLED = LOG.isDebugEnabled();
 
-    protected GlossaryTermUtils(AtlasRelationshipStore relationshipStore, AtlasTypeRegistry typeRegistry) {
-        super(relationshipStore, typeRegistry);
+    protected GlossaryTermUtils(AtlasRelationshipStore relationshipStore, AtlasTypeRegistry typeRegistry, DataAccess dataAccess) {
+        super(relationshipStore, typeRegistry, dataAccess);
     }
 
     public void processTermRelations(AtlasGlossaryTerm updatedTerm, AtlasGlossaryTerm existing, RelationshipOperation op) throws AtlasBaseException {

repository/src/main/java/org/apache/atlas/glossary/GlossaryUtils.java

@@ -21,6 +21,7 @@ import org.apache.atlas.AtlasErrorCode;
 import org.apache.atlas.exception.AtlasBaseException;
 import org.apache.atlas.model.glossary.relations.AtlasRelatedTermHeader;
 import org.apache.atlas.model.instance.AtlasRelationship;
+import org.apache.atlas.repository.ogm.DataAccess;
 import org.apache.atlas.repository.store.graph.AtlasRelationshipStore;
 import org.apache.atlas.type.AtlasTypeRegistry;
 
@@ -54,11 +55,13 @@ public abstract class GlossaryUtils {
     protected static final String TERM_RELATION_ATTR_STATUS      = "status";
 
     protected final AtlasRelationshipStore relationshipStore;
-    protected final AtlasTypeRegistry typeRegistry;
+    protected final AtlasTypeRegistry      typeRegistry;
+    protected final DataAccess             dataAccess;
 
-    protected GlossaryUtils(final AtlasRelationshipStore relationshipStore, final AtlasTypeRegistry typeRegistry) {
+    protected GlossaryUtils(final AtlasRelationshipStore relationshipStore, final AtlasTypeRegistry typeRegistry, final DataAccess dataAccess) {
         this.relationshipStore = relationshipStore;
         this.typeRegistry = typeRegistry;
+        this.dataAccess = dataAccess;
     }
 
     protected void createRelationship(AtlasRelationship relationship) throws AtlasBaseException {