ATLAS-2815 #2: Missing txn annotation and relationship attribute mapping

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

@@ -105,6 +105,7 @@ public class AtlasEntityStoreV2 implements AtlasEntityStore {
     }
 
     @Override
+    @GraphTransaction
     public AtlasEntityWithExtInfo getById(final String guid, final boolean isMinExtInfo) throws AtlasBaseException {
         if (LOG.isDebugEnabled()) {
             LOG.debug("==> getById({}, {})", guid, isMinExtInfo);
@@ -126,6 +127,7 @@ public class AtlasEntityStoreV2 implements AtlasEntityStore {
     }
 
     @Override
+    @GraphTransaction
     public AtlasEntityHeader getHeaderById(final String guid) throws AtlasBaseException {
         if (LOG.isDebugEnabled()) {
             LOG.debug("==> getHeaderById({})", guid);
@@ -147,6 +149,7 @@ public class AtlasEntityStoreV2 implements AtlasEntityStore {
     }
 
     @Override
+    @GraphTransaction
     public AtlasEntitiesWithExtInfo getByIds(List<String> guids) throws AtlasBaseException {
         return getByIds(guids, false);
     }
@@ -170,6 +173,7 @@ public class AtlasEntityStoreV2 implements AtlasEntityStore {
     }
 
     @Override
+    @GraphTransaction
     public AtlasEntityWithExtInfo getByUniqueAttributes(AtlasEntityType entityType, Map<String, Object> uniqAttributes)
             throws AtlasBaseException {
         return getByUniqueAttributes(entityType, uniqAttributes, false);

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

@@ -381,6 +381,8 @@ public final class EntityGraphRetriever {
 
             mapAttributes(entityVertex, entity, entityExtInfo, isMinExtInfo);
 
+            mapRelationshipAttributes(entityVertex, entity);
+
             mapClassifications(entityVertex, entity);
         }