Merge pull request 'formatting issues fix + added new Traccar Device constructor' (#8) from traccar_consistency_issue into master

Reviewed-on: deenath/device-mgt-core#8
pull/21/head
Deenath Geeganage 2 years ago
commit 74a09c2f1a

@ -485,8 +485,7 @@ public class TraccarClientFactory {
String msg = "Error occurred while mapping with deviceId ."; String msg = "Error occurred while mapping with deviceId .";
log.error(msg, e); log.error(msg, e);
throw new TrackerManagementDAOException(msg, e); throw new TrackerManagementDAOException(msg, e);
} } catch (SQLException e) {
catch (SQLException e) {
String msg = "Error occurred establishing the DB connection ."; String msg = "Error occurred establishing the DB connection .";
log.error(msg, e); log.error(msg, e);
throw new TrackerManagementDAOException(msg, e); throw new TrackerManagementDAOException(msg, e);

@ -64,7 +64,7 @@ public class DeviceAPIClientServiceImpl implements DeviceAPIClientService {
@Override @Override
public void modifyDevice(Device device, int tenantId) throws ExecutionException, InterruptedException { public void modifyDevice(Device device, int tenantId) throws ExecutionException, InterruptedException {
TraccarDevice traccarDevice = new TraccarDevice(device.getId(), device.getName(), device.getDeviceIdentifier(), null,null,null,null,null,null,null,null,null); TraccarDevice traccarDevice = new TraccarDevice(device.getId(), device.getDeviceIdentifier(), device.getName());
try { try {
client.modifyDevice(traccarDevice, tenantId); client.modifyDevice(traccarDevice, tenantId);
} catch (TrackerManagementDAOException e) { } catch (TrackerManagementDAOException e) {

@ -55,6 +55,12 @@ public class TraccarDevice {
this.category =category; this.category =category;
} }
public TraccarDevice(int id, String deviceIdentifier, String deviceName) {
this.id = id;
this.deviceIdentifier = deviceIdentifier;
this.deviceName = deviceName;
}
public TraccarDevice(){ } public TraccarDevice(){ }
public int getId() { return id; } public int getId() { return id; }

@ -72,8 +72,6 @@ public class TraccarUtil {
payload.put("id", id); payload.put("id", id);
payload.put("name", deviceInfo.getDeviceName()); payload.put("name", deviceInfo.getDeviceName());
payload.put("uniqueId", deviceInfo.getUniqueId()); payload.put("uniqueId", deviceInfo.getUniqueId());
// add other params if needed
// as long as its null it wintt be overitten
return payload; return payload;
} }
} }

Loading…
Cancel
Save