ATLAS-3139: updated basic search to include relationship attributes as well in the result

intg/src/main/java/org/apache/atlas/type/AtlasStructType.java

@@ -744,19 +744,19 @@ public class AtlasStructType extends AtlasType {
             this.inverseRefAttributeName   = inverseRefAttribute;
             this.relationshipEdgeDirection = AtlasRelationshipEdgeDirection.OUT;
 
-            switch (attributeType.getTypeCategory()) {
+            switch (this.attributeType.getTypeCategory()) {
                 case OBJECT_ID_TYPE:
                     isObjectRef = true;
                 break;
 
                 case MAP:
-                    AtlasMapType mapType = (AtlasMapType) attributeType;
+                    AtlasMapType mapType = (AtlasMapType) this.attributeType;
 
                     isObjectRef = mapType.getValueType().getTypeCategory() == OBJECT_ID_TYPE;
                 break;
 
                 case ARRAY:
-                    AtlasArrayType arrayType = (AtlasArrayType) attributeType;
+                    AtlasArrayType arrayType = (AtlasArrayType) this.attributeType;
 
                     isObjectRef = arrayType.getElementType().getTypeCategory() == OBJECT_ID_TYPE;
                 break;

repository/src/main/java/org/apache/atlas/discovery/EntityDiscoveryService.java

@@ -451,6 +451,10 @@ public class EntityDiscoveryService implements AtlasDiscoveryService {
                 for (String resultAttribute : resultAttributes) {
                     AtlasAttribute  attribute  = entityType.getAttribute(resultAttribute);
 
+                    if (attribute == null) {
+                        attribute = entityType.getRelationshipAttribute(resultAttribute, null);
+                    }
+
                     if (attribute != null) {
                         AtlasType attributeType = attribute.getAttributeType();
 
@@ -536,6 +540,10 @@ public class EntityDiscoveryService implements AtlasDiscoveryService {
 
         AtlasAttribute attribute = entityType.getAttribute(relation);
 
+        if (attribute == null) {
+            attribute = entityType.getRelationshipAttribute(relation, null);
+        }
+
         if (attribute != null) {
             if (attribute.isObjectRef()) {
                 relation = attribute.getRelationshipEdgeLabel();

repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphRetriever.java

@@ -533,7 +533,13 @@ public class EntityGraphRetriever {
                         continue;
                     }
 
-                    Object attrValue = getVertexAttribute(entityVertex, entityType.getAttribute(nonQualifiedAttrName));
+                    AtlasAttribute attribute = entityType.getAttribute(nonQualifiedAttrName);
+
+                    if (attribute == null) {
+                        attribute = entityType.getRelationshipAttribute(nonQualifiedAttrName, null);
+                    }
+
+                    Object attrValue = getVertexAttribute(entityVertex, attribute);
 
                     if (attrValue != null) {
                         ret.setAttribute(nonQualifiedAttrName, attrValue);