diff --git a/pom.xml b/pom.xml index 2706fb428..f77b50fcd 100644 --- a/pom.xml +++ b/pom.xml @@ -51,6 +51,13 @@ + + org.apache.logging.log4j + log4j-bom + 2.22.0 + pom + import + io.vertx vertx-stack-depchain @@ -228,8 +235,7 @@ org.apache.logging.log4j - log4j-slf4j-impl - 2.22.1 + log4j-slf4j2-impl test @@ -242,6 +248,7 @@ + org.apache.maven.plugins maven-compiler-plugin ${maven-compiler-plugin.version} diff --git a/src/main/java/org/folio/rest/impl/InstanceStorageBatchApi.java b/src/main/java/org/folio/rest/impl/InstanceStorageBatchApi.java index ea22e1af3..51594a4c3 100644 --- a/src/main/java/org/folio/rest/impl/InstanceStorageBatchApi.java +++ b/src/main/java/org/folio/rest/impl/InstanceStorageBatchApi.java @@ -10,7 +10,6 @@ import com.google.common.collect.Lists; import io.vertx.core.AsyncResult; -import io.vertx.core.CompositeFuture; import io.vertx.core.Context; import io.vertx.core.Future; import io.vertx.core.Handler; @@ -18,7 +17,6 @@ import java.util.List; import java.util.Map; import java.util.function.Function; -import java.util.stream.Collectors; import javax.ws.rs.core.Response; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -102,12 +100,12 @@ public void postInstanceStorageBatchInstances(Instances entity, * @return succeeded future containing the list of completed (failed and succeeded) * individual result futures, one per instance */ - private Future> executeInBatch(List instances, - Function, Future>> action) { - List totalFutures = new ArrayList<>(); + private Future>> executeInBatch(List instances, + Function, Future>>> action) { + List> totalFutures = new ArrayList<>(); List> batches = Lists.partition(instances, PARALLEL_DB_CONNECTIONS_LIMIT); - Future> future = succeededFuture(); + Future>> future = succeededFuture(); for (List batch : batches) { future = future.compose(x -> action.apply(batch)) .onSuccess(totalFutures::addAll); @@ -122,12 +120,12 @@ private Future> executeInBatch(List instances, * @param postgresClient Postgres Client * @return succeeded future containing the list of completed (succeeded and failed) individual result futures */ - private Future> saveInstances(List instances, PostgresClient postgresClient) { - List futures = instances.stream() + private Future>> saveInstances(List instances, PostgresClient postgresClient) { + List> futures = instances.stream() .map(instance -> saveInstance(instance, postgresClient)) - .collect(Collectors.toList()); + .toList(); - return CompositeFuture.join(futures) + return Future.join(futures) // on success and on failure return succeeding future with list of all (succeeded and failed) futures .map(futures) .otherwise(futures); @@ -165,14 +163,14 @@ private Future saveInstance(Instance instance, PostgresClient postgres * @param saveFutures list of completed individual result futures * @return InstancesBatchResponse */ - private InstancesBatchResponse constructResponse(List saveFutures) { + private InstancesBatchResponse constructResponse(List> saveFutures) { InstancesBatchResponse response = new InstancesBatchResponse(); saveFutures.forEach(save -> { if (save.failed()) { response.getErrorMessages().add(save.cause().getMessage()); } else { - response.getInstances().add((Instance) save.result()); + response.getInstances().add(save.result()); } }); diff --git a/src/main/java/org/folio/rest/impl/LocationApi.java b/src/main/java/org/folio/rest/impl/LocationApi.java index 7b5ed0e48..a14d22aa1 100644 --- a/src/main/java/org/folio/rest/impl/LocationApi.java +++ b/src/main/java/org/folio/rest/impl/LocationApi.java @@ -201,9 +201,8 @@ public void deleteLocationsById( @SafeVarargs private CompositeFuture runLocationChecks(Future... futures) { - @SuppressWarnings("rawtypes") - List allFutures = new ArrayList<>(Arrays.asList(futures)); - return CompositeFuture.all(allFutures); + List> allFutures = new ArrayList<>(Arrays.asList(futures)); + return Future.all(allFutures); } private Future checkIdProvided(Location entity) { diff --git a/src/main/java/org/folio/rest/support/CollectionUtil.java b/src/main/java/org/folio/rest/support/CollectionUtil.java index 90d71ac63..987d43a10 100644 --- a/src/main/java/org/folio/rest/support/CollectionUtil.java +++ b/src/main/java/org/folio/rest/support/CollectionUtil.java @@ -4,7 +4,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import java.util.Collection; import java.util.Collections; -import java.util.stream.Collectors; import org.folio.dbschema.ObjectMapperTool; public final class CollectionUtil { @@ -22,7 +21,7 @@ public static Collection deepCopy(Collection collection, Class type return collection.stream() .map(r -> clone(r, type)) - .collect(Collectors.toList()); + .toList(); } public static T getFirst(Collection collection) { diff --git a/src/main/java/org/folio/rest/support/CqlQuery.java b/src/main/java/org/folio/rest/support/CqlQuery.java index 7cc0f6fee..d2e967f71 100644 --- a/src/main/java/org/folio/rest/support/CqlQuery.java +++ b/src/main/java/org/folio/rest/support/CqlQuery.java @@ -21,10 +21,9 @@ public boolean isMatchingAll() { } catch (Exception e) { return false; } - if (!(cqlNode instanceof CQLTermNode)) { + if (!(cqlNode instanceof CQLTermNode node)) { return false; } - var node = (CQLTermNode) cqlNode; // cql.allRecords: A special index which matches every record available. Every record is matched no matter what // values are provided for the relation and term, but the recommended syntax is: cql.allRecords = 1 // http://docs.oasis-open.org/search-ws/searchRetrieve/v1.0/os/part5-cql/searchRetrieve-v1.0-os-part5-cql.html#_Toc324166821 diff --git a/src/main/java/org/folio/services/ItemEffectiveValuesService.java b/src/main/java/org/folio/services/ItemEffectiveValuesService.java index 4f62e98aa..8d76f3d36 100644 --- a/src/main/java/org/folio/services/ItemEffectiveValuesService.java +++ b/src/main/java/org/folio/services/ItemEffectiveValuesService.java @@ -32,7 +32,7 @@ public Future> populateEffectiveValues(List items) { return getHoldingsRecordsForItems(items) .map(holdingsRecordMap -> items.stream() .map(item -> populateEffectiveValues(item, holdingsRecordMap.get(item.getHoldingsRecordId()))) - .collect(Collectors.toList())); + .toList()); } public Future populateEffectiveValues(Item item) { diff --git a/src/main/java/org/folio/services/SuDocCallNumber.java b/src/main/java/org/folio/services/SuDocCallNumber.java index cc3106433..dc7f185cc 100644 --- a/src/main/java/org/folio/services/SuDocCallNumber.java +++ b/src/main/java/org/folio/services/SuDocCallNumber.java @@ -104,7 +104,7 @@ private void appendWithSymbolIfNeeded(StringBuilder key, String cnPart) { } var parts = cnPart.split("[./ -]"); for (String part : parts) { - if (key.length() > 0) { + if (!key.isEmpty()) { key.append(' '); } part = part.trim(); diff --git a/src/main/java/org/folio/services/domainevent/CommonDomainEventPublisher.java b/src/main/java/org/folio/services/domainevent/CommonDomainEventPublisher.java index 59c540832..9ef690f87 100644 --- a/src/main/java/org/folio/services/domainevent/CommonDomainEventPublisher.java +++ b/src/main/java/org/folio/services/domainevent/CommonDomainEventPublisher.java @@ -1,6 +1,6 @@ package org.folio.services.domainevent; -import static io.vertx.core.CompositeFuture.all; +import static io.vertx.core.Future.all; import static io.vertx.core.Future.succeededFuture; import static org.apache.logging.log4j.LogManager.getLogger; import static org.folio.rest.tools.utils.TenantTool.tenantId; @@ -20,7 +20,6 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.function.Function; import java.util.function.LongFunction; -import java.util.stream.Collectors; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Triple; import org.apache.logging.log4j.Logger; @@ -124,7 +123,7 @@ Future publishRecordsUpdated(Collection> updatedRecor return all(updatedRecords.stream() .map(triple -> publishRecordUpdated(triple.getLeft(), triple.getMiddle(), triple.getRight())) - .collect(Collectors.toList())) + .toList()) .map(notUsed -> null); } @@ -141,7 +140,7 @@ Future publishRecordsCreated(List> records) { return all(records.stream() .map(pair -> publishRecordCreated(pair.getKey(), pair.getValue())) - .collect(Collectors.toList())) + .toList()) .map(notUsed -> null); } diff --git a/src/main/java/org/folio/services/domainevent/InstanceDomainEventPublisher.java b/src/main/java/org/folio/services/domainevent/InstanceDomainEventPublisher.java index 5bfc7f0b7..8f2c574fc 100644 --- a/src/main/java/org/folio/services/domainevent/InstanceDomainEventPublisher.java +++ b/src/main/java/org/folio/services/domainevent/InstanceDomainEventPublisher.java @@ -10,7 +10,6 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import org.apache.commons.lang3.tuple.Pair; import org.apache.logging.log4j.Logger; import org.folio.persist.InstanceRepository; @@ -35,14 +34,14 @@ public Future publishInstancesCreated(List instances) { return domainEventService.publishRecordsCreated(instances.stream() .map(instance -> pair(instance.getId(), instance)) - .collect(Collectors.toList())); + .toList()); } @Override protected Future>> getInstanceIds(Collection instances) { return succeededFuture(instances.stream() .map(instance -> pair(instance.getId(), instance)) - .collect(Collectors.toList())); + .toList()); } @Override diff --git a/src/main/java/org/folio/services/holding/HoldingsService.java b/src/main/java/org/folio/services/holding/HoldingsService.java index 00f259d9f..c797922fb 100644 --- a/src/main/java/org/folio/services/holding/HoldingsService.java +++ b/src/main/java/org/folio/services/holding/HoldingsService.java @@ -243,7 +243,7 @@ private CompositeFuture createShadowInstancesIfNeeded(List holdi String instanceId = holdingRecord.getInstanceId(); instanceFuturesMap.computeIfAbsent(instanceId, v -> createShadowInstanceIfNeeded(instanceId, consortiumData)); } - return CompositeFuture.all(new ArrayList<>(instanceFuturesMap.values())); + return Future.all(new ArrayList<>(instanceFuturesMap.values())); } private Future createShadowInstanceIfNeeded(String instanceId, ConsortiumData consortiumData) { diff --git a/src/main/java/org/folio/services/migration/async/AsyncMigrationJobService.java b/src/main/java/org/folio/services/migration/async/AsyncMigrationJobService.java index 6bd988acb..2362e1819 100644 --- a/src/main/java/org/folio/services/migration/async/AsyncMigrationJobService.java +++ b/src/main/java/org/folio/services/migration/async/AsyncMigrationJobService.java @@ -16,7 +16,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import java.util.stream.Stream; import org.folio.persist.AsyncMigrationJobRepository; import org.folio.rest.jaxrs.model.AsyncMigration; @@ -172,13 +171,13 @@ public Future logJobProcessed(String migrationName, String jo private List getMigrationJobRunnersByName(List migrationNames) { return MIGRATION_JOB_RUNNERS.stream() .filter(runners -> migrationNames.contains(runners.getMigrationName())) - .collect(Collectors.toList()); + .toList(); } private boolean isJobAvailable(AsyncMigrationJobRequest jobRequest) { var availableMigrations = getAvailableMigrations().getAsyncMigrations() - .stream().flatMap(v -> Stream.of(v.getMigrations())).collect(Collectors.toList()) - .stream().flatMap(List::stream).collect(Collectors.toList()); + .stream().flatMap(v -> Stream.of(v.getMigrations())).toList() + .stream().flatMap(List::stream).toList(); return availableMigrations.containsAll(jobRequest.getMigrations()); } @@ -188,7 +187,7 @@ private AsyncMigrationJob buildInitialJob(AsyncMigrationJobRequest request) { jobRunners.forEach(asyncMigrationJobRunner -> affectedEntities.addAll(asyncMigrationJobRunner .getAffectedEntities() .stream().map(Enum::name) - .collect(Collectors.toList()))); + .toList())); return new AsyncMigrationJob() .withJobStatus(AsyncMigrationJob.JobStatus.IN_PROGRESS) .withMigrations(request.getMigrations()) diff --git a/src/main/java/org/folio/services/migration/async/AsyncMigrationsConsumerUtils.java b/src/main/java/org/folio/services/migration/async/AsyncMigrationsConsumerUtils.java index 77e396761..2a58c198e 100644 --- a/src/main/java/org/folio/services/migration/async/AsyncMigrationsConsumerUtils.java +++ b/src/main/java/org/folio/services/migration/async/AsyncMigrationsConsumerUtils.java @@ -13,7 +13,6 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import java.util.stream.Collectors; import org.apache.commons.collections4.map.CaseInsensitiveMap; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; @@ -59,9 +58,9 @@ public static Handler> pollAsyncMigrati .map(javaMigration -> javaMigration.runMigrationForIds(ids) .onSuccess(notUsed -> jobService.logJobProcessed(migrationName, migrationJob.getId(), ids.size())) .onFailure(notUsed -> jobService.logJobFail(migrationJob.getId()))) - .collect(Collectors.toList()); + .toList(); return CompositeFuture.all(new ArrayList<>(startedMigrations)); - }).collect(Collectors.toList()); + }).toList(); CompositeFuture.all(new ArrayList<>(migrations)) .onSuccess(composite -> consumer.commit()) diff --git a/src/main/java/org/folio/services/migration/async/PublicationPeriodMigrationService.java b/src/main/java/org/folio/services/migration/async/PublicationPeriodMigrationService.java index 7261b5494..052f04903 100644 --- a/src/main/java/org/folio/services/migration/async/PublicationPeriodMigrationService.java +++ b/src/main/java/org/folio/services/migration/async/PublicationPeriodMigrationService.java @@ -44,7 +44,7 @@ protected Future updateBatch(List batch, SQLConnection connection) var instances = batch.stream() .map(row -> rowToClass(row, Instance.class)) .peek(valuesService::populatePublicationPeriod) - .collect(Collectors.toList()); + .toList(); return instanceRepository.updateBatch(instances, connection) .map(notUsed -> instances.size()); } diff --git a/src/main/java/org/folio/services/migration/async/SubjectSeriesMigrationService.java b/src/main/java/org/folio/services/migration/async/SubjectSeriesMigrationService.java index a15f51216..f1a6e950f 100644 --- a/src/main/java/org/folio/services/migration/async/SubjectSeriesMigrationService.java +++ b/src/main/java/org/folio/services/migration/async/SubjectSeriesMigrationService.java @@ -45,7 +45,7 @@ protected Future updateBatch(List batch, SQLConnection connection) var instances = batch.stream() .map(row -> row.getJsonObject("jsonb")) .map(json -> json.mapTo(Instance.class)) - .collect(Collectors.toList()); + .toList(); return instanceRepository.updateBatch(instances, connection) .map(notUsed -> instances.size()); } diff --git a/src/main/java/org/folio/services/migration/item/ItemShelvingOrderMigrationService.java b/src/main/java/org/folio/services/migration/item/ItemShelvingOrderMigrationService.java index eb85ac9ea..c7ec0a821 100644 --- a/src/main/java/org/folio/services/migration/item/ItemShelvingOrderMigrationService.java +++ b/src/main/java/org/folio/services/migration/item/ItemShelvingOrderMigrationService.java @@ -6,7 +6,6 @@ import io.vertx.sqlclient.RowStream; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import org.folio.persist.ItemRepository; import org.folio.rest.jaxrs.model.Item; import org.folio.rest.persist.PgUtil; @@ -45,7 +44,7 @@ protected Future updateBatch(List batch, SQLConnection connection) var items = batch.stream() .map(row -> rowToClass(row, Item.class)) .map(EffectiveCallNumberComponentsUtil::calculateAndSetEffectiveShelvingOrder) - .collect(Collectors.toList()); + .toList(); return itemRepository.updateBatch(items, connection).map(notUsed -> items.size()); } diff --git a/src/test/java/org/folio/rest/api/AbstractInstanceRecordsApiTest.java b/src/test/java/org/folio/rest/api/AbstractInstanceRecordsApiTest.java index 9f37d6639..4fa771fb2 100644 --- a/src/test/java/org/folio/rest/api/AbstractInstanceRecordsApiTest.java +++ b/src/test/java/org/folio/rest/api/AbstractInstanceRecordsApiTest.java @@ -45,9 +45,8 @@ public void shouldRespondWith500StatusWhenErrorsOccursWhilstFetchingRecords(Test RoutingContext routingContext = mock(RoutingContext.class); when(routingContext.response()).thenReturn(mock(HttpServerResponse.class)); new MyAbstractInstanceRecordsApi().fetchRecordsByQuery("SELECT 1", - routingContext, null, testContext.asyncAssertSuccess(response -> { - assertThat(response.getStatus(), is(500)); - })); + routingContext, null, + testContext.asyncAssertSuccess(response -> assertThat(response.getStatus(), is(500)))); } @Test diff --git a/src/test/java/org/folio/rest/api/AsyncMigrationTest.java b/src/test/java/org/folio/rest/api/AsyncMigrationTest.java index 6397ae4de..6aab81096 100644 --- a/src/test/java/org/folio/rest/api/AsyncMigrationTest.java +++ b/src/test/java/org/folio/rest/api/AsyncMigrationTest.java @@ -14,8 +14,8 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; @@ -173,7 +173,7 @@ public void canGetAllAvailableMigrationJobs() { .withMigrations(List.of("itemShelvingOrderMigration"))); AsyncMigrationJobCollection migrations = asyncMigration.getAllMigrationJobs(); assertNotNull(migrations); - assertTrue(migrations.getJobs().size() > 0); + assertFalse(migrations.getJobs().isEmpty()); } @Test diff --git a/src/test/java/org/folio/rest/api/EffectiveLocationMigrationTest.java b/src/test/java/org/folio/rest/api/EffectiveLocationMigrationTest.java index de4c6c0aa..06f5d704e 100644 --- a/src/test/java/org/folio/rest/api/EffectiveLocationMigrationTest.java +++ b/src/test/java/org/folio/rest/api/EffectiveLocationMigrationTest.java @@ -29,14 +29,14 @@ public class EffectiveLocationMigrationTest extends TestBaseWithInventoryUtil { private static final String SET_EFFECTIVE_LOCATION = ResourceUtil .asString("templates/db_scripts/setEffectiveHoldingsLocation.sql") - .replace("${myuniversity}_${mymodule}", "test_tenant_mod_inventory_storage"); + .replace("${myuniversity}_${mymodule}", "test_mod_inventory_storage"); private static final Vertx VERTX = Vertx.vertx(); private static final UUID INSTANCE_ID = UUID.randomUUID(); private static final UUID HOLDINGS_ID = UUID.randomUUID(); private static final String REMOVE_EXISTING_FIELD = - "UPDATE test_tenant_mod_inventory_storage.holdings_record SET jsonb = jsonb - 'effectiveLocationId';"; + "UPDATE test_mod_inventory_storage.holdings_record SET jsonb = jsonb - 'effectiveLocationId';"; private static final String QUERY = - "SELECT jsonb FROM test_tenant_mod_inventory_storage.holdings_record WHERE id = '" + HOLDINGS_ID + "';"; + "SELECT jsonb FROM test_mod_inventory_storage.holdings_record WHERE id = '" + HOLDINGS_ID + "';"; @Before public void beforeEach() { diff --git a/src/test/java/org/folio/rest/api/HoldingsStorageTest.java b/src/test/java/org/folio/rest/api/HoldingsStorageTest.java index a2a9a78dd..5b3610d11 100644 --- a/src/test/java/org/folio/rest/api/HoldingsStorageTest.java +++ b/src/test/java/org/folio/rest/api/HoldingsStorageTest.java @@ -105,8 +105,8 @@ public class HoldingsStorageTest extends TestBaseWithInventoryUtil { private static final String TAG_VALUE = "test-tag"; private static final String X_OKAPI_URL = "X-Okapi-Url"; private static final String X_OKAPI_TENANT = "X-Okapi-Tenant"; - private static final String CONSORTIUM_MEMBER_TENANT = "consortium_member_tenant"; - private static final String TENANT_WITHOUT_USER_TENANTS_PERMISSIONS = "no_permissions_tenant"; + private static final String CONSORTIUM_MEMBER_TENANT = "consortium"; + private static final String TENANT_WITHOUT_USER_TENANTS_PERMISSIONS = "nopermissions"; private static final String USER_TENANTS_PATH = "/user-tenants?limit=1"; private final HoldingsEventMessageChecks holdingsMessageChecks = new HoldingsEventMessageChecks(KAFKA_CONSUMER); @@ -2842,7 +2842,7 @@ public void canSearchByDiscoverySuppressProperty() { assertThat(notSuppressedHoldings.size(), is(2)); assertThat(notSuppressedHoldings.stream() .map(IndividualResource::getId) - .collect(Collectors.toList()), + .toList(), containsInAnyOrder(notSuppressedHolding.getId(), notSuppressedHoldingDefault.getId())); } @@ -3242,7 +3242,7 @@ private List searchByCallNumberEyeReadable(String searchTerm) { searchTerm) .stream() .map(IndividualResource::getId) - .collect(Collectors.toList()); + .toList(); } private Response update(URL url, Object entity) throws InterruptedException, ExecutionException, TimeoutException { @@ -3267,7 +3267,7 @@ private List getTags(JsonObject json) { return json.getJsonObject("tags").getJsonArray("tagList") .stream() .map(obj -> (String) obj) - .collect(Collectors.toList()); + .toList(); } private void mockUserTenantsForConsortiumMember() { diff --git a/src/test/java/org/folio/rest/api/IllMigrationScriptTest.java b/src/test/java/org/folio/rest/api/IllMigrationScriptTest.java index 7c4173838..dfbf3428a 100644 --- a/src/test/java/org/folio/rest/api/IllMigrationScriptTest.java +++ b/src/test/java/org/folio/rest/api/IllMigrationScriptTest.java @@ -17,9 +17,7 @@ public class IllMigrationScriptTest extends MigrationTestBase { @Test public void canMigrateIllPolicies() throws Exception { Map initialIllPolicies = new HashMap(); - illPoliciesClient.getAll().forEach(policy -> { - initialIllPolicies.put(policy.getString("id"), policy); - }); + illPoliciesClient.getAll().forEach(policy -> initialIllPolicies.put(policy.getString("id"), policy)); executeMultipleSqlStatements(MIGRATION_SCRIPT); diff --git a/src/test/java/org/folio/rest/api/InstanceFormatUpgradeTest.java b/src/test/java/org/folio/rest/api/InstanceFormatUpgradeTest.java index e9b7c77d7..9fab5b2b6 100644 --- a/src/test/java/org/folio/rest/api/InstanceFormatUpgradeTest.java +++ b/src/test/java/org/folio/rest/api/InstanceFormatUpgradeTest.java @@ -22,7 +22,7 @@ public class InstanceFormatUpgradeTest extends TestBaseWithInventoryUtil { private static final String ADD_INSTANCE_FORMAT_AUDIO_BELT = ResourceUtil .asString("templates/db_scripts/addInstanceFormatsAudioBelt.sql") - .replace("${myuniversity}_${mymodule}", "test_tenant_mod_inventory_storage"); + .replace("${myuniversity}_${mymodule}", "test_mod_inventory_storage"); private static final Vertx VERTX = Vertx.vertx(); @SneakyThrows @@ -42,7 +42,7 @@ public void canMigrateToDefaultPreviouslyHeldValue() throws runSql(ADD_INSTANCE_FORMAT_AUDIO_BELT); String query = - "SELECT jsonb FROM test_tenant_mod_inventory_storage.instance_format WHERE id " + "SELECT jsonb FROM test_mod_inventory_storage.instance_format WHERE id " + "= '0d9b1c3d-2d13-4f18-9472-cc1b91bf1752'"; RowSet result = runSql(query); diff --git a/src/test/java/org/folio/rest/api/InstanceSetTest.java b/src/test/java/org/folio/rest/api/InstanceSetTest.java index 44e52b21d..8b847f308 100644 --- a/src/test/java/org/folio/rest/api/InstanceSetTest.java +++ b/src/test/java/org/folio/rest/api/InstanceSetTest.java @@ -17,7 +17,6 @@ import java.util.List; import java.util.UUID; import java.util.concurrent.CompletableFuture; -import java.util.stream.Collectors; import lombok.SneakyThrows; import org.folio.rest.support.Response; import org.folio.rest.support.builders.HoldingRequestBuilder; @@ -246,7 +245,7 @@ private List ids(JsonArray sets) { .stream() .map(o -> ((JsonObject) o).getString("id")) .map(UUID::fromString) - .collect(Collectors.toList()); + .toList(); } private List ids(JsonObject set, String arrayName, String stringName) { @@ -254,6 +253,6 @@ private List ids(JsonObject set, String arrayName, String stringName) { .stream() .map(o -> ((JsonObject) o).getString(stringName)) .map(UUID::fromString) - .collect(Collectors.toList()); + .toList(); } } diff --git a/src/test/java/org/folio/rest/api/InstanceStorageTest.java b/src/test/java/org/folio/rest/api/InstanceStorageTest.java index e85bb1625..4a5bc644e 100644 --- a/src/test/java/org/folio/rest/api/InstanceStorageTest.java +++ b/src/test/java/org/folio/rest/api/InstanceStorageTest.java @@ -68,7 +68,6 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import java.util.stream.Collectors; import java.util.stream.Stream; import lombok.SneakyThrows; import org.apache.commons.io.IOUtils; @@ -234,6 +233,7 @@ public void canCreateAnInstance() throws InterruptedException, assertThat(identifiersFromGet.size(), is(1)); assertThat(identifiersFromGet, hasItem(identifierMatches(UUID_ISBN.toString(), "9781473619777"))); + @SuppressWarnings("unchecked") List tags = instanceFromGet.getJsonObject("tags").getJsonArray("tagList").getList(); assertThat(tags.size(), is(1)); @@ -1812,7 +1812,7 @@ public void canPostSynchronousBatch() throws Exception { .map(json -> json.getString("id")) .map(this::getById) .map(Response::getJson) - .collect(Collectors.toList()); + .toList(); instanceMessageChecks.createdMessagesPublished(createdInstances); } @@ -2615,7 +2615,7 @@ public void canSearchByStaffSuppressProperty() throws Exception { assertThat(notSuppressedInstances.size(), is(2)); assertThat(notSuppressedInstances.stream() .map(IndividualResource::getId) - .collect(Collectors.toList()), + .toList(), containsInAnyOrder(notSuppressedInstance.getId(), notSuppressedInstanceDefault.getId())); } diff --git a/src/test/java/org/folio/rest/api/InventoryHierarchyViewTest.java b/src/test/java/org/folio/rest/api/InventoryHierarchyViewTest.java index 8134bf915..254b27559 100644 --- a/src/test/java/org/folio/rest/api/InventoryHierarchyViewTest.java +++ b/src/test/java/org/folio/rest/api/InventoryHierarchyViewTest.java @@ -568,7 +568,7 @@ private List requestInventoryHierarchyItemsAndHoldingsViewInstance(U final List results = new ArrayList<>(); InventoryInstanceIds instanceIdsPayload = new InventoryInstanceIds(); - instanceIdsPayload.setInstanceIds(Arrays.stream(instanceIds).map(UUID::toString).collect(Collectors.toList())); + instanceIdsPayload.setInstanceIds(Arrays.stream(instanceIds).map(UUID::toString).toList()); instanceIdsPayload.setSkipSuppressedFromDiscoveryRecords(skipSuppressedFromDiscovery); getClient().post(inventoryHierarchyItemsAndHoldings(), instanceIdsPayload, TENANT_ID, ResponseHandler.any(future)); diff --git a/src/test/java/org/folio/rest/api/ItemEffectiveCallNumberDataUpgradeTest.java b/src/test/java/org/folio/rest/api/ItemEffectiveCallNumberDataUpgradeTest.java index abed83a7c..9cecf9820 100644 --- a/src/test/java/org/folio/rest/api/ItemEffectiveCallNumberDataUpgradeTest.java +++ b/src/test/java/org/folio/rest/api/ItemEffectiveCallNumberDataUpgradeTest.java @@ -35,7 +35,7 @@ public class ItemEffectiveCallNumberDataUpgradeTest extends TestBaseWithInventor private static final String ITEM_LEVEL_CALL_NUMBER_TYPE = UUID.randomUUID().toString(); private static final String POPULATE_EFFECTIVE_CALL_NUMBER_SQL = ResourceUtil .asString("templates/db_scripts/populateEffectiveCallNumberComponentsForExistingItems.sql") - .replace("${myuniversity}_${mymodule}", "test_tenant_mod_inventory_storage"); + .replace("${myuniversity}_${mymodule}", "test_mod_inventory_storage"); private static final Vertx VERTX = Vertx.vertx(); private static final UUID INSTANCE_ID = UUID.randomUUID(); private final ObjectMapper mapper = new ObjectMapper(); @@ -70,7 +70,7 @@ public void canInitializeEffectiveCallNumber() throws Exception { item.setEffectiveCallNumberComponents(components); String query = String.format( - "INSERT INTO test_tenant_mod_inventory_storage.item (id, jsonb) values ('%s','%s');", + "INSERT INTO test_mod_inventory_storage.item (id, jsonb) values ('%s','%s');", item.getId(), mapper.writeValueAsString(item)); runSql(query); @@ -96,7 +96,7 @@ public void canInitializeEffectiveCallNumberAfterHoldingsChange() throws Excepti is("testCallNumber")); // Update holdings directly without updating item - String template = "UPDATE test_tenant_mod_inventory_storage.holdings_record " + String template = "UPDATE test_mod_inventory_storage.holdings_record " + "SET jsonb = jsonb_set(jsonb, '{callNumber}', '\"%s\"') WHERE id = '%s';"; String query = String.format(template, "updatedCallNumber", holding); runSql(query); @@ -125,7 +125,7 @@ public void canInitializeEffectiveCallNumberToItemLevelWhenPresent() throws Exce is("testCallNumber")); // Update item directly without updating item effective call number - String template = "UPDATE test_tenant_mod_inventory_storage.item " + String template = "UPDATE test_mod_inventory_storage.item " + "SET jsonb = jsonb_set(jsonb, '{itemLevelCallNumber}', '\"%s\"') WHERE id = '%s';"; String query = String.format(template, "updatedCallNumber", item.getId()); runSql(query); @@ -154,7 +154,7 @@ public void canInitializeEffectiveCallNumberPrefix() throws Exception { EffectiveCallNumberComponents components = new EffectiveCallNumberComponents(); item.setEffectiveCallNumberComponents(components); - String query = String.format("INSERT INTO test_tenant_mod_inventory_storage.item (id, jsonb) values ('%s','%s');", + String query = String.format("INSERT INTO test_mod_inventory_storage.item (id, jsonb) values ('%s','%s');", item.getId(), mapper.writeValueAsString(item)); runSql(query); @@ -180,7 +180,7 @@ public void canInitializeEffectiveCallNumberPrefixAfterHoldingsChange() throws E is("testCallNumberPrefix")); // Update holdings directly without updating item - String template = "UPDATE test_tenant_mod_inventory_storage.holdings_record " + String template = "UPDATE test_mod_inventory_storage.holdings_record " + "SET jsonb = jsonb_set(jsonb, '{callNumberPrefix}', '\"%s\"') WHERE id = '%s';"; String query = String.format(template, "updatedCallNumberPrefix", holding); runSql(query); @@ -209,7 +209,7 @@ public void canInitializeEffectiveCallNumberPrefixToItemLevelWhenPresent() throw is("testCallNumberPrefix")); // Update item directly without updating item effective call number prefix - String template = "UPDATE test_tenant_mod_inventory_storage.item " + String template = "UPDATE test_mod_inventory_storage.item " + "SET jsonb = jsonb_set(jsonb, '{itemLevelCallNumberPrefix}', '\"%s\"') WHERE id = '%s';"; String query = String.format(template, "updatedCallNumberPrefix", item.getId()); runSql(query); @@ -238,7 +238,7 @@ public void canInitializeEffectiveCallNumberSuffix() throws Exception { EffectiveCallNumberComponents components = new EffectiveCallNumberComponents(); item.setEffectiveCallNumberComponents(components); - String query = String.format("INSERT INTO test_tenant_mod_inventory_storage.item (id, jsonb) values ('%s','%s');", + String query = String.format("INSERT INTO test_mod_inventory_storage.item (id, jsonb) values ('%s','%s');", item.getId(), mapper.writeValueAsString(item)); runSql(query); @@ -264,7 +264,7 @@ public void canInitializeEffectiveCallNumberSuffixAfterHoldingsChange() throws E is("testCallNumberSuffix")); // Update holdings directly without updating item - String template = "UPDATE test_tenant_mod_inventory_storage.holdings_record " + String template = "UPDATE test_mod_inventory_storage.holdings_record " + "SET jsonb = jsonb_set(jsonb, '{callNumberSuffix}', '\"%s\"') WHERE id = '%s';"; String query = String.format(template, "updatedCallNumberSuffix", holding); runSql(query); @@ -293,7 +293,7 @@ public void canInitializeEffectiveCallNumberSuffixToItemLevelWhenPresent() throw is("testCallNumberSuffix")); // Update item directly without updating item effective call number suffix - String template = "UPDATE test_tenant_mod_inventory_storage.item " + String template = "UPDATE test_mod_inventory_storage.item " + "SET jsonb = jsonb_set(jsonb, '{itemLevelCallNumberSuffix}', '\"%s\"') WHERE id = '%s';"; String query = String.format(template, "updatedCallNumberSuffix", item.getId()); runSql(query); diff --git a/src/test/java/org/folio/rest/api/ItemEffectiveLocationTest.java b/src/test/java/org/folio/rest/api/ItemEffectiveLocationTest.java index 6f6d47401..25525652c 100644 --- a/src/test/java/org/folio/rest/api/ItemEffectiveLocationTest.java +++ b/src/test/java/org/folio/rest/api/ItemEffectiveLocationTest.java @@ -287,7 +287,7 @@ public void canSetTableFieldOnItemUpdate() throws Exception { Row result = runSql( "SELECT jsonb, effectiveLocationId " - + "FROM test_tenant_mod_inventory_storage.item " + + "FROM test_mod_inventory_storage.item " + "WHERE id='" + item.getId() + "'"); JsonObject jsonb = (JsonObject) result.getValue(0); String effectiveLocationId = result.getUUID(1).toString(); diff --git a/src/test/java/org/folio/rest/api/ItemShelvingOrderMigrationServiceApiTest.java b/src/test/java/org/folio/rest/api/ItemShelvingOrderMigrationServiceApiTest.java index b31cac179..561846334 100644 --- a/src/test/java/org/folio/rest/api/ItemShelvingOrderMigrationServiceApiTest.java +++ b/src/test/java/org/folio/rest/api/ItemShelvingOrderMigrationServiceApiTest.java @@ -12,7 +12,6 @@ import java.util.List; import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Collectors; import java.util.stream.IntStream; import org.folio.rest.jaxrs.model.Parameter; import org.folio.rest.jaxrs.model.TenantAttributes; @@ -90,6 +89,6 @@ private IndividualResource createItem(int index) { private List create201Items() { return IntStream.range(0, 201) .mapToObj(this::createItem) - .collect(Collectors.toList()); + .toList(); } } diff --git a/src/test/java/org/folio/rest/api/ItemStorageTest.java b/src/test/java/org/folio/rest/api/ItemStorageTest.java index 476913548..53fe8d0b5 100644 --- a/src/test/java/org/folio/rest/api/ItemStorageTest.java +++ b/src/test/java/org/folio/rest/api/ItemStorageTest.java @@ -2240,7 +2240,7 @@ public void canSearchItemByEffectiveLocation() throws Exception { assertThat(onlineLibraryItems.getItems() .stream() .map(Item::getId) - .collect(Collectors.toList()), + .toList(), hasItems(itemWithTempLocation.getId(), itemWithAllLocation.getId())); assertEquals(1, secondFloorLibraryItems.getTotalRecords().intValue()); @@ -2733,7 +2733,7 @@ public void canSearchByDiscoverySuppressProperty() throws Exception { assertThat(notSuppressedItems.size(), is(2)); assertThat(notSuppressedItems.stream() .map(IndividualResource::getId) - .collect(Collectors.toList()), + .toList(), containsInAnyOrder(notSuppressedItem.getId(), notSuppressedItemDefault.getId())); } @@ -3150,7 +3150,7 @@ private void setItemSequence(long sequenceNumber) { private List getTags(JsonObject item) { return item.getJsonObject("tags").getJsonArray("tagList").stream() .map(Object::toString) - .collect(Collectors.toList()); + .toList(); } @SneakyThrows @@ -3169,6 +3169,6 @@ private List searchByCallNumberEyeReadable(String searchTerm) + "effectiveCallNumberComponents.callNumber==\"%1$s\"", searchTerm) .stream() .map(IndividualResource::getId) - .collect(Collectors.toList()); + .toList(); } } diff --git a/src/test/java/org/folio/rest/api/LocationsTest.java b/src/test/java/org/folio/rest/api/LocationsTest.java index c807d2e1f..302ce50a2 100644 --- a/src/test/java/org/folio/rest/api/LocationsTest.java +++ b/src/test/java/org/folio/rest/api/LocationsTest.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.UUID; import java.util.concurrent.CompletableFuture; -import java.util.stream.Collectors; import lombok.SneakyThrows; import org.folio.rest.support.AdditionalHttpStatusCodes; import org.folio.rest.support.HttpClient; @@ -241,7 +240,7 @@ private List getMany(String cql, Object... args) { return get(getCompleted).getJson() .getJsonArray("locations").stream() .map(obj -> (JsonObject) obj) - .collect(Collectors.toList()); + .toList(); } private JsonObject createItemRequest(String holdingsRecordId, String temporaryLocationId) { diff --git a/src/test/java/org/folio/rest/api/OaiPmhViewTest.java b/src/test/java/org/folio/rest/api/OaiPmhViewTest.java index fa78a23b9..daff75979 100644 --- a/src/test/java/org/folio/rest/api/OaiPmhViewTest.java +++ b/src/test/java/org/folio/rest/api/OaiPmhViewTest.java @@ -308,15 +308,11 @@ public void testResponseStatus400WhenRequestingWithInvalidDates() // when params.put("startDate", "invalidDate"); // then - requestOaiPmhView(params, response -> { - assertThat(response.getStatusCode(), is(400)); - }); + requestOaiPmhView(params, response -> assertThat(response.getStatusCode(), is(400))); // The same call using newly added API // then - getOiaPmhViewInstances(params, response -> { - assertThat(response.getStatusCode(), is(400)); - }); + getOiaPmhViewInstances(params, response -> assertThat(response.getStatusCode(), is(400))); } /** @@ -331,14 +327,10 @@ public void testResponseStatus400WhenRequestingWithInvalidUntilDate() // when params.put("endDate", "invalidDate"); // then - requestOaiPmhView(params, response -> { - assertThat(response.getStatusCode(), is(400)); - }); + requestOaiPmhView(params, response -> assertThat(response.getStatusCode(), is(400))); // The same call using newly added API - getOiaPmhViewInstances(params, response -> { - assertThat(response.getStatusCode(), is(400)); - }); + getOiaPmhViewInstances(params, response -> assertThat(response.getStatusCode(), is(400))); } void clearAuditTables() { @@ -358,9 +350,7 @@ void clearAuditTables() { private List getOiaPmhViewInstances(Map queryParams) throws InterruptedException, ExecutionException, TimeoutException { - return getOiaPmhViewInstances(queryParams, response -> { - assertThat(response.getStatusCode(), is(200)); - }); + return getOiaPmhViewInstances(queryParams, response -> assertThat(response.getStatusCode(), is(200))); } private List getOiaPmhViewInstances(Map queryParams, Handler responseMatcher) @@ -402,9 +392,7 @@ private ItemRequestBuilder createItemRequest(UUID locationId, String barcode, St private List requestOaiPmhView(Map params) throws InterruptedException, ExecutionException, TimeoutException { - return requestOaiPmhView(params, response -> { - assertThat(response.getStatusCode(), is(200)); - }); + return requestOaiPmhView(params, response -> assertThat(response.getStatusCode(), is(200))); } private List requestOaiPmhView(Map params, Handler responseMatcher) @@ -441,7 +429,7 @@ private List requestOaiPmhViewEnrichedInstance(UUID[] instanceIds, final List results = new ArrayList<>(); OaipmhInstanceIds instanceIdsPayload = new OaipmhInstanceIds(); - instanceIdsPayload.setInstanceIds(Arrays.stream(instanceIds).map(UUID::toString).collect(Collectors.toList())); + instanceIdsPayload.setInstanceIds(Arrays.stream(instanceIds).map(UUID::toString).toList()); instanceIdsPayload.setSkipSuppressedFromDiscoveryRecords(skipSuppressedFromDiscoveryRecords); getClient().post(oaiPmhViewEnrichedInstances(), instanceIdsPayload, TENANT_ID, ResponseHandler.any(future)); @@ -461,9 +449,8 @@ private List requestOaiPmhViewEnrichedInstance(UUID[] instanceIds, private List requestOaiPmhViewUpdatedInstanceIds(Map queryParamsMap) throws InterruptedException, ExecutionException, TimeoutException { - return requestOaiPmhViewUpdatedInstanceIds(queryParamsMap, response -> { - assertThat(response.getStatusCode(), is(200)); - }); + return requestOaiPmhViewUpdatedInstanceIds(queryParamsMap, + response -> assertThat(response.getStatusCode(), is(200))); } private List requestOaiPmhViewUpdatedInstanceIds(Map queryParamsMap, diff --git a/src/test/java/org/folio/rest/api/PreviouslyHeldDataUpgradeTest.java b/src/test/java/org/folio/rest/api/PreviouslyHeldDataUpgradeTest.java index 9e475e401..72d07ebc9 100644 --- a/src/test/java/org/folio/rest/api/PreviouslyHeldDataUpgradeTest.java +++ b/src/test/java/org/folio/rest/api/PreviouslyHeldDataUpgradeTest.java @@ -22,7 +22,7 @@ public class PreviouslyHeldDataUpgradeTest extends TestBaseWithInventoryUtil { private static final String SET_DEFAULT_PREVIOUSLY_HELD = ResourceUtil .asString("templates/db_scripts/setPreviouslyHeldDefault.sql") - .replace("${myuniversity}_${mymodule}", "test_tenant_mod_inventory_storage"); + .replace("${myuniversity}_${mymodule}", "test_mod_inventory_storage"); private static final Vertx VERTX = Vertx.vertx(); private static final UUID INSTANCE_ID = UUID.randomUUID(); @@ -30,12 +30,12 @@ public class PreviouslyHeldDataUpgradeTest extends TestBaseWithInventoryUtil { public void canMigrateToDefaultPreviouslyHeldValue() throws InterruptedException, ExecutionException, TimeoutException { instancesClient.create(instance(INSTANCE_ID)); - String query = "UPDATE test_tenant_mod_inventory_storage.instance SET jsonb = jsonb - 'previouslyHeld';"; + String query = "UPDATE test_mod_inventory_storage.instance SET jsonb = jsonb - 'previouslyHeld';"; runSql(query); String migrationQuery = - "SELECT jsonb FROM test_tenant_mod_inventory_storage.instance WHERE id = '" + INSTANCE_ID + "';"; + "SELECT jsonb FROM test_mod_inventory_storage.instance WHERE id = '" + INSTANCE_ID + "';"; RowSet result = runSql(migrationQuery); assertEquals(1, result.rowCount()); diff --git a/src/test/java/org/folio/rest/api/ServicePointTest.java b/src/test/java/org/folio/rest/api/ServicePointTest.java index 32e724495..65cfe7409 100644 --- a/src/test/java/org/folio/rest/api/ServicePointTest.java +++ b/src/test/java/org/folio/rest/api/ServicePointTest.java @@ -23,7 +23,6 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import java.util.stream.Collectors; import lombok.SneakyThrows; import org.folio.rest.jaxrs.model.HoldShelfExpiryPeriod; import org.folio.rest.jaxrs.model.Servicepoint; @@ -775,7 +774,7 @@ private List getMany(String cql, Object... args) throws InterruptedE return getCompleted.get(TIMEOUT, TimeUnit.SECONDS).getJson() .getJsonArray("servicepoints").stream() .map(obj -> (JsonObject) obj) - .collect(Collectors.toList()); + .toList(); } private Response getById(UUID id) diff --git a/src/test/java/org/folio/rest/support/AwaitConfiguration.java b/src/test/java/org/folio/rest/support/AwaitConfiguration.java index 65ed65aea..42d729ba7 100644 --- a/src/test/java/org/folio/rest/support/AwaitConfiguration.java +++ b/src/test/java/org/folio/rest/support/AwaitConfiguration.java @@ -13,7 +13,7 @@ private AwaitConfiguration() { } public static ConditionFactory awaitAtMost() { // Timeout was gradually extended to try to alleviate instability // Attempts should be made to reduce this value - return await().atMost(10, SECONDS); + return await().atMost(20, SECONDS); } public static ConditionFactory awaitDuring(int timeout, TimeUnit unit) { diff --git a/src/test/java/org/folio/rest/support/JsonArrayHelper.java b/src/test/java/org/folio/rest/support/JsonArrayHelper.java index 7642d7d47..06ef5ca31 100644 --- a/src/test/java/org/folio/rest/support/JsonArrayHelper.java +++ b/src/test/java/org/folio/rest/support/JsonArrayHelper.java @@ -3,7 +3,7 @@ import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; import java.util.List; -import java.util.stream.Collectors; +import java.util.Objects; public class JsonArrayHelper { public static List toList(JsonArray array) { @@ -16,7 +16,7 @@ public static List toList(JsonArray array) { return null; } }) - .filter(item -> item != null) - .collect(Collectors.toList()); + .filter(Objects::nonNull) + .toList(); } } diff --git a/src/test/java/org/folio/rest/support/db/OptimisticLocking.java b/src/test/java/org/folio/rest/support/db/OptimisticLocking.java index 30bb1d712..c5bce4a4a 100644 --- a/src/test/java/org/folio/rest/support/db/OptimisticLocking.java +++ b/src/test/java/org/folio/rest/support/db/OptimisticLocking.java @@ -20,13 +20,10 @@ public static boolean hasFailOnConflict(String tableName) { for (int i = 0; i < TABLES.size(); i++) { JsonObject table = TABLES.getJsonObject(i); if (tableName.equals(table.getString("tableName"))) { - switch (table.getString("withOptimisticLocking", "")) { - case "failOnConflict": - case "failOnConflictUnlessSuppressed": - return true; - default: - return false; - } + return switch (table.getString("withOptimisticLocking", "")) { + case "failOnConflict", "failOnConflictUnlessSuppressed" -> true; + default -> false; + }; } } throw new InvalidParameterException("Table not found: " + tableName); diff --git a/src/test/java/org/folio/rest/support/http/ResourceClient.java b/src/test/java/org/folio/rest/support/http/ResourceClient.java index 548d8d992..5e40e0db8 100644 --- a/src/test/java/org/folio/rest/support/http/ResourceClient.java +++ b/src/test/java/org/folio/rest/support/http/ResourceClient.java @@ -12,7 +12,6 @@ import java.util.Map; import java.util.UUID; import java.util.concurrent.CompletableFuture; -import java.util.stream.Collectors; import org.folio.rest.api.TestBase; import org.folio.rest.support.HttpClient; import org.folio.rest.support.IndividualResource; @@ -380,7 +379,7 @@ public List getMany(String query, Object... queryParams) { return JsonArrayHelper.toList(response.getJson() .getJsonArray(collectionArrayPropertyName)).stream() .map(IndividualResource::new) - .collect(Collectors.toList()); + .toList(); } /** diff --git a/src/test/java/org/folio/rest/support/kafka/FakeKafkaConsumer.java b/src/test/java/org/folio/rest/support/kafka/FakeKafkaConsumer.java index ea95f4774..ddb70e86d 100644 --- a/src/test/java/org/folio/rest/support/kafka/FakeKafkaConsumer.java +++ b/src/test/java/org/folio/rest/support/kafka/FakeKafkaConsumer.java @@ -7,7 +7,6 @@ import java.util.List; import java.util.Set; import java.util.function.Function; -import java.util.stream.Collectors; import org.folio.rest.support.messages.EventMessage; import org.jetbrains.annotations.NotNull; @@ -15,14 +14,14 @@ public final class FakeKafkaConsumer { // These definitions are deliberately separate to the production definitions // This is so these can be changed independently to demonstrate // tests failing for the right reason prior to changing the production code - static final String INSTANCE_TOPIC_NAME = "folio.test_tenant.inventory.instance"; - static final String HOLDINGS_TOPIC_NAME = "folio.test_tenant.inventory.holdings-record"; - static final String ITEM_TOPIC_NAME = "folio.test_tenant.inventory.item"; - static final String BOUND_WITH_TOPIC_NAME = "folio.test_tenant.inventory.bound-with"; - static final String SERVICE_POINT_TOPIC_NAME = "folio.test_tenant.inventory.service-point"; + static final String INSTANCE_TOPIC_NAME = "folio.test.inventory.instance"; + static final String HOLDINGS_TOPIC_NAME = "folio.test.inventory.holdings-record"; + static final String ITEM_TOPIC_NAME = "folio.test.inventory.item"; + static final String BOUND_WITH_TOPIC_NAME = "folio.test.inventory.bound-with"; + static final String SERVICE_POINT_TOPIC_NAME = "folio.test.inventory.service-point"; static final String HOLDINGS_TOPIC_NAME_CONSORTIUM_MEMBER_TENANT = - "folio.consortium_member_tenant.inventory.holdings-record"; + "folio.consortium.inventory.holdings-record"; private final GroupedCollectedMessages collectedInstanceMessages = new GroupedCollectedMessages(); private final GroupedCollectedMessages collectedHoldingsMessages = new GroupedCollectedMessages(); @@ -74,7 +73,7 @@ public Collection getMessagesForInstances(List instanceIds return instanceIds.stream() .map(this::getMessagesForInstance) .flatMap(Collection::stream) - .collect(Collectors.toList()); + .toList(); } public Collection getMessagesForHoldings(String instanceId, String holdingsId) { diff --git a/src/test/java/org/folio/rest/support/matchers/InventoryHierarchyResponseMatchers.java b/src/test/java/org/folio/rest/support/matchers/InventoryHierarchyResponseMatchers.java index 5fea3c18e..4281245a3 100644 --- a/src/test/java/org/folio/rest/support/matchers/InventoryHierarchyResponseMatchers.java +++ b/src/test/java/org/folio/rest/support/matchers/InventoryHierarchyResponseMatchers.java @@ -5,7 +5,6 @@ import io.vertx.core.json.pointer.JsonPointer; import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; import org.apache.commons.lang3.ArrayUtils; import org.hamcrest.Description; import org.hamcrest.Matcher; @@ -57,7 +56,7 @@ protected boolean matchesSafely(JsonObject jsonObject) { } final List actualValues = items.stream() .map(jsonPointer::queryJson) - .collect(Collectors.toList()); + .toList(); return Arrays.asList(expectedValue) .containsAll(actualValues); diff --git a/src/test/java/org/folio/rest/support/matchers/OaiPmhResponseMatchers.java b/src/test/java/org/folio/rest/support/matchers/OaiPmhResponseMatchers.java index 1e8a0467d..bc3c336e9 100644 --- a/src/test/java/org/folio/rest/support/matchers/OaiPmhResponseMatchers.java +++ b/src/test/java/org/folio/rest/support/matchers/OaiPmhResponseMatchers.java @@ -5,7 +5,6 @@ import io.vertx.core.json.pointer.JsonPointer; import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.TypeSafeMatcher; @@ -34,7 +33,7 @@ protected boolean matchesSafely(JsonObject jsonObject) { } final List actualValues = items.stream() .map(jsonPointer::queryJson) - .collect(Collectors.toList()); + .toList(); return Arrays.asList(expectedValue) .containsAll(actualValues); diff --git a/src/test/java/org/folio/rest/support/messages/InstanceEventMessageChecks.java b/src/test/java/org/folio/rest/support/messages/InstanceEventMessageChecks.java index 8a1d6edc8..13d0c671c 100644 --- a/src/test/java/org/folio/rest/support/messages/InstanceEventMessageChecks.java +++ b/src/test/java/org/folio/rest/support/messages/InstanceEventMessageChecks.java @@ -14,7 +14,6 @@ import io.vertx.core.json.JsonObject; import java.util.List; -import java.util.stream.Collectors; import org.folio.rest.support.kafka.FakeKafkaConsumer; import org.folio.rest.support.messages.matchers.EventMessageMatchers; import org.hamcrest.Matcher; @@ -47,17 +46,15 @@ public void createdMessagePublished(JsonObject instance) { public void createdMessagesPublished(List instances) { final var instanceIds = instances.stream() .map(InstanceEventMessageChecks::getId) - .collect(Collectors.toList()); + .toList(); // This is a compromise because checking a large number of messages in // one go seems to cause instability in the Jenkins builds awaitAtMost().until(() -> kafkaConsumer.getMessagesForInstances(instanceIds), hasSize(instances.size())); - instances.forEach(instance -> { - assertThat(kafkaConsumer.getMessagesForInstances(instanceIds), - EVENT_MESSAGE_MATCHERS.hasCreateEventMessageFor(instance)); - }); + instances.forEach(instance -> assertThat(kafkaConsumer.getMessagesForInstances(instanceIds), + EVENT_MESSAGE_MATCHERS.hasCreateEventMessageFor(instance))); } public void updatedMessagePublished(JsonObject oldInstance, JsonObject newInstance) { diff --git a/src/test/java/org/folio/services/domainevent/CommonDomainEventPublisherTest.java b/src/test/java/org/folio/services/domainevent/CommonDomainEventPublisherTest.java index 411baf18a..22568473c 100644 --- a/src/test/java/org/folio/services/domainevent/CommonDomainEventPublisherTest.java +++ b/src/test/java/org/folio/services/domainevent/CommonDomainEventPublisherTest.java @@ -33,7 +33,7 @@ @RunWith(MockitoJUnitRunner.class) public class CommonDomainEventPublisherTest { - private static final String TENANT_ID = "foo-tenant"; + private static final String TENANT_ID = "foo"; @Mock private KafkaProducer producer; diff --git a/src/test/java/org/folio/services/instance/InstanceEffectiveValuesServiceTest.java b/src/test/java/org/folio/services/instance/InstanceEffectiveValuesServiceTest.java index 3f7f8fe61..65667e4b9 100644 --- a/src/test/java/org/folio/services/instance/InstanceEffectiveValuesServiceTest.java +++ b/src/test/java/org/folio/services/instance/InstanceEffectiveValuesServiceTest.java @@ -7,7 +7,6 @@ import static org.hamcrest.Matchers.nullValue; import java.util.List; -import java.util.stream.Collectors; import java.util.stream.Stream; import org.folio.rest.jaxrs.model.Instance; import org.folio.rest.jaxrs.model.Publication; @@ -155,7 +154,7 @@ public void shouldPopulatePeriodOnlyWhenDateIsChangedForBatch() { private Instance createInstance(String... datesOfPublications) { var publications = Stream.of(datesOfPublications) .map(dateOfPublication -> new Publication().withDateOfPublication(dateOfPublication)) - .collect(Collectors.toList()); + .toList(); return new Instance().withPublication(publications).withId(randomUUID().toString()); } diff --git a/src/test/java/org/folio/services/kafka/topic/KafkaAdminClientServiceTest.java b/src/test/java/org/folio/services/kafka/topic/KafkaAdminClientServiceTest.java index 4a11e78ff..efafc28f6 100644 --- a/src/test/java/org/folio/services/kafka/topic/KafkaAdminClientServiceTest.java +++ b/src/test/java/org/folio/services/kafka/topic/KafkaAdminClientServiceTest.java @@ -23,7 +23,6 @@ import io.vertx.kafka.admin.NewTopic; import java.util.List; import java.util.Set; -import java.util.stream.Collectors; import org.apache.kafka.common.errors.TopicExistsException; import org.folio.InventoryKafkaTopic; import org.folio.kafka.services.KafkaAdminClientService; @@ -117,7 +116,7 @@ public void shouldCreateTopicIfNotExist(TestContext testContext) { private List getTopicNames(ArgumentCaptor> createTopicsCaptor) { return createTopicsCaptor.getAllValues().get(0).stream() .map(NewTopic::getName) - .collect(Collectors.toList()); + .toList(); } private Future createKafkaTopicsAsync(KafkaAdminClient client) { diff --git a/src/test/java/org/folio/utility/RestUtility.java b/src/test/java/org/folio/utility/RestUtility.java index 5b8f57b55..e4d451d55 100644 --- a/src/test/java/org/folio/utility/RestUtility.java +++ b/src/test/java/org/folio/utility/RestUtility.java @@ -14,7 +14,7 @@ import org.apache.logging.log4j.Logger; public final class RestUtility { - public static final String TENANT_ID = "test_tenant"; + public static final String TENANT_ID = "test"; private static final Logger logger = LogManager.getLogger();