ATLAS-1544: entity create/update v2 REST API - addressed review comments and…

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

@@ -89,7 +89,7 @@ public class AtlasEntityType extends AtlasStructType {
         this.superTypes    = Collections.unmodifiableList(s);
         this.allSuperTypes = Collections.unmodifiableSet(allS);
         this.allAttributes = Collections.unmodifiableMap(allA);
-        this.allSubTypes          = new HashSet<>();   // this will be populated in resolveReferencesPhase2()
+        this.allSubTypes   = new HashSet<>();   // this will be populated in resolveReferencesPhase2()
     }
 
     @Override
@@ -188,11 +188,22 @@ public class AtlasEntityType extends AtlasStructType {
 
         if (obj != null) {
             if (obj instanceof AtlasObjectId) {
-                AtlasObjectId objId = (AtlasObjectId ) obj;
+                AtlasObjectId objId = (AtlasObjectId) obj;
                 return isAssignableFrom(objId);
+            } else if (obj instanceof AtlasEntity) {
+                // entity validation will be done below, outside of these if/else blocks
             } else if (obj instanceof Map) {
-                AtlasObjectId objId = new AtlasObjectId((Map)obj);
-                return isAssignableFrom(objId);
+                AtlasObjectId objId = new AtlasObjectId((Map) obj);
+
+                if (isAssignableFrom(objId)) {
+                    return true;
+                }
+
+                // entity validation will be done below, outside of these if/else blocks
+            } else {
+                ret = false;
+
+                messages.add(objName + ": invalid value type '" + obj.getClass().getName());
             }
 
             for (AtlasEntityType superType : superTypes) {

repository/src/main/java/org/apache/atlas/repository/store/graph/v1/AtlasEntityGraphDiscoveryV1.java

@@ -89,11 +89,13 @@ public class AtlasEntityGraphDiscoveryV1 implements EntityGraphDiscovery {
         while (entityStream.hasNext()) {
             AtlasEntity entity = entityStream.next();
 
-            if (entity != null) {
-                walkEntityGraph(entity);
-
-                walkedEntities.add(entity.getGuid());
+            if (entity == null) {
+                throw new AtlasBaseException(AtlasErrorCode.INVALID_PARAMETERS, "found null entity");
             }
+
+            walkEntityGraph(entity);
+
+            walkedEntities.add(entity.getGuid());
         }
 
         // walk through entities referenced by other entities

repository/src/main/java/org/apache/atlas/repository/store/graph/v1/EntityGraphMapper.java

@@ -606,14 +606,10 @@ public class EntityGraphMapper {
                 if (!newMap.values().contains(currentEdge)) {
                     boolean deleted = deleteHandler.deleteEdgeReference(currentEdge, mapType.getValueType().getTypeCategory(), attribute.isOwnedRef(), true);
 
-                    /* TODO: need to review the following 'if' block. Wouldn't this leave deleted keys in the map?
-                     *
                     if (!deleted) {
                         additionalMap.put(currentKey, currentEdge);
                         shouldDeleteKey = false;
                     }
-                    *
-                    */
                 }
             }
 
@@ -700,13 +696,9 @@ public class EntityGraphMapper {
                     for (AtlasEdge edge : edgesToRemove) {
                         boolean deleted = deleteHandler.deleteEdgeReference(edge, entryType.getTypeCategory(), attribute.isOwnedRef(), true);
 
-                        /* TODO: need to review the following 'if' block. Wouldn't this leave deleted elements continue to be in array?
-                         *
                         if (!deleted) {
                             additionalElements.add(edge);
                         }
-                         *
-                         */
                     }
 
                     return additionalElements;

repository/src/test/java/org/apache/atlas/repository/store/graph/v1/AtlasEntityStoreV1Test.java

@@ -677,13 +677,13 @@ public class AtlasEntityStoreV1Test {
                 Map          actualMap   = (Map) actual;
                 Map          expectedMap = (Map) expected;
 
-                if (MapUtils.isEmpty(expectedMap)) {
-                    Assert.assertEquals(0, (actualMap == null ? 0 : actualMap.size()));
-                } else {
-                    Assert.assertFalse(MapUtils.isEmpty(actualMap));
-                    Assert.assertEquals(actualMap.size(), expectedMap.size());
+                if (MapUtils.isNotEmpty(expectedMap)) {
+                    Assert.assertTrue(MapUtils.isNotEmpty(actualMap));
 
-                    for (Object key : actualMap.keySet()) {
+                    //actual map could have deleted entities. Hence size may not match.
+                    Assert.assertTrue(actualMap.size() >= expectedMap.size());
+
+                    for (Object key : expectedMap.keySet()) {
                         validateAttribute(entityExtInfo, actualMap.get(key), expectedMap.get(key), valueType, attrName);
                     }
                 }
@@ -695,14 +695,13 @@ public class AtlasEntityStoreV1Test {
                 List           actualList   = (List) actual;
                 List           expectedList = (List) expected;
 
-                if (CollectionUtils.isEmpty(expectedList)) {
-                    Assert.assertTrue(CollectionUtils.isEmpty(actualList));
-                } else {
-                    Assert.assertFalse(CollectionUtils.isEmpty(actualList));
-                    Assert.assertEquals(actualList.size(), expectedList.size());
+                if (CollectionUtils.isNotEmpty(expectedList)) {
+                    Assert.assertTrue(CollectionUtils.isNotEmpty(actualList));
 
                     //actual list could have deleted entities. Hence size may not match.
-                    for (int i = 0; i < actualList.size(); i++) {
+                    Assert.assertTrue(actualList.size() >= expectedList.size());
+
+                    for (int i = 0; i < expectedList.size(); i++) {
                         validateAttribute(entityExtInfo, actualList.get(i), expectedList.get(i), elemType, attrName);
                     }
                 }

webapp/src/test/java/org/apache/atlas/web/adapters/TestEntitiesREST.java

@@ -185,6 +185,8 @@ public class TestEntitiesREST {
         verifyAttributes(entities);
     }
 
+	/* Disabled until EntityREST.deleteByIds() is implemented
+	 *
     @Test(dependsOnMethods = "testGetEntities")
     public void testDeleteEntities() throws Exception {
 
@@ -194,6 +196,8 @@ public class TestEntitiesREST {
         Assert.assertNotNull(entities);
         Assert.assertEquals(entities.size(), 3);
     }
+	*
+	*/
 
     private void verifyAttributes(List<AtlasEntity> retrievedEntities) throws Exception {
         AtlasEntity retrievedDBEntity = null;