From bcc332913578d711a67e622cf5d96e882506fb69 Mon Sep 17 00:00:00 2001
From: Viacheslav Klimov <viacheslavklimov11@gmail.com>
Date: Thu, 19 Aug 2021 14:24:51 +0300
Subject: [PATCH] Process bulk import columns in order

---
 .../server/service/importing/AbstractBulkImportService.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/importing/AbstractBulkImportService.java b/application/src/main/java/org/thingsboard/server/service/importing/AbstractBulkImportService.java
index d042bc51b5..b1d0b30c9d 100644
--- a/application/src/main/java/org/thingsboard/server/service/importing/AbstractBulkImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/importing/AbstractBulkImportService.java
@@ -49,7 +49,7 @@ import org.thingsboard.server.utils.TypeCastUtil;
 import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -212,8 +212,8 @@ public abstract class AbstractBulkImportService<E extends BaseData<? extends Ent
 
     @Data
     protected static class EntityData {
-        private final Map<BulkImportColumnType, String> fields = new HashMap<>();
-        private final Map<ColumnMapping, ParsedValue> kvs = new HashMap<>();
+        private final Map<BulkImportColumnType, String> fields = new LinkedHashMap<>();
+        private final Map<ColumnMapping, ParsedValue> kvs = new LinkedHashMap<>();
     }
 
     @Data