|
|
|
@ -95,7 +95,7 @@ public class DefaultTbResourceService extends AbstractTbEntityService implements |
|
|
|
@Override |
|
|
|
public List<LwM2mObject> findLwM2mObject(TenantId tenantId, String sortOrder, String sortProperty, String[] objectIds) { |
|
|
|
log.trace("Executing findByTenantId [{}]", tenantId); |
|
|
|
validateId(tenantId, t -> INCORRECT_TENANT_ID + t); |
|
|
|
validateId(tenantId, id -> INCORRECT_TENANT_ID + id); |
|
|
|
List<TbResource> resources = resourceService.findTenantResourcesByResourceTypeAndObjectIds(tenantId, ResourceType.LWM2M_MODEL, |
|
|
|
objectIds); |
|
|
|
return resources.stream() |
|
|
|
@ -107,7 +107,7 @@ public class DefaultTbResourceService extends AbstractTbEntityService implements |
|
|
|
@Override |
|
|
|
public List<LwM2mObject> findLwM2mObjectPage(TenantId tenantId, String sortProperty, String sortOrder, PageLink pageLink) { |
|
|
|
log.trace("Executing findByTenantId [{}]", tenantId); |
|
|
|
validateId(tenantId, t -> INCORRECT_TENANT_ID + t); |
|
|
|
validateId(tenantId, id -> INCORRECT_TENANT_ID + id); |
|
|
|
PageData<TbResource> resourcePageData = resourceService.findTenantResourcesByResourceTypeAndPageLink(tenantId, ResourceType.LWM2M_MODEL, pageLink); |
|
|
|
return resourcePageData.getData().stream() |
|
|
|
.flatMap(s -> Stream.ofNullable(toLwM2mObject(s, false))) |
|
|
|
|