ATLAS-1684: export should include super-type definitions, import should preserve…

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

@@ -233,6 +233,9 @@ public class AtlasEntityChangeNotifier {
         }
 
         AtlasVertex atlasVertex = AtlasGraphUtilsV1.findByGuid(entityId);
+        if(atlasVertex == null) {
+            return;
+        }
 
         if (atlasVertex == null) {
             LOG.warn("updateFullTextMapping(): no entity exists with guid {}", entityId);

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

@@ -170,10 +170,6 @@ public class AtlasEntityStoreV1 implements AtlasEntityStore {
 
             EntityMutationResponse resp = createOrUpdate(oneEntityStream, false, true);
 
-            if(CollectionUtils.isNotEmpty(entity.getClassifications())) {
-                addClassifications(entity.getGuid(), entity.getClassifications());
-            }
-
             updateImportMetrics("entity:%s:created", resp.getCreatedEntities(), processedGuids, importResult);
             updateImportMetrics("entity:%s:updated", resp.getUpdatedEntities(), processedGuids, importResult);
             updateImportMetrics("entity:%s:deleted", resp.getDeletedEntities(), processedGuids, importResult);
@@ -567,6 +563,11 @@ public class AtlasEntityStoreV1 implements AtlasEntityStore {
 
                     context.addCreated(guid, entity, entityType, vertex);
                 }
+
+                // during import, update the system attributes
+                if (entityStream instanceof EntityImportStream) {
+                    entityGraphMapper.updateSystemAttributes(vertex, entity);
+                }
             }
         }
 

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

@@ -51,6 +51,7 @@ import org.apache.atlas.type.AtlasTypeUtil;
 import org.apache.atlas.type.AtlasStructType.AtlasAttribute;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -112,6 +113,28 @@ public class EntityGraphMapper {
         return ret;
     }
 
+    public void updateSystemAttributes(AtlasVertex vertex, AtlasEntity entity) {
+        if (entity.getStatus() != null) {
+            AtlasGraphUtilsV1.setProperty(vertex, Constants.STATE_PROPERTY_KEY, entity.getStatus().name());
+        }
+
+        if (entity.getCreateTime() != null) {
+            AtlasGraphUtilsV1.setProperty(vertex, Constants.TIMESTAMP_PROPERTY_KEY, entity.getCreateTime().getTime());
+        }
+
+        if (entity.getUpdateTime() != null) {
+            AtlasGraphUtilsV1.setProperty(vertex, Constants.MODIFICATION_TIMESTAMP_PROPERTY_KEY, entity.getUpdateTime().getTime());
+        }
+
+        if (StringUtils.isNotEmpty(entity.getCreatedBy())) {
+            AtlasGraphUtilsV1.setProperty(vertex, Constants.CREATED_BY_KEY, entity.getCreatedBy());
+        }
+
+        if (StringUtils.isNotEmpty(entity.getUpdatedBy())) {
+            AtlasGraphUtilsV1.setProperty(vertex, Constants.MODIFIED_BY_KEY, entity.getUpdatedBy());
+        }
+    }
+
     public EntityMutationResponse mapAttributesAndClassifications(EntityMutationContext context, final boolean isPartialUpdate, final boolean replaceClassifications) throws AtlasBaseException {
         EntityMutationResponse resp = new EntityMutationResponse();
 

webapp/src/main/java/org/apache/atlas/web/resources/ImportService.java

@@ -120,13 +120,14 @@ public class ImportService {
 
     private void processTypes(AtlasTypesDef typeDefinitionMap, AtlasImportResult result) throws AtlasBaseException {
         setGuidToEmpty(typeDefinitionMap);
+
         AtlasTypesDef typesToCreate = AtlasTypeDefStoreInitializer.getTypesToCreate(typeDefinitionMap, this.typeRegistry);
+
         if (!typesToCreate.isEmpty()) {
             typeDefStore.createTypesDef(typesToCreate);
-        }
 
-        typeDefStore.updateTypesDef(typeDefinitionMap);
-        updateMetricsForTypesDef(typeDefinitionMap, result);
+            updateMetricsForTypesDef(typesToCreate, result);
+        }
     }
 
     private void updateMetricsForTypesDef(AtlasTypesDef typeDefinitionMap, AtlasImportResult result) {