Merge errors fixed

application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java

@@ -29,7 +29,7 @@ import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.asset.Asset;
-import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.*;
 import org.thingsboard.server.common.data.kv.AttributeKey;
 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
 import org.thingsboard.server.common.data.kv.TsKvEntry;

application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java

@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import com.datastax.driver.core.utils.UUIDs;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.thingsboard.server.common.data.*;
 import org.thingsboard.server.common.data.id.CustomerId;
@@ -154,7 +155,7 @@ public class DashboardControllerTest extends AbstractControllerTest {
         dashboard.setTitle("My dashboard");
         Dashboard savedDashboard = doPost("/api/dashboard", dashboard, Dashboard.class);
         
-        doPost("/api/customer/" + UUIDs.timeBased().toString() 
+        doPost("/api/customer/" + UUIDs.timeBased().toString()
                 + "/dashboard/" + savedDashboard.getId().getId().toString())
         .andExpect(status().isNotFound());
     }

application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java

@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import com.datastax.driver.core.utils.UUIDs;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.Device;
@@ -171,7 +172,7 @@ public class DeviceControllerTest extends AbstractControllerTest {
         device.setName("My device");
         Device savedDevice = doPost("/api/device", device, Device.class);
         
-        doPost("/api/customer/" + UUIDs.timeBased().toString() 
+        doPost("/api/customer/" + UUIDs.timeBased().toString()
                 + "/device/" + savedDevice.getId().getId().toString())
         .andExpect(status().isNotFound());
     }

extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryRestMsgHandler.java

@@ -139,11 +139,6 @@ public class TelemetryRestMsgHandler extends DefaultRestMsgHandler {
                 }
             }
         }
-                    if (vList == null) {
-                        vList = new ArrayList<>();
-                        result.put(entry.getKey(), vList);
-                    }
-                    vList.add(new TsData(entry.getTs(), entry.getValueAsString()));
     }
 
     @Override