mirror of
https://repository.entgra.net/community/device-mgt-plugins.git
synced 2025-09-16 23:42:15 +00:00
fix merge conflicts for traccar
This commit is contained in:
parent
ff615bf81d
commit
a28952dc80
@ -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())) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user