ATLAS-3176: Fix for export order regression.

repository/src/main/java/org/apache/atlas/repository/impexp/ExportTypeProcessor.java

@@ -42,11 +42,9 @@ class ExportTypeProcessor {
     private static final Logger LOG = LoggerFactory.getLogger(ExportTypeProcessor.class);
 
     private AtlasTypeRegistry typeRegistry;
-    private final ExportService.ExportContext context;
 
-    ExportTypeProcessor(AtlasTypeRegistry typeRegistry, ExportService.ExportContext context) {
+    ExportTypeProcessor(AtlasTypeRegistry typeRegistry) {
         this.typeRegistry = typeRegistry;
-        this.context = context;
     }
 
     public void addTypes(AtlasEntity entity, ExportService.ExportContext context) {

repository/src/main/java/org/apache/atlas/repository/impexp/ZipSource.java

@@ -190,10 +190,10 @@ public class ZipSource implements EntityImportStream {
         T t;
         try {
             t = AtlasType.fromJson(jsonData, clazz);
-            if(t == null) {
-                throw new AtlasBaseException("Error converting file to JSON.");
+            if (t == null) {
+                LOG.error("Error converting file to JSON.");
+                return null;
             }
-
         } catch (Exception e) {
             throw new AtlasBaseException("Error converting file to JSON.", e);
         }
@@ -238,7 +238,7 @@ public class ZipSource implements EntityImportStream {
             currentPosition++;
             return getEntityWithExtInfo(this.iterator.next());
         } catch (AtlasBaseException e) {
-            LOG.error("getNextEntityWithExtInfo", e);
+            LOG.warn("getNextEntityWithExtInfo", e);
             return null;
         }
     }

webapp/src/test/java/org/apache/atlas/web/resources/AdminExportImportTestIT.java

@@ -73,7 +73,7 @@ public class AdminExportImportTestIT extends BaseResourceIT {
 
     @Test(dependsOnMethods = "importData")
     public void exportData() throws AtlasServiceException, IOException, AtlasBaseException {
-        final int EXPECTED_CREATION_ORDER_SIZE = 10;
+        final int EXPECTED_CREATION_ORDER_SIZE = 6;
 
         AtlasExportRequest request = TestResourceFileUtils.readObjectFromJson(".", EXPORT_REQUEST_FILE, AtlasExportRequest.class);
         InputStream exportedStream = atlasClientV2.exportData(request);
@@ -81,7 +81,7 @@ public class AdminExportImportTestIT extends BaseResourceIT {
 
         ZipSource zs = new ZipSource(exportedStream);
         assertNotNull(zs.getExportResult());
-        assertTrue(zs.getCreationOrder().size() > EXPECTED_CREATION_ORDER_SIZE, "expected creationOrderSize > " + EXPECTED_CREATION_ORDER_SIZE + ", but found " + zs.getCreationOrder().size());
+        assertTrue(zs.getCreationOrder().size() >= EXPECTED_CREATION_ORDER_SIZE, "expected creationOrderSize > " + EXPECTED_CREATION_ORDER_SIZE + ", but found " + zs.getCreationOrder().size());
     }
 
     private void performImport(String fileToImport, int expectedProcessedEntitiesCount) throws AtlasServiceException {