From ed01989ed9dcd0c8a8614fcf60fe2684201c06b0 Mon Sep 17 00:00:00 2001 From: Dmytro Krutii Date: Thu, 30 May 2024 19:14:31 +0300 Subject: [PATCH] MODINV-943 Fix checkstyle violations --- .../org/folio/rest/api/HoldingsStorageTest.java | 13 ++++++------- .../org/folio/rest/api/InstanceStorageTest.java | 4 ++-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/test/java/org/folio/rest/api/HoldingsStorageTest.java b/src/test/java/org/folio/rest/api/HoldingsStorageTest.java index 00bbf9954..31cd11663 100644 --- a/src/test/java/org/folio/rest/api/HoldingsStorageTest.java +++ b/src/test/java/org/folio/rest/api/HoldingsStorageTest.java @@ -533,28 +533,27 @@ public void canRetrieveAllHoldings() { instancesClient.create(nod(secondInstanceId)); instancesClient.create(uprooted(thirdInstanceId)); - var firstHoldingId = holdingsClient.create(new HoldingRequestBuilder() + CompletableFuture getCompleted = new CompletableFuture<>(); + + final var firstHoldingId = holdingsClient.create(new HoldingRequestBuilder() .forInstance(firstInstanceId) .withPermanentLocation(MAIN_LIBRARY_LOCATION_ID)).getId(); - var secondHoldingId = holdingsClient.create(new HoldingRequestBuilder() + final var secondHoldingId = holdingsClient.create(new HoldingRequestBuilder() .forInstance(secondInstanceId) .withPermanentLocation(ANNEX_LIBRARY_LOCATION_ID)).getId(); - var thirdHoldingId = holdingsClient.create(new HoldingRequestBuilder() + final var thirdHoldingId = holdingsClient.create(new HoldingRequestBuilder() .forInstance(thirdInstanceId) .withPermanentLocation(MAIN_LIBRARY_LOCATION_ID) .withTags(new JsonObject().put("tagList", new JsonArray().add(TAG_VALUE)))).getId(); - var getCompleted = new CompletableFuture(); - getClient().post(holdingsStorageUrl("/retrieve"), new JsonObject(), TENANT_ID, ResponseHandler.json(getCompleted)); var response = getCompleted.get(TIMEOUT, TimeUnit.SECONDS); var responseBody = response.getJson(); - var allHoldings = JsonArrayHelper.toList( - responseBody.getJsonArray("holdingsRecords")); + var allHoldings = JsonArrayHelper.toList(responseBody.getJsonArray("holdingsRecords")); assertThat(allHoldings.size(), is(3)); assertThat(responseBody.getInteger("totalRecords"), is(3)); diff --git a/src/test/java/org/folio/rest/api/InstanceStorageTest.java b/src/test/java/org/folio/rest/api/InstanceStorageTest.java index 3165b38b3..c8943378c 100644 --- a/src/test/java/org/folio/rest/api/InstanceStorageTest.java +++ b/src/test/java/org/folio/rest/api/InstanceStorageTest.java @@ -667,11 +667,11 @@ public void canRetrieveAllInstances() throws InterruptedException, ExecutionExce var firstInstanceToCreate = smallAngryPlanet(firstInstanceId); var secondInstanceId = UUID.randomUUID(); var secondInstanceToCreate = nod(secondInstanceId); - var query = "title=\"Nod\""; createInstance(firstInstanceToCreate); createInstance(secondInstanceToCreate); + var query = "title=\"Nod\""; var retrieveCompleted = new CompletableFuture(); var retrieveByTitleCompleted = new CompletableFuture(); @@ -692,7 +692,6 @@ public void canRetrieveAllInstances() throws InterruptedException, ExecutionExce var firstInstance = allInstances.getJsonObject(0); var secondInstance = allInstances.getJsonObject(1); - var foundInstance = foundInstances.getJsonObject(0); // no "sortBy" used so the database can return them in any order. // swap if needed: if (firstInstanceId.toString().equals(secondInstance.getString("id"))) { @@ -700,6 +699,7 @@ public void canRetrieveAllInstances() throws InterruptedException, ExecutionExce firstInstance = secondInstance; secondInstance = tmp; } + final var foundInstance = foundInstances.getJsonObject(0); assertThat(firstInstance.getString("id"), is(firstInstanceId.toString())); assertThat(firstInstance.getString("title"), is("Long Way to a Small Angry Planet"));