fix merge conflicts for traccar

This commit is contained in:
Rushdi 2022-05-30 17:33:38 +05:30
parent ff615bf81d
commit a28952dc80

View File

@ -140,6 +140,11 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
return null;
}
@Override
public PaginationResult getAllDevicesIds(PaginationRequest paginationRequest) throws DeviceManagementException {
return null;
}
@Override
public PaginationResult getAllDevices(PaginationRequest paginationRequest, boolean b)
throws DeviceManagementException {
@ -156,6 +161,11 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
return null;
}
@Override
public PaginationResult getAllDevicesIdList(PaginationRequest paginationRequest) throws DeviceManagementException {
return null;
}
@Override
public Device getDevice(DeviceIdentifier deviceIdentifier) throws DeviceManagementException {
if (TestUtils.getDeviceId().equals(deviceIdentifier.getId())) {