diff --git a/src/main/java/org/folio/consortia/config/AppConfig.java b/src/main/java/org/folio/consortia/config/AppConfig.java index 5fd6dfca..7e99b17e 100644 --- a/src/main/java/org/folio/consortia/config/AppConfig.java +++ b/src/main/java/org/folio/consortia/config/AppConfig.java @@ -13,7 +13,6 @@ import org.springframework.web.client.RestTemplate; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; @@ -46,8 +45,7 @@ public ObjectMapper objectMapper() { final ObjectMapper objectMapper = new ObjectMapper(); objectMapper.findAndRegisterModules() .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) - .configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false) - .setSerializationInclusion(JsonInclude.Include.NON_EMPTY); + .configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false); return objectMapper; } diff --git a/src/main/java/org/folio/consortia/service/impl/ConsortiumServiceImpl.java b/src/main/java/org/folio/consortia/service/impl/ConsortiumServiceImpl.java index edb651ce..b4b9cddb 100644 --- a/src/main/java/org/folio/consortia/service/impl/ConsortiumServiceImpl.java +++ b/src/main/java/org/folio/consortia/service/impl/ConsortiumServiceImpl.java @@ -9,9 +9,9 @@ import org.folio.consortia.exception.ResourceAlreadyExistException; import org.folio.consortia.exception.ResourceNotFoundException; import org.folio.consortia.service.ConsortiumService; +import org.folio.spring.data.OffsetRequest; import org.springframework.core.convert.ConversionService; import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; import java.util.UUID; @@ -58,7 +58,7 @@ public Consortium update(UUID consortiumId, Consortium consortiumDto) { public ConsortiumCollection getAll() { var result = new ConsortiumCollection(); - Page consortiaPage = repository.findAll(PageRequest.of(0, 1)); + Page consortiaPage = repository.findAll(OffsetRequest.of(0, 1)); result.setConsortia(consortiaPage.stream().map(o -> converter.convert(o, Consortium.class)).toList()); result.setTotalRecords((int) consortiaPage.getTotalElements()); return result; diff --git a/src/main/java/org/folio/consortia/service/impl/PublicationServiceImpl.java b/src/main/java/org/folio/consortia/service/impl/PublicationServiceImpl.java index 2cd65351..a881deff 100644 --- a/src/main/java/org/folio/consortia/service/impl/PublicationServiceImpl.java +++ b/src/main/java/org/folio/consortia/service/impl/PublicationServiceImpl.java @@ -39,11 +39,11 @@ import org.folio.consortia.service.UserTenantService; import org.folio.spring.FolioExecutionContext; import org.folio.spring.FolioModuleMetadata; +import org.folio.spring.data.OffsetRequest; import org.folio.spring.scope.FolioExecutionContextSetter; import org.springframework.beans.factory.annotation.Value; import org.springframework.core.task.TaskExecutor; import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; @@ -99,7 +99,7 @@ public PublicationDetailsResponse getPublicationDetails(UUID consortiumId, UUID var publicationStatusEntity = publicationStatusRepository.findById(publicationId) .orElseThrow(() -> new ResourceNotFoundException(PUBLICATION_ID_FIELD, String.valueOf(publicationId))); - var ptrEntities = publicationTenantRequestRepository.findByPcStateId(publicationId, PageRequest.of(0, Integer.MAX_VALUE)); + var ptrEntities = publicationTenantRequestRepository.findByPcStateId(publicationId, OffsetRequest.of(0, Integer.MAX_VALUE)); log.info("getPublicationDetails:: Found {} of {} expected tenant request records", ptrEntities.getTotalElements(), publicationStatusEntity.getTotalRecords()); var errorList = buildErrorListFromPublicationTenantRequestEntities(ptrEntities); @@ -305,7 +305,7 @@ public PublicationResultCollection getPublicationResults(UUID consortiumId, UUID var publicationStatusEntity = publicationStatusRepository.findById(publicationId) .orElseThrow(() -> new ResourceNotFoundException(PUBLICATION_ID_FIELD, String.valueOf(publicationId))); - var ptrEntities = publicationTenantRequestRepository.findByPcStateId(publicationId, PageRequest.of(0, Integer.MAX_VALUE)); + var ptrEntities = publicationTenantRequestRepository.findByPcStateId(publicationId, OffsetRequest.of(0, Integer.MAX_VALUE)); log.info("getPublicationResults:: Found {} of {} expected tenant request records for publication {}", ptrEntities.getTotalElements(), publicationStatusEntity.getTotalRecords(), publicationId); var resultList = ptrEntities.stream() diff --git a/src/main/java/org/folio/consortia/service/impl/SharingInstanceServiceImpl.java b/src/main/java/org/folio/consortia/service/impl/SharingInstanceServiceImpl.java index d5abb04d..2824789c 100644 --- a/src/main/java/org/folio/consortia/service/impl/SharingInstanceServiceImpl.java +++ b/src/main/java/org/folio/consortia/service/impl/SharingInstanceServiceImpl.java @@ -8,6 +8,15 @@ import java.util.Objects; import java.util.UUID; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.fasterxml.jackson.databind.node.TextNode; + +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import lombok.SneakyThrows; +import lombok.extern.log4j.Log4j2; import org.apache.commons.lang3.ObjectUtils; import org.folio.consortia.client.InventoryClient; import org.folio.consortia.config.kafka.KafkaService; @@ -23,21 +32,11 @@ import org.folio.consortia.service.TenantService; import org.folio.spring.FolioExecutionContext; import org.folio.spring.FolioModuleMetadata; +import org.folio.spring.data.OffsetRequest; import org.folio.spring.scope.FolioExecutionContextSetter; import org.springframework.core.convert.ConversionService; -import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; -import com.fasterxml.jackson.databind.node.TextNode; - -import jakarta.transaction.Transactional; -import lombok.RequiredArgsConstructor; -import lombok.SneakyThrows; -import lombok.extern.log4j.Log4j2; - @Service @Log4j2 @RequiredArgsConstructor @@ -145,7 +144,7 @@ public SharingInstanceCollection getSharingInstances(UUID consortiumId, UUID ins consortiumService.checkConsortiumExistsOrThrow(consortiumId); var specification = constructSpecification(instanceIdentifier, sourceTenantId, targetTenantId, status); - var sharingInstancePage = sharingInstanceRepository.findAll(specification, PageRequest.of(offset, limit)); + var sharingInstancePage = sharingInstanceRepository.findAll(specification, OffsetRequest.of(offset, limit)); var result = new SharingInstanceCollection(); result.setSharingInstances(sharingInstancePage.stream().map(o -> converter.convert(o, SharingInstance.class)).toList()); result.setTotalRecords((int) sharingInstancePage.getTotalElements()); diff --git a/src/main/java/org/folio/consortia/service/impl/SyncPrimaryAffiliationServiceImpl.java b/src/main/java/org/folio/consortia/service/impl/SyncPrimaryAffiliationServiceImpl.java index a126f48c..8c016fd1 100644 --- a/src/main/java/org/folio/consortia/service/impl/SyncPrimaryAffiliationServiceImpl.java +++ b/src/main/java/org/folio/consortia/service/impl/SyncPrimaryAffiliationServiceImpl.java @@ -22,8 +22,8 @@ import org.folio.consortia.service.SyncPrimaryAffiliationService; import org.folio.consortia.service.TenantService; import org.folio.consortia.service.UserService; +import org.folio.spring.data.OffsetRequest; import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -118,7 +118,7 @@ private void createPrimaryUserAffiliations(UUID consortiumId, String centralTena var user = userList.get(idx); try { log.info("createPrimaryUserAffiliations:: Processing users: {} of {}", idx + 1, userList.size()); - Page userTenantPage = userTenantRepository.findAnyByUserId(UUID.fromString(user.getId()), PageRequest.of(0, 1)); + Page userTenantPage = userTenantRepository.findAnyByUserId(UUID.fromString(user.getId()), OffsetRequest.of(0, 1)); if (userTenantPage.getTotalElements() > 0) { log.info("createPrimaryUserAffiliations:: Primary affiliation already exists for tenant/user: {}/{}", diff --git a/src/main/java/org/folio/consortia/service/impl/TenantServiceImpl.java b/src/main/java/org/folio/consortia/service/impl/TenantServiceImpl.java index 7f327f2d..a72d34dc 100644 --- a/src/main/java/org/folio/consortia/service/impl/TenantServiceImpl.java +++ b/src/main/java/org/folio/consortia/service/impl/TenantServiceImpl.java @@ -8,6 +8,8 @@ import java.util.Optional; import java.util.UUID; +import lombok.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.folio.consortia.client.ConsortiaConfigurationClient; @@ -37,18 +39,15 @@ import org.folio.consortia.service.TenantService; import org.folio.consortia.service.UserService; import org.folio.spring.FolioExecutionContext; +import org.folio.spring.data.OffsetRequest; import org.folio.spring.scope.FolioExecutionContextSetter; import org.springframework.beans.factory.annotation.Value; import org.springframework.core.convert.ConversionService; import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import lombok.RequiredArgsConstructor; -import lombok.extern.log4j.Log4j2; - @Service @Log4j2 @RequiredArgsConstructor @@ -81,7 +80,7 @@ public class TenantServiceImpl implements TenantService { public TenantCollection get(UUID consortiumId, Integer offset, Integer limit) { TenantCollection result = new TenantCollection(); consortiumService.checkConsortiumExistsOrThrow(consortiumId); - Page page = tenantRepository.findByConsortiumId(consortiumId, PageRequest.of(offset, limit)); + Page page = tenantRepository.findByConsortiumId(consortiumId, OffsetRequest.of(offset, limit)); result.setTenants(page.map(o -> converter.convert(o, Tenant.class)).getContent()); result.setTotalRecords((int) page.getTotalElements()); return result; diff --git a/src/main/java/org/folio/consortia/service/impl/UserTenantServiceImpl.java b/src/main/java/org/folio/consortia/service/impl/UserTenantServiceImpl.java index 89b69b21..886611df 100644 --- a/src/main/java/org/folio/consortia/service/impl/UserTenantServiceImpl.java +++ b/src/main/java/org/folio/consortia/service/impl/UserTenantServiceImpl.java @@ -9,6 +9,8 @@ import java.util.Optional; import java.util.UUID; +import lombok.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; import org.apache.commons.collections4.CollectionUtils; import org.folio.consortia.config.FolioExecutionContextHelper; import org.folio.consortia.domain.dto.PermissionUser; @@ -17,8 +19,8 @@ import org.folio.consortia.domain.dto.UserTenantCollection; import org.folio.consortia.domain.entity.TenantEntity; import org.folio.consortia.domain.entity.UserTenantEntity; -import org.folio.consortia.exception.UserAffiliationException; import org.folio.consortia.exception.ResourceNotFoundException; +import org.folio.consortia.exception.UserAffiliationException; import org.folio.consortia.repository.UserTenantRepository; import org.folio.consortia.service.ConsortiumService; import org.folio.consortia.service.PermissionUserService; @@ -27,16 +29,13 @@ import org.folio.consortia.service.UserTenantService; import org.folio.spring.FolioExecutionContext; import org.folio.spring.FolioModuleMetadata; +import org.folio.spring.data.OffsetRequest; import org.folio.spring.scope.FolioExecutionContextSetter; import org.springframework.core.convert.ConversionService; import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import lombok.RequiredArgsConstructor; -import lombok.extern.log4j.Log4j2; - /** * Implementation of {@link UserTenantService}. *

@@ -68,7 +67,7 @@ public class UserTenantServiceImpl implements UserTenantService { public UserTenantCollection get(UUID consortiumId, Integer offset, Integer limit) { consortiumService.checkConsortiumExistsOrThrow(consortiumId); var result = new UserTenantCollection(); - Page userTenantPage = userTenantRepository.getAll(PageRequest.of(offset, limit)); + Page userTenantPage = userTenantRepository.getAll(OffsetRequest.of(offset, limit)); result.setUserTenants(userTenantPage.map(o -> converter.convert(o, UserTenant.class)).getContent()); result.setTotalRecords((int) userTenantPage.getTotalElements()); return result; @@ -99,7 +98,7 @@ public UserTenantCollection getByUsernameAndTenantId(UUID consortiumId, String u public UserTenantCollection getByUserId(UUID consortiumId, UUID userId, Integer offset, Integer limit) { consortiumService.checkConsortiumExistsOrThrow(consortiumId); var result = new UserTenantCollection(); - Page userTenantPage = userTenantRepository.findByUserId(userId, PageRequest.of(offset, limit)); + Page userTenantPage = userTenantRepository.findByUserId(userId, OffsetRequest.of(offset, limit)); if (userTenantPage.getContent().isEmpty()) { throw new ResourceNotFoundException(USER_ID, String.valueOf(userId)); diff --git a/src/test/java/org/folio/consortia/controller/ConsortiumControllerTest.java b/src/test/java/org/folio/consortia/controller/ConsortiumControllerTest.java index ff10f497..dfe7dca4 100644 --- a/src/test/java/org/folio/consortia/controller/ConsortiumControllerTest.java +++ b/src/test/java/org/folio/consortia/controller/ConsortiumControllerTest.java @@ -18,12 +18,12 @@ import org.folio.consortia.exception.ResourceAlreadyExistException; import org.folio.consortia.repository.ConsortiumRepository; import org.folio.consortia.support.BaseIT; +import org.folio.spring.data.OffsetRequest; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.data.domain.PageImpl; -import org.springframework.data.domain.PageRequest; class ConsortiumControllerTest extends BaseIT { private static final String CONSORTIUM_RESOURCE_EXIST_MSG_TEMPLATE = "System can not have more than one consortium record"; @@ -161,8 +161,8 @@ void shouldGetConsortiumCollection() throws Exception { List consortiumEntityList = new ArrayList<>(); consortiumEntityList.add(consortiumEntity); - when(consortiumRepository.findAll(PageRequest.of(0, 1))) - .thenReturn(new PageImpl<>(consortiumEntityList, PageRequest.of(0, 1), consortiumEntityList.size())); + when(consortiumRepository.findAll(OffsetRequest.of(0, 1))) + .thenReturn(new PageImpl<>(consortiumEntityList, OffsetRequest.of(0, 1), consortiumEntityList.size())); this.mockMvc.perform( get("/consortia") diff --git a/src/test/java/org/folio/consortia/controller/TenantControllerTest.java b/src/test/java/org/folio/consortia/controller/TenantControllerTest.java index c8dbd3a8..b17c2542 100644 --- a/src/test/java/org/folio/consortia/controller/TenantControllerTest.java +++ b/src/test/java/org/folio/consortia/controller/TenantControllerTest.java @@ -32,6 +32,11 @@ import java.util.Set; import java.util.UUID; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.github.tomakehurst.wiremock.client.WireMock; + +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; import org.folio.consortia.client.ConsortiaConfigurationClient; import org.folio.consortia.client.PermissionsClient; import org.folio.consortia.client.SyncPrimaryAffiliationClient; @@ -59,6 +64,7 @@ import org.folio.consortia.support.BaseIT; import org.folio.spring.FolioExecutionContext; import org.folio.spring.FolioModuleMetadata; +import org.folio.spring.data.OffsetRequest; import org.folio.spring.integration.XOkapiHeaders; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -67,15 +73,8 @@ import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.data.domain.PageImpl; -import org.springframework.data.domain.PageRequest; import org.springframework.http.MediaType; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.github.tomakehurst.wiremock.client.WireMock; - -import jakarta.validation.ConstraintViolation; -import jakarta.validation.ConstraintViolationException; - @EntityScan(basePackageClasses = TenantEntity.class) class TenantControllerTest extends BaseIT { private static final String TENANT_REQUEST_BODY = "{\"id\":\"diku1234\",\"code\":\"TST\",\"name\":\"diku_tenant_name1234\", \"isCentral\":false}"; @@ -128,12 +127,12 @@ void getTenants() throws Exception { tenantEntityList.add(tenantEntity1); tenantEntityList.add(tenantEntity2); - when(tenantRepository.findByConsortiumId(any(), any(PageRequest.of(0, 2) - .getClass()))).thenReturn(new PageImpl<>(tenantEntityList, PageRequest.of(0, 2), tenantEntityList.size())); + when(tenantRepository.findByConsortiumId(any(), any(OffsetRequest.of(1, 2).getClass()))) + .thenReturn(new PageImpl<>(tenantEntityList, OffsetRequest.of(2, 2), tenantEntityList.size())); when(consortiumRepository.existsById(consortiumId)).thenReturn(true); var headers = defaultHeaders(); - this.mockMvc.perform(get("/consortia/7698e46-c3e3-11ed-afa1-0242ac120002/tenants?limit=2&offset=1").headers(headers)) + this.mockMvc.perform(get("/consortia/7698e46-c3e3-11ed-afa1-0242ac120002/tenants?limit=2&offset=2").headers(headers)) .andExpectAll(status().isOk(), content().contentType(MediaType.APPLICATION_JSON_VALUE)); } @@ -253,7 +252,7 @@ void getBadRequest() throws Exception { andExpectAll( status().is4xxClientError(), content().contentType(MediaType.APPLICATION_JSON_VALUE), - jsonPath("$.errors[0].message", is("Page size must not be less than one"))); + jsonPath("$.errors[0].message", is("Limit cannot be negative or zero: 0"))); } @Test diff --git a/src/test/java/org/folio/consortia/controller/UserTenantControllerTest.java b/src/test/java/org/folio/consortia/controller/UserTenantControllerTest.java index 8757ca2e..138ffb87 100644 --- a/src/test/java/org/folio/consortia/controller/UserTenantControllerTest.java +++ b/src/test/java/org/folio/consortia/controller/UserTenantControllerTest.java @@ -21,6 +21,10 @@ import java.util.Optional; import java.util.UUID; +import feign.FeignException; +import feign.Request; +import feign.RequestTemplate; +import feign.Response; import org.folio.consortia.client.UsersClient; import org.folio.consortia.domain.dto.UserTenant; import org.folio.consortia.domain.dto.UserTenantCollection; @@ -31,6 +35,7 @@ import org.folio.consortia.service.TenantService; import org.folio.consortia.service.UserTenantService; import org.folio.consortia.support.BaseIT; +import org.folio.spring.data.OffsetRequest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -42,16 +47,10 @@ import org.springframework.boot.test.mock.mockito.SpyBean; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; -import org.springframework.data.domain.PageRequest; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import feign.FeignException; -import feign.Request; -import feign.RequestTemplate; -import feign.Response; - @EntityScan(basePackageClasses = UserTenantEntity.class) class UserTenantControllerTest extends BaseIT { @@ -123,7 +122,7 @@ void shouldGetUserTenantList() throws Exception { Page userTenantPage = new PageImpl<>(List.of(createUserTenantEntity(consortiumId))); when(consortiumRepository.existsById(consortiumId)).thenReturn(true); - when(userTenantRepository.getAll(PageRequest.of(1, 2))).thenReturn(userTenantPage); + when(userTenantRepository.getAll(OffsetRequest.of(1, 2))).thenReturn(userTenantPage); this.mockMvc.perform( get("/consortia/7698e46-c3e3-11ed-afa1-0242ac120002/user-tenants?limit=2&offset=1") diff --git a/src/test/java/org/folio/consortia/service/ConsortiumServiceTest.java b/src/test/java/org/folio/consortia/service/ConsortiumServiceTest.java index b5db1473..808032b8 100644 --- a/src/test/java/org/folio/consortia/service/ConsortiumServiceTest.java +++ b/src/test/java/org/folio/consortia/service/ConsortiumServiceTest.java @@ -6,6 +6,7 @@ import org.folio.consortia.exception.ResourceAlreadyExistException; import org.folio.consortia.exception.ResourceNotFoundException; import org.folio.consortia.service.impl.ConsortiumServiceImpl; +import org.folio.spring.data.OffsetRequest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; @@ -15,7 +16,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.core.convert.ConversionService; import org.springframework.data.domain.PageImpl; -import org.springframework.data.domain.PageRequest; import java.util.ArrayList; import java.util.List; @@ -44,8 +44,8 @@ void shouldGetConsortiumList() { List consortiumEntityList = new ArrayList<>(); consortiumEntityList.add(consortiumEntity); - when(consortiumRepository.findAll(PageRequest.of(0, 1))) - .thenReturn(new PageImpl<>(consortiumEntityList, PageRequest.of(0, 1), consortiumEntityList.size())); + when(consortiumRepository.findAll(OffsetRequest.of(0, 1))) + .thenReturn(new PageImpl<>(consortiumEntityList, OffsetRequest.of(0, 1), consortiumEntityList.size())); var consortiumCollection = consortiumService.getAll(); Assertions.assertEquals(1, consortiumCollection.getTotalRecords()); diff --git a/src/test/java/org/folio/consortia/service/TenantServiceTest.java b/src/test/java/org/folio/consortia/service/TenantServiceTest.java index d2e158a1..391dd463 100644 --- a/src/test/java/org/folio/consortia/service/TenantServiceTest.java +++ b/src/test/java/org/folio/consortia/service/TenantServiceTest.java @@ -56,6 +56,7 @@ import org.folio.consortia.service.impl.TenantServiceImpl; import org.folio.spring.FolioExecutionContext; import org.folio.spring.FolioModuleMetadata; +import org.folio.spring.data.OffsetRequest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; @@ -66,7 +67,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.core.convert.ConversionService; import org.springframework.data.domain.PageImpl; -import org.springframework.data.domain.PageRequest; @SpringBootTest @EnableAutoConfiguration(exclude = BatchAutoConfiguration.class) @@ -136,8 +136,8 @@ void shouldGetTenantList() { when(consortiumRepository.existsById(consortiumId)).thenReturn(true); when(tenantRepository.existsById(any())).thenReturn(true); - when(tenantRepository.findByConsortiumId(any(), any(PageRequest.of(offset, limit).getClass()))) - .thenReturn(new PageImpl<>(tenantEntityList, PageRequest.of(offset, limit), tenantEntityList.size())); + when(tenantRepository.findByConsortiumId(any(), any(OffsetRequest.of(offset, limit).getClass()))) + .thenReturn(new PageImpl<>(tenantEntityList, OffsetRequest.of(offset, limit), tenantEntityList.size())); var tenantCollection = tenantService.get(consortiumId, 0, 10); assertEquals(2, tenantCollection.getTotalRecords()); diff --git a/src/test/java/org/folio/consortia/service/UserTenantServiceTest.java b/src/test/java/org/folio/consortia/service/UserTenantServiceTest.java index 09eee626..09a46239 100644 --- a/src/test/java/org/folio/consortia/service/UserTenantServiceTest.java +++ b/src/test/java/org/folio/consortia/service/UserTenantServiceTest.java @@ -48,6 +48,7 @@ import org.folio.consortia.service.impl.UserTenantServiceImpl; import org.folio.spring.FolioExecutionContext; import org.folio.spring.FolioModuleMetadata; +import org.folio.spring.data.OffsetRequest; import org.folio.spring.integration.XOkapiHeaders; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -63,7 +64,6 @@ import org.springframework.core.convert.ConversionService; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; -import org.springframework.data.domain.PageRequest; @SpringBootTest @EnableAutoConfiguration(exclude = BatchAutoConfiguration.class) @@ -104,10 +104,10 @@ class UserTenantServiceTest { void shouldGetUserTenantList() { // given List userTenantEntities = List.of(new UserTenantEntity(), new UserTenantEntity()); - Page userTenantPage = new PageImpl<>(userTenantEntities, PageRequest.of(0, 10), userTenantEntities.size()); + Page userTenantPage = new PageImpl<>(userTenantEntities, OffsetRequest.of(0, 10), userTenantEntities.size()); when(consortiumRepository.findById(UUID.fromString(CONSORTIUM_ID))).thenReturn(Optional.of(createConsortiumEntity())); - when(userTenantRepository.getAll(PageRequest.of(0, 10))).thenReturn(userTenantPage); + when(userTenantRepository.getAll(OffsetRequest.of(0, 10))).thenReturn(userTenantPage); // when var result = userTenantService.get(UUID.fromString(CONSORTIUM_ID), 0, 10); @@ -152,7 +152,8 @@ void shouldGetUserTenantListByUserId() { when(consortiumRepository.findById(UUID.fromString(CONSORTIUM_ID))).thenReturn(Optional.of(createConsortiumEntity())); when(conversionService.convert(userTenant, UserTenant.class)).thenReturn(toDto(userTenant)); when(conversionService.convert(userTenant2, UserTenant.class)).thenReturn(toDto(userTenant2)); - when(userTenantRepository.findByUserId(userId, PageRequest.of(0, 10))).thenReturn(new PageImpl<>(userTenantEntities, PageRequest.of(0, 10), userTenantEntities.size())); + when(userTenantRepository.findByUserId(userId, OffsetRequest.of(0, 10))) + .thenReturn(new PageImpl<>(userTenantEntities, OffsetRequest.of(0, 10), userTenantEntities.size())); // when UserTenantCollection result = userTenantService.getByUserId(UUID.fromString(CONSORTIUM_ID), userId, 0, 10); @@ -463,7 +464,7 @@ void shouldReturn404UserIdNotFoundException() { UUID userId = UUID.randomUUID(); when(consortiumRepository.findById(UUID.fromString(CONSORTIUM_ID))).thenReturn(Optional.of(createConsortiumEntity())); - when(userTenantRepository.findByUserId(userId, PageRequest.of(0, 10))).thenReturn(new PageImpl<>(new ArrayList<>())); + when(userTenantRepository.findByUserId(userId, OffsetRequest.of(0, 10))).thenReturn(new PageImpl<>(new ArrayList<>())); UUID id = UUID.fromString(CONSORTIUM_ID); // throw exception