From ded228dc73cdb8b3a662e6dadf398b4dee9d7b60 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 15:07:41 +0200 Subject: [PATCH] build(deps): bump jackson from 2.17.2 to 2.18.0 (#4502) * build(deps): bump jackson from 2.17.2 to 2.18.0 Bumps `jackson` from 2.17.2 to 2.18.0. Updates `com.fasterxml.jackson.core:jackson-annotations` from 2.17.2 to 2.18.0 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `com.fasterxml.jackson.core:jackson-databind` from 2.17.2 to 2.18.0 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `com.fasterxml.jackson.datatype:jackson-datatype-jakarta-jsonp` from 2.17.2 to 2.18.0 - [Commits](https://github.com/FasterXML/jackson-datatypes-misc/compare/jackson-datatypes-misc-parent-2.17.2...jackson-datatypes-misc-parent-2.18.0) Updates `com.fasterxml.jackson.datatype:jackson-datatype-jsr310` from 2.17.2 to 2.18.0 --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-annotations dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jakarta-jsonp dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * dependencies * bump jackson to 2.18.1 * dependencies --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ndr_brt --- DEPENDENCIES | 33 +++++++++-------- .../java/org/eclipse/edc/util/io/Ports.java | 4 +-- gradle/libs.versions.toml | 2 +- .../spi/types/DeprovisionedResource.java | 4 ++- .../store/TransferProcessStoreTestBase.java | 36 +++++++++---------- 5 files changed, 43 insertions(+), 36 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index a5fc05ef74a..3a300d4d04d 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -18,29 +18,33 @@ maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.14.1, Apache maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.16.2, Apache-2.0, approved, #11606 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.17.1, Apache-2.0, approved, #13672 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.17.2, Apache-2.0, approved, #13672 +maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.18.0, Apache-2.0, approved, #16364 maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.14.1, Apache-2.0 AND MIT, approved, #4303 maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.16.2, Apache-2.0 AND MIT, approved, #11602 -maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.17.2, , approved, #13665 +maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.17.2, Apache-2.0 AND MIT, approved, #13665 +maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.18.0, Apache-2.0 AND MIT, approved, #16371 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.11.0, Apache-2.0, approved, CQ23093 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.14.0, Apache-2.0, approved, #4105 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.14.1, Apache-2.0, approved, #15232 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.16.2, Apache-2.0, approved, #11605 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.17.1, Apache-2.0, approved, #13671 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.17.2, Apache-2.0, approved, #13671 +maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.18.0, Apache-2.0, approved, #16372 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.14.0, Apache-2.0, approved, #5933 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.16.2, Apache-2.0, approved, #11855 -maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.17.2, Apache-2.0, approved, #13669 -maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jakarta-jsonp/2.17.2, Apache-2.0, approved, #14161 +maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.18.0, Apache-2.0, approved, #16370 +maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jakarta-jsonp/2.18.0, , restricted, clearlydefined maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.14.0, Apache-2.0, approved, #4699 maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.16.2, Apache-2.0, approved, #11853 -maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.17.2, Apache-2.0, approved, #14160 -maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-base/2.17.2, Apache-2.0, approved, #14194 +maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.18.0, , restricted, clearlydefined +maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-base/2.18.0, , restricted, clearlydefined maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/2.16.2, Apache-2.0, approved, #11858 -maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/2.17.2, Apache-2.0, approved, #14195 +maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/2.18.0, , restricted, clearlydefined maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-annotations/2.17.1, Apache-2.0, approved, #13668 -maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-annotations/2.17.2, Apache-2.0, approved, #13668 +maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-annotations/2.18.0, Apache-2.0, approved, #16368 maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.16.2, Apache-2.0, approved, #11852 maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.17.2, Apache-2.0, approved, #14162 +maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.18.0, , restricted, clearlydefined maven/mavencentral/com.fasterxml.uuid/java-uuid-generator/4.1.0, Apache-2.0, approved, clearlydefined maven/mavencentral/com.github.cliftonlabs/json-simple/3.0.2, Apache-2.0, approved, clearlydefined maven/mavencentral/com.github.docker-java/docker-java-api/3.4.0, Apache-2.0, approved, clearlydefined @@ -69,11 +73,12 @@ maven/mavencentral/com.google.guava/guava/28.1-android, Apache-2.0, approved, cl maven/mavencentral/com.google.guava/guava/28.2-android, Apache-2.0 AND LicenseRef-Public-Domain, approved, CQ22437 maven/mavencentral/com.google.guava/guava/31.0.1-android, Apache-2.0, approved, clearlydefined maven/mavencentral/com.google.guava/guava/31.1-jre, Apache-2.0, approved, clearlydefined -maven/mavencentral/com.google.guava/guava/33.3.0-jre, Apache-2.0 AND CC0-1.0 AND (Apache-2.0 AND CC-PDDC) AND (Apache-2.0 AND CC0-1.0), approved, #15952 +maven/mavencentral/com.google.guava/guava/33.3.1-jre, Apache-2.0 AND CC0-1.0 AND (Apache-2.0 AND CC-PDDC) AND (Apache-2.0 AND CC0-1.0), approved, #15952 maven/mavencentral/com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava, Apache-2.0, approved, CQ22657 maven/mavencentral/com.google.j2objc/j2objc-annotations/1.3, Apache-2.0, approved, CQ21195 +maven/mavencentral/com.google.j2objc/j2objc-annotations/3.0.0, Apache-2.0, approved, #13676 maven/mavencentral/com.google.protobuf/protobuf-java/3.25.3, BSD-3-Clause, approved, clearlydefined -maven/mavencentral/com.google.protobuf/protobuf-java/4.28.2, , restricted, clearlydefined +maven/mavencentral/com.google.protobuf/protobuf-java/4.28.2, BSD-3-Clause, approved, clearlydefined maven/mavencentral/com.googlecode.libphonenumber/libphonenumber/8.11.1, Apache-2.0, approved, clearlydefined maven/mavencentral/com.h2database/h2/2.3.232, (MPL-2.0 AND EPL-1.0) AND (MPL-2.0 AND EPL-1.0 AND LGPL-3.0-or-later) AND BSD-3-Clause, approved, #15708 maven/mavencentral/com.jayway.jsonpath/json-path/2.7.0, Apache-2.0, approved, clearlydefined @@ -82,7 +87,7 @@ maven/mavencentral/com.lmax/disruptor/3.4.4, Apache-2.0, approved, clearlydefine maven/mavencentral/com.networknt/json-schema-validator/1.0.76, Apache-2.0, approved, CQ22638 maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.28, Apache-2.0, approved, clearlydefined maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.41.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/com.puppycrawl.tools/checkstyle/10.18.1, LGPL-2.1-or-later AND (Apache-2.0 AND LGPL-2.1-or-later) AND Apache-2.0, approved, #16060 +maven/mavencentral/com.puppycrawl.tools/checkstyle/10.18.2, LGPL-2.1-or-later AND (Apache-2.0 AND LGPL-2.1-or-later) AND Apache-2.0, approved, #16060 maven/mavencentral/com.samskivert/jmustache/1.15, BSD-2-Clause AND BSD-3-Clause, approved, clearlydefined maven/mavencentral/com.squareup.okhttp3/okhttp-dnsoverhttps/4.12.0, Apache-2.0, approved, #11159 maven/mavencentral/com.squareup.okhttp3/okhttp/4.12.0, Apache-2.0, approved, #15227 @@ -186,10 +191,10 @@ maven/mavencentral/javax.ws.rs/javax.ws.rs-api/2.1, (CDDL-1.1 OR GPL-2.0 WITH Cl maven/mavencentral/joda-time/joda-time/2.10.5, Apache-2.0, approved, clearlydefined maven/mavencentral/junit/junit/4.13.2, EPL-2.0, approved, CQ23636 maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.14.1, Apache-2.0, approved, #7164 -maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.15.0, Apache-2.0, approved, #16009 +maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.15.2, Apache-2.0, approved, #16009 maven/mavencentral/net.bytebuddy/byte-buddy/1.14.1, Apache-2.0 AND BSD-3-Clause, approved, #7163 maven/mavencentral/net.bytebuddy/byte-buddy/1.14.18, Apache-2.0 AND BSD-3-Clause, approved, #7163 -maven/mavencentral/net.bytebuddy/byte-buddy/1.15.0, Apache-2.0 AND BSD-3-Clause, approved, #16008 +maven/mavencentral/net.bytebuddy/byte-buddy/1.15.2, Apache-2.0 AND BSD-3-Clause, approved, #16008 maven/mavencentral/net.java.dev.jna/jna/5.13.0, Apache-2.0 AND LGPL-2.1-or-later, approved, #15196 maven/mavencentral/net.javacrumbs.json-unit/json-unit-core/2.36.0, Apache-2.0, approved, clearlydefined maven/mavencentral/net.minidev/accessors-smart/2.4.7, Apache-2.0, approved, #7515 @@ -240,7 +245,7 @@ maven/mavencentral/org.bouncycastle/bcutil-jdk18on/1.78.1, MIT, approved, #14435 maven/mavencentral/org.ccil.cowan.tagsoup/tagsoup/1.2.1, Apache-2.0, approved, clearlydefined maven/mavencentral/org.checkerframework/checker-qual/3.12.0, MIT, approved, clearlydefined maven/mavencentral/org.checkerframework/checker-qual/3.42.0, MIT, approved, clearlydefined -maven/mavencentral/org.checkerframework/checker-qual/3.46.0, MIT, approved, clearlydefined +maven/mavencentral/org.checkerframework/checker-qual/3.47.0, MIT, approved, clearlydefined maven/mavencentral/org.codehaus.plexus/plexus-classworlds/2.6.0, Apache-2.0 AND Plexus, approved, CQ22821 maven/mavencentral/org.codehaus.plexus/plexus-component-annotations/2.1.0, Apache-2.0, approved, #809 maven/mavencentral/org.codehaus.plexus/plexus-container-default/2.1.0, Apache-2.0, approved, clearlydefined @@ -317,7 +322,7 @@ maven/mavencentral/org.lz4/lz4-java/1.8.0, Apache-2.0, approved, clearlydefined maven/mavencentral/org.mock-server/mockserver-client-java/5.15.0, Apache-2.0 AND LGPL-3.0-only, approved, #9324 maven/mavencentral/org.mock-server/mockserver-core/5.15.0, Apache-2.0, approved, clearlydefined maven/mavencentral/org.mock-server/mockserver-netty/5.15.0, Apache-2.0, approved, #9276 -maven/mavencentral/org.mockito/mockito-core/5.13.0, MIT, approved, clearlydefined +maven/mavencentral/org.mockito/mockito-core/5.14.0, MIT AND (Apache-2.0 AND MIT) AND Apache-2.0, approved, #16375 maven/mavencentral/org.mockito/mockito-core/5.2.0, MIT AND (Apache-2.0 AND MIT) AND Apache-2.0, approved, #7401 maven/mavencentral/org.mockito/mockito-inline/5.2.0, MIT, approved, clearlydefined maven/mavencentral/org.mozilla/rhino/1.7.7.2, MPL-2.0 AND BSD-3-Clause AND ISC, approved, CQ16320 diff --git a/core/common/lib/util-lib/src/main/java/org/eclipse/edc/util/io/Ports.java b/core/common/lib/util-lib/src/main/java/org/eclipse/edc/util/io/Ports.java index 55cfd3c47b3..9e98aa3b30f 100644 --- a/core/common/lib/util-lib/src/main/java/org/eclipse/edc/util/io/Ports.java +++ b/core/common/lib/util-lib/src/main/java/org/eclipse/edc/util/io/Ports.java @@ -18,9 +18,9 @@ import java.net.DatagramSocket; import java.net.ServerSocket; import java.net.Socket; -import java.util.HashSet; import java.util.Random; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; /** @@ -29,7 +29,7 @@ public final class Ports { public static final int MAX_TCP_PORT = 65_535; private static final Random RANDOM = new Random(); - private static final Set ALREADY_RETURNED = new HashSet<>(); + private static final Set ALREADY_RETURNED = ConcurrentHashMap.newKeySet(); /** * Gets a free port in the range 1024 - 65535 by trying them randomly. diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 36614447bd3..0487f7d3f03 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,7 +15,7 @@ h2 = "2.3.232" httpMockServer = "5.15.0" jakarta-json = "2.1.3" jakarta-transaction = "2.0.1" -jackson = "2.17.2" +jackson = "2.18.0" jersey = "3.1.8" jetbrainsAnnotation = "25.0.0" jetty = "11.0.24" diff --git a/spi/control-plane/transfer-spi/src/main/java/org/eclipse/edc/connector/controlplane/transfer/spi/types/DeprovisionedResource.java b/spi/control-plane/transfer-spi/src/main/java/org/eclipse/edc/connector/controlplane/transfer/spi/types/DeprovisionedResource.java index 9625ae39345..9948608e398 100644 --- a/spi/control-plane/transfer-spi/src/main/java/org/eclipse/edc/connector/controlplane/transfer/spi/types/DeprovisionedResource.java +++ b/spi/control-plane/transfer-spi/src/main/java/org/eclipse/edc/connector/controlplane/transfer/spi/types/DeprovisionedResource.java @@ -74,7 +74,9 @@ public Builder provisionedResourceId(String id) { public Builder errorMessage(String message) { resource.errorMessage = message; - resource.error = true; + if (message != null) { + resource.error = true; + } return this; } diff --git a/spi/control-plane/transfer-spi/src/testFixtures/java/org/eclipse/edc/connector/controlplane/transfer/spi/testfixtures/store/TransferProcessStoreTestBase.java b/spi/control-plane/transfer-spi/src/testFixtures/java/org/eclipse/edc/connector/controlplane/transfer/spi/testfixtures/store/TransferProcessStoreTestBase.java index 64874d4b133..71ce6f636e7 100644 --- a/spi/control-plane/transfer-spi/src/testFixtures/java/org/eclipse/edc/connector/controlplane/transfer/spi/testfixtures/store/TransferProcessStoreTestBase.java +++ b/spi/control-plane/transfer-spi/src/testFixtures/java/org/eclipse/edc/connector/controlplane/transfer/spi/testfixtures/store/TransferProcessStoreTestBase.java @@ -37,7 +37,6 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import java.util.stream.Collectors; import static java.util.stream.IntStream.range; import static org.assertj.core.api.Assertions.assertThat; @@ -50,6 +49,7 @@ import static org.eclipse.edc.connector.controlplane.transfer.spi.types.TransferProcessStates.TERMINATED; import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat; import static org.eclipse.edc.spi.persistence.StateEntityStore.hasState; +import static org.eclipse.edc.spi.query.Criterion.criterion; import static org.eclipse.edc.spi.result.StoreFailure.Reason.ALREADY_LEASED; import static org.eclipse.edc.spi.result.StoreFailure.Reason.NOT_FOUND; import static org.hamcrest.Matchers.hasSize; @@ -100,7 +100,7 @@ void verifyCallbacks() { var t = TestFunctions.createTransferProcessBuilder("test-id").privateProperties(Map.of("key", "value")).callbackAddresses(callbacks).build(); getTransferProcessStore().save(t); - var all = getTransferProcessStore().findAll(QuerySpec.none()).collect(Collectors.toList()); + var all = getTransferProcessStore().findAll(QuerySpec.none()).toList(); assertThat(all).containsExactly(t); assertThat(all.get(0)).usingRecursiveComparison().isEqualTo(t); assertThat(all.get(0).getCallbackAddresses()).hasSize(1).usingRecursiveFieldByFieldElementComparator().containsAll(callbacks); @@ -111,7 +111,7 @@ void verifyTransferType() { var t = TestFunctions.createTransferProcessBuilder("test-id").transferType("transferType").build(); getTransferProcessStore().save(t); - var all = getTransferProcessStore().findAll(QuerySpec.none()).collect(Collectors.toList()); + var all = getTransferProcessStore().findAll(QuerySpec.none()).toList(); assertThat(all).containsExactly(t); assertThat(all.get(0)).usingRecursiveComparison().isEqualTo(t); assertThat(all.get(0).getTransferType()).isEqualTo("transferType"); @@ -122,7 +122,7 @@ void verifyDataPlaneId() { var t = TestFunctions.createTransferProcessBuilder("test-id").dataPlaneId("dataPlaneId").build(); getTransferProcessStore().save(t); - var all = getTransferProcessStore().findAll(QuerySpec.none()).collect(Collectors.toList()); + var all = getTransferProcessStore().findAll(QuerySpec.none()).toList(); assertThat(all).containsExactly(t); assertThat(all.get(0)).usingRecursiveComparison().isEqualTo(t); assertThat(all.get(0).getDataPlaneId()).isEqualTo("dataPlaneId"); @@ -153,7 +153,7 @@ void shouldReturnNotLeasedItems() { assertThat(getTransferProcessStore().nextNotLeased(5, hasState(state.code()))) .hasSize(5) .extracting(TransferProcess::getId) - .isSubsetOf(all.stream().map(TransferProcess::getId).collect(Collectors.toList())) + .isSubsetOf(all.stream().map(TransferProcess::getId).toList()) .allMatch(id -> isLeasedBy(id, CONNECTOR_NAME)); } @@ -163,7 +163,7 @@ void shouldOnlyReturnFreeItems() { var all = range(0, 10) .mapToObj(i -> createTransferProcess("id" + i, state)) .peek(getTransferProcessStore()::save) - .collect(Collectors.toList()); + .toList(); // lease a few var leasedTp = all.stream().skip(5).peek(tp -> leaseEntity(tp.getId(), CONNECTOR_NAME)).toList(); @@ -285,7 +285,7 @@ void shouldLeaseEntityUntilUpdate() { @Test void avoidsStarvation() throws InterruptedException { - for (int i = 0; i < 10; i++) { + for (var i = 0; i < 10; i++) { var process = createTransferProcess("test-process-" + i); getTransferProcessStore().save(process); } @@ -480,7 +480,7 @@ void noQuerySpec() { var all = range(0, 10) .mapToObj(i -> createTransferProcess("id" + i)) .peek(getTransferProcessStore()::save) - .collect(Collectors.toList()); + .toList(); assertThat(getTransferProcessStore().findAll(QuerySpec.none())).containsExactlyInAnyOrderElementsOf(all); } @@ -488,7 +488,7 @@ void noQuerySpec() { @Test void verifyFiltering() { range(0, 10).forEach(i -> getTransferProcessStore().save(createTransferProcess("test-neg-" + i))); - var querySpec = QuerySpec.Builder.newInstance().filter(Criterion.criterion("id", "=", "test-neg-3")).build(); + var querySpec = QuerySpec.Builder.newInstance().filter(criterion("id", "=", "test-neg-3")).build(); var result = getTransferProcessStore().findAll(querySpec); @@ -498,7 +498,7 @@ void verifyFiltering() { @Test void shouldThrowException_whenInvalidOperator() { range(0, 10).forEach(i -> getTransferProcessStore().save(createTransferProcess("test-neg-" + i))); - var querySpec = QuerySpec.Builder.newInstance().filter(Criterion.criterion("id", "foobar", "other")).build(); + var querySpec = QuerySpec.Builder.newInstance().filter(criterion("id", "foobar", "other")).build(); assertThatThrownBy(() -> getTransferProcessStore().findAll(querySpec).toList()).isInstanceOf(IllegalArgumentException.class); } @@ -521,7 +521,7 @@ void queryByTransferType() { range(0, 10).forEach(i -> getTransferProcessStore().save(TestFunctions.createTransferProcessBuilder("test-tp-" + i) .transferType("type" + i) .build())); - var querySpec = QuerySpec.Builder.newInstance().filter(Criterion.criterion("transferType", "=", "type4")).build(); + var querySpec = QuerySpec.Builder.newInstance().filter(criterion("transferType", "=", "type4")).build(); var result = getTransferProcessStore().findAll(querySpec); @@ -790,7 +790,7 @@ void queryByDeprovisionedResourcesProperty() { getTransferProcessStore().save(process2); var query = QuerySpec.Builder.newInstance() - .filter(Criterion.criterion("deprovisionedResources.inProcess", "=", true)) + .filter(criterion("deprovisionedResources.inProcess", "=", true)) .build(); var result = getTransferProcessStore().findAll(query); @@ -832,7 +832,7 @@ void queryByDeprovisionedResourcesProperty_multipleCriteria() { )) .build(); - var result = getTransferProcessStore().findAll(query).collect(Collectors.toList()); + var result = getTransferProcessStore().findAll(query).toList(); assertThat(result).hasSize(1) .usingRecursiveFieldByFieldElementComparator() @@ -865,10 +865,10 @@ void queryByDeprovisionedResourcesProperty_multipleResults() { getTransferProcessStore().save(process2); var query = QuerySpec.Builder.newInstance() - .filter(Criterion.criterion("deprovisionedResources.inProcess", "=", false)) + .filter(criterion("deprovisionedResources.inProcess", "=", false)) .build(); - var result = getTransferProcessStore().findAll(query).collect(Collectors.toList()); + var result = getTransferProcessStore().findAll(query).toList(); assertThat(result).hasSize(2) .usingRecursiveFieldByFieldElementComparator() @@ -892,7 +892,7 @@ void queryByDeprovisionedResources_propNotExist() { getTransferProcessStore().save(process1); var query = QuerySpec.Builder.newInstance() - .filter(Criterion.criterion("deprovisionedResources.foobar", "=", "barbaz")) + .filter(criterion("deprovisionedResources.foobar", "=", "barbaz")) .build(); assertThat(getTransferProcessStore().findAll(query)).isEmpty(); @@ -917,10 +917,10 @@ void queryByDeprovisionedResources_valueNotExist() { getTransferProcessStore().save(process1); var query = QuerySpec.Builder.newInstance() - .filter(Criterion.criterion("deprovisionedResources.errorMessage", "=", "notexist")) + .filter(criterion("deprovisionedResources.errorMessage", "=", "notexist")) .build(); - var result = getTransferProcessStore().findAll(query).collect(Collectors.toList()); + var result = getTransferProcessStore().findAll(query).toList(); assertThat(result).isEmpty(); }