Sync with master branch

master
tcdlpds 4 months ago
commit 614a9b0294

@ -69,6 +69,7 @@ import io.entgra.device.mgt.plugins.mobile.android.api.utils.TestUtils;
import org.apache.commons.collections.map.SingletonMap; import org.apache.commons.collections.map.SingletonMap;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -917,9 +918,10 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
@Override @Override
public List<DeviceDetailsDTO> getDevicesByTenantId(int i, int i1, String s, String s1) throws DeviceManagementDAOException { public List<DeviceDetailsDTO> getDevicesByTenantId(int i, int i1, String s, String s1) throws DeviceManagementDAOException {
return null; return Collections.emptyList();
} }
@Override @Override
public OperationDTO getOperationDetailsById(int i) throws OperationManagementException { public OperationDTO getOperationDetailsById(int i) throws OperationManagementException {
return null; return null;
@ -936,4 +938,34 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
throws DeviceManagementException, DeviceNotFoundException, ConflictException { throws DeviceManagementException, DeviceNotFoundException, ConflictException {
return null; return null;
} }
@Override
public List<Integer> getDevicesNotInGivenIdList(List<Integer> list) throws DeviceManagementException {
return null;
}
@Override
public List<Integer> getDevicesInGivenIdList(List<Integer> list) throws DeviceManagementException {
return null;
}
@Override
public int getDeviceCountNotInGivenIdList(List<Integer> list) throws DeviceManagementException {
return 0;
}
@Override
public List<Device> getDevicesByDeviceIds(PaginationRequest paginationRequest, List<Integer> list) throws DeviceManagementException {
return null;
}
@Override
public int getDeviceCountByDeviceIds(PaginationRequest paginationRequest, List<Integer> list) throws DeviceManagementException {
return 0;
}
@Override
public List<Integer> getDeviceIdsByStatus(List<String> list) throws DeviceManagementException {
return null;
}
} }

@ -964,7 +964,7 @@
<properties> <properties>
<!-- Carbon Device Management --> <!-- Carbon Device Management -->
<io.entgra.device.mgt.core.version>5.2.1-SNAPSHOT</io.entgra.device.mgt.core.version> <io.entgra.device.mgt.core.version>5.2.4-SNAPSHOT</io.entgra.device.mgt.core.version>
<io.entgra.device.mgt.core.version.range>[5.0.0, 6.0.0)</io.entgra.device.mgt.core.version.range> <io.entgra.device.mgt.core.version.range>[5.0.0, 6.0.0)</io.entgra.device.mgt.core.version.range>
<!-- Carbon Device Management Plugins --> <!-- Carbon Device Management Plugins -->

Loading…
Cancel
Save