简柏林 / thingskit · Commits

Commit 8604afad38ca335bf0a16217876667b1bf631e82

Authored by mp-loki
1 parent 0661de23

Merge errors fixed

Inline Side-by-side
Showing 4 changed files with 5 additions and 8 deletions
... ... @@ -29,7 +29,7 @@ import org.thingsboard.server.common.data.Device;
29 29 import org.thingsboard.server.common.data.EntityType;
30 30 import org.thingsboard.server.common.data.Tenant;
31 31 import org.thingsboard.server.common.data.asset.Asset;
32   -import org.thingsboard.server.common.data.id.TenantId;
  32 +import org.thingsboard.server.common.data.id.*;
33 33 import org.thingsboard.server.common.data.kv.AttributeKey;
34 34 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
35 35 import org.thingsboard.server.common.data.kv.TsKvEntry;
... ...
... ... @@ -23,6 +23,7 @@ import java.util.ArrayList;
23 23 import java.util.Collections;
24 24 import java.util.List;
25 25
  26 +import com.datastax.driver.core.utils.UUIDs;
26 27 import org.apache.commons.lang3.RandomStringUtils;
27 28 import org.thingsboard.server.common.data.*;
28 29 import org.thingsboard.server.common.data.id.CustomerId;
... ... @@ -154,7 +155,7 @@ public class DashboardControllerTest extends AbstractControllerTest {
154 155 dashboard.setTitle("My dashboard");
155 156 Dashboard savedDashboard = doPost("/api/dashboard", dashboard, Dashboard.class);
156 157
157   - doPost("/api/customer/" + UUIDs.timeBased().toString()
  158 + doPost("/api/customer/" + UUIDs.timeBased().toString()
158 159 + "/dashboard/" + savedDashboard.getId().getId().toString())
159 160 .andExpect(status().isNotFound());
160 161 }
... ...
... ... @@ -23,6 +23,7 @@ import java.util.ArrayList;
23 23 import java.util.Collections;
24 24 import java.util.List;
25 25
  26 +import com.datastax.driver.core.utils.UUIDs;
26 27 import org.apache.commons.lang3.RandomStringUtils;
27 28 import org.thingsboard.server.common.data.Customer;
28 29 import org.thingsboard.server.common.data.Device;
... ... @@ -171,7 +172,7 @@ public class DeviceControllerTest extends AbstractControllerTest {
171 172 device.setName("My device");
172 173 Device savedDevice = doPost("/api/device", device, Device.class);
173 174
174   - doPost("/api/customer/" + UUIDs.timeBased().toString()
  175 + doPost("/api/customer/" + UUIDs.timeBased().toString()
175 176 + "/device/" + savedDevice.getId().getId().toString())
176 177 .andExpect(status().isNotFound());
177 178 }
... ...
... ... @@ -139,11 +139,6 @@ public class TelemetryRestMsgHandler extends DefaultRestMsgHandler {
139 139 }
140 140 }
141 141 }
142   - if (vList == null) {
143   - vList = new ArrayList<>();
144   - result.put(entry.getKey(), vList);
145   - }
146   - vList.add(new TsData(entry.getTs(), entry.getValueAsString()));
147 142 }
148 143
149 144 @Override
... ...