diff --git a/base/api/src/main/java/org/eclipse/ditto/base/api/common/PurgeEntitiesReason.java b/base/api/src/main/java/org/eclipse/ditto/base/api/common/PurgeEntitiesReason.java index f64c054663..705f50969a 100644 --- a/base/api/src/main/java/org/eclipse/ditto/base/api/common/PurgeEntitiesReason.java +++ b/base/api/src/main/java/org/eclipse/ditto/base/api/common/PurgeEntitiesReason.java @@ -17,19 +17,18 @@ import java.util.List; import java.util.Objects; import java.util.function.Predicate; -import java.util.stream.Collectors; import javax.annotation.concurrent.Immutable; +import org.eclipse.ditto.base.model.entity.id.EntityId; +import org.eclipse.ditto.base.model.json.FieldType; +import org.eclipse.ditto.base.model.json.JsonSchemaVersion; import org.eclipse.ditto.json.JsonArray; import org.eclipse.ditto.json.JsonFactory; import org.eclipse.ditto.json.JsonField; import org.eclipse.ditto.json.JsonObject; import org.eclipse.ditto.json.JsonObjectBuilder; import org.eclipse.ditto.json.JsonValue; -import org.eclipse.ditto.base.model.entity.id.EntityId; -import org.eclipse.ditto.base.model.json.FieldType; -import org.eclipse.ditto.base.model.json.JsonSchemaVersion; /** * A dedicated {@link ShutdownReason} for purging a namespace. @@ -57,7 +56,7 @@ public static PurgeEntitiesReason of(final List entityIdsToPurge) { final List stringEntityIdsToPurge = argumentNotEmpty(entityIdsToPurge, "entities to purge") .stream() .map(String::valueOf) - .collect(Collectors.toList()); + .toList(); return new PurgeEntitiesReason(stringEntityIdsToPurge); } @@ -65,7 +64,7 @@ public static PurgeEntitiesReason of(final List entityIdsToPurge) { static PurgeEntitiesReason fromJson(final JsonObject jsonObject) { final List entityIdsToPurge = jsonObject.getValueOrThrow(JsonFields.DETAILS).asArray().stream() .map(JsonValue::asString) - .collect(Collectors.toList()); + .toList(); return new PurgeEntitiesReason(entityIdsToPurge); } diff --git a/base/api/src/main/java/org/eclipse/ditto/base/api/devops/signals/commands/RetrieveLoggerConfig.java b/base/api/src/main/java/org/eclipse/ditto/base/api/devops/signals/commands/RetrieveLoggerConfig.java index c9847a0a5e..127713365d 100755 --- a/base/api/src/main/java/org/eclipse/ditto/base/api/devops/signals/commands/RetrieveLoggerConfig.java +++ b/base/api/src/main/java/org/eclipse/ditto/base/api/devops/signals/commands/RetrieveLoggerConfig.java @@ -18,11 +18,15 @@ import java.util.List; import java.util.Objects; import java.util.function.Predicate; -import java.util.stream.Collectors; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; +import org.eclipse.ditto.base.model.headers.DittoHeaders; +import org.eclipse.ditto.base.model.json.FieldType; +import org.eclipse.ditto.base.model.json.JsonParsableCommand; +import org.eclipse.ditto.base.model.json.JsonSchemaVersion; +import org.eclipse.ditto.base.model.signals.commands.CommandJsonDeserializer; import org.eclipse.ditto.json.JsonArray; import org.eclipse.ditto.json.JsonCollectors; import org.eclipse.ditto.json.JsonFactory; @@ -31,11 +35,6 @@ import org.eclipse.ditto.json.JsonObject; import org.eclipse.ditto.json.JsonObjectBuilder; import org.eclipse.ditto.json.JsonValue; -import org.eclipse.ditto.base.model.headers.DittoHeaders; -import org.eclipse.ditto.base.model.json.FieldType; -import org.eclipse.ditto.base.model.json.JsonParsableCommand; -import org.eclipse.ditto.base.model.json.JsonSchemaVersion; -import org.eclipse.ditto.base.model.signals.commands.CommandJsonDeserializer; /** * Command to retrieve the {@link org.eclipse.ditto.base.api.devops.LoggerConfig} for each configured Logger. @@ -225,7 +224,7 @@ public static RetrieveLoggerConfig fromJson(final JsonObject jsonObject, final D final List extractedSpecificLoggers = loggersJsonArray.stream() .filter(JsonValue::isString) .map(JsonValue::asString) - .collect(Collectors.toList()); + .toList(); return of(serviceName, instance, dittoHeaders, extractedSpecificLoggers); } diff --git a/base/api/src/main/java/org/eclipse/ditto/base/api/devops/signals/commands/RetrieveLoggerConfigResponse.java b/base/api/src/main/java/org/eclipse/ditto/base/api/devops/signals/commands/RetrieveLoggerConfigResponse.java index 9c6d3cfca4..bf4ccc308b 100755 --- a/base/api/src/main/java/org/eclipse/ditto/base/api/devops/signals/commands/RetrieveLoggerConfigResponse.java +++ b/base/api/src/main/java/org/eclipse/ditto/base/api/devops/signals/commands/RetrieveLoggerConfigResponse.java @@ -16,7 +16,6 @@ import java.util.List; import java.util.Objects; import java.util.function.Predicate; -import java.util.stream.Collectors; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; @@ -67,7 +66,7 @@ public final class RetrieveLoggerConfigResponse extends AbstractDevOpsCommandRes .filter(JsonValue::isObject) .map(JsonValue::asObject) .map(ImmutableLoggerConfig::fromJson) - .collect(Collectors.toList()); + .toList(); return new RetrieveLoggerConfigResponse( jsonObject.getValue(DevOpsCommandResponse.JsonFields.JSON_SERVICE_NAME).orElse(null), @@ -165,7 +164,7 @@ public RetrieveLoggerConfigResponse setEntity(final JsonValue entity) { .filter(JsonValue::isObject) .map(JsonValue::asObject) .map(ImmutableLoggerConfig::fromJson) - .collect(Collectors.toList()), + .toList(), getDittoHeaders()); } diff --git a/base/api/src/main/java/org/eclipse/ditto/base/api/devops/signals/commands/RetrieveStatisticsDetails.java b/base/api/src/main/java/org/eclipse/ditto/base/api/devops/signals/commands/RetrieveStatisticsDetails.java index c87d298447..1368d729af 100755 --- a/base/api/src/main/java/org/eclipse/ditto/base/api/devops/signals/commands/RetrieveStatisticsDetails.java +++ b/base/api/src/main/java/org/eclipse/ditto/base/api/devops/signals/commands/RetrieveStatisticsDetails.java @@ -17,11 +17,14 @@ import java.util.List; import java.util.Objects; import java.util.function.Predicate; -import java.util.stream.Collectors; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; +import org.eclipse.ditto.base.model.headers.DittoHeaders; +import org.eclipse.ditto.base.model.json.JsonParsableCommand; +import org.eclipse.ditto.base.model.json.JsonSchemaVersion; +import org.eclipse.ditto.base.model.signals.commands.CommandJsonDeserializer; import org.eclipse.ditto.json.JsonArray; import org.eclipse.ditto.json.JsonCollectors; import org.eclipse.ditto.json.JsonFactory; @@ -30,10 +33,6 @@ import org.eclipse.ditto.json.JsonObject; import org.eclipse.ditto.json.JsonObjectBuilder; import org.eclipse.ditto.json.JsonValue; -import org.eclipse.ditto.base.model.headers.DittoHeaders; -import org.eclipse.ditto.base.model.json.JsonParsableCommand; -import org.eclipse.ditto.base.model.json.JsonSchemaVersion; -import org.eclipse.ditto.base.model.signals.commands.CommandJsonDeserializer; /** * Command which retrieves publicly available statistics about the stored Things currently present. @@ -200,7 +199,7 @@ public String toString() { } private static List toStringListOrThrow(final JsonArray jsonArray) { - return jsonArray.stream().map(JsonValue::asString).collect(Collectors.toList()); + return jsonArray.stream().map(JsonValue::asString).toList(); } /** diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/headers/AbstractDittoHeadersBuilder.java b/base/model/src/main/java/org/eclipse/ditto/base/model/headers/AbstractDittoHeadersBuilder.java index e50cb895b7..3dde80d871 100755 --- a/base/model/src/main/java/org/eclipse/ditto/base/model/headers/AbstractDittoHeadersBuilder.java +++ b/base/model/src/main/java/org/eclipse/ditto/base/model/headers/AbstractDittoHeadersBuilder.java @@ -652,11 +652,4 @@ private static Map preserveCaseSensitivity(final Map AcknowledgementLabels.newLabel(labelValue)) diff --git a/base/model/src/test/java/org/eclipse/ditto/base/model/acks/ImmutableAcknowledgementLabelTest.java b/base/model/src/test/java/org/eclipse/ditto/base/model/acks/ImmutableAcknowledgementLabelTest.java index c03c0871b2..b5b678658a 100644 --- a/base/model/src/test/java/org/eclipse/ditto/base/model/acks/ImmutableAcknowledgementLabelTest.java +++ b/base/model/src/test/java/org/eclipse/ditto/base/model/acks/ImmutableAcknowledgementLabelTest.java @@ -17,7 +17,6 @@ import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable; import org.assertj.core.api.AutoCloseableSoftAssertions; -import org.junit.Ignore; import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; @@ -45,7 +44,7 @@ public void assertImmutability() { public void toStringReturnsExpected() { final ImmutableAcknowledgementLabel underTest = ImmutableAcknowledgementLabel.of(KNOWN_LABEL_VALUE); - assertThat(underTest.toString()).isEqualTo(KNOWN_LABEL_VALUE); + assertThat(underTest.toString()).hasToString(KNOWN_LABEL_VALUE); } @Test diff --git a/base/model/src/test/java/org/eclipse/ditto/base/model/acks/ImmutableAcknowledgementRequestTest.java b/base/model/src/test/java/org/eclipse/ditto/base/model/acks/ImmutableAcknowledgementRequestTest.java index db01b0c2f5..6af9d77a1a 100644 --- a/base/model/src/test/java/org/eclipse/ditto/base/model/acks/ImmutableAcknowledgementRequestTest.java +++ b/base/model/src/test/java/org/eclipse/ditto/base/model/acks/ImmutableAcknowledgementRequestTest.java @@ -18,7 +18,6 @@ import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf; import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable; -import org.junit.Ignore; import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; @@ -63,7 +62,7 @@ public void toStringReturnsExpected() { final AcknowledgementLabel label = DittoAcknowledgementLabel.TWIN_PERSISTED; final ImmutableAcknowledgementRequest underTest = ImmutableAcknowledgementRequest.getInstance(label); - assertThat(underTest.toString()).isEqualTo(label.toString()); + assertThat(underTest.toString()).hasToString(label.toString()); } } diff --git a/base/model/src/test/java/org/eclipse/ditto/base/model/acks/ImmutableFilteredAcknowledgementRequestTest.java b/base/model/src/test/java/org/eclipse/ditto/base/model/acks/ImmutableFilteredAcknowledgementRequestTest.java index abcb3aea24..88021a0fe4 100644 --- a/base/model/src/test/java/org/eclipse/ditto/base/model/acks/ImmutableFilteredAcknowledgementRequestTest.java +++ b/base/model/src/test/java/org/eclipse/ditto/base/model/acks/ImmutableFilteredAcknowledgementRequestTest.java @@ -25,7 +25,6 @@ import org.eclipse.ditto.json.JsonCollectors; import org.eclipse.ditto.json.JsonFactory; import org.eclipse.ditto.json.JsonObject; -import org.junit.Ignore; import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; @@ -101,7 +100,7 @@ public void toStringReturnsExpected() { final ImmutableFilteredAcknowledgementRequest underTest = ImmutableFilteredAcknowledgementRequest.getInstance(INCLUDES, FILTER); - assertThat(underTest.toString()).isEqualTo( + assertThat(underTest.toString()).hasToString( ImmutableFilteredAcknowledgementRequest.class.getSimpleName() + " [" + "includes=" + INCLUDES + ", filter=" + FILTER + diff --git a/base/model/src/test/java/org/eclipse/ditto/base/model/auth/ImmutableAuthorizationContextTypeTest.java b/base/model/src/test/java/org/eclipse/ditto/base/model/auth/ImmutableAuthorizationContextTypeTest.java index b2240979ff..acd63b56e3 100644 --- a/base/model/src/test/java/org/eclipse/ditto/base/model/auth/ImmutableAuthorizationContextTypeTest.java +++ b/base/model/src/test/java/org/eclipse/ditto/base/model/auth/ImmutableAuthorizationContextTypeTest.java @@ -17,7 +17,6 @@ import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable; import org.assertj.core.api.AutoCloseableSoftAssertions; -import org.junit.Ignore; import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; @@ -44,7 +43,7 @@ public void assertImmutability() { public void toStringReturnsExpected() { final ImmutableAuthorizationContextType underTest = ImmutableAuthorizationContextType.of(KNOWN_TYPE_VALUE); - assertThat(underTest.toString()).isEqualTo(KNOWN_TYPE_VALUE); + assertThat(underTest.toString()).hasToString(KNOWN_TYPE_VALUE); } @Test diff --git a/base/model/src/test/java/org/eclipse/ditto/base/model/entity/type/DefaultEntityTypeTest.java b/base/model/src/test/java/org/eclipse/ditto/base/model/entity/type/DefaultEntityTypeTest.java index 6f7267c4ad..f49231d1bb 100644 --- a/base/model/src/test/java/org/eclipse/ditto/base/model/entity/type/DefaultEntityTypeTest.java +++ b/base/model/src/test/java/org/eclipse/ditto/base/model/entity/type/DefaultEntityTypeTest.java @@ -19,7 +19,6 @@ import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable; import org.assertj.core.api.AutoCloseableSoftAssertions; -import org.junit.Ignore; import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; @@ -63,7 +62,7 @@ public void tryToGetInstanceWithEmptyValue() { public void toStringReturnsExpected() { final DefaultEntityType underTest = DefaultEntityType.of(KNOWN_VALUE); - assertThat(underTest.toString()).isEqualTo(KNOWN_VALUE); + assertThat(underTest.toString()).hasToString(KNOWN_VALUE); } @Test diff --git a/base/model/src/test/java/org/eclipse/ditto/base/model/exceptions/TooManyRequestsExceptionTest.java b/base/model/src/test/java/org/eclipse/ditto/base/model/exceptions/TooManyRequestsExceptionTest.java index 895e6219cc..295d3b0ef9 100644 --- a/base/model/src/test/java/org/eclipse/ditto/base/model/exceptions/TooManyRequestsExceptionTest.java +++ b/base/model/src/test/java/org/eclipse/ditto/base/model/exceptions/TooManyRequestsExceptionTest.java @@ -59,6 +59,7 @@ public void createInstanceFromValidJson() { @Test public void retryAfterHeaderIsSet() { - assertThat(UNDER_TEST.getDittoHeaders().get(TooManyRequestsException.RETRY_AFTER)).isEqualTo("3600"); + assertThat(UNDER_TEST.getDittoHeaders()).containsEntry(TooManyRequestsException.RETRY_AFTER, "3600"); } + } diff --git a/base/model/src/test/java/org/eclipse/ditto/base/model/headers/ImmutableDittoHeadersTest.java b/base/model/src/test/java/org/eclipse/ditto/base/model/headers/ImmutableDittoHeadersTest.java index bd16dbc5dc..5c53e597a8 100755 --- a/base/model/src/test/java/org/eclipse/ditto/base/model/headers/ImmutableDittoHeadersTest.java +++ b/base/model/src/test/java/org/eclipse/ditto/base/model/headers/ImmutableDittoHeadersTest.java @@ -675,7 +675,7 @@ public void areCaseInsensitiveAndCasePreserving() { final Map headers = new HashMap<>(); headers.put("hElLo", "world"); final DittoHeaders underTest = ImmutableDittoHeaders.of(headers); - assertThat(underTest.get("hello")).isEqualTo("world"); + assertThat(underTest).containsEntry("hello", "world"); final JsonObject serialized = underTest.toJson(); assertThat(serialized).containsExactly(JsonField.newInstance("hElLo", JsonValue.of("world"))); final DittoHeaders deserialized = DittoHeaders.newBuilder(serialized).build(); diff --git a/base/model/src/test/java/org/eclipse/ditto/base/model/signals/DateTimeUtilTest.java b/base/model/src/test/java/org/eclipse/ditto/base/model/signals/DateTimeUtilTest.java index 175a812a76..30e7f746e3 100755 --- a/base/model/src/test/java/org/eclipse/ditto/base/model/signals/DateTimeUtilTest.java +++ b/base/model/src/test/java/org/eclipse/ditto/base/model/signals/DateTimeUtilTest.java @@ -68,7 +68,7 @@ public void parseShortBasicFormat() { @Test public void parseZuluTime() { final OffsetDateTime time = DateTimeUtil.parseOffsetDateTime("19700123T012345Z"); - assertThat(time.getOffset().getLong(ChronoField.OFFSET_SECONDS)).isEqualTo(0); + assertThat(time.getOffset().getLong(ChronoField.OFFSET_SECONDS)).isZero(); } @Test(expected = DateTimeException.class) diff --git a/base/service/src/main/java/org/eclipse/ditto/base/service/devops/LogbackLoggingFacade.java b/base/service/src/main/java/org/eclipse/ditto/base/service/devops/LogbackLoggingFacade.java index 6c0b555772..6fc3baff21 100644 --- a/base/service/src/main/java/org/eclipse/ditto/base/service/devops/LogbackLoggingFacade.java +++ b/base/service/src/main/java/org/eclipse/ditto/base/service/devops/LogbackLoggingFacade.java @@ -15,7 +15,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; -import java.util.stream.Collectors; import java.util.stream.StreamSupport; import javax.annotation.Nonnull; @@ -70,9 +69,9 @@ public List getLoggerConfig() { @Override @Nonnull public List getLoggerConfig(@Nonnull final Iterable loggerNames) { - final List loggerList = StreamSupport.stream(loggerNames.spliterator(), false) // - .map(logger -> (Logger) LoggerFactory.getLogger(logger)) // - .collect(Collectors.toList()); + final List loggerList = StreamSupport.stream(loggerNames.spliterator(), false) + .map(logger -> (Logger) LoggerFactory.getLogger(logger)) + .toList(); return loggerConfigsFor(loggerList); } @@ -90,4 +89,5 @@ private List loggerConfigsFor(final Iterable loggers) { return loggerConfigList; } + } diff --git a/connectivity/api/src/main/java/org/eclipse/ditto/connectivity/api/UnmappedOutboundSignal.java b/connectivity/api/src/main/java/org/eclipse/ditto/connectivity/api/UnmappedOutboundSignal.java index aa67176b4c..119b4c626b 100644 --- a/connectivity/api/src/main/java/org/eclipse/ditto/connectivity/api/UnmappedOutboundSignal.java +++ b/connectivity/api/src/main/java/org/eclipse/ditto/connectivity/api/UnmappedOutboundSignal.java @@ -17,26 +17,25 @@ import java.util.List; import java.util.Objects; import java.util.function.Predicate; -import java.util.stream.Collectors; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; -import org.eclipse.ditto.json.JsonArray; -import org.eclipse.ditto.json.JsonCollectors; -import org.eclipse.ditto.json.JsonFactory; -import org.eclipse.ditto.json.JsonField; -import org.eclipse.ditto.json.JsonObject; -import org.eclipse.ditto.json.JsonValue; import org.eclipse.ditto.base.model.headers.DittoHeaders; import org.eclipse.ditto.base.model.json.JsonSchemaVersion; import org.eclipse.ditto.base.model.json.Jsonifiable; -import org.eclipse.ditto.connectivity.model.ConnectivityModelFactory; -import org.eclipse.ditto.connectivity.model.Target; -import org.eclipse.ditto.internal.utils.cluster.MappingStrategies; import org.eclipse.ditto.base.model.signals.JsonParsable; import org.eclipse.ditto.base.model.signals.Signal; import org.eclipse.ditto.base.model.signals.commands.Command; +import org.eclipse.ditto.connectivity.model.ConnectivityModelFactory; +import org.eclipse.ditto.connectivity.model.Target; +import org.eclipse.ditto.internal.utils.cluster.MappingStrategies; +import org.eclipse.ditto.json.JsonArray; +import org.eclipse.ditto.json.JsonCollectors; +import org.eclipse.ditto.json.JsonFactory; +import org.eclipse.ditto.json.JsonField; +import org.eclipse.ditto.json.JsonObject; +import org.eclipse.ditto.json.JsonValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -88,7 +87,7 @@ public static OutboundSignal fromJson(final JsonObject jsonObject, final Mapping .filter(JsonValue::isObject) .map(JsonValue::asObject) .map(ConnectivityModelFactory::targetFromJson) - .collect(Collectors.toList()); + .toList(); return new UnmappedOutboundSignal((Signal) signalJsonifiable, targets); } diff --git a/connectivity/model/src/test/java/org/eclipse/ditto/connectivity/model/ConnectionIdTest.java b/connectivity/model/src/test/java/org/eclipse/ditto/connectivity/model/ConnectionIdTest.java index f2ca6433dd..0a716de0ea 100644 --- a/connectivity/model/src/test/java/org/eclipse/ditto/connectivity/model/ConnectionIdTest.java +++ b/connectivity/model/src/test/java/org/eclipse/ditto/connectivity/model/ConnectionIdTest.java @@ -18,7 +18,6 @@ import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable; import org.eclipse.ditto.base.model.entity.id.EntityId; -import org.junit.Ignore; import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; @@ -58,7 +57,7 @@ public void connectionIdOfConnectionIdIsSameInstance() { @Test public void toStringEqualsInput() { final ConnectionId connectionId = ConnectionId.of("myConnection"); - assertThat(connectionId.toString()).isEqualTo("myConnection"); + assertThat(connectionId.toString()).hasToString("myConnection"); } } diff --git a/connectivity/model/src/test/java/org/eclipse/ditto/connectivity/model/ImmutableFilteredTopicTest.java b/connectivity/model/src/test/java/org/eclipse/ditto/connectivity/model/ImmutableFilteredTopicTest.java index bd1983384c..8faa85f477 100644 --- a/connectivity/model/src/test/java/org/eclipse/ditto/connectivity/model/ImmutableFilteredTopicTest.java +++ b/connectivity/model/src/test/java/org/eclipse/ditto/connectivity/model/ImmutableFilteredTopicTest.java @@ -25,7 +25,6 @@ import org.assertj.core.util.Lists; import org.eclipse.ditto.json.JsonFieldSelector; import org.eclipse.ditto.things.model.ThingFieldSelector; -import org.junit.Ignore; import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; @@ -157,7 +156,7 @@ public void toStringReturnsExpectedWithFilterNamespacesAndExtraFields() { final String actual = underTest.toString(); - assertThat(actual).isEqualTo(expected); + assertThat(actual).hasToString(expected); } @Test diff --git a/connectivity/model/src/test/java/org/eclipse/ditto/connectivity/model/signals/commands/query/RetrieveConnectionLogsResponseTest.java b/connectivity/model/src/test/java/org/eclipse/ditto/connectivity/model/signals/commands/query/RetrieveConnectionLogsResponseTest.java index b59bdac65f..69dba32bd3 100644 --- a/connectivity/model/src/test/java/org/eclipse/ditto/connectivity/model/signals/commands/query/RetrieveConnectionLogsResponseTest.java +++ b/connectivity/model/src/test/java/org/eclipse/ditto/connectivity/model/signals/commands/query/RetrieveConnectionLogsResponseTest.java @@ -36,7 +36,6 @@ import org.eclipse.ditto.json.JsonFactory; import org.eclipse.ditto.json.JsonObject; import org.eclipse.ditto.json.JsonParseException; -import org.junit.Ignore; import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; @@ -167,7 +166,7 @@ public void merge() { assertThat(merged.getEnabledSince()).contains(ENABLED_SINCE); assertThat(merged.getEnabledUntil()).contains(ENABLED_UNTIL); assertThat(merged.getConnectionLogs()).containsOnlyElementsOf(expectedEntries); - assertThat(merged.getConnectionLogs().size()).isEqualTo(expectedEntries.size()); + assertThat(merged.getConnectionLogs()).hasSameSizeAs(expectedEntries); } @Test diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/SignalEnforcementFilter.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/SignalEnforcementFilter.java index e045849892..c1de3233ed 100644 --- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/SignalEnforcementFilter.java +++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/SignalEnforcementFilter.java @@ -113,8 +113,8 @@ private ConnectionSignalIdEnforcementFailedException getEnforcementFailedExcepti } private static Optional extractEntityId(final Signal signal) { - return signal instanceof WithEntityId - ? Optional.of(((WithEntityId) signal).getEntityId()) + return signal instanceof WithEntityId withEntityId + ? Optional.of(withEntityId.getEntityId()) : Optional.empty(); } diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/mapping/MergedJsonObjectMap.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/mapping/MergedJsonObjectMap.java index 3e210bde20..2528cc1b68 100644 --- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/mapping/MergedJsonObjectMap.java +++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/mapping/MergedJsonObjectMap.java @@ -47,8 +47,8 @@ static MergedJsonObjectMap of(final JsonObject jsonObject, final JsonObject fall } static MergedJsonObjectMap of(final Map map) { - if (map instanceof MergedJsonObjectMap) { - return (MergedJsonObjectMap) map; + if (map instanceof MergedJsonObjectMap mergedJsonObjectMap) { + return mergedJsonObjectMap; } else { return new MergedJsonObjectMap(map.entrySet().stream() .map(entry -> JsonField.newInstance(entry.getKey(), entry.getValue())) diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/mapping/javascript/SandboxingContextFactory.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/mapping/javascript/SandboxingContextFactory.java index 4297484e66..9dd9c23d0e 100644 --- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/mapping/javascript/SandboxingContextFactory.java +++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/mapping/javascript/SandboxingContextFactory.java @@ -62,9 +62,8 @@ protected Context makeContext() { @Override public boolean hasFeature(final Context cx, final int featureIndex) { - switch (featureIndex) { - case Context.FEATURE_MEMBER_EXPR_AS_FUNCTION_NAME: - return true; + if (featureIndex == Context.FEATURE_MEMBER_EXPR_AS_FUNCTION_NAME) { + return true; } return super.hasFeature(cx, featureIndex); } diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/mapping/javascript/ScriptedIncomingMapping.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/mapping/javascript/ScriptedIncomingMapping.java index b9e8f26dd6..ea39e8f198 100644 --- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/mapping/javascript/ScriptedIncomingMapping.java +++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/mapping/javascript/ScriptedIncomingMapping.java @@ -18,14 +18,14 @@ import javax.annotation.Nullable; -import org.eclipse.ditto.json.JsonFactory; -import org.eclipse.ditto.json.JsonObject; import org.eclipse.ditto.base.model.exceptions.DittoJsonException; import org.eclipse.ditto.base.model.headers.DittoHeaders; +import org.eclipse.ditto.connectivity.api.ExternalMessage; import org.eclipse.ditto.connectivity.model.MessageMappingFailedException; +import org.eclipse.ditto.json.JsonFactory; +import org.eclipse.ditto.json.JsonObject; import org.eclipse.ditto.protocol.Adaptable; import org.eclipse.ditto.protocol.ProtocolFactory; -import org.eclipse.ditto.connectivity.api.ExternalMessage; import org.mozilla.javascript.Context; import org.mozilla.javascript.ContextFactory; import org.mozilla.javascript.NativeArray; @@ -72,15 +72,15 @@ public List apply(final ExternalMessage message) { if (result == null) { // return empty list if result is null return Collections.emptyList(); - } else if (result instanceof NativeArray) { + } else if (result instanceof NativeArray nativeArray) { // array handling - final NativeArray jsArray = (NativeArray) result; final List list = new ArrayList<>(); - for (Object idxObj : jsArray.getIds()) { + for (Object idxObj : nativeArray.getIds()) { int index = (Integer) idxObj; - final Object element = jsArray.get(index, null); + final Object element = nativeArray.get(index, null); list.add(getAdaptableFromObject(cx, element)); } + return list; } diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/mapping/javascript/ScriptedOutgoingMapping.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/mapping/javascript/ScriptedOutgoingMapping.java index 4134176d80..b3e62eb36a 100644 --- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/mapping/javascript/ScriptedOutgoingMapping.java +++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/mapping/javascript/ScriptedOutgoingMapping.java @@ -27,14 +27,14 @@ import javax.annotation.Nullable; import javax.script.Bindings; +import org.eclipse.ditto.connectivity.api.ExternalMessage; +import org.eclipse.ditto.connectivity.api.ExternalMessageBuilder; +import org.eclipse.ditto.connectivity.api.ExternalMessageFactory; import org.eclipse.ditto.connectivity.model.MessageMappingFailedException; +import org.eclipse.ditto.connectivity.service.mapping.MessageMapper; import org.eclipse.ditto.protocol.Adaptable; import org.eclipse.ditto.protocol.JsonifiableAdaptable; import org.eclipse.ditto.protocol.ProtocolFactory; -import org.eclipse.ditto.connectivity.service.mapping.MessageMapper; -import org.eclipse.ditto.connectivity.api.ExternalMessage; -import org.eclipse.ditto.connectivity.api.ExternalMessageBuilder; -import org.eclipse.ditto.connectivity.api.ExternalMessageFactory; import org.mozilla.javascript.Callable; import org.mozilla.javascript.Context; import org.mozilla.javascript.ContextFactory; @@ -82,13 +82,12 @@ public List apply(final Adaptable adaptable) { if (result == null) { // return empty list if result is null return Collections.emptyList(); - } else if (result instanceof NativeArray) { + } else if (result instanceof NativeArray nativeArray) { // handle array - final NativeArray jsArray = (NativeArray) result; final List list = new ArrayList<>(); - for (Object idxObj : jsArray.getIds()) { + for (Object idxObj : nativeArray.getIds()) { int index = (Integer) idxObj; - final Object element = jsArray.get(index, null); + final Object element = nativeArray.get(index, null); list.add(getExternalMessageFromObject(adaptable, (NativeObject) element)); } return list; @@ -146,8 +145,8 @@ private ExternalMessage getExternalMessageFromObject(final Adaptable adaptable, } private static Optional convertToByteBuffer(final Object obj) { - if (obj instanceof NativeArrayBuffer) { - return Optional.of(ByteBuffer.wrap(((NativeArrayBuffer) obj).getBuffer())); + if (obj instanceof NativeArrayBuffer nativeArrayBuffer) { + return Optional.of(ByteBuffer.wrap(nativeArrayBuffer.getBuffer())); } else if (obj instanceof Bindings) { try { final Class cls = Class.forName("jdk.nashorn.api.scripting.ScriptObjectMirror"); diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/BaseClientActor.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/BaseClientActor.java index dbe3c4f6a8..4692d1db62 100644 --- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/BaseClientActor.java +++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/BaseClientActor.java @@ -1797,7 +1797,7 @@ private Sink getInboundMappingSink(final ProtocolAdapter protoc inboundMappingProcessors = IntStream.range(0, processorPoolSize) .mapToObj(i -> InboundMappingProcessor.of(connection, connectivityConfig, actorSystem, protocolAdapter, logger)) - .collect(Collectors.toList()); + .toList(); } catch (final DittoRuntimeException dre) { connectionLogger.failure("Failed to start message mapping processor due to: {0}", dre.getMessage()); logger.info("Got DittoRuntimeException during initialization of MessageMappingProcessor: {} {} - desc: {}", diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/amqp/AmqpConsumerActor.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/amqp/AmqpConsumerActor.java index 3291a45b14..25ce7df36c 100644 --- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/amqp/AmqpConsumerActor.java +++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/amqp/AmqpConsumerActor.java @@ -300,9 +300,9 @@ private void createMessageConsumer(final Control createConsumer) { final CompletionStage responseFuture = Patterns.ask(jmsActor, createMessageConsumer, jmsActorAskTimeout) .thenApply(response -> { - if (response instanceof Throwable) { + if (response instanceof Throwable throwable) { // create failed future so that Patterns.pipe sends me Status.Failure - throw new CompletionException((Throwable) response); + throw new CompletionException(throwable); } return response; }); @@ -456,11 +456,10 @@ private void acknowledge(final JmsMessage message, final boolean isSuccess, fina private ExternalMessageBuilder extractPayloadFromMessage(final JmsMessage message, final ExternalMessageBuilder builder, @Nullable final String correlationId) throws JMSException { - if (message instanceof TextMessage) { - final String payload = ((TextMessage) message).getText(); + if (message instanceof TextMessage textMessage) { + final String payload = textMessage.getText(); builder.withTextAndBytes(payload, payload.getBytes()); - } else if (message instanceof BytesMessage) { - final BytesMessage bytesMessage = (BytesMessage) message; + } else if (message instanceof BytesMessage bytesMessage) { final long bodyLength = bytesMessage.getBodyLength(); if (bodyLength >= Integer.MIN_VALUE && bodyLength <= Integer.MAX_VALUE) { final int length = (int) bodyLength; diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/httppush/HttpPushValidator.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/httppush/HttpPushValidator.java index d3b8c86cc5..15cc29ba6e 100644 --- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/httppush/HttpPushValidator.java +++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/httppush/HttpPushValidator.java @@ -144,9 +144,8 @@ private static void validateHttpMethod(final String methodName, private void validateCredentials(final Connection connection, final DittoHeaders dittoHeaders) { connection.getCredentials().ifPresent(credentials -> { - if (credentials instanceof OAuthClientCredentials) { - final var oauthClientCredentials = (OAuthClientCredentials) credentials; - final var uri = Uri.create(oauthClientCredentials.getTokenEndpoint()); + if (credentials instanceof OAuthClientCredentials oAuthClientCredentials) { + final var uri = Uri.create(oAuthClientCredentials.getTokenEndpoint()); if (oauth2EnforceHttps && !isSecureScheme(uri.getScheme())) { final var errorMessage = "The OAuth2 token endpoint must be accessed via HTTPS " + "in order not to transmit the client secret in plain text."; diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/kafka/KafkaPublisherActor.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/kafka/KafkaPublisherActor.java index eed94fbfb3..6fa2f64c7f 100644 --- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/kafka/KafkaPublisherActor.java +++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/kafka/KafkaPublisherActor.java @@ -314,9 +314,10 @@ protected HttpStatus getHttpStatusForGenericException(final Throwable exception) final class KafkaProducerStream { - private static final String TOO_MANY_IN_FLIGHT_MESSAGE_DESCRIPTION = "This can have the following reasons:\n" + - "a) The Kafka consumer does not consume the messages fast enough.\n" + - "b) The client count of this connection is not configured high enough."; + private static final String TOO_MANY_IN_FLIGHT_MESSAGE_DESCRIPTION = """ + This can have the following reasons: + a) The Kafka consumer does not consume the messages fast enough. + b) The client count of this connection is not configured high enough."""; private final KillSwitch killSwitch; private final SourceQueueWithComplete>> diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/hivemq/client/BaseGenericMqttSubscribingClient.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/hivemq/client/BaseGenericMqttSubscribingClient.java index 953b719999..82d224d510 100644 --- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/hivemq/client/BaseGenericMqttSubscribingClient.java +++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/hivemq/client/BaseGenericMqttSubscribingClient.java @@ -16,7 +16,6 @@ import java.util.List; import java.util.concurrent.CompletionStage; -import java.util.stream.Collectors; import org.eclipse.ditto.connectivity.service.messaging.mqtt.hivemq.message.connect.GenericMqttConnect; import org.eclipse.ditto.connectivity.service.messaging.mqtt.hivemq.message.publish.GenericMqttPublish; @@ -139,7 +138,7 @@ private static SingleTransformer handleFai private static List getSubscriptionTopicFilters(final GenericMqttSubscribe genericMqttSubscribe) { return genericMqttSubscribe.genericMqttSubscriptions() .map(GenericMqttSubscription::getMqttTopicFilter) - .collect(Collectors.toList()); + .toList(); } private static List getFailedSubscriptionStatuses( @@ -149,7 +148,7 @@ private static List getFailedSubscriptionStatuses( return Zipper.zipIterables(subscriptionTopicFilters, genericMqttSubAck.getGenericMqttSubAckStatuses()) .filter(zip -> zip.b().isError()) .map(zip -> SubscriptionStatus.newInstance(zip.a(), zip.b())) - .collect(Collectors.toList()); + .toList(); } @Override diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/SignalFilter.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/SignalFilter.java index 5c7a18db5a..781e459a2d 100644 --- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/SignalFilter.java +++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/SignalFilter.java @@ -149,7 +149,7 @@ private static Predicate applyTopicFilter(final Signal signal) private static Predicate applyNamespaceFilter(final Signal signal) { return t -> t.getNamespaces().isEmpty() || - (signal instanceof WithEntityId && t.getNamespaces().contains(namespaceFromId((WithEntityId) signal))); + (signal instanceof WithEntityId withEntityId && t.getNamespaces().contains(namespaceFromId(withEntityId))); } @Nullable diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/mapping/ConnectionStatusMessageMapperTest.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/mapping/ConnectionStatusMessageMapperTest.java index 847f04b512..bb84f82328 100644 --- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/mapping/ConnectionStatusMessageMapperTest.java +++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/mapping/ConnectionStatusMessageMapperTest.java @@ -133,8 +133,8 @@ public void emittedCommandShouldExplicitlyRequestNoAcknowledgements() { final Adaptable adaptable = mappingResult.get(0); final Signal signal = DittoProtocolAdapter.newInstance().fromAdaptable(adaptable); assertThat(signal).isInstanceOf(ModifyFeature.class); - assertThat(signal.getDittoHeaders().containsKey(DittoHeaderDefinition.REQUESTED_ACKS.getKey())).isTrue(); - assertThat(signal.getDittoHeaders().getAcknowledgementRequests().isEmpty()).isTrue(); + assertThat(signal.getDittoHeaders()).containsKey(DittoHeaderDefinition.REQUESTED_ACKS.getKey()); + assertThat(signal.getDittoHeaders().getAcknowledgementRequests()).isEmpty(); } @Test diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/mapping/ImplicitThingCreationMessageMapperTest.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/mapping/ImplicitThingCreationMessageMapperTest.java index 48df022321..f47685a31a 100644 --- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/mapping/ImplicitThingCreationMessageMapperTest.java +++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/mapping/ImplicitThingCreationMessageMapperTest.java @@ -152,8 +152,8 @@ public void doForwardMappingContextWithCommandHeaderPlaceholder() { assertThat(createThing.getThing().getEntityId()).isEqualTo(expectedThing.getEntityId()); assertThat(createThing.getThing().getPolicyId()).isEmpty(); assertThat(createThing.getThing().getAttributes()).isEqualTo(expectedThing.getAttributes()); - assertThat(createThing.getDittoHeaders().get("other-test-header")).isEqualTo(GATEWAY_ID); - assertThat(createThing.getDittoHeaders().get("test-header")).isEqualTo("this-is-a-test-header"); + assertThat(createThing.getDittoHeaders()).containsEntry("other-test-header", GATEWAY_ID); + assertThat(createThing.getDittoHeaders()).containsEntry("test-header", "this-is-a-test-header"); assertThat(createThing.getDittoHeaders().isAllowPolicyLockout()).isTrue(); assertThat(createThing.getDittoHeaders().getIfNoneMatch()).contains(EntityTagMatchers.fromStrings("*")); assertThat(createThing.getPolicyIdOrPlaceholder()).contains(GATEWAY_ID); diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/mapping/RawMessageMapperTest.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/mapping/RawMessageMapperTest.java index 92f40706d6..dc1b657f69 100644 --- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/mapping/RawMessageMapperTest.java +++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/mapping/RawMessageMapperTest.java @@ -194,7 +194,7 @@ public void mapToBinaryMessagePerDefault() { final Signal signal = ADAPTER.fromAdaptable(adaptables.get(0)); assertThat(signal).isInstanceOf(SendThingMessage.class); final SendThingMessage sendThingMessage = (SendThingMessage) signal; - assertThat(sendThingMessage.getEntityId().toString()).isEqualTo("thing:id"); + assertThat(sendThingMessage.getEntityId().toString()).hasToString("thing:id"); assertThat(sendThingMessage.getMessage().getRawPayload().orElseThrow()).isEqualTo(payload); } @@ -214,7 +214,7 @@ public void mapToTextMessage() { final Signal signal = ADAPTER.fromAdaptable(adaptables.get(0)); assertThat(signal).isInstanceOf(SendThingMessage.class); final SendThingMessage sendThingMessage = (SendThingMessage) signal; - assertThat(sendThingMessage.getEntityId().toString()).isEqualTo("thing:id"); + assertThat(sendThingMessage.getEntityId().toString()).hasToString("thing:id"); assertThat(sendThingMessage.getMessage().getPayload().orElseThrow()).isEqualTo(payload); } @@ -241,7 +241,7 @@ public void mapToTextMessageWithContentTypeOverride() { final Signal signal = ADAPTER.fromAdaptable(adaptables.get(0)); assertThat(signal).isInstanceOf(SendThingMessage.class); final SendThingMessage sendThingMessage = (SendThingMessage) signal; - assertThat(sendThingMessage.getEntityId().toString()).isEqualTo("thing:id"); + assertThat(sendThingMessage.getEntityId().toString()).hasToString("thing:id"); assertThat(sendThingMessage.getMessage().getPayload().orElseThrow()).isEqualTo(payload); actorSystem.terminate(); } @@ -270,7 +270,7 @@ public void mapToBinaryMessageWithContentTypeOverride() { final Signal signal = ADAPTER.fromAdaptable(adaptables.get(0)); assertThat(signal).isInstanceOf(SendThingMessage.class); final SendThingMessage sendThingMessage = (SendThingMessage) signal; - assertThat(sendThingMessage.getEntityId().toString()).isEqualTo("thing:id"); + assertThat(sendThingMessage.getEntityId().toString()).hasToString("thing:id"); assertThat(sendThingMessage.getMessage().getPayload().orElseThrow()) .isEqualTo(ByteBuffer.wrap(payload.getBytes())); actorSystem.terminate(); @@ -293,7 +293,7 @@ public void mapToJsonMessage() { final Signal signal = ADAPTER.fromAdaptable(adaptables.get(0)); assertThat(signal).isInstanceOf(SendThingMessage.class); final SendThingMessage sendThingMessage = (SendThingMessage) signal; - assertThat(sendThingMessage.getEntityId().toString()).isEqualTo("thing:id"); + assertThat(sendThingMessage.getEntityId().toString()).hasToString("thing:id"); assertThat(sendThingMessage.getMessage().getPayload().orElseThrow()).isEqualTo(JsonObject.of(payload)); } @@ -338,8 +338,8 @@ public void mapToSendFeatureMessageResponse() { assertThat(signal).isInstanceOf(SendFeatureMessageResponse.class); final SendFeatureMessageResponse response = (SendFeatureMessageResponse) signal; assertThat(response.getHttpStatus()).isEqualTo(HttpStatus.IM_A_TEAPOT); - assertThat(response.getEntityId().toString()).isEqualTo("thing:id"); - assertThat(response.getFeatureId()).isEqualTo("accelerometer"); + assertThat(response.getEntityId().toString()).hasToString("thing:id"); + assertThat(response.getFeatureId()).hasToString("accelerometer"); assertThat(response.getMessage().getPayload().orElseThrow()).isEqualTo(JsonObject.of(payload)); } diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/mapping/javascript/JavaScriptMessageMapperRhinoTest.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/mapping/javascript/JavaScriptMessageMapperRhinoTest.java index 6f8b0ff398..ed7aa99ed2 100644 --- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/mapping/javascript/JavaScriptMessageMapperRhinoTest.java +++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/mapping/javascript/JavaScriptMessageMapperRhinoTest.java @@ -1088,9 +1088,9 @@ public void testPlainJavascriptIncomingMapping() { assertThat(adaptable.getTopicPath().getChannel()).isEqualTo(TopicPath.Channel.TWIN); assertThat(adaptable.getTopicPath().getCriterion()).isEqualTo(TopicPath.Criterion.COMMANDS); assertThat(adaptable.getTopicPath().getAction()).contains(TopicPath.Action.MODIFY); - assertThat(adaptable.getTopicPath().getNamespace()).isEqualTo(MAPPING_INCOMING_NAMESPACE); - assertThat(adaptable.getTopicPath().getEntityName()).isEqualTo(MAPPING_INCOMING_NAME); - assertThat(adaptable.getPayload().getPath().toString()).isEqualTo(MAPPING_INCOMING_PATH); + assertThat(adaptable.getTopicPath().getNamespace()).hasToString(MAPPING_INCOMING_NAMESPACE); + assertThat(adaptable.getTopicPath().getEntityName()).hasToString(MAPPING_INCOMING_NAME); + assertThat(adaptable.getPayload().getPath().toString()).hasToString(MAPPING_INCOMING_PATH); assertThat(adaptable.getPayload().getValue()).contains(JsonValue.of(MAPPING_INCOMING_PAYLOAD_STRING)); } @@ -1120,9 +1120,9 @@ public void testPlainJavascriptIncomingMappingWithStatus() { assertThat(adaptable.getTopicPath().getChannel()).isEqualTo(TopicPath.Channel.TWIN); assertThat(adaptable.getTopicPath().getCriterion()).isEqualTo(TopicPath.Criterion.COMMANDS); assertThat(adaptable.getTopicPath().getAction()).contains(TopicPath.Action.MODIFY); - assertThat(adaptable.getTopicPath().getNamespace()).isEqualTo(MAPPING_INCOMING_NAMESPACE); - assertThat(adaptable.getTopicPath().getEntityName()).isEqualTo(MAPPING_INCOMING_NAME); - assertThat(adaptable.getPayload().getPath().toString()).isEqualTo(MAPPING_INCOMING_PATH); + assertThat(adaptable.getTopicPath().getNamespace()).hasToString(MAPPING_INCOMING_NAMESPACE); + assertThat(adaptable.getTopicPath().getEntityName()).hasToString(MAPPING_INCOMING_NAME); + assertThat(adaptable.getPayload().getPath().toString()).hasToString(MAPPING_INCOMING_PATH); assertThat(adaptable.getPayload().getValue()).map(JsonValue::asString) .contains(modifyThingResponse.toJsonString()); assertThat(adaptable.getPayload().getHttpStatus()).contains(HttpStatus.NO_CONTENT); @@ -1155,8 +1155,8 @@ public void testPlainJavascriptIncomingMappingWithStatusAndExtra() { softly.assertThat(topicPath.getChannel()).isEqualTo(TopicPath.Channel.TWIN); softly.assertThat(topicPath.getCriterion()).isEqualTo(TopicPath.Criterion.COMMANDS); softly.assertThat(topicPath.getAction()).contains(TopicPath.Action.MODIFY); - softly.assertThat(topicPath.getNamespace()).isEqualTo(MAPPING_INCOMING_NAMESPACE); - softly.assertThat(topicPath.getEntityName()).isEqualTo(MAPPING_INCOMING_NAME); + softly.assertThat(topicPath.getNamespace()).hasToString(MAPPING_INCOMING_NAMESPACE); + softly.assertThat(topicPath.getEntityName()).hasToString(MAPPING_INCOMING_NAME); }); softly.assertThat(adaptable.getPayload()).satisfies(payload -> { softly.assertThat(payload.getPath().toString()).isEqualTo(MAPPING_INCOMING_PATH); diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/mapping/javascript/ScriptedIncomingMappingTest.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/mapping/javascript/ScriptedIncomingMappingTest.java index 28a3f089cb..6611286af3 100644 --- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/mapping/javascript/ScriptedIncomingMappingTest.java +++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/mapping/javascript/ScriptedIncomingMappingTest.java @@ -21,10 +21,10 @@ import java.util.List; import java.util.function.Consumer; -import org.eclipse.ditto.json.JsonValue; -import org.eclipse.ditto.protocol.Adaptable; import org.eclipse.ditto.connectivity.api.ExternalMessage; import org.eclipse.ditto.connectivity.api.ExternalMessageFactory; +import org.eclipse.ditto.json.JsonValue; +import org.eclipse.ditto.protocol.Adaptable; import org.junit.Test; import org.mozilla.javascript.NativeObject; import org.mozilla.javascript.Scriptable; @@ -105,7 +105,7 @@ public void mapExternalMessageProducingArrayOfDittoProtocolMessages() { "}\n", adaptables -> { assertThat(adaptables).isNotEmpty(); - assertThat(adaptables.size()).isEqualTo(2); + assertThat(adaptables).hasSize(2); final Adaptable adaptable0 = adaptables.get(0); assertThat(adaptable0.getPayload().getValue()).contains(JsonValue.of(PAYLOAD)); final Adaptable adaptable1 = adaptables.get(1); diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/MessageMappingProcessorActorTest.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/MessageMappingProcessorActorTest.java index 52ef45dc74..88e911632a 100644 --- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/MessageMappingProcessorActorTest.java +++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/MessageMappingProcessorActorTest.java @@ -661,8 +661,8 @@ public void testAppendingConnectionIdToResponses() { ActorRef.noSender() ); final Acknowledgement receivedAck = (Acknowledgement) expectMsgClass(InboundSignal.class).getSignal(); - assertThat(receivedAck.getDittoHeaders().get(DittoHeaderDefinition.CONNECTION_ID.getKey())) - .isEqualTo(CONNECTION_ID.toString()); + assertThat(receivedAck.getDittoHeaders()) + .containsEntry(DittoHeaderDefinition.CONNECTION_ID.getKey(), CONNECTION_ID.toString()); assertThat(getLastSender()).isEqualTo(outboundMappingProcessorActor); // Acknowledgements @@ -675,9 +675,8 @@ public void testAppendingConnectionIdToResponses() { final Acknowledgements receivedAcks = (Acknowledgements) expectMsgClass(InboundSignal.class).getSignal(); assertThat(receivedAcks.getAcknowledgement(label) .orElseThrow() - .getDittoHeaders() - .get(DittoHeaderDefinition.CONNECTION_ID.getKey())) - .isEqualTo(CONNECTION_ID.toString()); + .getDittoHeaders()) + .containsEntry(DittoHeaderDefinition.CONNECTION_ID.getKey(), CONNECTION_ID.toString()); assertThat(getLastSender()).isEqualTo(outboundMappingProcessorActor); // Live response @@ -692,8 +691,8 @@ public void testAppendingConnectionIdToResponses() { final DeleteThingResponse receivedResponse = (DeleteThingResponse) expectMsgClass(InboundSignal.class).getSignal(); assertThat(receivedResponse.getDittoHeaders().getChannel()).contains(TopicPath.Channel.LIVE.getName()); - assertThat(receivedResponse.getDittoHeaders().get(DittoHeaderDefinition.CONNECTION_ID.getKey())) - .isEqualTo(CONNECTION_ID.toString()); + assertThat(receivedResponse.getDittoHeaders()) + .containsEntry(DittoHeaderDefinition.CONNECTION_ID.getKey(), CONNECTION_ID.toString()); assertThat(getLastSender()).isEqualTo(actorSystem.deadLetters()); }}; } diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/amqp/AmqpPublisherActorTest.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/amqp/AmqpPublisherActorTest.java index 1ddd0b7911..daa49a1427 100644 --- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/amqp/AmqpPublisherActorTest.java +++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/amqp/AmqpPublisherActorTest.java @@ -489,7 +489,7 @@ protected void verifyAcknowledgements(final Supplier ackSuppli final Acknowledgements acks = acksFuture.join(); for (final Acknowledgement ack : acks.getSuccessfulAcknowledgements()) { - assertThat(ack.getLabel().toString()).isEqualTo("please-verify"); + assertThat(ack.getLabel().toString()).hasToString("please-verify"); assertThat(ack.getHttpStatus()).isEqualTo(HttpStatus.OK); } } diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/httppush/HttpPublisherActorTest.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/httppush/HttpPublisherActorTest.java index 3a7db04943..4040777d42 100644 --- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/httppush/HttpPublisherActorTest.java +++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/httppush/HttpPublisherActorTest.java @@ -172,7 +172,7 @@ protected void verifyAcknowledgements(final Supplier ackSuppli final var acks = ackSupplier.get(); assertThat(acks.getSize()).describedAs("Expect 1 acknowledgement in: " + acks).isEqualTo(1); final var ack = acks.stream().findAny().orElseThrow(); - assertThat(ack.getLabel().toString()).describedAs("Ack label").isEqualTo("please-verify"); + assertThat(ack.getLabel().toString()).describedAs("Ack label").hasToString("please-verify"); assertThat(ack.getHttpStatus()).describedAs("Ack status").isEqualTo(HttpStatus.OK); assertThat(ack.getEntity()).contains(JsonFactory.readFrom(BODY)); assertThat(ack.getDittoHeaders()).containsAllEntriesOf( @@ -286,7 +286,7 @@ public void testMessageCommandHttpPushCreatesCommandResponse() { assertThat(responseMessage.getPayload()).contains(jsonResponse); final var responseMessageHeaders = responseMessage.getHeaders(); - assertThat(responseMessageHeaders.get(CUSTOM_HEADER_NAME)).isEqualTo(CUSTOM_HEADER_VALUE); + assertThat(responseMessageHeaders).containsKey(CUSTOM_HEADER_NAME); }}; } @@ -426,7 +426,7 @@ public void testMessageCommandHttpPushCreatesCommandResponseFromProtocolMessage( assertThat(responseMessage.getPayload()).contains(jsonResponse); final var responseMessageHeaders = responseMessage.getHeaders(); - assertThat(responseMessageHeaders.get(CUSTOM_HEADER_NAME)).isEqualTo(CUSTOM_HEADER_VALUE); + assertThat(responseMessageHeaders).containsKey(CUSTOM_HEADER_NAME); }}; } @@ -790,6 +790,7 @@ public void testAzMonitorRequestSigning() throws Exception { } @Test + @SuppressWarnings("secrets:S6290") public void testAwsRequestSigning() throws Exception { new TestKit(actorSystem) {{ // GIVEN: HTTP publisher actor configured to authenticate by HMAC request signing diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/kafka/KafkaAuthenticationSpecificConfigTest.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/kafka/KafkaAuthenticationSpecificConfigTest.java index 865f64aafc..1cd073eb14 100644 --- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/kafka/KafkaAuthenticationSpecificConfigTest.java +++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/kafka/KafkaAuthenticationSpecificConfigTest.java @@ -163,8 +163,8 @@ private void shouldNotContainSaslMechanism(final Connection connection) { private void shouldContainPlainSaslMechanism(final Connection connection) { final Map properties = underTest.apply(connection); - assertThat(properties.get(SaslConfigs.SASL_MECHANISM)).isEqualTo(KNOWN_PLAIN_SASL_MECHANISM); - assertThat(properties.get(SaslConfigs.SASL_JAAS_CONFIG)).isEqualTo( + assertThat(properties).containsEntry(SaslConfigs.SASL_MECHANISM, KNOWN_PLAIN_SASL_MECHANISM); + assertThat(properties).containsEntry(SaslConfigs.SASL_JAAS_CONFIG, "org.apache.kafka.common.security.plain.PlainLoginModule required username=\"" + KNOWN_USER + "\" password=\"" + KNOWN_PASSWORD + "\";" ); @@ -173,8 +173,8 @@ private void shouldContainPlainSaslMechanism(final Connection connection) { private void shouldContainScramSaslMechanism(final Connection connection, final String mechanism) { final Map properties = underTest.apply(connection); - assertThat(properties.get(SaslConfigs.SASL_MECHANISM)).isEqualTo(mechanism); - assertThat(properties.get(SaslConfigs.SASL_JAAS_CONFIG)).isEqualTo( + assertThat(properties).containsEntry(SaslConfigs.SASL_MECHANISM, mechanism); + assertThat(properties).containsEntry(SaslConfigs.SASL_JAAS_CONFIG, "org.apache.kafka.common.security.scram.ScramLoginModule required username=\"" + KNOWN_USER + "\" password=\"" + KNOWN_PASSWORD + "\";" ); diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/monitoring/metrics/MetricsAlertGaugeTest.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/monitoring/metrics/MetricsAlertGaugeTest.java index 8790fd5972..6130b66d2c 100644 --- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/monitoring/metrics/MetricsAlertGaugeTest.java +++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/monitoring/metrics/MetricsAlertGaugeTest.java @@ -60,7 +60,7 @@ public void reset() { sut.set(5L); assertThat(sut.get()).isEqualTo(5L); sut.reset(); - assertThat(sut.get()).isEqualTo(0L); + assertThat(sut.get()).isZero(); } @Test diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/monitoring/metrics/SlidingWindowCounterTest.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/monitoring/metrics/SlidingWindowCounterTest.java index 23bf02e3f8..0edaf50c27 100644 --- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/monitoring/metrics/SlidingWindowCounterTest.java +++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/monitoring/metrics/SlidingWindowCounterTest.java @@ -84,10 +84,12 @@ public void testOneMeasurementEveryMs() { final Map success = counter.getCounts(true); final Map failure = counter.getCounts(false); - assertThat(success).containsEntry(ONE_MINUTE_WITH_TEN_SECONDS_RESOLUTION.getWindow(), 60L); - assertThat(success).containsEntry(ONE_HOUR_WITH_ONE_MINUTE_RESOLUTION.getWindow(), 3600L); - assertThat(failure).containsEntry(ONE_MINUTE_WITH_TEN_SECONDS_RESOLUTION.getWindow(), 12L); - assertThat(failure).containsEntry(ONE_HOUR_WITH_ONE_MINUTE_RESOLUTION.getWindow(), 720L); + assertThat(success) + .containsEntry(ONE_MINUTE_WITH_TEN_SECONDS_RESOLUTION.getWindow(), 60L) + .containsEntry(ONE_HOUR_WITH_ONE_MINUTE_RESOLUTION.getWindow(), 3600L); + assertThat(failure) + .containsEntry(ONE_MINUTE_WITH_TEN_SECONDS_RESOLUTION.getWindow(), 12L) + .containsEntry(ONE_HOUR_WITH_ONE_MINUTE_RESOLUTION.getWindow(), 720L); } @@ -115,9 +117,10 @@ public void testCounterWritingToCustomMeasurementWindows() { final Map success = counter.getCounts(true); - assertThat(success).containsEntry(ONE_MINUTE_WITH_TEN_SECONDS_RESOLUTION.getWindow(), 1L); - assertThat(success).containsEntry(ONE_HOUR_WITH_ONE_MINUTE_RESOLUTION.getWindow(), 60L); - assertThat(success).containsEntry(ONE_DAY_WITH_ONE_HOUR_RESOLUTION.getWindow(), 1440L); + assertThat(success) + .containsEntry(ONE_MINUTE_WITH_TEN_SECONDS_RESOLUTION.getWindow(), 1L) + .containsEntry(ONE_HOUR_WITH_ONE_MINUTE_RESOLUTION.getWindow(), 60L) + .containsEntry(ONE_DAY_WITH_ONE_HOUR_RESOLUTION.getWindow(), 1440L); } @Test @@ -149,14 +152,17 @@ public void testCounterWithThrottledAlert() { // verify measurements of the observed counter is correct final Map success = consumedInboundCounter.getCounts(true); - assertThat(success).containsEntry(ONE_MINUTE_WITH_TEN_SECONDS_RESOLUTION.getWindow(), 3L); - assertThat(success).containsEntry(ONE_HOUR_WITH_ONE_MINUTE_RESOLUTION.getWindow(), 14L); + assertThat(success) + .containsEntry(ONE_MINUTE_WITH_TEN_SECONDS_RESOLUTION.getWindow(), 3L) + .containsEntry(ONE_HOUR_WITH_ONE_MINUTE_RESOLUTION.getWindow(), 14L); final Map throttled = throttledCounter.getCounts(false); - // last minute was throttled - assertThat(throttled).containsEntry(ONE_MINUTE_WITH_TEN_SECONDS_RESOLUTION.getWindow(), 1L); - // 3 minutes within last hour were "throttled" - assertThat(throttled).containsEntry(ONE_HOUR_WITH_ONE_MINUTE_RESOLUTION.getWindow(), 3L); + + assertThat(throttled) + // last minute was throttled + .containsEntry(ONE_MINUTE_WITH_TEN_SECONDS_RESOLUTION.getWindow(), 1L) + // 3 minutes within last hour were "throttled" + .containsEntry(ONE_HOUR_WITH_ONE_MINUTE_RESOLUTION.getWindow(), 3L); } private void increment(final SlidingWindowCounter counter, final int count, final long ts) { @@ -207,4 +213,5 @@ public void reset() { counter.reset(); } } + } diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/MqttSpecificConfigTest.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/MqttSpecificConfigTest.java index 8332b0b314..1a7a98452b 100644 --- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/MqttSpecificConfigTest.java +++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/MqttSpecificConfigTest.java @@ -78,7 +78,7 @@ public void parseMqttSpecificConfig() throws IllegalKeepAliveIntervalSecondsExce .isEqualTo(KeepAliveInterval.of(Duration.ofSeconds(30L))); assertThat(specificConfig.getMqttLastWillTopic()).contains(MqttTopic.of("lastWillTopic")); assertThat(specificConfig.getLastWillQosOrThrow()).isEqualTo(MqttQos.AT_LEAST_ONCE); - assertThat(specificConfig.getMqttWillRetain()).isEqualTo(true); + assertThat(specificConfig.getMqttWillRetain()).isTrue(); assertThat(specificConfig.getMqttWillMessage()).contains("last will message"); } diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/ReconnectDelayTest.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/ReconnectDelayTest.java index 73b5014310..96aafa2527 100644 --- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/ReconnectDelayTest.java +++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/ReconnectDelayTest.java @@ -68,9 +68,9 @@ public void compareToWorksAsExpected() { final var reconnectDelayOneSecond = ReconnectDelay.ofOrLowerBoundary(Duration.ofSeconds(1L)); final var reconnectDelayTwoSeconds = ReconnectDelay.ofOrLowerBoundary(Duration.ofSeconds(2L)); - assertThat(reconnectDelayOneSecond).isEqualByComparingTo(reconnectDelayOneSecond); - assertThat(reconnectDelayOneSecond).isLessThan(reconnectDelayTwoSeconds); - assertThat(reconnectDelayTwoSeconds).isGreaterThan(reconnectDelayOneSecond); + assertThat(reconnectDelayOneSecond).isEqualByComparingTo(reconnectDelayOneSecond) + .isLessThan(reconnectDelayTwoSeconds) + .isGreaterThan(reconnectDelayOneSecond); } @Test diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/hivemq/message/publish/GenericMqttPublishTest.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/hivemq/message/publish/GenericMqttPublishTest.java index 402bdb4f36..e257e9aee5 100644 --- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/hivemq/message/publish/GenericMqttPublishTest.java +++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/hivemq/message/publish/GenericMqttPublishTest.java @@ -250,7 +250,7 @@ public void toStringReturnsExpected() { Mockito.when(mqtt3Publish.toString()).thenReturn(stringRepresentation); final var underTest = GenericMqttPublish.ofMqtt3Publish(mqtt3Publish); - assertThat(underTest.toString()).isEqualTo(stringRepresentation); + assertThat(underTest.toString()).hasToString(stringRepresentation); } } @@ -522,7 +522,7 @@ public void toStringReturnsExpected() { Mockito.when(mqtt5Publish.toString()).thenReturn(stringRepresentation); final var underTest = GenericMqttPublish.ofMqtt5Publish(mqtt5Publish); - assertThat(underTest.toString()).isEqualTo(stringRepresentation); + assertThat(underTest.toString()).hasToString(stringRepresentation); } } diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/rabbitmq/RabbitMQPublisherActorTest.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/rabbitmq/RabbitMQPublisherActorTest.java index 453f58b25b..b9cbaf8c49 100644 --- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/rabbitmq/RabbitMQPublisherActorTest.java +++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/rabbitmq/RabbitMQPublisherActorTest.java @@ -153,7 +153,7 @@ protected void verifyAcknowledgements(final Supplier ackSuppli final Acknowledgements acks = acksFuture.join(); assertThat(acks.getSize()).describedAs("Expect 1 acknowledgement in: " + acks).isEqualTo(1); final Acknowledgement ack = acks.stream().findAny().orElseThrow(); - assertThat(ack.getLabel().toString()).describedAs("Ack label").isEqualTo("please-verify"); + assertThat(ack.getLabel().toString()).describedAs("Ack label").hasToString("please-verify"); assertThat(ack.getHttpStatus()).describedAs("Ack status").isEqualTo(HttpStatus.OK); } @@ -173,15 +173,15 @@ protected void verifyPublishedMessage() throws Exception { verify(channel, timeout(1000)).basicPublish(eq("exchange"), eq("outbound"), eq(true), propertiesCaptor.capture(), bodyCaptor.capture()); - assertThat(propertiesCaptor.getValue().getHeaders().get("thing_id")) - .isEqualTo(TestConstants.Things.THING_ID.toString()); - assertThat(propertiesCaptor.getValue().getHeaders().get("suffixed_thing_id")).isEqualTo( - TestConstants.Things.THING_ID + ".some.suffix"); - assertThat(propertiesCaptor.getValue().getHeaders().get("prefixed_thing_id")).isEqualTo( - "some.prefix." + TestConstants.Things.THING_ID); - assertThat(propertiesCaptor.getValue().getHeaders().get("eclipse")).isEqualTo("ditto"); - assertThat(propertiesCaptor.getValue().getHeaders().get("device_id")) - .isEqualTo(TestConstants.Things.THING_ID.toString()); + assertThat(propertiesCaptor.getValue().getHeaders()) + .containsEntry("thing_id", TestConstants.Things.THING_ID.toString()); + assertThat(propertiesCaptor.getValue().getHeaders()) + .containsEntry("suffixed_thing_id", TestConstants.Things.THING_ID + ".some.suffix"); + assertThat(propertiesCaptor.getValue().getHeaders()) + .containsEntry("prefixed_thing_id", "some.prefix." + TestConstants.Things.THING_ID); + assertThat(propertiesCaptor.getValue().getHeaders()).containsEntry("eclipse", "ditto"); + assertThat(propertiesCaptor.getValue().getHeaders()) + .containsEntry("device_id", TestConstants.Things.THING_ID.toString()); } @Override @@ -205,9 +205,10 @@ protected void verifyPublishedMessageToReplyTarget() throws Exception { propertiesCaptor.capture(), bodyCaptor.capture()); - assertThat(propertiesCaptor.getValue().getHeaders().get("correlation-id")).isEqualTo( - TestConstants.CORRELATION_ID); - assertThat(propertiesCaptor.getValue().getHeaders().get("mappedHeader2")).isEqualTo("thing:id"); + assertThat(propertiesCaptor.getValue().getHeaders()) + .containsEntry("correlation-id", TestConstants.CORRELATION_ID); + assertThat(propertiesCaptor.getValue().getHeaders()) + .containsEntry("mappedHeader2", "thing:id"); } protected String getOutboundAddress() { @@ -242,4 +243,5 @@ private Pair setUpPublishConfirmMode() { throw new AssertionError(e); } } + } diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/tunnel/SshTunnelStateTest.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/tunnel/SshTunnelStateTest.java index 4d500df18b..2c7fb8eb7e 100644 --- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/tunnel/SshTunnelStateTest.java +++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/tunnel/SshTunnelStateTest.java @@ -22,7 +22,6 @@ import org.eclipse.ditto.connectivity.model.Connection; import org.eclipse.ditto.connectivity.service.messaging.TestConstants; -import org.junit.Ignore; import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; @@ -117,7 +116,7 @@ private void assertClosed(final SshTunnelState closed) { assertThat(closed.isEstablished()).isFalse(); assertThat(closed.isFailed()).isFalse(); - assertThat(closed.getLocalPort()).isEqualTo(0); + assertThat(closed.getLocalPort()).isZero(); assertThat(closed.getReason()).isNull(); assertThatExceptionOfType(IllegalStateException.class) .isThrownBy(() -> closed.getURI(CONNECTION_WITH_TUNNEL)); @@ -128,7 +127,7 @@ private void assertFailed(final SshTunnelState failed) { assertThat(failed.isEstablished()).isFalse(); assertThat(failed.isFailed()).isTrue(); - assertThat(failed.getLocalPort()).isEqualTo(0); + assertThat(failed.getLocalPort()).isZero(); assertThat(failed.getReason()).isInstanceOf(IllegalStateException.class); assertThatExceptionOfType(IllegalStateException.class) .isThrownBy(() -> failed.getURI(CONNECTION_WITH_TUNNEL)); @@ -139,7 +138,7 @@ private void assertDisabled(final SshTunnelState disabled, final Connection conn assertThat(disabled.isEstablished()).isFalse(); assertThat(disabled.isFailed()).isFalse(); - assertThat(disabled.getLocalPort()).isEqualTo(0); + assertThat(disabled.getLocalPort()).isZero(); assertThat(disabled.getReason()).isNull(); assertThat(disabled.getURI(connection)).isEqualTo(URI.create(connection.getUri())); } diff --git a/edge/service/src/main/java/org/eclipse/ditto/edge/service/dispatching/AskWithRetryCommandForwarder.java b/edge/service/src/main/java/org/eclipse/ditto/edge/service/dispatching/AskWithRetryCommandForwarder.java index 0c8f6f51ba..d5a1ba1492 100644 --- a/edge/service/src/main/java/org/eclipse/ditto/edge/service/dispatching/AskWithRetryCommandForwarder.java +++ b/edge/service/src/main/java/org/eclipse/ditto/edge/service/dispatching/AskWithRetryCommandForwarder.java @@ -184,8 +184,8 @@ private > Function getResponseCaster(fin private DittoRuntimeException reportErrorOrResponse(final Command command, @Nullable final Object response) { - if (response instanceof Throwable) { - return reportError(command, (Throwable) response); + if (response instanceof Throwable throwable) { + return reportError(command, throwable); } else if (response != null) { return reportUnknownResponse(command, response); } else { diff --git a/edge/service/src/main/java/org/eclipse/ditto/edge/service/placeholders/ImmutableFeaturePlaceholder.java b/edge/service/src/main/java/org/eclipse/ditto/edge/service/placeholders/ImmutableFeaturePlaceholder.java index 4a1f3a6bc9..cce7444e0c 100644 --- a/edge/service/src/main/java/org/eclipse/ditto/edge/service/placeholders/ImmutableFeaturePlaceholder.java +++ b/edge/service/src/main/java/org/eclipse/ditto/edge/service/placeholders/ImmutableFeaturePlaceholder.java @@ -17,7 +17,6 @@ import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; import javax.annotation.concurrent.Immutable; @@ -87,7 +86,7 @@ private static List resolveFeatureIds(final JsonPointer path, final Json if (value.isObject()) { final Thing thing = ThingsModelFactory.newThing(value.asObject()); featureIds = thing.getFeatures() - .map(features -> features.stream().map(Feature::getId).collect(Collectors.toList())) + .map(features -> features.stream().map(Feature::getId).toList()) .orElseGet(List::of); } else { LOGGER.info("Signal had empty path but non-object value. Can't resolve placeholder ."); @@ -107,7 +106,7 @@ private static List resolveFeatureIds(final JsonPointer path, final Json featureIds = ThingsModelFactory.newFeatures(value.asObject()) .stream() .map(Feature::getId) - .collect(Collectors.toList()); + .toList(); } else { featureIds = List.of(); } diff --git a/edge/service/src/main/java/org/eclipse/ditto/edge/service/placeholders/ImmutablePolicyPlaceholder.java b/edge/service/src/main/java/org/eclipse/ditto/edge/service/placeholders/ImmutablePolicyPlaceholder.java index 3fa03fc1fd..d3a9cf9c7e 100644 --- a/edge/service/src/main/java/org/eclipse/ditto/edge/service/placeholders/ImmutablePolicyPlaceholder.java +++ b/edge/service/src/main/java/org/eclipse/ditto/edge/service/placeholders/ImmutablePolicyPlaceholder.java @@ -44,8 +44,8 @@ public String getPrefix() { public List resolveValues(final EntityId policyId, final String placeholder) { argumentNotEmpty(placeholder, "placeholder"); checkNotNull(policyId, "Policy ID"); - if (policyId instanceof PolicyId) { - return doResolve(((PolicyId) policyId), placeholder); + if (policyId instanceof PolicyId policyId1) { + return doResolve(policyId1, placeholder); } else { return Collections.emptyList(); } diff --git a/edge/service/src/main/java/org/eclipse/ditto/edge/service/placeholders/ImmutableRequestPlaceholder.java b/edge/service/src/main/java/org/eclipse/ditto/edge/service/placeholders/ImmutableRequestPlaceholder.java index dfc4091f17..5f3eb8e60e 100644 --- a/edge/service/src/main/java/org/eclipse/ditto/edge/service/placeholders/ImmutableRequestPlaceholder.java +++ b/edge/service/src/main/java/org/eclipse/ditto/edge/service/placeholders/ImmutableRequestPlaceholder.java @@ -15,7 +15,6 @@ import java.util.Collections; import java.util.List; import java.util.Optional; -import java.util.stream.Collectors; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; @@ -63,7 +62,7 @@ public List resolveValues(@Nullable final AuthorizationContext authoriza return Optional.ofNullable(authorizationContext) .map(context -> context.getAuthorizationSubjects().stream() .map(AuthorizationSubject::getId) - .collect(Collectors.toList())) + .toList()) .orElseGet(Collections::emptyList); } diff --git a/edge/service/src/main/java/org/eclipse/ditto/edge/service/placeholders/ImmutableThingPlaceholder.java b/edge/service/src/main/java/org/eclipse/ditto/edge/service/placeholders/ImmutableThingPlaceholder.java index d142007750..f4c80b3cbd 100644 --- a/edge/service/src/main/java/org/eclipse/ditto/edge/service/placeholders/ImmutableThingPlaceholder.java +++ b/edge/service/src/main/java/org/eclipse/ditto/edge/service/placeholders/ImmutableThingPlaceholder.java @@ -44,8 +44,8 @@ public String getPrefix() { public List resolveValues(final EntityId thingId, final String placeholder) { argumentNotEmpty(placeholder, "placeholder"); checkNotNull(thingId, "Thing ID"); - if (thingId instanceof ThingId) { - return doResolve(((ThingId) thingId), placeholder); + if (thingId instanceof ThingId thingId1) { + return doResolve(thingId1, placeholder); } else { return Collections.emptyList(); } diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/directives/RequestLoggingFilter.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/directives/RequestLoggingFilter.java index 455292da7d..44c6462ba9 100644 --- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/directives/RequestLoggingFilter.java +++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/directives/RequestLoggingFilter.java @@ -15,7 +15,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import java.util.stream.Collectors; import java.util.stream.StreamSupport; import akka.http.javadsl.model.HttpHeader; @@ -106,6 +105,7 @@ static Iterable filterHeaders(final Iterable headers) { return header; } }) - .collect(Collectors.toList()); + .toList(); } + } diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/directives/RequestResultLoggingDirective.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/directives/RequestResultLoggingDirective.java index 42759065de..d6fdcd3811 100755 --- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/directives/RequestResultLoggingDirective.java +++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/directives/RequestResultLoggingDirective.java @@ -63,8 +63,7 @@ public static Route logRequestResult(final CharSequence correlationId, final Sup final String filteredRelativeRequestUri = filterUri(request.getUri().toRelative()).toString(); return mapRouteResult(routeResult -> { final ThreadSafeDittoLogger logger = LOGGER.withCorrelationId(correlationId); - if (routeResult instanceof Complete) { - final Complete complete = (Complete) routeResult; + if (routeResult instanceof Complete complete) { final int statusCode = complete.getResponse().status().intValue(); logger.info("StatusCode of request {} '{}' was: {}", requestMethod, filteredRelativeRequestUri, statusCode); diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/directives/RequestTracingDirective.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/directives/RequestTracingDirective.java index 2d06f209f3..29dea002a0 100644 --- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/directives/RequestTracingDirective.java +++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/directives/RequestTracingDirective.java @@ -76,8 +76,7 @@ public static Route traceRequest(final CharSequence correlationId, final Supplie private static RouteResult handleRouteResult(final StartedTrace startedTrace, final String requestMethod, final String filteredRelativeRequestUri, final RouteResult routeResult) { try { - if (routeResult instanceof Complete) { - final Complete complete = (Complete) routeResult; + if (routeResult instanceof Complete complete) { final int statusCode = complete.getResponse().status().intValue(); startedTrace.tag(TracingTags.REQUEST_METHOD, requestMethod); startedTrace.tag(TracingTags.STATUS_CODE, statusCode); diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/directives/auth/GatewayAuthenticationDirective.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/directives/auth/GatewayAuthenticationDirective.java index a94a3e1191..c0c9fed439 100755 --- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/directives/auth/GatewayAuthenticationDirective.java +++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/directives/auth/GatewayAuthenticationDirective.java @@ -109,10 +109,10 @@ private Route handleAuthenticationTry(final Try authentica private Route handleFailedAuthentication(final Throwable reasonOfFailure, final Uri requestUri, final DittoHeaders dittoHeaders) { - if (reasonOfFailure instanceof DittoRuntimeException) { + if (reasonOfFailure instanceof DittoRuntimeException dittoRuntimeException) { LOGGER.debug("Authentication for URI <{}> failed. Rethrow DittoRuntimeException.", requestUri, reasonOfFailure); - throw (DittoRuntimeException) reasonOfFailure; + throw dittoRuntimeException; } LOGGER.debug("Unexpected error during authentication for URI <{}>! Applying unauthorizedDirective", diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/sse/ThingsSseRouteBuilder.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/sse/ThingsSseRouteBuilder.java index fcc80d4178..ef10171870 100644 --- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/sse/ThingsSseRouteBuilder.java +++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/sse/ThingsSseRouteBuilder.java @@ -32,7 +32,6 @@ import java.util.concurrent.CompletionStage; import java.util.function.Supplier; import java.util.regex.Pattern; -import java.util.stream.Collectors; import java.util.stream.Stream; import java.util.stream.StreamSupport; @@ -662,7 +661,7 @@ private static List getThingIds(@Nullable final String thingIdString) { if (null != thingIdString) { return Stream.of(thingIdString.split(",")) .map(ThingId::of) - .collect(Collectors.toList()); + .toList(); } return Collections.emptyList(); } diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/things/ThingsRoute.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/things/ThingsRoute.java index 7bf057e5b9..783c0fb510 100755 --- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/things/ThingsRoute.java +++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/things/ThingsRoute.java @@ -19,7 +19,6 @@ import java.util.Optional; import java.util.function.Function; import java.util.function.Predicate; -import java.util.stream.Collectors; import java.util.stream.Stream; import javax.annotation.Nullable; @@ -279,7 +278,7 @@ private static List splitThingIdString(final String thingIdString) { } else { result = Stream.of(thingIdString.split(",")) .map(ThingId::of) - .collect(Collectors.toList()); + .toList(); } return result; diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/websocket/WebSocketRoute.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/websocket/WebSocketRoute.java index 0436879650..45e938b897 100755 --- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/websocket/WebSocketRoute.java +++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/websocket/WebSocketRoute.java @@ -870,14 +870,14 @@ private static Adaptable jsonifiableToAdaptable(final Jsonifiable.WithPredicate< final Adaptable adaptable; if (jsonifiable instanceof Signal) { adaptable = adapter.toAdaptable((Signal) jsonifiable); - } else if (jsonifiable instanceof DittoRuntimeException) { + } else if (jsonifiable instanceof DittoRuntimeException dittoRuntimeException) { final Signal signal; if (jsonifiable instanceof PolicyException) { - signal = buildPolicyErrorResponse((DittoRuntimeException) jsonifiable); + signal = buildPolicyErrorResponse(dittoRuntimeException); } else if (jsonifiable instanceof ThingSearchException) { - signal = buildSearchErrorResponse((DittoRuntimeException) jsonifiable); + signal = buildSearchErrorResponse(dittoRuntimeException); } else { - signal = buildThingErrorResponse((DittoRuntimeException) jsonifiable); + signal = buildThingErrorResponse(dittoRuntimeException); } adaptable = adapter.toAdaptable(signal); } else { diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/whoami/DefaultUserInformation.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/whoami/DefaultUserInformation.java index c0a854d9d4..6dd1594257 100644 --- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/whoami/DefaultUserInformation.java +++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/whoami/DefaultUserInformation.java @@ -26,15 +26,15 @@ import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; +import org.eclipse.ditto.base.model.auth.AuthorizationContext; +import org.eclipse.ditto.base.model.auth.AuthorizationSubject; +import org.eclipse.ditto.base.model.json.JsonSchemaVersion; import org.eclipse.ditto.json.JsonCollectors; import org.eclipse.ditto.json.JsonFactory; import org.eclipse.ditto.json.JsonField; import org.eclipse.ditto.json.JsonObject; import org.eclipse.ditto.json.JsonObjectBuilder; import org.eclipse.ditto.json.JsonValue; -import org.eclipse.ditto.base.model.auth.AuthorizationContext; -import org.eclipse.ditto.base.model.auth.AuthorizationSubject; -import org.eclipse.ditto.base.model.json.JsonSchemaVersion; /** * Default implementation of {@link UserInformation}. @@ -68,7 +68,8 @@ public static DefaultUserInformation fromAuthorizationContext(final Authorizatio final List subjects = context.getAuthorizationSubjects() .stream() .map(AuthorizationSubject::getId) - .collect(Collectors.toList()); + .toList(); + return new DefaultUserInformation(defaultSubject, subjects); } diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/health/ClusterStatusAndHealthHelper.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/health/ClusterStatusAndHealthHelper.java index 9165250363..dce75c8326 100644 --- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/health/ClusterStatusAndHealthHelper.java +++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/health/ClusterStatusAndHealthHelper.java @@ -26,15 +26,8 @@ import java.util.concurrent.CompletionStage; import java.util.function.Function; import java.util.function.Supplier; -import java.util.stream.Collectors; import org.eclipse.ditto.base.service.CompletableFutureUtils; -import org.eclipse.ditto.json.JsonArray; -import org.eclipse.ditto.json.JsonCollectors; -import org.eclipse.ditto.json.JsonFactory; -import org.eclipse.ditto.json.JsonObject; -import org.eclipse.ditto.json.JsonObjectBuilder; -import org.eclipse.ditto.json.JsonValue; import org.eclipse.ditto.gateway.service.util.config.health.HealthCheckConfig; import org.eclipse.ditto.internal.utils.akka.SimpleCommand; import org.eclipse.ditto.internal.utils.akka.SimpleCommandResponse; @@ -43,6 +36,12 @@ import org.eclipse.ditto.internal.utils.health.cluster.ClusterRoleStatus; import org.eclipse.ditto.internal.utils.health.cluster.ClusterStatus; import org.eclipse.ditto.internal.utils.health.status.StatusSupplierActor; +import org.eclipse.ditto.json.JsonArray; +import org.eclipse.ditto.json.JsonCollectors; +import org.eclipse.ditto.json.JsonFactory; +import org.eclipse.ditto.json.JsonObject; +import org.eclipse.ditto.json.JsonObjectBuilder; +import org.eclipse.ditto.json.JsonValue; import akka.actor.ActorSystem; import akka.pattern.Patterns; @@ -133,7 +132,7 @@ CompletionStage retrieveOverallRolesStatus() { return roleStatusFuture.thenApply(rolesStatus -> JsonObject.newBuilder().set(role, rolesStatus).build()); - }).collect(Collectors.toList()); + }).toList(); return CompletableFutureUtils.collectAsList(statuses).thenApply(roleStatuses -> { final JsonObjectBuilder rolesStatusBuilder = JsonFactory.newObjectBuilder(); @@ -229,7 +228,7 @@ CompletionStage retrieveOverallRolesHealth() { }) .thenApply(roleStatus -> roleStatus.label(roleLabel)); }) - .collect(Collectors.toList())); + .toList()); return CompletableFutureUtils.collectAsList(healths) .thenApply(statuses -> StatusInfo.composite(statuses).label(JSON_KEY_ROLES)); @@ -254,7 +253,7 @@ private List> sendCommandToRemoteAddresses(final ActorS responseTransformer.apply(response, throwable, addressString)) .toCompletableFuture(); }) - .collect(Collectors.toList()); + .toList(); } @FunctionalInterface diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/proxy/actors/StatisticsActor.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/proxy/actors/StatisticsActor.java index 84f3f752cc..74d18f9312 100755 --- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/proxy/actors/StatisticsActor.java +++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/proxy/actors/StatisticsActor.java @@ -24,7 +24,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.Consumer; import java.util.function.Predicate; -import java.util.stream.Collectors; import java.util.stream.Stream; import javax.annotation.Nonnull; @@ -148,7 +147,7 @@ public Receive createReceive() { .getRoles() .stream() .filter(this::hasRelevantRole) - .collect(Collectors.toList()); + .toList(); tellRelevantRootActorsToRetrieveStatistics(relevantRoles, retrieveStatistics); becomeStatisticsDetailsAwaiting(relevantRoles, details -> respondWithStatisticsDetails(retrieveStatistics, details, sender)); diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/security/authentication/AbstractAuthenticationResult.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/security/authentication/AbstractAuthenticationResult.java index ea4a76fdea..7113776a58 100644 --- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/security/authentication/AbstractAuthenticationResult.java +++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/security/authentication/AbstractAuthenticationResult.java @@ -63,8 +63,8 @@ public boolean isSuccess() { @Override public AuthorizationContext getAuthorizationContext() { if (null == authorizationContext) { - if (reasonOfFailure instanceof RuntimeException) { - throw (RuntimeException) reasonOfFailure; + if (reasonOfFailure instanceof RuntimeException runtimeException) { + throw runtimeException; } throw new IllegalStateException(reasonOfFailure); } diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/security/authentication/AuthenticationChain.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/security/authentication/AuthenticationChain.java index 91531bbbea..afd894e74a 100644 --- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/security/authentication/AuthenticationChain.java +++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/security/authentication/AuthenticationChain.java @@ -22,7 +22,6 @@ import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.Executor; -import java.util.stream.Collectors; import java.util.stream.Stream; import javax.annotation.Nullable; @@ -139,7 +138,7 @@ private AuthResultAccumulator appendResult(final AuthenticationProvider authe } else { logFailure(authenticationProvider, nextResult); final var newFailureResults = - Stream.concat(failureResults.stream(), Stream.of(nextResult)).collect(Collectors.toList()); + Stream.concat(failureResults.stream(), Stream.of(nextResult)).toList(); return new AuthResultAccumulator(successResult, newFailureResults, requestContext, dittoHeaders); } } @@ -175,8 +174,7 @@ private CompletableFuture andThen(final CompletableFuture } else { return other.thenApplyAsync(that -> { final var newFailureResults = - Stream.concat(failureResults.stream(), that.failureResults.stream()) - .collect(Collectors.toList()); + Stream.concat(failureResults.stream(), that.failureResults.stream()).toList(); return new AuthResultAccumulator(that.successResult, newFailureResults, requestContext, dittoHeaders); }, authenticationDispatcher); diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/security/authentication/DefaultAuthenticationFailureAggregator.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/security/authentication/DefaultAuthenticationFailureAggregator.java index 644c2ad57a..59f3ec6b3e 100644 --- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/security/authentication/DefaultAuthenticationFailureAggregator.java +++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/security/authentication/DefaultAuthenticationFailureAggregator.java @@ -84,13 +84,13 @@ private static List getDittoRuntimeExceptionReasonsWithDe .map(DefaultAuthenticationFailureAggregator::toDittoRuntimeException) .filter(Objects::nonNull) .filter(reasonOfFailure -> reasonOfFailure.getDescription().isPresent()) - .collect(Collectors.toList()); + .toList(); } @Nullable private static DittoRuntimeException toDittoRuntimeException(final Throwable throwable) { - if (throwable instanceof DittoRuntimeException) { - return (DittoRuntimeException) throwable; + if (throwable instanceof DittoRuntimeException dittoRuntimeException) { + return dittoRuntimeException; } else if (null == throwable) { return null; } else { diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/security/authentication/TimeMeasuringAuthenticationProvider.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/security/authentication/TimeMeasuringAuthenticationProvider.java index 5d76ba1bf4..1d5ff03822 100644 --- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/security/authentication/TimeMeasuringAuthenticationProvider.java +++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/security/authentication/TimeMeasuringAuthenticationProvider.java @@ -74,22 +74,22 @@ public final CompletableFuture authenticate(final RequestContext requestConte }) .exceptionally(error -> { final Throwable rootCause = getRootCause(error); - if (rootCause instanceof DittoRuntimeException) { - final DittoRuntimeException e = (DittoRuntimeException) rootCause; + if (rootCause instanceof DittoRuntimeException dittoRuntimeException) { timer.tag(AUTH_SUCCESS_TAG, false); - if (isInternalError(e.getHttpStatus())) { + if (isInternalError(dittoRuntimeException.getHttpStatus())) { logger.withCorrelationId(dittoHeaders) .warn("An unexpected error occurred during authentication of type <{}>.", - authorizationContextType, e); + authorizationContextType, dittoRuntimeException); timer.tag(AUTH_ERROR_TAG, true); } - return toFailedAuthenticationResult(e, dittoHeaders); + return toFailedAuthenticationResult(dittoRuntimeException, dittoHeaders); } else { timer.tag(AUTH_SUCCESS_TAG, false).tag(AUTH_ERROR_TAG, true); return toFailedAuthenticationResult(rootCause, dittoHeaders); } }); resultFuture.whenComplete((result, error) -> timer.stop()); + return resultFuture; } @@ -168,12 +168,11 @@ private static DittoRuntimeException unwrapDittoRuntimeException(final Throwable return null; } - if (throwable instanceof DittoRuntimeException) { - final DittoRuntimeException dre = (DittoRuntimeException) throwable; - if (dre.getDittoHeaders().getCorrelationId().isPresent()) { - return dre; + if (throwable instanceof DittoRuntimeException dittoRuntimeException) { + if (dittoRuntimeException.getDittoHeaders().getCorrelationId().isPresent()) { + return dittoRuntimeException; } - return dre.setDittoHeaders(dittoHeaders); + return dittoRuntimeException.setDittoHeaders(dittoHeaders); } return unwrapDittoRuntimeException(throwable.getCause(), dittoHeaders); @@ -193,4 +192,5 @@ protected static DittoRuntimeException buildInternalErrorException(final Throwab .cause(cause) .build(); } + } diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/security/authentication/jwt/JwtPlaceholder.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/security/authentication/jwt/JwtPlaceholder.java index fc3ae88190..586fa7a78d 100644 --- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/security/authentication/jwt/JwtPlaceholder.java +++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/security/authentication/jwt/JwtPlaceholder.java @@ -18,7 +18,6 @@ import java.util.Collections; import java.util.List; import java.util.Optional; -import java.util.stream.Collectors; import org.eclipse.ditto.json.JsonValue; import org.eclipse.ditto.jwt.model.JsonWebToken; @@ -69,7 +68,7 @@ public List resolveValues(final JsonWebToken jwt, final String placehold .map(JsonValue::asArray) .map(array -> array.stream() .map(JsonValue::formatAsString) - .collect(Collectors.toList())) + .toList()) .or(() -> value.map(JsonValue::formatAsString) .map(Collections::singletonList)) .orElseGet(Collections::emptyList); diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/security/authentication/jwt/JwtSubjectIssuersConfig.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/security/authentication/jwt/JwtSubjectIssuersConfig.java index 2b558d404c..49bc8a7135 100644 --- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/security/authentication/jwt/JwtSubjectIssuersConfig.java +++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/security/authentication/jwt/JwtSubjectIssuersConfig.java @@ -122,7 +122,7 @@ public Collection getConfigItems(final SubjectIssuer sub return subjectIssuerConfigMap.values().stream() .filter(jwtSubjectIssuerConfig -> jwtSubjectIssuerConfig.getSubjectIssuer().equals(subjectIssuer)) - .collect(Collectors.toList()); + .toList(); } @Override diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/security/authentication/preauth/PreAuthenticatedAuthenticationProvider.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/security/authentication/preauth/PreAuthenticatedAuthenticationProvider.java index 24797cbd74..7c34fd3220 100644 --- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/security/authentication/preauth/PreAuthenticatedAuthenticationProvider.java +++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/security/authentication/preauth/PreAuthenticatedAuthenticationProvider.java @@ -18,7 +18,6 @@ import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.function.Predicate; -import java.util.stream.Collectors; import javax.annotation.concurrent.Immutable; @@ -143,7 +142,7 @@ private static List getAuthorizationSubjects(final String .map(String::trim) .filter(Predicate.not(String::isEmpty)) .map(AuthorizationModelFactory::newAuthSubject) - .collect(Collectors.toList()); + .toList(); } private static DittoRuntimeException buildFailedToExtractAuthorizationSubjectsException( diff --git a/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/endpoints/actors/AbstractHttpRequestActorTest.java b/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/endpoints/actors/AbstractHttpRequestActorTest.java index 0bf59f0299..007e2be83c 100644 --- a/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/endpoints/actors/AbstractHttpRequestActorTest.java +++ b/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/endpoints/actors/AbstractHttpRequestActorTest.java @@ -74,11 +74,11 @@ public abstract class AbstractHttpRequestActorTest { @ClassRule - public static final ActorSystemResource ACTOR_SYSTEM_RESOURCE = ActorSystemResource.newInstance( - ConfigFactory.load("test")); + public static final ActorSystemResource ACTOR_SYSTEM_RESOURCE = + ActorSystemResource.newInstance(ConfigFactory.load("test")); - static final HeaderTranslator HEADER_TRANSLATOR = HeaderTranslator.of(DittoHeaderDefinition.values(), - MessageHeaderDefinition.values()); + static final HeaderTranslator HEADER_TRANSLATOR = + HeaderTranslator.of(DittoHeaderDefinition.values(), MessageHeaderDefinition.values()); protected static GatewayConfig gatewayConfig; @@ -87,7 +87,8 @@ public abstract class AbstractHttpRequestActorTest { @BeforeClass public static void beforeClass() { - gatewayConfig = DittoGatewayConfig.of(DefaultScopedConfig.dittoScoped(ConfigFactory.load("test.conf"))); + gatewayConfig = DittoGatewayConfig.of( + DefaultScopedConfig.dittoScoped(ConfigFactory.load("test.conf"))); } void testThingModifyCommand(final ThingId thingId, @@ -99,7 +100,8 @@ void testThingModifyCommand(final ThingId thingId, final DittoHeaders expectedResponseHeaders) throws InterruptedException, ExecutionException { final var proxyActorProbe = ACTOR_SYSTEM_RESOURCE.newTestProbe(); - final var modifyAttribute = ModifyAttribute.of(thingId, attributePointer, JsonValue.of("bar"), dittoHeaders); + final var modifyAttribute = + ModifyAttribute.of(thingId, attributePointer, JsonValue.of("bar"), dittoHeaders); final var responseFuture = new CompletableFuture(); final var underTest = createHttpRequestActor(proxyActorProbe.ref(), getHttpRequest(modifyAttribute), responseFuture); @@ -128,11 +130,12 @@ void testThingModifyCommand(final ThingId thingId, assertThat(httpResponse.status()).isEqualTo(expectedHttpStatusCode); if (expectedResponseHeaders != null) { - final var expectedHttpResponseHeaders = HEADER_TRANSLATOR.toExternalHeaders(expectedResponseHeaders) - .entrySet() - .stream() - .map(e -> RawHeader.create(e.getKey(), e.getValue())) - .collect(Collectors.toList()); + final var expectedHttpResponseHeaders = + HEADER_TRANSLATOR.toExternalHeaders(expectedResponseHeaders) + .entrySet() + .stream() + .map(e -> RawHeader.create(e.getKey(), e.getValue())) + .toList(); assertThat(httpResponse.getHeaders()).isEqualTo(expectedHttpResponseHeaders); } @@ -186,7 +189,8 @@ HttpResponse testMessageCommand(final ThingId thingId, .build(); final var sendThingMessage = SendThingMessage.of(thingId, message, dittoHeaders); - final var httpRequest = HttpRequest.PUT("/api/2/things/" + thingId + "/inbox/messages/" + messageSubject); + final var httpRequest = + HttpRequest.PUT("/api/2/things/" + thingId + "/inbox/messages/" + messageSubject); final var responseFuture = new CompletableFuture(); final var underTest = createHttpRequestActor(proxyActorProbe.ref(), httpRequest, responseFuture); @@ -252,6 +256,7 @@ DittoHeaders createAuthorizedHeaders() { AuthorizationSubject.newInstance(SubjectId.newInstance(SubjectIssuer.GOOGLE, "any-google-user")), AuthorizationSubject.newInstance(SubjectId.newInstance(SubjectIssuer.INTEGRATION, "any-integration-subject"))); + return DittoHeaders.newBuilder() .correlationId(testNameCorrelationId.getCorrelationId()) .authorizationContext(context) @@ -269,6 +274,7 @@ HttpResponse createExpectedWhoamiResponse(final Whoami whoami) { .stream() .map(e -> RawHeader.create(e.getKey(), e.getValue())) .collect(Collectors.toList()); + return HttpResponse.create().withStatus(StatusCodes.OK) .withEntity(ContentTypes.APPLICATION_JSON, ByteString.fromString(userInformation.toJsonString())) .withHeaders(expectedHeaders); @@ -279,6 +285,7 @@ static AuthorizationContext getAuthContextWithPrefixedSubjectsFromHeaders(final final var authContextJson = authContextString == null ? JsonObject.empty() : JsonObject.of(authContextString); + return AuthorizationModelFactory.newAuthContext(authContextJson); } diff --git a/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/security/authentication/DefaultAuthenticationFailureAggregatorTest.java b/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/security/authentication/DefaultAuthenticationFailureAggregatorTest.java index ba10f986da..8ba68c8123 100644 --- a/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/security/authentication/DefaultAuthenticationFailureAggregatorTest.java +++ b/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/security/authentication/DefaultAuthenticationFailureAggregatorTest.java @@ -109,9 +109,8 @@ public void aggregateAuthenticationFailures() { final DittoRuntimeException dittoRuntimeException = underTest.aggregateAuthenticationFailures(authenticationResults); - assertThat(dittoRuntimeException).isExactlyInstanceOf(GatewayAuthenticationFailedException.class); - assertThat(dittoRuntimeException).hasMessage( - "Multiple authentication mechanisms were applicable but none succeeded."); + assertThat(dittoRuntimeException).isExactlyInstanceOf(GatewayAuthenticationFailedException.class) + .hasMessage("Multiple authentication mechanisms were applicable but none succeeded."); assertThat(dittoRuntimeException.getDescription()).contains( "For a successful authentication see the following suggestions: { do this }, { do that }."); assertThat(dittoRuntimeException.getDittoHeaders()).containsAllEntriesOf(expectedHeaders); diff --git a/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/security/authentication/jwt/DittoJwtAuthorizationSubjectsProviderTest.java b/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/security/authentication/jwt/DittoJwtAuthorizationSubjectsProviderTest.java index 814f767d87..05ecae5928 100644 --- a/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/security/authentication/jwt/DittoJwtAuthorizationSubjectsProviderTest.java +++ b/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/security/authentication/jwt/DittoJwtAuthorizationSubjectsProviderTest.java @@ -56,7 +56,7 @@ public void verifyThatTheDefaultJwtSubjectPlaceholderWorks() { final List authSubjects = underTest.getAuthorizationSubjects(jsonWebToken); - assertThat(authSubjects.size()).isEqualTo(1); + assertThat(authSubjects).hasSize(1); assertThat(authSubjects.get(0)).isEqualTo(AuthorizationSubject.newInstance(subjectIssuer + ":" + tokenSubject)); } @@ -74,7 +74,7 @@ public void verifyThatASingleJwtSubjectPlaceholderWorks() { final List authSubjects = underTest.getAuthorizationSubjects(jsonWebToken); - assertThat(authSubjects.size()).isEqualTo(1); + assertThat(authSubjects).hasSize(1); assertThat(authSubjects.get(0)).isEqualTo( AuthorizationSubject.newInstance(subjectIssuer + ":test-" + tokenAudience)); } diff --git a/internal/models/signalenrichment/src/main/java/org/eclipse/ditto/internal/models/signalenrichment/ByRoundTripSignalEnrichmentFacade.java b/internal/models/signalenrichment/src/main/java/org/eclipse/ditto/internal/models/signalenrichment/ByRoundTripSignalEnrichmentFacade.java index 5494b3bb39..046b361c07 100644 --- a/internal/models/signalenrichment/src/main/java/org/eclipse/ditto/internal/models/signalenrichment/ByRoundTripSignalEnrichmentFacade.java +++ b/internal/models/signalenrichment/src/main/java/org/eclipse/ditto/internal/models/signalenrichment/ByRoundTripSignalEnrichmentFacade.java @@ -90,8 +90,7 @@ public CompletionStage retrievePartialThing(final ThingId thingId, } private static CompletionStage extractPartialThing(final Object object) { - if (object instanceof RetrieveThingResponse) { - final RetrieveThingResponse retrieveThingResponse = (RetrieveThingResponse) object; + if (object instanceof RetrieveThingResponse retrieveThingResponse) { final JsonSchemaVersion jsonSchemaVersion = retrieveThingResponse.getDittoHeaders() .getSchemaVersion() .orElse(JsonSchemaVersion.LATEST); @@ -104,8 +103,8 @@ private static CompletionStage extractPartialThing(final Object obje } private static Throwable toThrowable(final Object object) { - if (object instanceof Throwable) { - return (Throwable) object; + if (object instanceof Throwable throwable) { + return throwable; } else { return new IllegalStateException("Unexpected message: " + object); } diff --git a/internal/models/signalenrichment/src/test/java/org/eclipse/ditto/internal/models/signalenrichment/SignalEnrichmentCacheKeyTest.java b/internal/models/signalenrichment/src/test/java/org/eclipse/ditto/internal/models/signalenrichment/SignalEnrichmentCacheKeyTest.java index d85fa87f8b..2897220bc1 100644 --- a/internal/models/signalenrichment/src/test/java/org/eclipse/ditto/internal/models/signalenrichment/SignalEnrichmentCacheKeyTest.java +++ b/internal/models/signalenrichment/src/test/java/org/eclipse/ditto/internal/models/signalenrichment/SignalEnrichmentCacheKeyTest.java @@ -23,7 +23,6 @@ import org.eclipse.ditto.base.model.entity.id.EntityId; import org.eclipse.ditto.base.model.entity.type.EntityType; -import org.junit.Ignore; import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; @@ -63,7 +62,7 @@ public void testSerialization() { assertThat((CharSequence) CACHE_KEY.getId()).isEqualTo(ENTITY_ID); // assert serialization - assertThat(CACHE_KEY.toString()).isEqualTo(EXPECTED_SERIALIZED_ENTITY_ID); + assertThat(CACHE_KEY.toString()).hasToString(EXPECTED_SERIALIZED_ENTITY_ID); } /** diff --git a/internal/utils/akka/src/main/java/org/eclipse/ditto/internal/utils/akka/mailbox/MonitoredUnboundedMailboxType.java b/internal/utils/akka/src/main/java/org/eclipse/ditto/internal/utils/akka/mailbox/MonitoredUnboundedMailboxType.java index 94d4b91fd1..43b08d8906 100644 --- a/internal/utils/akka/src/main/java/org/eclipse/ditto/internal/utils/akka/mailbox/MonitoredUnboundedMailboxType.java +++ b/internal/utils/akka/src/main/java/org/eclipse/ditto/internal/utils/akka/mailbox/MonitoredUnboundedMailboxType.java @@ -150,9 +150,8 @@ static final class InstrumentedMessageQueue implements MessageQueue, akka.dispat * @return the name of the actor class or empty. */ private static Optional getClassOfOwnerActorRef(final ActorRef owner) { - if (owner instanceof ActorRefWithCell) { - final ActorRefWithCell ownerWithCell = (ActorRefWithCell) owner; - return Optional.ofNullable(ownerWithCell.underlying().props().actorClass().getCanonicalName()); + if (owner instanceof ActorRefWithCell actorRefWithCell) { + return Optional.ofNullable(actorRefWithCell.underlying().props().actorClass().getCanonicalName()); } else { return Optional.empty(); } diff --git a/internal/utils/cache/src/test/java/org/eclipse/ditto/internal/utils/cache/MetricsStatsCounterTest.java b/internal/utils/cache/src/test/java/org/eclipse/ditto/internal/utils/cache/MetricsStatsCounterTest.java index 5a8cd3da8c..ce64ab75dc 100644 --- a/internal/utils/cache/src/test/java/org/eclipse/ditto/internal/utils/cache/MetricsStatsCounterTest.java +++ b/internal/utils/cache/src/test/java/org/eclipse/ditto/internal/utils/cache/MetricsStatsCounterTest.java @@ -106,12 +106,12 @@ public void basicUsage() { assertThat(totalLoadTime.getNumberOfRecords()).isEqualTo(expectedEstimatedSize); assertThat(loadSuccessCount.getCount()).isEqualTo(expectedEstimatedSize); - assertThat(loadFailureCount.getCount()).isEqualTo(0); + assertThat(loadFailureCount.getCount()).isZero(); - assertThat(evictionCount.getCount()).isEqualTo(0); - assertThat(evictionWeight.getCount()).isEqualTo(0); + assertThat(evictionCount.getCount()).isZero(); + assertThat(evictionWeight.getCount()).isZero(); - assertThat(estimatedInvalidations.getCount()).isEqualTo(0); + assertThat(estimatedInvalidations.getCount()).isZero(); }); } @@ -133,11 +133,11 @@ public void evictions() { see https://github.com/ben-manes/caffeine/wiki/Efficiency */ - assertThat(evictionCount.getCount()).isGreaterThan(0); - assertThat(evictionWeight.getCount()).isGreaterThan(0); + assertThat(evictionCount.getCount()).isPositive(); + assertThat(evictionWeight.getCount()).isPositive(); // invalidations are no evictions - assertThat(estimatedInvalidations.getCount()).isEqualTo(0); + assertThat(estimatedInvalidations.getCount()).isZero(); }); } @@ -163,10 +163,10 @@ public void invalidate() { // THEN waitUntilAsserted(() -> { assertThat(estimatedInvalidations.getCount()).isEqualTo(1); - assertThat(estimatedSize.get()).isEqualTo(0L); + assertThat(estimatedSize.get()).isZero(); // evictions are no invalidations - assertThat(evictionCount.getCount()).isEqualTo(0); + assertThat(evictionCount.getCount()).isZero(); }); } @@ -182,4 +182,5 @@ private void requestNTimes(final Cache cache, final K key, final lo cache.get(key); } } + } diff --git a/internal/utils/cluster/src/main/java/org/eclipse/ditto/internal/utils/cluster/AbstractJsonifiableWithDittoHeadersSerializer.java b/internal/utils/cluster/src/main/java/org/eclipse/ditto/internal/utils/cluster/AbstractJsonifiableWithDittoHeadersSerializer.java index f92c11c21a..91036cb4be 100755 --- a/internal/utils/cluster/src/main/java/org/eclipse/ditto/internal/utils/cluster/AbstractJsonifiableWithDittoHeadersSerializer.java +++ b/internal/utils/cluster/src/main/java/org/eclipse/ditto/internal/utils/cluster/AbstractJsonifiableWithDittoHeadersSerializer.java @@ -159,11 +159,11 @@ public void toBinary(final Object object, final ByteBuffer buf) { final JsonValue jsonValue; - if (object instanceof Jsonifiable.WithPredicate) { + if (object instanceof Jsonifiable.WithPredicate withPredicate) { final JsonSchemaVersion schemaVersion = dittoHeaders.getSchemaVersion().orElse(JsonSchemaVersion.LATEST); - jsonValue = ((Jsonifiable.WithPredicate) object).toJson(schemaVersion, FieldType.regularOrSpecial()); + jsonValue = withPredicate.toJson(schemaVersion, FieldType.regularOrSpecial()); } else { jsonValue = ((Jsonifiable) object).toJson(); } @@ -229,8 +229,8 @@ public byte[] toBinary(final Object object) { } private static DittoHeaders getDittoHeadersOrEmpty(final Object object) { - if (object instanceof WithDittoHeaders) { - @Nullable final DittoHeaders dittoHeaders = ((WithDittoHeaders) object).getDittoHeaders(); + if (object instanceof WithDittoHeaders withDittoHeaders) { + @Nullable final DittoHeaders dittoHeaders = withDittoHeaders.getDittoHeaders(); if (null != dittoHeaders) { return dittoHeaders; } diff --git a/internal/utils/cluster/src/main/java/org/eclipse/ditto/internal/utils/cluster/RetrieveStatisticsDetailsResponseSupplier.java b/internal/utils/cluster/src/main/java/org/eclipse/ditto/internal/utils/cluster/RetrieveStatisticsDetailsResponseSupplier.java index 52cd7c9a78..f0046a58c4 100644 --- a/internal/utils/cluster/src/main/java/org/eclipse/ditto/internal/utils/cluster/RetrieveStatisticsDetailsResponseSupplier.java +++ b/internal/utils/cluster/src/main/java/org/eclipse/ditto/internal/utils/cluster/RetrieveStatisticsDetailsResponseSupplier.java @@ -77,12 +77,12 @@ public CompletionStage apply(final DittoHeade .set(shardRegionName, JsonFactory.newObject()) .build(), dittoHeaders); - } else if (result instanceof ShardRegion.CurrentShardRegionState) { + } else if (result instanceof ShardRegion.CurrentShardRegionState currentShardRegionState) { final Collector> stringMapCollector = Collectors.groupingBy(Function.identity(), Collectors.mapping(Function.identity(), Collectors.counting())); final Map shardStats = - ((ShardRegion.CurrentShardRegionState) result).getShards() + currentShardRegionState.getShards() .stream() .map(ShardRegion.ShardState::getEntityIds) .flatMap(strSet -> strSet.stream() diff --git a/internal/utils/cluster/src/main/java/org/eclipse/ditto/internal/utils/cluster/ShardRegionExtractor.java b/internal/utils/cluster/src/main/java/org/eclipse/ditto/internal/utils/cluster/ShardRegionExtractor.java index 1eaef11bab..923d8c725d 100755 --- a/internal/utils/cluster/src/main/java/org/eclipse/ditto/internal/utils/cluster/ShardRegionExtractor.java +++ b/internal/utils/cluster/src/main/java/org/eclipse/ditto/internal/utils/cluster/ShardRegionExtractor.java @@ -23,11 +23,11 @@ import javax.annotation.Nullable; -import org.eclipse.ditto.json.JsonObject; import org.eclipse.ditto.base.model.entity.id.WithEntityId; import org.eclipse.ditto.base.model.json.Jsonifiable; import org.eclipse.ditto.base.model.signals.JsonParsable; import org.eclipse.ditto.base.model.signals.ShardedMessageEnvelope; +import org.eclipse.ditto.json.JsonObject; import akka.actor.ActorSystem; import akka.cluster.sharding.ShardRegion; @@ -80,11 +80,11 @@ public static ShardRegionExtractor of(final int numberOfShards, final MappingStr @Override public String entityId(final Object message) { final String result; - if (message instanceof WithEntityId) { - final var entityId = ((WithEntityId) message).getEntityId(); + if (message instanceof WithEntityId withEntityId) { + final var entityId = withEntityId.getEntityId(); result = entityId.toString(); - } else if (message instanceof ShardRegion.StartEntity) { - result = ((ShardRegion.StartEntity) message).entityId(); + } else if (message instanceof ShardRegion.StartEntity startEntity) { + result = startEntity.entityId(); } else { result = null; } @@ -96,13 +96,13 @@ public String entityId(final Object message) { public Object entityMessage(final Object message) { final Object entity; - if (message instanceof JsonObject) { + if (message instanceof JsonObject jsonObject) { // message was sent from another cluster node and therefore is serialized as json - final ShardedMessageEnvelope shardedMessageEnvelope = ShardedMessageEnvelope.fromJson((JsonObject) message); + final ShardedMessageEnvelope shardedMessageEnvelope = ShardedMessageEnvelope.fromJson(jsonObject); entity = createJsonifiableFrom(shardedMessageEnvelope); - } else if (message instanceof ShardedMessageEnvelope) { + } else if (message instanceof ShardedMessageEnvelope shardedMessageEnvelope) { // message was sent from the same cluster node - entity = createJsonifiableFrom((ShardedMessageEnvelope) message); + entity = createJsonifiableFrom(shardedMessageEnvelope); } else { entity = message; } diff --git a/internal/utils/cluster/src/test/java/org/eclipse/ditto/internal/utils/cluster/MappingStrategiesBuilderTest.java b/internal/utils/cluster/src/test/java/org/eclipse/ditto/internal/utils/cluster/MappingStrategiesBuilderTest.java index 6c70c7f449..e90eccd898 100644 --- a/internal/utils/cluster/src/test/java/org/eclipse/ditto/internal/utils/cluster/MappingStrategiesBuilderTest.java +++ b/internal/utils/cluster/src/test/java/org/eclipse/ditto/internal/utils/cluster/MappingStrategiesBuilderTest.java @@ -17,18 +17,18 @@ import java.util.Set; import org.assertj.core.api.AutoCloseableSoftAssertions; -import org.eclipse.ditto.json.JsonFactory; -import org.eclipse.ditto.json.JsonObject; import org.eclipse.ditto.base.model.headers.DittoHeaders; import org.eclipse.ditto.base.model.json.Jsonifiable; +import org.eclipse.ditto.base.model.signals.JsonParsableRegistry; +import org.eclipse.ditto.base.model.signals.ShardedMessageEnvelope; import org.eclipse.ditto.internal.utils.akka.PingCommand; import org.eclipse.ditto.internal.utils.akka.PingCommandResponse; import org.eclipse.ditto.internal.utils.akka.SimpleCommand; import org.eclipse.ditto.internal.utils.akka.SimpleCommandResponse; import org.eclipse.ditto.internal.utils.akka.streaming.StreamAck; import org.eclipse.ditto.internal.utils.health.StatusInfo; -import org.eclipse.ditto.base.model.signals.JsonParsableRegistry; -import org.eclipse.ditto.base.model.signals.ShardedMessageEnvelope; +import org.eclipse.ditto.json.JsonFactory; +import org.eclipse.ditto.json.JsonObject; import org.junit.Test; import org.mutabilitydetector.internal.com.google.common.collect.Sets; @@ -151,12 +151,12 @@ private static final class MyJsonifiable implements Jsonifiable { private static final JsonObject INNER_VALUE = JsonObject.newBuilder().set("text", "I am JSON value").build(); private static MyJsonifiable fromJson(final JsonObject jsonObject) { - assertThat(INNER_VALUE).isEqualTo(jsonObject); + assertThat(jsonObject).isEqualTo(INNER_VALUE); return INSTANCE; } private static MyJsonifiable fromJsonWithHeaders(final JsonObject jsonObject, final DittoHeaders headers) { - assertThat(INNER_VALUE).isEqualTo(jsonObject); + assertThat(jsonObject).isEqualTo(INNER_VALUE); return INSTANCE; } diff --git a/internal/utils/config/src/main/java/org/eclipse/ditto/internal/utils/config/ConfigWithFallback.java b/internal/utils/config/src/main/java/org/eclipse/ditto/internal/utils/config/ConfigWithFallback.java index 1e15b1ecf3..161fe23ef0 100644 --- a/internal/utils/config/src/main/java/org/eclipse/ditto/internal/utils/config/ConfigWithFallback.java +++ b/internal/utils/config/src/main/java/org/eclipse/ditto/internal/utils/config/ConfigWithFallback.java @@ -131,8 +131,8 @@ private static Config arrayToConfig(final KnownConfigValue[] knownConfigValues) final Map fallbackValues = new HashMap<>(knownConfigValues.length); for (final KnownConfigValue knownConfigValue : knownConfigValues) { final Object fallbackValue = knownConfigValue.getDefaultValue(); - if (fallbackValue instanceof JsonObject) { - final Map fallbackMap = ((JsonObject) fallbackValue).stream() + if (fallbackValue instanceof JsonObject jsonObject) { + final Map fallbackMap = jsonObject.stream() .collect(Collectors.toMap(f -> f.getKey().toString(), JsonField::getValue)); fallbackValues.put(knownConfigValue.getConfigPath(), fallbackMap); } else { diff --git a/internal/utils/config/src/test/java/org/eclipse/ditto/internal/utils/config/ConfigWithFallbackTest.java b/internal/utils/config/src/test/java/org/eclipse/ditto/internal/utils/config/ConfigWithFallbackTest.java index 6099273751..017bf21819 100644 --- a/internal/utils/config/src/test/java/org/eclipse/ditto/internal/utils/config/ConfigWithFallbackTest.java +++ b/internal/utils/config/src/test/java/org/eclipse/ditto/internal/utils/config/ConfigWithFallbackTest.java @@ -114,7 +114,7 @@ public void configWithEmptyFallBackValuesRemainsSameUnwrapped() { assertThat(underTest.root()).satisfies(configObject -> assertThat(configObject).hasSize(3)); assertThat(underTest.getString("foo")).isEqualTo("bar"); assertThat(underTest.getInt("bar")).isEqualTo(1); - assertThat(underTest.getBoolean("baz")).isEqualTo(true); + assertThat(underTest.getBoolean("baz")).isTrue(); } @Test @@ -136,7 +136,7 @@ public void useFallBackValuesIfNotSetInOriginalConfig() { }); assertThat(underTest.getString("foo")).isEqualTo("bar"); assertThat(underTest.getInt("bar")).isEqualTo(1); - assertThat(underTest.getBoolean("baz")).isEqualTo(true); + assertThat(underTest.getBoolean("baz")).isTrue(); } @Test @@ -159,7 +159,7 @@ public void ignoreFallBackValuesIfSetInOriginalConfig() { }); assertThat(underTest.getString("foo")).isEqualTo("bar"); assertThat(underTest.getInt("bar")).isEqualTo(2); - assertThat(underTest.getBoolean("baz")).isEqualTo(true); + assertThat(underTest.getBoolean("baz")).isTrue(); } @Test diff --git a/internal/utils/ddata/src/test/java/org/eclipse/ditto/internal/utils/ddata/DefaultAkkaReplicatorConfigTest.java b/internal/utils/ddata/src/test/java/org/eclipse/ditto/internal/utils/ddata/DefaultAkkaReplicatorConfigTest.java index c3a5f96700..0a5013eab1 100644 --- a/internal/utils/ddata/src/test/java/org/eclipse/ditto/internal/utils/ddata/DefaultAkkaReplicatorConfigTest.java +++ b/internal/utils/ddata/src/test/java/org/eclipse/ditto/internal/utils/ddata/DefaultAkkaReplicatorConfigTest.java @@ -20,7 +20,6 @@ import org.assertj.core.api.JUnitSoftAssertions; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.mutabilitydetector.unittesting.AllowedReason; @@ -105,7 +104,7 @@ public void underTestReturnsValuesOfConfigFileWithOverwrites() { // test that akka default config values are copied final Config completeConfig = underTest.getCompleteConfig(); assertThat(completeConfig.getDuration("gossip-interval")).isEqualTo(Duration.ofMillis(1337L)); - assertThat(completeConfig.getBoolean("delta-crdt.enabled")).isEqualTo(true); + assertThat(completeConfig.getBoolean("delta-crdt.enabled")).isTrue(); } } diff --git a/internal/utils/health/src/main/java/org/eclipse/ditto/internal/utils/health/HealthRouteSupplier.java b/internal/utils/health/src/main/java/org/eclipse/ditto/internal/utils/health/HealthRouteSupplier.java index c15679e5e3..8ac4053fae 100755 --- a/internal/utils/health/src/main/java/org/eclipse/ditto/internal/utils/health/HealthRouteSupplier.java +++ b/internal/utils/health/src/main/java/org/eclipse/ditto/internal/utils/health/HealthRouteSupplier.java @@ -62,8 +62,8 @@ public Route get() { private HttpResponse handleHealthResult(@Nullable final Object health, @Nullable final Throwable failure) { if (null != health) { - if (health instanceof StatusInfo) { - return completeHealthRequest((StatusInfo) health); + if (health instanceof StatusInfo statusInfo) { + return completeHealthRequest(statusInfo); } else { return completeHealthRequestForUnexpectedHealthResult(health); } diff --git a/internal/utils/jwt/src/main/java/org/eclipse/ditto/internal/utils/jwt/JjwtDeserializer.java b/internal/utils/jwt/src/main/java/org/eclipse/ditto/internal/utils/jwt/JjwtDeserializer.java index a44757dc8f..6294c9f6c2 100644 --- a/internal/utils/jwt/src/main/java/org/eclipse/ditto/internal/utils/jwt/JjwtDeserializer.java +++ b/internal/utils/jwt/src/main/java/org/eclipse/ditto/internal/utils/jwt/JjwtDeserializer.java @@ -20,12 +20,12 @@ import javax.annotation.concurrent.Immutable; +import org.eclipse.ditto.base.model.common.ConditionChecker; import org.eclipse.ditto.json.JsonArray; import org.eclipse.ditto.json.JsonFactory; import org.eclipse.ditto.json.JsonField; import org.eclipse.ditto.json.JsonObject; import org.eclipse.ditto.json.JsonValue; -import org.eclipse.ditto.base.model.common.ConditionChecker; import io.jsonwebtoken.io.DeserializationException; import io.jsonwebtoken.io.Deserializer; @@ -78,7 +78,7 @@ private static Map toJavaMap(final JsonObject jsonObject) { private static List toJavaList(final JsonArray jsonArray) { return jsonArray.stream() .map(JjwtDeserializer::toJavaObject) - .collect(Collectors.toList()); + .toList(); } private static Object toJavaObject(final JsonValue jsonValue) { diff --git a/internal/utils/jwt/src/main/java/org/eclipse/ditto/internal/utils/jwt/JjwtSerializer.java b/internal/utils/jwt/src/main/java/org/eclipse/ditto/internal/utils/jwt/JjwtSerializer.java index 0c3a5eb9a7..5cc54a239e 100644 --- a/internal/utils/jwt/src/main/java/org/eclipse/ditto/internal/utils/jwt/JjwtSerializer.java +++ b/internal/utils/jwt/src/main/java/org/eclipse/ditto/internal/utils/jwt/JjwtSerializer.java @@ -71,30 +71,30 @@ private static JsonValue toJson(final Object input) { if (input == null) { return JsonFactory.nullLiteral(); - } else if (input instanceof Boolean) { - return JsonFactory.newValue((boolean) input); + } else if (input instanceof Boolean aBoolean) { + return JsonFactory.newValue(aBoolean); } else if (input instanceof Byte || input instanceof Short || input instanceof Integer) { return JsonFactory.newValue((int) input); - } else if (input instanceof Long) { - return JsonFactory.newValue((long) input); - } else if (input instanceof Float) { - return JsonFactory.newValue((float) input); - } else if (input instanceof Double) { - return JsonFactory.newValue((double) input); + } else if (input instanceof Long aLong) { + return JsonFactory.newValue(aLong); + } else if (input instanceof Float aFloat) { + return JsonFactory.newValue(aFloat); + } else if (input instanceof Double aDouble) { + return JsonFactory.newValue(aDouble); } else if (input instanceof Character || input instanceof String || input instanceof Enum) { return JsonFactory.newValue(input.toString()); - } else if (input instanceof Calendar) { - return JsonFactory.newValue(DateFormats.formatIso8601(((Calendar) input).getTime())); - } else if (input instanceof Date) { - return JsonFactory.newValue(DateFormats.formatIso8601((Date) input)); - } else if (input instanceof byte[]) { - return JsonFactory.newValue(Encoders.BASE64.encode((byte[]) input)); - } else if (input instanceof char[]) { - return JsonFactory.newValue(new String((char[]) input)); - } else if (input instanceof Map) { - return toJsonObject((Map) input); - } else if (input instanceof Collection) { - return toJsonArray((Collection) input); + } else if (input instanceof Calendar calendar) { + return JsonFactory.newValue(DateFormats.formatIso8601(calendar.getTime())); + } else if (input instanceof Date date) { + return JsonFactory.newValue(DateFormats.formatIso8601(date)); + } else if (input instanceof byte[] bytes) { + return JsonFactory.newValue(Encoders.BASE64.encode((bytes))); + } else if (input instanceof char[] chars) { + return JsonFactory.newValue(new String(chars)); + } else if (input instanceof Map map) { + return toJsonObject(map); + } else if (input instanceof Collection collection) { + return toJsonArray(collection); } else if (Objects.isArray(input)) { return toJsonArray(Collections.arrayToList(input)); } diff --git a/internal/utils/jwt/src/test/java/org/eclipse/ditto/internal/utils/jwt/JjwtDeserializerTest.java b/internal/utils/jwt/src/test/java/org/eclipse/ditto/internal/utils/jwt/JjwtDeserializerTest.java index 858d8fe01d..8fed2ee373 100644 --- a/internal/utils/jwt/src/test/java/org/eclipse/ditto/internal/utils/jwt/JjwtDeserializerTest.java +++ b/internal/utils/jwt/src/test/java/org/eclipse/ditto/internal/utils/jwt/JjwtDeserializerTest.java @@ -52,9 +52,9 @@ public void foo() { final Object jwtBody = jwt.getBody(); Assertions.assertThat(jwtBody).isInstanceOf(Claims.class); - Assertions.assertThat(((Claims) jwtBody).get(Claims.ISSUER)).isEqualTo(KNOWN_ISS); - Assertions.assertThat(((Claims) jwtBody).get(Claims.SUBJECT)).isEqualTo(KNOWN_SUB); - Assertions.assertThat(((Claims) jwtBody).get(Claims.EXPIRATION)).isEqualTo((int) (KNOWN_EXP.getTime() / 1000L)); + Assertions.assertThat(((Claims) jwtBody)).containsEntry(Claims.ISSUER, KNOWN_ISS) + .containsEntry(Claims.SUBJECT, KNOWN_SUB) + .containsEntry(Claims.EXPIRATION, (int) (KNOWN_EXP.getTime() / 1000L)); } } diff --git a/internal/utils/metrics/src/main/java/org/eclipse/ditto/internal/utils/metrics/instruments/counter/KamonCounter.java b/internal/utils/metrics/src/main/java/org/eclipse/ditto/internal/utils/metrics/instruments/counter/KamonCounter.java index c1034f67a1..0b8fd63551 100644 --- a/internal/utils/metrics/src/main/java/org/eclipse/ditto/internal/utils/metrics/instruments/counter/KamonCounter.java +++ b/internal/utils/metrics/src/main/java/org/eclipse/ditto/internal/utils/metrics/instruments/counter/KamonCounter.java @@ -105,8 +105,8 @@ public long getCount() { private long getSnapshot() { final kamon.metric.Counter kamonInternalCounter = getKamonInternalCounter(); - if (kamonInternalCounter instanceof kamon.metric.Counter.LongAdder) { - return ((kamon.metric.Counter.LongAdder) kamonInternalCounter).snapshot(false); + if (kamonInternalCounter instanceof kamon.metric.Counter.LongAdder longAdder) { + return longAdder.snapshot(false); } LOGGER.warn("Could not get snapshot of Kamon counter with name <{}>!", name); return 0L; @@ -120,8 +120,8 @@ private kamon.metric.Counter getKamonInternalCounter() { public boolean reset() { try { final kamon.metric.Counter kamonInternalCounter = getKamonInternalCounter(); - if (kamonInternalCounter instanceof kamon.metric.Counter.LongAdder) { - ((kamon.metric.Counter.LongAdder) kamonInternalCounter).snapshot(true); + if (kamonInternalCounter instanceof kamon.metric.Counter.LongAdder longAdder) { + longAdder.snapshot(true); LOGGER.trace("Reset counter with name <{}>.", name); return true; } diff --git a/internal/utils/metrics/src/main/java/org/eclipse/ditto/internal/utils/metrics/instruments/histogram/KamonHistogram.java b/internal/utils/metrics/src/main/java/org/eclipse/ditto/internal/utils/metrics/instruments/histogram/KamonHistogram.java index 97b1afd9c0..2b1082e042 100644 --- a/internal/utils/metrics/src/main/java/org/eclipse/ditto/internal/utils/metrics/instruments/histogram/KamonHistogram.java +++ b/internal/utils/metrics/src/main/java/org/eclipse/ditto/internal/utils/metrics/instruments/histogram/KamonHistogram.java @@ -114,8 +114,8 @@ private List addBucketValuesToList(Distribution.Bucket bucket, List private Optional getSnapshot(final boolean reset) { final kamon.metric.Histogram histogram = getKamonInternalHistogram(); - if (histogram instanceof kamon.metric.Histogram.Atomic) { - return Optional.of(((kamon.metric.Histogram.Atomic) histogram).snapshot(reset)); + if (histogram instanceof kamon.metric.Histogram.Atomic atomic) { + return Optional.of(atomic.snapshot(reset)); } LOGGER.warn("Could not get snapshot of kamon internal histogram"); return Optional.empty(); @@ -133,4 +133,5 @@ public String toString() { ", tags=" + tags + "]"; } + } diff --git a/internal/utils/metrics/src/main/java/org/eclipse/ditto/internal/utils/metrics/instruments/timer/PreparedKamonTimer.java b/internal/utils/metrics/src/main/java/org/eclipse/ditto/internal/utils/metrics/instruments/timer/PreparedKamonTimer.java index 5dfa20d1bf..499fecf116 100644 --- a/internal/utils/metrics/src/main/java/org/eclipse/ditto/internal/utils/metrics/instruments/timer/PreparedKamonTimer.java +++ b/internal/utils/metrics/src/main/java/org/eclipse/ditto/internal/utils/metrics/instruments/timer/PreparedKamonTimer.java @@ -173,8 +173,8 @@ public boolean reset() { private Optional getSnapshot(boolean reset) { final Timer kamonInternalTimer = getKamonInternalTimer(); - if (kamonInternalTimer instanceof Timer.Atomic) { - return Optional.of(((Timer.Atomic) kamonInternalTimer).snapshot(reset)); + if (kamonInternalTimer instanceof Timer.Atomic atomic) { + return Optional.of(atomic.snapshot(reset)); } else { LOGGER.warn("Could not get snapshot of kamon timer"); return Optional.empty(); diff --git a/internal/utils/metrics/src/test/java/org/eclipse/ditto/internal/utils/metrics/instruments/counter/KamonCounterTest.java b/internal/utils/metrics/src/test/java/org/eclipse/ditto/internal/utils/metrics/instruments/counter/KamonCounterTest.java index b6241adf36..8b41794d20 100644 --- a/internal/utils/metrics/src/test/java/org/eclipse/ditto/internal/utils/metrics/instruments/counter/KamonCounterTest.java +++ b/internal/utils/metrics/src/test/java/org/eclipse/ditto/internal/utils/metrics/instruments/counter/KamonCounterTest.java @@ -43,10 +43,10 @@ public void getCountDoesNotResetCounter() { @Test public void reset() { - assertThat(sut.getCount()).isEqualTo(0); + assertThat(sut.getCount()).isZero(); sut.increment(); assertThat(sut.getCount()).isEqualTo(1); sut.reset(); - assertThat(sut.getCount()).isEqualTo(0); + assertThat(sut.getCount()).isZero(); } } diff --git a/internal/utils/metrics/src/test/java/org/eclipse/ditto/internal/utils/metrics/instruments/gauge/KamonGaugeTest.java b/internal/utils/metrics/src/test/java/org/eclipse/ditto/internal/utils/metrics/instruments/gauge/KamonGaugeTest.java index c2eea716a4..cd20c786b8 100644 --- a/internal/utils/metrics/src/test/java/org/eclipse/ditto/internal/utils/metrics/instruments/gauge/KamonGaugeTest.java +++ b/internal/utils/metrics/src/test/java/org/eclipse/ditto/internal/utils/metrics/instruments/gauge/KamonGaugeTest.java @@ -38,7 +38,7 @@ public void reset() { sut.set(5L); assertThat(sut.get()).isEqualTo(5L); sut.reset(); - assertThat(sut.get()).isEqualTo(0L); + assertThat(sut.get()).isZero(); } @Test diff --git a/internal/utils/metrics/src/test/java/org/eclipse/ditto/internal/utils/metrics/instruments/histogram/KamonHistogramTest.java b/internal/utils/metrics/src/test/java/org/eclipse/ditto/internal/utils/metrics/instruments/histogram/KamonHistogramTest.java index 6d6a0c41ec..1d6df9a49a 100644 --- a/internal/utils/metrics/src/test/java/org/eclipse/ditto/internal/utils/metrics/instruments/histogram/KamonHistogramTest.java +++ b/internal/utils/metrics/src/test/java/org/eclipse/ditto/internal/utils/metrics/instruments/histogram/KamonHistogramTest.java @@ -32,23 +32,23 @@ public void setup() { public void record() { sut.record(4711L); final Long[] recordedValues = sut.getRecordedValues(); - assertThat(recordedValues.length).isEqualTo(1); + assertThat(recordedValues).hasSize(1); assertThat(recordedValues[0]).isCloseTo(4711L, Percentage.withPercentage(1)); } @Test public void getRecordsDoesNotResetHistogram() { sut.record(4711L); - assertThat(sut.getRecordedValues().length).isEqualTo(1); - assertThat(sut.getRecordedValues().length).isEqualTo(1); + assertThat(sut.getRecordedValues()).hasSize(1); + assertThat(sut.getRecordedValues()).hasSize(1); } @Test public void resets() { sut.record(4711L); - assertThat(sut.getRecordedValues().length).isEqualTo(1); + assertThat(sut.getRecordedValues()).hasSize(1); sut.reset(); - assertThat(sut.getRecordedValues().length).isEqualTo(0); + assertThat(sut.getRecordedValues()).hasSize(0); } } diff --git a/internal/utils/metrics/src/test/java/org/eclipse/ditto/internal/utils/metrics/instruments/timer/PreparedKamonTimerTest.java b/internal/utils/metrics/src/test/java/org/eclipse/ditto/internal/utils/metrics/instruments/timer/PreparedKamonTimerTest.java index f6e6081d9f..de9b2e98bf 100644 --- a/internal/utils/metrics/src/test/java/org/eclipse/ditto/internal/utils/metrics/instruments/timer/PreparedKamonTimerTest.java +++ b/internal/utils/metrics/src/test/java/org/eclipse/ditto/internal/utils/metrics/instruments/timer/PreparedKamonTimerTest.java @@ -44,8 +44,8 @@ public void getRecords() { @Test public void getRecordsDoesNotResetRecords() { sut.record(1, TimeUnit.SECONDS); - assertThat(sut.getTotalTime()).isGreaterThan(0); - assertThat(sut.getTotalTime()).isGreaterThan(0); + assertThat(sut.getTotalTime()).isPositive(); + assertThat(sut.getTotalTime()).isPositive(); } @Test @@ -53,7 +53,7 @@ public void reset() { sut.record(1, TimeUnit.SECONDS); assertThat(sut.getTotalTime()).isCloseTo(TimeUnit.SECONDS.toNanos(1), Percentage.withPercentage(1)); sut.reset(); - assertThat(sut.getTotalTime()).isEqualTo(0); + assertThat(sut.getTotalTime()).isZero(); } @Test diff --git a/internal/utils/metrics/src/test/java/org/eclipse/ditto/internal/utils/metrics/instruments/timer/StartedKamonTimerTest.java b/internal/utils/metrics/src/test/java/org/eclipse/ditto/internal/utils/metrics/instruments/timer/StartedKamonTimerTest.java index 5fb4cff669..8e25c0217f 100644 --- a/internal/utils/metrics/src/test/java/org/eclipse/ditto/internal/utils/metrics/instruments/timer/StartedKamonTimerTest.java +++ b/internal/utils/metrics/src/test/java/org/eclipse/ditto/internal/utils/metrics/instruments/timer/StartedKamonTimerTest.java @@ -47,8 +47,9 @@ public void getOnStopHandlers() { final OnStopHandler onStopHandler = mock(OnStopHandler.class); sut.onStop(onStopHandler); final List onStopHandlers = sut.getOnStopHandlers(); - Assertions.assertThat(onStopHandlers).hasSize(2); - Assertions.assertThat(onStopHandlers).contains(onStopHandler); + Assertions.assertThat(onStopHandlers) + .hasSize(2) + .contains(onStopHandler); } @Test @@ -74,11 +75,11 @@ public void stopAStoppedTimerCausesNoException() { @Test public void getSegments() { - assertThat(sut.getSegments().keySet()).hasSize(0); + assertThat(sut.getSegments().keySet()).isEmpty(); final StartedTimer testSegment = sut.startNewSegment("TEST"); final Map segments = sut.getSegments(); Assertions.assertThat(segments).hasSize(1); - assertThat(segments.get("TEST")).isEqualTo(testSegment); + assertThat(segments).containsEntry("TEST", testSegment); } @Test @@ -89,12 +90,12 @@ public void segmentHasSameTags() { final Map parentTags = sut.getTags(); assertThat(parentTags.keySet()).hasSize(2); - assertThat(parentTags.get("segment")).isEqualTo("overall"); - assertThat(parentTags.get("tag1")).isEqualTo("value1"); + assertThat(parentTags).containsEntry("segment", "overall"); + assertThat(parentTags).containsEntry("tag1", "value1"); assertThat(segmentTags.keySet()).hasSize(2); - assertThat(segmentTags.get("segment")).isEqualTo("TEST"); - assertThat(segmentTags.get("tag1")).isEqualTo("value1"); + assertThat(segmentTags).containsEntry("segment", "TEST"); + assertThat(segmentTags).containsEntry("tag1", "value1"); } @Test @@ -119,7 +120,7 @@ public void onStopHandlersOfSegmentsAreCalledToo() { @Test public void startTimeStampAlwaysSet() { - assertThat(sut.getStartNanoTime()).isGreaterThan(0); + assertThat(sut.getStartNanoTime()).isPositive(); } @Test diff --git a/internal/utils/metrics/src/test/java/org/eclipse/ditto/internal/utils/metrics/instruments/timer/StoppedKamonTimerTest.java b/internal/utils/metrics/src/test/java/org/eclipse/ditto/internal/utils/metrics/instruments/timer/StoppedKamonTimerTest.java index d9d7d8d8d3..2c8bcefde8 100644 --- a/internal/utils/metrics/src/test/java/org/eclipse/ditto/internal/utils/metrics/instruments/timer/StoppedKamonTimerTest.java +++ b/internal/utils/metrics/src/test/java/org/eclipse/ditto/internal/utils/metrics/instruments/timer/StoppedKamonTimerTest.java @@ -38,7 +38,7 @@ public void getName() { @Test public void getDuration() { - assertThat(sut.getDuration().toNanos()).isGreaterThan(0); + assertThat(sut.getDuration().toNanos()).isPositive(); } @Test diff --git a/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/AbstractBasicDBMapper.java b/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/AbstractBasicDBMapper.java index f2c4de955a..1435b4a292 100644 --- a/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/AbstractBasicDBMapper.java +++ b/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/AbstractBasicDBMapper.java @@ -38,7 +38,7 @@ abstract class AbstractBasicDBMapper implements Function final Function jsonKeyNameReviser; - AbstractBasicDBMapper(final Function theJsonKeyNameReviser) { + AbstractBasicDBMapper(final Function theJsonKeyNameReviser) { jsonKeyNameReviser = checkNotNull(theJsonKeyNameReviser, "The JSON key name reviser"); } diff --git a/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/AbstractMongoEventAdapter.java b/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/AbstractMongoEventAdapter.java index 73f1190692..5e3b253401 100644 --- a/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/AbstractMongoEventAdapter.java +++ b/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/AbstractMongoEventAdapter.java @@ -19,16 +19,16 @@ import org.bson.BsonDocument; import org.bson.BsonValue; -import org.eclipse.ditto.json.JsonField; -import org.eclipse.ditto.json.JsonObject; -import org.eclipse.ditto.json.JsonParseException; -import org.eclipse.ditto.json.JsonValue; import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException; import org.eclipse.ditto.base.model.headers.DittoHeaders; import org.eclipse.ditto.base.model.json.JsonSchemaVersion; import org.eclipse.ditto.base.model.signals.events.Event; import org.eclipse.ditto.base.model.signals.events.EventRegistry; import org.eclipse.ditto.base.model.signals.events.EventsourcedEvent; +import org.eclipse.ditto.json.JsonField; +import org.eclipse.ditto.json.JsonObject; +import org.eclipse.ditto.json.JsonParseException; +import org.eclipse.ditto.json.JsonValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -85,8 +85,8 @@ public Object toJournal(final Object event) { @Override public EventSeq fromJournal(final Object event, final String manifest) { - if (event instanceof BsonValue) { - final JsonValue jsonValue = DittoBsonJson.getInstance().serialize((BsonValue) event); + if (event instanceof BsonValue bsonValue) { + final JsonValue jsonValue = DittoBsonJson.getInstance().serialize(bsonValue); try { final JsonObject jsonObject = jsonValue.asObject() .setValue(EventsourcedEvent.JsonFields.REVISION.getPointer(), Event.DEFAULT_REVISION); diff --git a/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/AbstractMongoSnapshotAdapter.java b/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/AbstractMongoSnapshotAdapter.java index 21e4dd16d6..633ddeb421 100644 --- a/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/AbstractMongoSnapshotAdapter.java +++ b/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/AbstractMongoSnapshotAdapter.java @@ -135,8 +135,8 @@ private T convertSnapshotToJsonifiable(final Object rawSnapshotEntity) { private static JsonObject convertSnapshotEntityToJson(final Object rawSnapshotEntity) { checkNotNull(rawSnapshotEntity, "raw snapshot entity"); - if (rawSnapshotEntity instanceof BsonValue) { - return convertToJson((BsonValue) rawSnapshotEntity); + if (rawSnapshotEntity instanceof BsonValue bsonValue) { + return convertToJson(bsonValue); } final String pattern = "Unable to create a Jsonifiable from <{0}>! Expected was a BsonDocument instance."; throw new IllegalArgumentException(MessageFormat.format(pattern, rawSnapshotEntity.getClass())); diff --git a/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/DittoMongoClient.java b/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/DittoMongoClient.java index c0d230ab01..f9dc4ff0ce 100644 --- a/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/DittoMongoClient.java +++ b/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/DittoMongoClient.java @@ -46,7 +46,7 @@ public interface DittoMongoClient extends MongoClient { MongoCollection getCollection(CharSequence collectionName); /** - * Returns the the settings that this client uses additionally to the + * Returns the settings that this client uses additionally to the * {@link MongoClientSettings}. * * @return the Ditto specific settings of this client. diff --git a/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/streaming/MongoReadJournal.java b/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/streaming/MongoReadJournal.java index 0b06eaffd5..a96405080d 100644 --- a/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/streaming/MongoReadJournal.java +++ b/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/streaming/MongoReadJournal.java @@ -794,7 +794,7 @@ private static List asFirstSnapshotBsonFields(final String... snapsho return Accumulators.first(fieldName, serializedFieldName); }); - return Stream.concat(snFieldStream, snapshotFieldStream).collect(Collectors.toList()); + return Stream.concat(snFieldStream, snapshotFieldStream).toList(); } private Source, NotUsed> getJournal() { diff --git a/internal/utils/persistence/src/test/java/org/eclipse/ditto/internal/utils/persistence/mongo/ops/eventsource/MongoPersistenceOperationsSelectionTest.java b/internal/utils/persistence/src/test/java/org/eclipse/ditto/internal/utils/persistence/mongo/ops/eventsource/MongoPersistenceOperationsSelectionTest.java index cb6fb17a80..3e44fdc9fc 100644 --- a/internal/utils/persistence/src/test/java/org/eclipse/ditto/internal/utils/persistence/mongo/ops/eventsource/MongoPersistenceOperationsSelectionTest.java +++ b/internal/utils/persistence/src/test/java/org/eclipse/ditto/internal/utils/persistence/mongo/ops/eventsource/MongoPersistenceOperationsSelectionTest.java @@ -20,7 +20,6 @@ import org.bson.BsonString; import org.bson.Document; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; @@ -92,7 +91,7 @@ public void toStringOfSelectionWithFilterReturnsExpected() { final MongoPersistenceOperationsSelection underTest = MongoPersistenceOperationsSelection.of(COLLECTION_NAME, namespaceFilter); - assertThat(underTest.toString()).isEqualTo(COLLECTION_NAME + " (filtered: " + namespaceFilter + ")"); + assertThat(underTest.toString()).hasToString(COLLECTION_NAME + " (filtered: " + namespaceFilter + ")"); } @Test @@ -100,7 +99,7 @@ public void toStringOfSelectionWithoutFilterReturnsExpected() { final MongoPersistenceOperationsSelection underTest = MongoPersistenceOperationsSelection.of(COLLECTION_NAME, emptyFilter); - assertThat(underTest.toString()).isEqualTo(COLLECTION_NAME + " (complete)"); + assertThat(underTest.toString()).hasToString(COLLECTION_NAME + " (complete)"); } } diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceSupervisor.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceSupervisor.java index 556f2f781a..16ab9822ba 100644 --- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceSupervisor.java +++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceSupervisor.java @@ -602,9 +602,9 @@ private void enforceAndForwardToTargetActor(final Object message) { final CompletionStage syncCs = signalTransformer.apply(signal) .whenComplete((result, error) -> handleOptionalTransformationException(signal, error, sender)) .thenCompose(transformed -> enforceSignalAndForwardToTargetActor((S) transformed, sender) - .whenComplete((response, throwable) -> { - handleSignalEnforcementResponse(response, throwable, transformed, sender); - })) + .whenComplete((response, throwable) -> + handleSignalEnforcementResponse(response, throwable, transformed, sender) + )) .handle((response, throwable) -> Control.PROCESS_NEXT_TWIN_MESSAGE); Patterns.pipe(syncCs, getContext().getDispatcher()).pipeTo(getSelf(), getSelf()); } diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistentActorWithTimersAndCleanup.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistentActorWithTimersAndCleanup.java index a20c2e400f..670594d048 100644 --- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistentActorWithTimersAndCleanup.java +++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistentActorWithTimersAndCleanup.java @@ -171,12 +171,12 @@ private boolean isCleanupCompletedSuccessfully() { private String getResponseStatus(@Nullable final Protocol.Message message) { if (message == null) { return "no response received"; - } else if (message instanceof DeleteSnapshotsFailure) { + } else if (message instanceof DeleteSnapshotsFailure deleteSnapshotsFailure) { return String.format("%s (%s)", message.getClass().getSimpleName(), - ((DeleteSnapshotsFailure) message).cause().getMessage()); - } else if (message instanceof DeleteMessagesFailure) { + deleteSnapshotsFailure.cause().getMessage()); + } else if (message instanceof DeleteMessagesFailure deleteMessagesFailure) { return String.format("%s (%s)", message.getClass().getSimpleName(), - ((DeleteMessagesFailure) message).cause().getMessage()); + deleteMessagesFailure.cause().getMessage()); } else { return message.getClass().getSimpleName(); } diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/etags/AbstractConditionHeaderCheckingCommandStrategy.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/etags/AbstractConditionHeaderCheckingCommandStrategy.java index 6dd460c130..93092c65e2 100644 --- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/etags/AbstractConditionHeaderCheckingCommandStrategy.java +++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/etags/AbstractConditionHeaderCheckingCommandStrategy.java @@ -107,9 +107,8 @@ public boolean isDefined(final Context context, @Nullable final S entity, fin } private static > boolean commandHasEntityIdAndIsEqual(EntityId entityId, C command) { - if (command instanceof WithEntityId) { - final WithEntityId commandWithEntityId = (WithEntityId) command; - return Objects.equals(entityId, commandWithEntityId.getEntityId()); + if (command instanceof WithEntityId withEntityId) { + return Objects.equals(entityId, withEntityId.getEntityId()); } else { return false; } diff --git a/internal/utils/pubsub/src/main/java/org/eclipse/ditto/internal/utils/pubsub/DistributedAcksImpl.java b/internal/utils/pubsub/src/main/java/org/eclipse/ditto/internal/utils/pubsub/DistributedAcksImpl.java index 14c39bc08d..e316a9c2fc 100644 --- a/internal/utils/pubsub/src/main/java/org/eclipse/ditto/internal/utils/pubsub/DistributedAcksImpl.java +++ b/internal/utils/pubsub/src/main/java/org/eclipse/ditto/internal/utils/pubsub/DistributedAcksImpl.java @@ -132,10 +132,10 @@ public DistributedDataConfig getConfig() { } private static CompletionStage processAskResponse(final Object askResponse) { - if (askResponse instanceof AcksDeclared) { - return CompletableFuture.completedStage((AcksDeclared) askResponse); - } else if (askResponse instanceof Throwable) { - return CompletableFuture.failedStage((Throwable) askResponse); + if (askResponse instanceof AcksDeclared acksDeclared) { + return CompletableFuture.completedStage( acksDeclared); + } else if (askResponse instanceof Throwable throwable) { + return CompletableFuture.failedStage(throwable); } else { return CompletableFuture.failedStage(new ClassCastException("Expect SubAck, got: " + askResponse)); } diff --git a/internal/utils/pubsub/src/main/java/org/eclipse/ditto/internal/utils/pubsub/DistributedSubImpl.java b/internal/utils/pubsub/src/main/java/org/eclipse/ditto/internal/utils/pubsub/DistributedSubImpl.java index 05080aec80..6220253684 100644 --- a/internal/utils/pubsub/src/main/java/org/eclipse/ditto/internal/utils/pubsub/DistributedSubImpl.java +++ b/internal/utils/pubsub/src/main/java/org/eclipse/ditto/internal/utils/pubsub/DistributedSubImpl.java @@ -103,10 +103,10 @@ public void removeSubscriber(final ActorRef subscriber) { } private static CompletionStage processAskResponse(final Object askResponse) { - if (askResponse instanceof SubAck) { - return CompletableFuture.completedStage((SubAck) askResponse); - } else if (askResponse instanceof Throwable) { - return CompletableFuture.failedStage((Throwable) askResponse); + if (askResponse instanceof SubAck subAck) { + return CompletableFuture.completedStage(subAck); + } else if (askResponse instanceof Throwable throwable) { + return CompletableFuture.failedStage(throwable); } else { return CompletableFuture.failedStage(new ClassCastException("Expect SubAck, got: " + askResponse)); } diff --git a/internal/utils/pubsub/src/main/java/org/eclipse/ditto/internal/utils/pubsub/api/AbstractRequest.java b/internal/utils/pubsub/src/main/java/org/eclipse/ditto/internal/utils/pubsub/api/AbstractRequest.java index db79b2d871..07058ef0fc 100644 --- a/internal/utils/pubsub/src/main/java/org/eclipse/ditto/internal/utils/pubsub/api/AbstractRequest.java +++ b/internal/utils/pubsub/src/main/java/org/eclipse/ditto/internal/utils/pubsub/api/AbstractRequest.java @@ -16,7 +16,6 @@ import java.util.Set; import akka.actor.ActorRef; -import akka.cluster.ddata.Replicator; /** * Abstract base class for subscription requests. diff --git a/internal/utils/pubsub/src/main/java/org/eclipse/ditto/internal/utils/pubsub/api/Request.java b/internal/utils/pubsub/src/main/java/org/eclipse/ditto/internal/utils/pubsub/api/Request.java index e3b27b12d9..e920906283 100644 --- a/internal/utils/pubsub/src/main/java/org/eclipse/ditto/internal/utils/pubsub/api/Request.java +++ b/internal/utils/pubsub/src/main/java/org/eclipse/ditto/internal/utils/pubsub/api/Request.java @@ -14,8 +14,6 @@ import java.util.Set; -import akka.cluster.ddata.Replicator; - /** * Super class of subscription requests. */ @@ -30,4 +28,5 @@ public interface Request { * @return whether acknowledgement is expected. */ boolean shouldAcknowledge(); + } diff --git a/internal/utils/pubsub/src/main/java/org/eclipse/ditto/internal/utils/pubsub/ddata/AbstractDDataHandler.java b/internal/utils/pubsub/src/main/java/org/eclipse/ditto/internal/utils/pubsub/ddata/AbstractDDataHandler.java index 3c8f1e9155..a886054f51 100644 --- a/internal/utils/pubsub/src/main/java/org/eclipse/ditto/internal/utils/pubsub/ddata/AbstractDDataHandler.java +++ b/internal/utils/pubsub/src/main/java/org/eclipse/ditto/internal/utils/pubsub/ddata/AbstractDDataHandler.java @@ -117,10 +117,11 @@ public CompletionStage>> getAllShards(final Replicator.Rea .mapToObj(i -> get(getKey(i), consistency).toCompletableFuture()) .toList(); return CompletableFuture.allOf(futures.toArray(CompletableFuture[]::new)) - .thenApply(_void -> futures.stream() + .thenApply(unused -> futures.stream() .map(CompletableFuture::join) .flatMap(Optional::stream) .toList() ); } + } diff --git a/internal/utils/pubsub/src/test/java/org/eclipse/ditto/internal/utils/pubsub/PubSubFactoryTest.java b/internal/utils/pubsub/src/test/java/org/eclipse/ditto/internal/utils/pubsub/PubSubFactoryTest.java index f3769f8b61..5407a70be6 100644 --- a/internal/utils/pubsub/src/test/java/org/eclipse/ditto/internal/utils/pubsub/PubSubFactoryTest.java +++ b/internal/utils/pubsub/src/test/java/org/eclipse/ditto/internal/utils/pubsub/PubSubFactoryTest.java @@ -597,9 +597,9 @@ public void publishToEachMemberOfAGroup() { final Set thingIdSet = Set.of(received1.getEntityId(), received2.getEntityId(), received3.getEntityId(), received4.getEntityId(), received5.getEntityId(), received6.getEntityId()); - assertThat(thingIdSet.size()) + assertThat(thingIdSet) .describedAs("Signals received by subscribers should have distinct entity IDs") - .isEqualTo(6); + .hasSize(6); // THEN: any subscriber receives no further messages. subscriber1.expectNoMessage(); diff --git a/internal/utils/search/src/main/java/org/eclipse/ditto/internal/utils/search/SearchSource.java b/internal/utils/search/src/main/java/org/eclipse/ditto/internal/utils/search/SearchSource.java index 82648a5ba3..38fa14f01e 100644 --- a/internal/utils/search/src/main/java/org/eclipse/ditto/internal/utils/search/SearchSource.java +++ b/internal/utils/search/src/main/java/org/eclipse/ditto/internal/utils/search/SearchSource.java @@ -154,7 +154,7 @@ private Optional mapError(final Throwable error) { private Source, NotUsed> resume(final String lastThingId) { return streamThingsFrom(lastThingId) - .mapAsync(1, streamThings -> Patterns.ask(commandForwarder, streamThings, searchAskTimeout)) + .mapAsync(1, streamTings -> Patterns.ask(commandForwarder, streamTings, searchAskTimeout)) .via(expectMsgClass(SourceRef.class)) .flatMapConcat(SourceRef::source) .flatMapConcat(thingId -> retrieveThingForElement((String) thingId)); diff --git a/internal/utils/tracing/src/test/java/org/eclipse/ditto/internal/utils/tracing/instruments/trace/PreparedKamonTraceTest.java b/internal/utils/tracing/src/test/java/org/eclipse/ditto/internal/utils/tracing/instruments/trace/PreparedKamonTraceTest.java index 6560c2c9f6..35be4500a2 100644 --- a/internal/utils/tracing/src/test/java/org/eclipse/ditto/internal/utils/tracing/instruments/trace/PreparedKamonTraceTest.java +++ b/internal/utils/tracing/src/test/java/org/eclipse/ditto/internal/utils/tracing/instruments/trace/PreparedKamonTraceTest.java @@ -60,7 +60,7 @@ public void nullTraceTagsAreIgnored() { underTest.correlationId(null); underTest.connectionType(null); underTest.connectionId(null); - assertThat(underTest.getTags()).hasSize(0); + assertThat(underTest.getTags()).isEmpty(); } @Test diff --git a/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonArrayNullTest.java b/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonArrayNullTest.java index e443f5b4a9..53c95100f1 100755 --- a/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonArrayNullTest.java +++ b/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonArrayNullTest.java @@ -16,7 +16,6 @@ import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf; import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable; -import org.junit.Ignore; import org.junit.Test; /** @@ -34,8 +33,9 @@ public void testHashCodeAndEquals() { final ImmutableJsonArrayNull green = ImmutableJsonArrayNull.getInstance(); final ImmutableJsonArrayNull blue = ImmutableJsonArrayNull.getInstance(); - assertThat(green).isEqualTo(green); - assertThat(green).isEqualTo(blue); + assertThat(green) + .isEqualTo(green) + .isEqualTo(blue); final ImmutableJsonObjectNull nullObject = ImmutableJsonObjectNull.getInstance(); @@ -46,7 +46,7 @@ public void testHashCodeAndEquals() { public void toStringReturnsExpected() { final ImmutableJsonArrayNull underTest = ImmutableJsonArrayNull.getInstance(); - assertThat(underTest.toString()).isEqualTo("null"); + assertThat(underTest.toString()).hasToString("null"); } } diff --git a/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonArrayTest.java b/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonArrayTest.java index b80ead6904..15518ab53a 100755 --- a/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonArrayTest.java +++ b/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonArrayTest.java @@ -31,7 +31,6 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.Ignore; import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; @@ -94,16 +93,17 @@ public void twoParsedArraysFromSameStringHaveSameHashCode() { assertThat(parsedFirst).isInstanceOf(ImmutableJsonArray.class); assertThat(parsedSecond).isInstanceOf(ImmutableJsonArray.class); - assertThat(parsedFirst.hashCode()).isEqualTo(parsedSecond.hashCode()); + assertThat(parsedFirst.hashCode()).hasSameHashCodeAs(parsedSecond.hashCode()); } @Test public void emptyArrayIsEmpty() { final ImmutableJsonArray underTest = ImmutableJsonArray.empty(); - assertThat(underTest).isArray(); - assertThat(underTest).isEmpty(); - assertThat(underTest).hasSize(0); + assertThat(underTest) + .isArray() + .isEmpty() + .hasSize(0); } @Test @@ -124,12 +124,12 @@ public void asArrayReturnsSameObjectReference() { public void arrayIsNothingElse() { final ImmutableJsonArray underTest = ImmutableJsonArray.empty(); - assertThat(underTest).isArray(); - assertThat(underTest).isNotNullLiteral(); - assertThat(underTest).isNotBoolean(); - assertThat(underTest).isNotNumber(); - assertThat(underTest).isNotString(); - assertThat(underTest).isNotObject(); + assertThat(underTest).isArray() + .isNotNullLiteral() + .isNotBoolean() + .isNotNumber() + .isNotString() + .isNotObject(); assertThat(underTest.isInt()).isFalse(); assertThat(underTest.isLong()).isFalse(); assertThat(underTest.isDouble()).isFalse(); @@ -139,12 +139,12 @@ public void arrayIsNothingElse() { public void checkUnsupportedOperations() { final ImmutableJsonArray underTest = ImmutableJsonArray.of(KNOWN_INT_VALUE_LIST); - assertThat(underTest).doesNotSupport(JsonValue::asObject); - assertThat(underTest).doesNotSupport(JsonValue::asBoolean); - assertThat(underTest).doesNotSupport(JsonValue::asString); - assertThat(underTest).doesNotSupport(JsonValue::asInt); - assertThat(underTest).doesNotSupport(JsonValue::asLong); - assertThat(underTest).doesNotSupport(JsonValue::asDouble); + assertThat(underTest).doesNotSupport(JsonValue::asObject) + .doesNotSupport(JsonValue::asBoolean) + .doesNotSupport(JsonValue::asString) + .doesNotSupport(JsonValue::asInt) + .doesNotSupport(JsonValue::asLong) + .doesNotSupport(JsonValue::asDouble); } @Test @@ -173,14 +173,14 @@ public void addIntReturnsDisjointArray() { final int expectedSize = underTest.getSize() + 3; final ImmutableJsonArray afterAdd = underTest.add(firstIntValueToAdd, secondIntValueToAdd, thirdIntValueToAdd); - assertThat(afterAdd).isNotSameAs(underTest); - assertThat(afterAdd).hasSize(expectedSize); - assertThat(afterAdd).contains(firstIntValueToAdd); - assertThat(afterAdd).contains(secondIntValueToAdd); - assertThat(afterAdd).contains(thirdIntValueToAdd); - assertThat(underTest).doesNotContain(firstIntValueToAdd); - assertThat(underTest).doesNotContain(secondIntValueToAdd); - assertThat(underTest).doesNotContain(thirdIntValueToAdd); + assertThat(afterAdd).isNotSameAs(underTest) + .hasSize(expectedSize) + .contains(firstIntValueToAdd) + .contains(secondIntValueToAdd) + .contains(thirdIntValueToAdd); + assertThat(underTest).doesNotContain(firstIntValueToAdd) + .doesNotContain(secondIntValueToAdd) + .doesNotContain(thirdIntValueToAdd); final JsonValue otherValueToAddToOriginalJsonArray = newValue(KNOWN_INT_0); underTest.add(otherValueToAddToOriginalJsonArray); @@ -202,16 +202,18 @@ public void addLongReturnsDisjointArray() { final long secondLongValueToAdd = 1983L; final long thirdLongValueToAdd = 1984L; final int expectedSize = underTest.getSize() + 3; - final ImmutableJsonArray afterAdd = underTest.add(firstLongValueToAdd, secondLongValueToAdd, thirdLongValueToAdd); - - assertThat(afterAdd).isNotSameAs(underTest); - assertThat(afterAdd).hasSize(expectedSize); - assertThat(afterAdd).contains(firstLongValueToAdd); - assertThat(afterAdd).contains(secondLongValueToAdd); - assertThat(afterAdd).contains(thirdLongValueToAdd); - assertThat(underTest).doesNotContain(firstLongValueToAdd); - assertThat(underTest).doesNotContain(secondLongValueToAdd); - assertThat(underTest).doesNotContain(thirdLongValueToAdd); + final ImmutableJsonArray afterAdd = + underTest.add(firstLongValueToAdd, secondLongValueToAdd, thirdLongValueToAdd); + + assertThat(afterAdd) + .isNotSameAs(underTest) + .hasSize(expectedSize) + .contains(firstLongValueToAdd) + .contains(secondLongValueToAdd) + .contains(thirdLongValueToAdd); + assertThat(underTest).doesNotContain(firstLongValueToAdd) + .doesNotContain(secondLongValueToAdd) + .doesNotContain(thirdLongValueToAdd); final JsonValue otherValueToAddToOriginalJsonArray = newValue(KNOWN_INT_0); underTest.add(otherValueToAddToOriginalJsonArray); @@ -236,14 +238,14 @@ public void addDoubleReturnsDisjointArray() { final ImmutableJsonArray afterAdd = underTest.add(firstDoubleValueToAdd, secondDoubleValueToAdd, thirdDoubleValueToAdd); - assertThat(afterAdd).isNotSameAs(underTest); - assertThat(afterAdd).hasSize(expectedSize); - assertThat(afterAdd).contains(firstDoubleValueToAdd); - assertThat(afterAdd).contains(secondDoubleValueToAdd); - assertThat(afterAdd).contains(thirdDoubleValueToAdd); - assertThat(underTest).doesNotContain(firstDoubleValueToAdd); - assertThat(underTest).doesNotContain(secondDoubleValueToAdd); - assertThat(underTest).doesNotContain(thirdDoubleValueToAdd); + assertThat(afterAdd).isNotSameAs(underTest) + .hasSize(expectedSize) + .contains(firstDoubleValueToAdd) + .contains(secondDoubleValueToAdd) + .contains(thirdDoubleValueToAdd); + assertThat(underTest).doesNotContain(firstDoubleValueToAdd) + .doesNotContain(secondDoubleValueToAdd) + .doesNotContain(thirdDoubleValueToAdd); final JsonValue otherValueToAddToOriginalJsonArray = newValue(KNOWN_INT_0); underTest.add(otherValueToAddToOriginalJsonArray); @@ -268,14 +270,14 @@ public void addBooleanReturnsDisjointArray() { final ImmutableJsonArray afterAdd = underTest.add(firstBooleanValueToAdd, secondBooleanValueToAdd, thirdBooleanValueToAdd); - assertThat(afterAdd).isNotSameAs(underTest); - assertThat(afterAdd).hasSize(expectedSize); - assertThat(afterAdd).contains(firstBooleanValueToAdd); - assertThat(afterAdd).contains(secondBooleanValueToAdd); - assertThat(afterAdd).contains(thirdBooleanValueToAdd); - assertThat(underTest).doesNotContain(firstBooleanValueToAdd); - assertThat(underTest).doesNotContain(secondBooleanValueToAdd); - assertThat(underTest).doesNotContain(thirdBooleanValueToAdd); + assertThat(afterAdd).isNotSameAs(underTest) + .hasSize(expectedSize) + .contains(firstBooleanValueToAdd) + .contains(secondBooleanValueToAdd) + .contains(thirdBooleanValueToAdd); + assertThat(underTest).doesNotContain(firstBooleanValueToAdd) + .doesNotContain(secondBooleanValueToAdd) + .doesNotContain(thirdBooleanValueToAdd); final JsonValue otherValueToAddToOriginalJsonArray = newValue(KNOWN_INT_0); underTest.add(otherValueToAddToOriginalJsonArray); @@ -307,14 +309,14 @@ public void addStringReturnsDisjointArray() { final ImmutableJsonArray afterAdd = underTest.add(firstStringValueToAdd, secondStringValueToAdd, thirdStringValueToAdd); - assertThat(afterAdd).isNotSameAs(underTest); - assertThat(afterAdd).hasSize(expectedSize); - assertThat(afterAdd).contains(firstStringValueToAdd); - assertThat(afterAdd).contains(secondStringValueToAdd); - assertThat(afterAdd).contains(thirdStringValueToAdd); - assertThat(underTest).doesNotContain(firstStringValueToAdd); - assertThat(underTest).doesNotContain(secondStringValueToAdd); - assertThat(underTest).doesNotContain(thirdStringValueToAdd); + assertThat(afterAdd).isNotSameAs(underTest) + .hasSize(expectedSize) + .contains(firstStringValueToAdd) + .contains(secondStringValueToAdd) + .contains(thirdStringValueToAdd); + assertThat(underTest).doesNotContain(firstStringValueToAdd) + .doesNotContain(secondStringValueToAdd) + .doesNotContain(thirdStringValueToAdd); final JsonValue otherValueToAddToOriginalJsonArray = newValue(KNOWN_INT_0); underTest.add(otherValueToAddToOriginalJsonArray); @@ -343,16 +345,17 @@ public void addJsonValueReturnsDisjointArray() { final JsonValue secondJsonValueToAdd = newValue("1983.02D"); final JsonValue thirdJsonValueToAdd = newValue("1984.23D"); final int expectedSize = underTest.getSize() + 3; - final ImmutableJsonArray afterAdd = underTest.add(firstJsonValueToAdd, secondJsonValueToAdd, thirdJsonValueToAdd); + final ImmutableJsonArray afterAdd = + underTest.add(firstJsonValueToAdd, secondJsonValueToAdd, thirdJsonValueToAdd); - assertThat(afterAdd).isNotSameAs(underTest); - assertThat(afterAdd).hasSize(expectedSize); - assertThat(afterAdd).contains(firstJsonValueToAdd); - assertThat(afterAdd).contains(secondJsonValueToAdd); - assertThat(afterAdd).contains(thirdJsonValueToAdd); - assertThat(underTest).doesNotContain(firstJsonValueToAdd); - assertThat(underTest).doesNotContain(secondJsonValueToAdd); - assertThat(underTest).doesNotContain(thirdJsonValueToAdd); + assertThat(afterAdd).isNotSameAs(underTest) + .hasSize(expectedSize) + .contains(firstJsonValueToAdd) + .contains(secondJsonValueToAdd) + .contains(thirdJsonValueToAdd); + assertThat(underTest).doesNotContain(firstJsonValueToAdd) + .doesNotContain(secondJsonValueToAdd) + .doesNotContain(thirdJsonValueToAdd); final JsonValue otherValueToAddToOriginalJsonArray = newValue(KNOWN_INT_0); underTest.add(otherValueToAddToOriginalJsonArray); @@ -432,7 +435,7 @@ public void validateSoftReferenceStrategy() throws IllegalAccessException, NoSuc softReference.clear(); - assertThat(jsonArray.get(0).isPresent()).isTrue(); + assertThat(jsonArray.get(0)).isPresent(); } private void assertInternalCachesAreAsExpected(final JsonArray jsonArray, final boolean jsonExpected) { diff --git a/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonBooleanTest.java b/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonBooleanTest.java index 6987a15158..e0ef77c8df 100644 --- a/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonBooleanTest.java +++ b/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonBooleanTest.java @@ -18,7 +18,6 @@ import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; @@ -60,7 +59,7 @@ public void asBooleanReturnsExpected() { public void toStringReturnsExpected() { final ImmutableJsonBoolean underTest = ImmutableJsonBoolean.FALSE; - assertThat(underTest.toString()).isEqualTo("false"); + assertThat(underTest.toString()).hasToString("false"); } @Test diff --git a/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonDoubleTest.java b/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonDoubleTest.java index e663b26e36..091b3accb3 100644 --- a/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonDoubleTest.java +++ b/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonDoubleTest.java @@ -21,7 +21,6 @@ import java.util.Collection; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.runners.Enclosed; import org.junit.runner.RunWith; @@ -87,7 +86,7 @@ public void jsonDoubleHasSameHashCodeAsJsonIntIfSameValue() { final ImmutableJsonInt intValue = ImmutableJsonInt.of(value); final ImmutableJsonDouble underTest = ImmutableJsonDouble.of(value); - assertThat(underTest.hashCode()).isEqualTo(intValue.hashCode()); + assertThat(underTest.hashCode()).hasSameHashCodeAs(intValue.hashCode()); } @Test @@ -105,7 +104,7 @@ public void jsonDoubleHasSameHashCodeAsJsonLongIfSameValue() { final ImmutableJsonLong longValue = ImmutableJsonLong.of(value); final ImmutableJsonDouble underTest = ImmutableJsonDouble.of(value); - assertThat(underTest.hashCode()).isEqualTo(longValue.hashCode()); + assertThat(underTest.hashCode()).hasSameHashCodeAs(longValue.hashCode()); } @Test @@ -120,7 +119,7 @@ public void asDoubleReturnsExpected() { @Test public void toStringReturnsExpected() { - assertThat(underTest.toString()).isEqualTo(String.valueOf(doubleValue)); + assertThat(underTest.toString()).hasToString(String.valueOf(doubleValue)); } @Test diff --git a/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonFieldSelectorBuilderTest.java b/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonFieldSelectorBuilderTest.java index e8d83e9a4a..83691a33bf 100755 --- a/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonFieldSelectorBuilderTest.java +++ b/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonFieldSelectorBuilderTest.java @@ -248,7 +248,7 @@ public void removePointerViaIteratorResetsJsonSelectorString() { final JsonFieldSelector fieldSelector1 = underTest.addFieldSelectorString(fieldSelectorString) .build(); - assertThat(fieldSelector1.toString()).isEqualTo(fieldSelectorString); + assertThat(fieldSelector1.toString()).hasToString(fieldSelectorString); final Iterator pointerIterator = underTest.iterator(); while (pointerIterator.hasNext()) { diff --git a/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonFieldSelectorTest.java b/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonFieldSelectorTest.java index a17dda6d26..9a6a4431ce 100755 --- a/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonFieldSelectorTest.java +++ b/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonFieldSelectorTest.java @@ -26,7 +26,6 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.Ignore; import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; @@ -110,8 +109,8 @@ public void usingJsonPointerCollectionResultsInSameToStringAsJsonFieldSelectorSt final JsonFieldSelector underTest2 = JsonFactory.newFieldSelector(inputJsonFieldSelector, JsonFactory.newParseOptionsBuilder().withoutUrlDecoding().build()); - assertThat(underTest1.toString()).isEqualTo(underTest2.toString()); - assertThat(underTest1.toString()).isEqualTo(inputJsonFieldSelector); + assertThat(underTest1.toString()).hasToString(underTest2.toString()); + assertThat(underTest1.toString()).hasToString(inputJsonFieldSelector); } } diff --git a/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonFieldTest.java b/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonFieldTest.java index 2a72a5efa4..8cf12aa89f 100755 --- a/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonFieldTest.java +++ b/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonFieldTest.java @@ -25,7 +25,6 @@ import java.util.HashSet; import java.util.Set; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -137,7 +136,7 @@ public void fieldWithSchemaVersionMarkerIsMarkedCorrectly() { public void toStringReturnsExpected() { final JsonField underTest = ImmutableJsonField.newInstance(jsonKeyMock, jsonValueMock, fieldDefinitionMock); - assertThat(underTest.toString()).isEqualTo("\"" + jsonKeyMock + "\"" + ":" + jsonValueMock); + assertThat(underTest.toString()).hasToString("\"" + jsonKeyMock + "\"" + ":" + jsonValueMock); } @Test diff --git a/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonIntTest.java b/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonIntTest.java index a379524f5b..d0fa172565 100644 --- a/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonIntTest.java +++ b/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonIntTest.java @@ -21,7 +21,6 @@ import java.util.Collection; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.runners.Enclosed; import org.junit.runner.RunWith; @@ -82,7 +81,7 @@ public void jsonIntEqualsJsonLongIfSameValue() { public void jsonIntHasSameHashCodeAsJsonLongIfSameValue() { final ImmutableJsonLong longValue = ImmutableJsonLong.of(intValue); - assertThat(underTest.hashCode()).isEqualTo(longValue.hashCode()); + assertThat(underTest.hashCode()).hasSameHashCodeAs(longValue.hashCode()); } @Test @@ -96,7 +95,7 @@ public void jsonIntEqualsJsonDoubleIfSameValue() { public void jsonIntHasSameHashCodeAsJsonDoubleIfSameValue() { final ImmutableJsonDouble doubleValue = ImmutableJsonDouble.of(intValue); - assertThat(underTest.hashCode()).isEqualTo(doubleValue.hashCode()); + assertThat(underTest.hashCode()).hasSameHashCodeAs(doubleValue.hashCode()); } @Test @@ -121,7 +120,7 @@ public void asDoubleReturnsExpected() { @Test public void toStringReturnsExpected() { - assertThat(underTest.toString()).isEqualTo(String.valueOf(intValue)); + assertThat(underTest.toString()).hasToString(String.valueOf(intValue)); } @Test diff --git a/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonKeyTest.java b/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonKeyTest.java index 87b4ded976..680e18d930 100755 --- a/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonKeyTest.java +++ b/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonKeyTest.java @@ -16,7 +16,6 @@ import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf; import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable; -import org.junit.Ignore; import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; @@ -52,7 +51,7 @@ public void toStringReturnsExpected() { final String expected = "key"; final JsonKey underTest = ImmutableJsonKey.of(expected); - assertThat(underTest.toString()).isEqualTo(expected); + assertThat(underTest.toString()).hasToString(expected); } @Test @@ -63,8 +62,9 @@ public void getKeyWithSlashesAsPointer() { final JsonPointer jsonPointer = underTest.asPointer(); - assertThat(jsonPointer).hasLevelCount(1); - assertThat(jsonPointer).isEqualTo(expected); + assertThat(jsonPointer) + .hasLevelCount(1) + .isEqualTo(expected); } } diff --git a/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonLiteralTest.java b/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonLiteralTest.java index dcff11670a..8e2ebc64e3 100755 --- a/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonLiteralTest.java +++ b/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonLiteralTest.java @@ -18,7 +18,6 @@ import java.lang.ref.SoftReference; -import org.junit.Ignore; import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; @@ -50,26 +49,26 @@ public void testHashCodeAndEquals() { public void trueBehavesAsExpected() { final ImmutableJsonBoolean underTest = ImmutableJsonBoolean.TRUE; - assertThat(underTest).isNotArray(); - assertThat(underTest).isBoolean(); - assertThat(underTest).isNotNullLiteral(); - assertThat(underTest).isNotNumber(); - assertThat(underTest).isNotObject(); - assertThat(underTest).isNotString(); - assertThat(underTest.toString()).isEqualTo("true"); + assertThat(underTest).isNotArray() + .isBoolean() + .isNotNullLiteral() + .isNotNumber() + .isNotObject() + .isNotString(); + assertThat(underTest.toString()).hasToString("true"); } @Test public void falseBehavesAsExpected() { final ImmutableJsonBoolean underTest = ImmutableJsonBoolean.FALSE; - assertThat(underTest).isNotArray(); - assertThat(underTest).isBoolean(); - assertThat(underTest).isNotNullLiteral(); - assertThat(underTest).isNotNumber(); - assertThat(underTest).isNotObject(); - assertThat(underTest).isNotString(); - assertThat(underTest.toString()).isEqualTo("false"); + assertThat(underTest).isNotArray() + .isBoolean() + .isNotNullLiteral() + .isNotNumber() + .isNotObject() + .isNotString(); + assertThat(underTest.toString()).hasToString("false"); } } diff --git a/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonLongTest.java b/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonLongTest.java index 75fe587f5e..0c2bedb8a0 100644 --- a/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonLongTest.java +++ b/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonLongTest.java @@ -21,7 +21,6 @@ import java.util.Collection; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.runners.Enclosed; import org.junit.runner.RunWith; @@ -86,7 +85,7 @@ public void jsonLongHasSameHashCodeAsJsonIntIfSameValue() { final ImmutableJsonInt intValue = ImmutableJsonInt.of(value); final ImmutableJsonLong underTest = ImmutableJsonLong.of(value); - assertThat(underTest.hashCode()).isEqualTo(intValue.hashCode()); + assertThat(underTest.hashCode()).hasSameHashCodeAs(intValue.hashCode()); } @Test @@ -100,7 +99,7 @@ public void jsonLongEqualsJsonDoubleIfSameValue() { public void jsonLongHasSameHashCodeAsJsonDoubleIfSameValue() { final ImmutableJsonDouble doubleValue = ImmutableJsonDouble.of(longValue); - assertThat(underTest.hashCode()).isEqualTo(doubleValue.hashCode()); + assertThat(underTest.hashCode()).hasSameHashCodeAs(doubleValue.hashCode()); } @Test @@ -120,7 +119,7 @@ public void asDoubleReturnsExpected() { @Test public void toStringReturnsExpected() { - assertThat(underTest.toString()).isEqualTo(String.valueOf(longValue)); + assertThat(underTest.toString()).hasToString(String.valueOf(longValue)); } @Test diff --git a/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonNullTest.java b/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonNullTest.java index 717e8569d0..3be899384c 100755 --- a/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonNullTest.java +++ b/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonNullTest.java @@ -20,7 +20,6 @@ import org.assertj.core.api.Assertions; import org.eclipse.ditto.json.assertions.DittoJsonAssertions; -import org.junit.Ignore; import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; @@ -59,13 +58,13 @@ public void testHashCodeAndEquals() { public void nullBehavesAsExpected() { final JsonValue underTest = ImmutableJsonNull.getInstance(); - DittoJsonAssertions.assertThat(underTest).isArray(); - DittoJsonAssertions.assertThat(underTest).isNotBoolean(); - DittoJsonAssertions.assertThat(underTest).isNullLiteral(); - DittoJsonAssertions.assertThat(underTest).isNotNumber(); - DittoJsonAssertions.assertThat(underTest).isObject(); - DittoJsonAssertions.assertThat(underTest).isNotString(); - assertThat(underTest.toString()).isEqualTo("null"); + DittoJsonAssertions.assertThat(underTest).isArray() + .isNotBoolean() + .isNullLiteral() + .isNotNumber() + .isObject() + .isNotString(); + assertThat(underTest.toString()).hasToString("null"); } } diff --git a/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonObjectNullTest.java b/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonObjectNullTest.java index 9576c34526..3c42054a7d 100755 --- a/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonObjectNullTest.java +++ b/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonObjectNullTest.java @@ -16,7 +16,6 @@ import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf; import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable; -import org.junit.Ignore; import org.junit.Test; /** @@ -44,7 +43,7 @@ public void testHashCodeAndEquals() { public void toStringReturnsExpected() { final ImmutableJsonObjectNull underTest = ImmutableJsonObjectNull.getInstance(); - assertThat(underTest.toString()).isEqualTo("null"); + assertThat(underTest.toString()).hasToString("null"); } } diff --git a/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonObjectTest.java b/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonObjectTest.java index 514f39aadb..910b36d8b5 100644 --- a/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonObjectTest.java +++ b/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonObjectTest.java @@ -33,7 +33,6 @@ import java.util.function.Function; import org.assertj.core.api.Assertions; -import org.junit.Ignore; import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; @@ -135,30 +134,30 @@ public void twoParsedObjectsFromSameStringHaveSameHashCode() { assertThat(parsedFirst).isInstanceOf(ImmutableJsonObject.class); assertThat(parsedSecond).isInstanceOf(ImmutableJsonObject.class); assertThat(parsedFirst.equals(parsedSecond)).isTrue(); - assertThat(parsedFirst.hashCode()).isEqualTo(parsedSecond.hashCode()); + assertThat(parsedFirst.hashCode()).hasSameHashCodeAs(parsedSecond.hashCode()); } @Test public void getEmptyInstanceReturnsExpected() { final JsonObject underTest = ImmutableJsonObject.empty(); - assertThat(underTest).isObject(); - assertThat(underTest).isEmpty(); + assertThat(underTest).isObject() + .isEmpty(); assertThat(underTest).hasSize(0); assertThat(underTest.asObject()).isSameAs(underTest); - assertThat(underTest.toString()).isEqualTo("{}"); + assertThat(underTest.toString()).hasToString("{}"); } @Test public void objectIsNothingElse() { final JsonValue underTest = ImmutableJsonObject.empty(); - assertThat(underTest).isObject(); - assertThat(underTest).isNotNullLiteral(); - assertThat(underTest).isNotBoolean(); - assertThat(underTest).isNotNumber(); - assertThat(underTest).isNotString(); - assertThat(underTest).isNotArray(); + assertThat(underTest).isObject() + .isNotNullLiteral() + .isNotBoolean() + .isNotNumber() + .isNotString() + .isNotArray(); assertThat(underTest.isInt()).isFalse(); assertThat(underTest.isLong()).isFalse(); assertThat(underTest.isDouble()).isFalse(); @@ -168,23 +167,23 @@ public void objectIsNothingElse() { public void checkUnsupportedOperations() { final JsonValue underTest = ImmutableJsonObject.of(KNOWN_FIELDS); - assertThat(underTest).doesNotSupport(JsonValue::asArray); - assertThat(underTest).doesNotSupport(JsonValue::asBoolean); - assertThat(underTest).doesNotSupport(JsonValue::asString); - assertThat(underTest).doesNotSupport(JsonValue::asInt); - assertThat(underTest).doesNotSupport(JsonValue::asLong); - assertThat(underTest).doesNotSupport(JsonValue::asDouble); + assertThat(underTest).doesNotSupport(JsonValue::asArray) + .doesNotSupport(JsonValue::asBoolean) + .doesNotSupport(JsonValue::asString) + .doesNotSupport(JsonValue::asInt) + .doesNotSupport(JsonValue::asLong) + .doesNotSupport(JsonValue::asDouble); } @Test public void getInstanceReturnsExpected() { final JsonObject underTest = ImmutableJsonObject.of(KNOWN_FIELDS); - assertThat(underTest).isObject(); - assertThat(underTest).isNotEmpty(); - assertThat(underTest).hasSize(3); + assertThat(underTest).isObject() + .isNotEmpty() + .hasSize(3); assertThat(underTest.asObject()).isSameAs(underTest); - assertThat(underTest.toString()).isEqualTo(KNOWN_JSON_STRING); + assertThat(underTest.toString()).hasToString(KNOWN_JSON_STRING); } @Test @@ -208,10 +207,10 @@ public void setWorksAsExpected() { final JsonObject newJsonObject = underTest.setValue(key, valueToAdd); assertThat(underTest).isEmpty(); - assertThat(newJsonObject).isNotEmpty(); - assertThat(newJsonObject).hasSize(1); - assertThat(newJsonObject).isNotSameAs(underTest); - assertThat(newJsonObject).contains(key, valueToAdd); + assertThat(newJsonObject).isNotEmpty() + .hasSize(1) + .isNotSameAs(underTest) + .contains(key, valueToAdd); } @Test(expected = NullPointerException.class) @@ -237,9 +236,9 @@ public void setIntCreatesDisjointJsonObject() { final int value = KNOWN_INT_42; final JsonObject afterAdd = underTest.setValue(key, value); - assertThat(afterAdd).isNotSameAs(underTest); - assertThat(afterAdd).hasSize(1); - assertThat(afterAdd).contains(key, value); + assertThat(afterAdd).isNotSameAs(underTest) + .hasSize(1) + .contains(key, value); underTest.setValue(KNOWN_KEY_FOO, KNOWN_VALUE_FOO); @@ -288,9 +287,9 @@ public void setLongCreatesDisjointJsonObject() { final long value = Long.MAX_VALUE; final JsonObject afterAdd = underTest.setValue(key, value); - assertThat(afterAdd).isNotSameAs(underTest); - assertThat(afterAdd).hasSize(1); - assertThat(afterAdd).contains(key, value); + assertThat(afterAdd).isNotSameAs(underTest) + .hasSize(1) + .contains(key, value); underTest.setValue(KNOWN_KEY_FOO, KNOWN_VALUE_FOO); @@ -304,9 +303,9 @@ public void setDoubleCreatesDisjointJsonObject() { final double value = Double.MAX_VALUE; final JsonObject afterAdd = underTest.setValue(key, value); - assertThat(afterAdd).isNotSameAs(underTest); - assertThat(afterAdd).hasSize(1); - assertThat(afterAdd).contains(key, value); + assertThat(afterAdd).isNotSameAs(underTest) + .hasSize(1) + .contains(key, value); underTest.setValue(KNOWN_KEY_FOO, KNOWN_VALUE_FOO); @@ -320,9 +319,9 @@ public void setBooleanCreatesDisjointJsonObject() { final boolean value = false; final JsonObject afterAdd = underTest.setValue(key, value); - assertThat(afterAdd).isNotSameAs(underTest); - assertThat(afterAdd).hasSize(1); - assertThat(afterAdd).contains(key, value); + assertThat(afterAdd).isNotSameAs(underTest) + .hasSize(1) + .contains(key, value); underTest.setValue(KNOWN_KEY_FOO, KNOWN_VALUE_FOO); @@ -336,9 +335,9 @@ public void setStringCreatesDisjoint() { final String value = "black out"; final JsonObject afterAdd = underTest.setValue(key, value); - assertThat(afterAdd).isNotSameAs(underTest); - assertThat(afterAdd).hasSize(1); - assertThat(afterAdd).contains(key, value); + assertThat(afterAdd).isNotSameAs(underTest) + .hasSize(1) + .contains(key, value); underTest.setValue(KNOWN_KEY_FOO, KNOWN_VALUE_FOO); @@ -589,9 +588,9 @@ public void removingExistingJsonFieldByNameReturnsDisjunctJsonObject() { final JsonObject afterRemoval = underTest.remove(nameToRemove); final int expectedSize = underTest.getSize() - 1; - assertThat(afterRemoval).isNotSameAs(underTest); - assertThat(afterRemoval).hasSize(expectedSize); - assertThat(afterRemoval).doesNotContain(KNOWN_KEY_BAR); + assertThat(afterRemoval).isNotSameAs(underTest) + .hasSize(expectedSize) + .doesNotContain(KNOWN_KEY_BAR); underTest.remove(KNOWN_KEY_BAZ); @@ -617,9 +616,9 @@ public void removingSubAttributesWorksAsExpected() { jsonFields.remove(complex.getKeyName()); jsonFields.put(complex.getKeyName(), toField(complex.getKey(), JsonObject.of("{}"))); - assertThat(afterRemoval).isNotSameAs(underTest); - assertThat(afterRemoval).doesNotContain(JsonKey.of("subToDelete")); - assertThat(afterRemoval).containsExactlyElementsOf(jsonFields.values()); + assertThat(afterRemoval).isNotSameAs(underTest) + .doesNotContain(JsonKey.of("subToDelete")) + .containsExactlyElementsOf(jsonFields.values()); } @Test(expected = NullPointerException.class) @@ -1272,8 +1271,9 @@ public void setFieldAppendsFieldIfNoPreviousFieldWithSameKeyExists() { JsonObject underTest = ImmutableJsonObject.of(KNOWN_FIELDS); underTest = underTest.set(newField); - assertThat(underTest).hasSize(KNOWN_FIELDS.size() + 1); - assertThat(underTest).contains(newField); + assertThat(underTest) + .hasSize(KNOWN_FIELDS.size() + 1) + .contains(newField); } @Test @@ -1282,8 +1282,9 @@ public void setFieldReplacesExistingFieldWithSameKey() { JsonObject underTest = ImmutableJsonObject.of(KNOWN_FIELDS); underTest = underTest.set(changedField); - assertThat(underTest).hasSize(KNOWN_FIELDS.size()); - assertThat(underTest).contains(changedField); + assertThat(underTest) + .hasSize(KNOWN_FIELDS.size()) + .contains(changedField); } @Test @@ -1408,7 +1409,7 @@ public void validateSoftReferenceStrategy() throws IllegalAccessException, NoSuc softReference.clear(); - assertThat(jsonObject.getValue(KNOWN_KEY_FOO).isPresent()).isTrue(); + assertThat(jsonObject.getValue(KNOWN_KEY_FOO)).isPresent(); } private void assertInternalCachesAreAsExpected(final JsonObject jsonObject, final boolean jsonExpected) { @@ -1431,4 +1432,5 @@ private void assertInternalCachesAreAsExpected(final JsonObject jsonObject, fina e.printStackTrace(); } } + } diff --git a/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonPointerTest.java b/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonPointerTest.java index e7cb28ff60..4aff6ab138 100755 --- a/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonPointerTest.java +++ b/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonPointerTest.java @@ -25,7 +25,6 @@ import java.util.List; import java.util.Optional; -import org.junit.Ignore; import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; @@ -74,7 +73,7 @@ public void emptyPointerEqualsPointerWithOneSlash() { final JsonPointer underTest = ImmutableJsonPointer.ofParsed("/"); assertThat(underTest).isEqualTo(ImmutableJsonPointer.empty()); - assertThat(underTest.toString()).isEqualTo(ImmutableJsonPointer.empty().toString()); + assertThat(underTest.toString()).hasToString(ImmutableJsonPointer.empty().toString()); } @Test @@ -202,7 +201,7 @@ public void createInstanceFromRootPointer() { final JsonPointer underTest = ImmutableJsonPointer.ofParsed(rootString); assertThat(underTest.isEmpty()).isTrue(); - assertThat(underTest.toString()).isEqualTo(rootString); + assertThat(underTest.toString()).hasToString(rootString); } @Test @@ -255,7 +254,7 @@ public void appendSubPointerReturnsExpected() { final JsonPointer subPointer = ImmutableJsonPointer.of(JsonFactory.newKey("child"), JsonFactory.newKey("sub")); final JsonPointer newPointer = root.append(subPointer); - assertThat(newPointer.toString()).isEqualTo("/root/child/sub"); + assertThat(newPointer.toString()).hasToString("/root/child/sub"); } @Test @@ -279,7 +278,7 @@ public void createInstanceFromParsedStringWithEscapedTildesWorksAsExpected() { assertThat(underTest).hasLevelCount(3); assertThat(underTest.get(1)).contains(JsonFactory.newKey("~dum~die~dum")); - assertThat(underTest.toString()).isEqualTo("/foo/~0dum~0die~0dum/baz"); + assertThat(underTest.toString()).hasToString("/foo/~0dum~0die~0dum/baz"); } @Test @@ -292,7 +291,7 @@ public void createInstanceFromJsonKeysWithEscapedTildesAndSlashesWorksAsExpected assertThat(underTest).hasLevelCount(3); assertThat(underTest.get(1)).contains(key2); - assertThat(underTest.toString()).isEqualTo("/foo/~0dum/~0die/~0dum/baz"); + assertThat(underTest.toString()).hasToString("/foo/~0dum/~0die/~0dum/baz"); } } diff --git a/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonStringTest.java b/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonStringTest.java index 75b5282936..b3420c3c46 100755 --- a/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonStringTest.java +++ b/json/src/test/java/org/eclipse/ditto/json/ImmutableJsonStringTest.java @@ -18,7 +18,6 @@ import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf; import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable; -import org.junit.Ignore; import org.junit.Test; import com.eclipsesource.json.Json; @@ -83,7 +82,7 @@ public void toStringReturnsExpected() { final String expected = "\"" + KNOWN_STRING_VALUE + "\""; final com.eclipsesource.json.JsonValue underTest = Json.value(KNOWN_STRING_VALUE); - assertThat(underTest.toString()).isEqualTo(expected); + assertThat(underTest.toString()).hasToString(expected); } @Test diff --git a/json/src/test/java/org/eclipse/ditto/json/JsonFactoryTest.java b/json/src/test/java/org/eclipse/ditto/json/JsonFactoryTest.java index 3e46466fa0..73775e11a1 100755 --- a/json/src/test/java/org/eclipse/ditto/json/JsonFactoryTest.java +++ b/json/src/test/java/org/eclipse/ditto/json/JsonFactoryTest.java @@ -25,7 +25,6 @@ import java.util.LinkedHashMap; import java.util.Map; -import org.junit.Ignore; import org.junit.Test; /** @@ -83,7 +82,7 @@ public void newJsonStringReturnsExpected() { final String expectedJsonString = "\"" + string + "\""; assertThat(jsonString.isString()).isTrue(); - assertThat(jsonString.toString()).isEqualTo(expectedJsonString); + assertThat(jsonString.toString()).hasToString(expectedJsonString); } @Test @@ -163,9 +162,10 @@ public void tryToCreateNewObjectBuilderFromNullObject() { public void newObjectReturnsExpected() { final JsonObject underTest = JsonFactory.newObject(); - assertThat(underTest).isObject(); - assertThat(underTest).isEmpty(); - assertThat(underTest).isNotNullLiteral(); + assertThat(underTest) + .isObject() + .isNotNullLiteral() + .isEmpty(); } @Test(expected = NullPointerException.class) @@ -208,12 +208,12 @@ public void newObjectFromStringReturnsExpected() { final JsonObject underTest = JsonFactory.newObject(KNOWN_JSON_OBJECT_STRING); final byte expectedSize = 3; - assertThat(underTest).isObject(); - assertThat(underTest).isNotNullLiteral(); - assertThat(underTest).isNotEmpty(); - assertThat(underTest).hasSize(expectedSize); - assertThat(underTest).contains(JsonFactory.newKey("featureId"), "1"); - assertThat(underTest).contains(JsonFactory.newKey("functionblock"), JsonFactory.nullLiteral()); + assertThat(underTest).isObject() + .isNotEmpty() + .isNotNullLiteral() + .hasSize(expectedSize) + .contains(JsonFactory.newKey("featureId"), "1") + .contains(JsonFactory.newKey("functionblock"), JsonFactory.nullLiteral()); JsonObject expectedProperties = JsonFactory.newObject(); expectedProperties = expectedProperties.setValue("someInt", 42); @@ -236,8 +236,9 @@ public void tryToCreateNewObjectBuilderFromNullIterable() { public void createNewEmptyArray() { final JsonArray underTest = JsonFactory.newArray(); - assertThat(underTest).isArray(); - assertThat(underTest).isEmpty(); + assertThat(underTest) + .isArray() + .isEmpty(); } @Test(expected = IllegalArgumentException.class) @@ -255,14 +256,15 @@ public void newArrayFromStringReturnsExpected() { final JsonArray underTest = JsonFactory.newArray(KNOWN_JSON_ARRAY_STRING); final byte expectedSize = 3; - assertThat(underTest).isArray(); - assertThat(underTest).isNotNullLiteral(); - assertThat(underTest).isNotEmpty(); - assertThat(underTest).hasSize(expectedSize); - assertThat(underTest).isNotObject(); - assertThat(underTest).contains("one"); - assertThat(underTest).contains("two"); - assertThat(underTest).contains("three"); + assertThat(underTest) + .isArray() + .isNotNullLiteral() + .isNotEmpty() + .hasSize(expectedSize) + .isNotObject() + .contains("one") + .contains("two") + .contains("three"); } @Test(expected = JsonParseException.class) @@ -301,8 +303,9 @@ public void readFromJsonArrayStringReader() { final StringReader stringReader = new StringReader(KNOWN_JSON_ARRAY_STRING); final JsonValue jsonValue = JsonFactory.readFrom(stringReader); - assertThat(jsonValue).isNotNull(); - assertThat(jsonValue).isArray(); + assertThat(jsonValue) + .isNotNull() + .isArray(); assertThat((JsonArray) jsonValue).contains("two"); } @@ -462,7 +465,7 @@ public void newStringFieldDefinitionReturnsExpected() { public void newBooleanFieldDefinitionReturnsExpected() { final JsonFieldDefinition underTest = JsonFactory.newBooleanFieldDefinition(KNOWN_POINTER); - assertThat(underTest.mapValue(JsonFactory.newValue(true))).isEqualTo(true); + assertThat(underTest.mapValue(JsonFactory.newValue(true))).isTrue(); assertThat(underTest.mapValue(JsonFactory.nullLiteral())).isNull(); assertThatExceptionOfType(JsonParseException.class) .isThrownBy(() -> underTest.mapValue(JsonFactory.newValue(KNOWN_INT))) @@ -600,4 +603,5 @@ public void newJsonObjectFromPathAndValue() { public void newJsonObjectThrowsExceptionIfRootIsNotAnObject() { JsonFactory.newObject(JsonPointer.empty(), JsonValue.of(1)); } + } diff --git a/jwt/model/src/test/java/org/eclipse/ditto/jwt/model/ImmutableJsonWebTokenTest.java b/jwt/model/src/test/java/org/eclipse/ditto/jwt/model/ImmutableJsonWebTokenTest.java index 55e52d980c..9b098ac3e2 100644 --- a/jwt/model/src/test/java/org/eclipse/ditto/jwt/model/ImmutableJsonWebTokenTest.java +++ b/jwt/model/src/test/java/org/eclipse/ditto/jwt/model/ImmutableJsonWebTokenTest.java @@ -106,7 +106,7 @@ public void checkTokenExpiration() { final JsonWebToken expiredJsonWebToken = ImmutableJsonWebToken.fromAuthorization(authorizationHeader); - assertThat(expiredJsonWebToken.isExpired()).isEqualTo(true); + assertThat(expiredJsonWebToken.isExpired()).isTrue(); } private static String base64(final String value) { diff --git a/messages/model/src/main/java/org/eclipse/ditto/messages/model/signals/commands/MessagePayloadSerializer.java b/messages/model/src/main/java/org/eclipse/ditto/messages/model/signals/commands/MessagePayloadSerializer.java index 1fd5dcfb38..3714a0d469 100644 --- a/messages/model/src/main/java/org/eclipse/ditto/messages/model/signals/commands/MessagePayloadSerializer.java +++ b/messages/model/src/main/java/org/eclipse/ditto/messages/model/signals/commands/MessagePayloadSerializer.java @@ -47,7 +47,7 @@ static void serialize(final Message message, final JsonObjectBuilder mess final Optional payloadOptional = message.getPayload(); final ContentType contentType = message.getContentType().map(ContentType::of).orElse(ContentType.of("")); final JsonValue payloadValue; - if (rawPayloadOptional.isPresent() && !payloadOptional.filter(p -> p instanceof JsonValue).isPresent()) { + if (rawPayloadOptional.isPresent() && !payloadOptional.filter(JsonValue.class::isInstance).isPresent()) { final ByteBuffer rawPayload = rawPayloadOptional.get(); if (MessageDeserializer.shouldBeInterpretedAsTextOrJson(contentType)) { payloadValue = diff --git a/placeholders/src/main/java/org/eclipse/ditto/placeholders/ExpressionResolver.java b/placeholders/src/main/java/org/eclipse/ditto/placeholders/ExpressionResolver.java index 11fd1d7f6f..014810ca77 100644 --- a/placeholders/src/main/java/org/eclipse/ditto/placeholders/ExpressionResolver.java +++ b/placeholders/src/main/java/org/eclipse/ditto/placeholders/ExpressionResolver.java @@ -21,7 +21,6 @@ import java.util.function.Function; import java.util.regex.Matcher; import java.util.stream.Collectors; -import java.util.stream.Stream; import org.eclipse.ditto.base.model.common.Placeholders; diff --git a/placeholders/src/main/java/org/eclipse/ditto/placeholders/PlaceholderNotResolvableException.java b/placeholders/src/main/java/org/eclipse/ditto/placeholders/PlaceholderNotResolvableException.java index 36184d8563..f14c6899e6 100644 --- a/placeholders/src/main/java/org/eclipse/ditto/placeholders/PlaceholderNotResolvableException.java +++ b/placeholders/src/main/java/org/eclipse/ditto/placeholders/PlaceholderNotResolvableException.java @@ -26,7 +26,6 @@ import org.eclipse.ditto.base.model.common.HttpStatus; import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException; import org.eclipse.ditto.base.model.exceptions.DittoRuntimeExceptionBuilder; -import org.eclipse.ditto.base.model.exceptions.GeneralException; import org.eclipse.ditto.base.model.headers.DittoHeaders; import org.eclipse.ditto.base.model.json.JsonParsableException; import org.eclipse.ditto.json.JsonObject; diff --git a/placeholders/src/main/java/org/eclipse/ditto/placeholders/PlaceholderReferenceNotSupportedException.java b/placeholders/src/main/java/org/eclipse/ditto/placeholders/PlaceholderReferenceNotSupportedException.java index f70816922a..8f6170553a 100644 --- a/placeholders/src/main/java/org/eclipse/ditto/placeholders/PlaceholderReferenceNotSupportedException.java +++ b/placeholders/src/main/java/org/eclipse/ditto/placeholders/PlaceholderReferenceNotSupportedException.java @@ -26,7 +26,6 @@ import org.eclipse.ditto.base.model.common.HttpStatus; import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException; import org.eclipse.ditto.base.model.exceptions.DittoRuntimeExceptionBuilder; -import org.eclipse.ditto.base.model.exceptions.GeneralException; import org.eclipse.ditto.base.model.headers.DittoHeaders; import org.eclipse.ditto.base.model.json.JsonParsableException; import org.eclipse.ditto.json.JsonObject; diff --git a/placeholders/src/main/java/org/eclipse/ditto/placeholders/PlaceholderReferenceUnknownFieldException.java b/placeholders/src/main/java/org/eclipse/ditto/placeholders/PlaceholderReferenceUnknownFieldException.java index e939f193a7..4575124ca1 100644 --- a/placeholders/src/main/java/org/eclipse/ditto/placeholders/PlaceholderReferenceUnknownFieldException.java +++ b/placeholders/src/main/java/org/eclipse/ditto/placeholders/PlaceholderReferenceUnknownFieldException.java @@ -24,7 +24,6 @@ import org.eclipse.ditto.base.model.common.HttpStatus; import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException; import org.eclipse.ditto.base.model.exceptions.DittoRuntimeExceptionBuilder; -import org.eclipse.ditto.base.model.exceptions.GeneralException; import org.eclipse.ditto.base.model.headers.DittoHeaders; import org.eclipse.ditto.base.model.json.JsonParsableException; import org.eclipse.ditto.json.JsonObject; diff --git a/placeholders/src/test/java/org/eclipse/ditto/placeholders/ImmutableTimePlaceholderTest.java b/placeholders/src/test/java/org/eclipse/ditto/placeholders/ImmutableTimePlaceholderTest.java index 6d0d81131e..03e1b2eded 100644 --- a/placeholders/src/test/java/org/eclipse/ditto/placeholders/ImmutableTimePlaceholderTest.java +++ b/placeholders/src/test/java/org/eclipse/ditto/placeholders/ImmutableTimePlaceholderTest.java @@ -53,14 +53,15 @@ public void testReplaceCurrentTimestampIso() { final List resolved = UNDER_TEST.resolveValues(SOME_OBJECT, "now").stream() .map(Instant::parse) .collect(Collectors.toList()); - assertThat(resolved).allSatisfy(i -> { + assertThat(resolved) + .hasSize(1) + .allSatisfy(i -> { final Instant now = Instant.now(); assertThat(i) .isBefore(now) .isCloseTo(now, new TemporalUnitLessThanOffset(1000, ChronoUnit.MILLIS)); } ); - assertThat(resolved).hasSize(1); } @Test @@ -70,6 +71,7 @@ public void testReplaceCurrentTimestampMillisSinceEpoch() { .map(Instant::ofEpochMilli) .collect(Collectors.toList()); assertThat(resolved) + .hasSize(1) .allSatisfy(i -> { final Instant now = Instant.now(); assertThat(i) @@ -77,7 +79,6 @@ public void testReplaceCurrentTimestampMillisSinceEpoch() { .isCloseTo(now, new TemporalUnitLessThanOffset(1000, ChronoUnit.MILLIS)); } ); - assertThat(resolved).hasSize(1); } } diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/enforcers/tree/CheckPartialPermissionsVisitor.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/enforcers/tree/CheckPartialPermissionsVisitor.java index 943b936098..917e351552 100755 --- a/policies/model/src/main/java/org/eclipse/ditto/policies/model/enforcers/tree/CheckPartialPermissionsVisitor.java +++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/enforcers/tree/CheckPartialPermissionsVisitor.java @@ -18,8 +18,6 @@ import javax.annotation.concurrent.NotThreadSafe; import org.eclipse.ditto.json.JsonPointer; -import org.eclipse.ditto.policies.model.enforcers.tree.PointerLocation; -import org.eclipse.ditto.policies.model.enforcers.tree.ResourceNode; import org.eclipse.ditto.policies.model.EffectedPermissions; import org.eclipse.ditto.policies.model.Permissions; diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/enforcers/tree/CheckPermissionsVisitor.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/enforcers/tree/CheckPermissionsVisitor.java index 54fca00ff5..d32e470351 100755 --- a/policies/model/src/main/java/org/eclipse/ditto/policies/model/enforcers/tree/CheckPermissionsVisitor.java +++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/enforcers/tree/CheckPermissionsVisitor.java @@ -22,14 +22,11 @@ import javax.annotation.ParametersAreNonnullByDefault; import org.eclipse.ditto.json.JsonPointer; -import org.eclipse.ditto.policies.model.enforcers.tree.PointerLocation; -import org.eclipse.ditto.policies.model.enforcers.tree.PolicyTreeNode; -import org.eclipse.ditto.policies.model.enforcers.tree.ResourceNode; -import org.eclipse.ditto.policies.model.enforcers.tree.Visitor; import org.eclipse.ditto.policies.model.Permissions; /** - * Abstract base implementation for visitors which check permissions on {@link org.eclipse.ditto.policies.model.enforcers.tree.ResourceNode}s. + * Abstract base implementation for visitors which check permissions on + * {@link org.eclipse.ditto.policies.model.enforcers.tree.ResourceNode}s. */ @ParametersAreNonnullByDefault abstract class CheckPermissionsVisitor implements Visitor { diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/enforcers/tree/CheckUnrestrictedPermissionsVisitor.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/enforcers/tree/CheckUnrestrictedPermissionsVisitor.java index 25cddb4947..50f13b01fe 100755 --- a/policies/model/src/main/java/org/eclipse/ditto/policies/model/enforcers/tree/CheckUnrestrictedPermissionsVisitor.java +++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/enforcers/tree/CheckUnrestrictedPermissionsVisitor.java @@ -18,8 +18,6 @@ import javax.annotation.concurrent.NotThreadSafe; import org.eclipse.ditto.json.JsonPointer; -import org.eclipse.ditto.policies.model.enforcers.tree.PointerLocation; -import org.eclipse.ditto.policies.model.enforcers.tree.ResourceNode; import org.eclipse.ditto.policies.model.EffectedPermissions; import org.eclipse.ditto.policies.model.Permissions; diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/enforcers/tree/CollectPartialGrantedSubjectsVisitor.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/enforcers/tree/CollectPartialGrantedSubjectsVisitor.java index 772f694cef..ad6d7b222c 100644 --- a/policies/model/src/main/java/org/eclipse/ditto/policies/model/enforcers/tree/CollectPartialGrantedSubjectsVisitor.java +++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/enforcers/tree/CollectPartialGrantedSubjectsVisitor.java @@ -21,12 +21,8 @@ import javax.annotation.Nullable; import javax.annotation.concurrent.NotThreadSafe; -import org.eclipse.ditto.json.JsonPointer; import org.eclipse.ditto.base.model.auth.AuthorizationSubject; -import org.eclipse.ditto.policies.model.enforcers.tree.PointerLocation; -import org.eclipse.ditto.policies.model.enforcers.tree.PolicyTreeNode; -import org.eclipse.ditto.policies.model.enforcers.tree.ResourceNode; -import org.eclipse.ditto.policies.model.enforcers.tree.Visitor; +import org.eclipse.ditto.json.JsonPointer; import org.eclipse.ditto.policies.model.EffectedPermissions; import org.eclipse.ditto.policies.model.Permissions; diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/enforcers/tree/EffectedResources.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/enforcers/tree/EffectedResources.java index cea8e92569..e5ccbee9d3 100755 --- a/policies/model/src/main/java/org/eclipse/ditto/policies/model/enforcers/tree/EffectedResources.java +++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/enforcers/tree/EffectedResources.java @@ -21,8 +21,6 @@ import javax.annotation.concurrent.Immutable; -import org.eclipse.ditto.policies.model.enforcers.tree.TreeBasedPolicyEnforcer; - /** * Wrapper to hold the granted and revoked resources. */ diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/enforcers/tree/PointerLocationEvaluator.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/enforcers/tree/PointerLocationEvaluator.java index fd417b6d04..df4f23a848 100755 --- a/policies/model/src/main/java/org/eclipse/ditto/policies/model/enforcers/tree/PointerLocationEvaluator.java +++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/enforcers/tree/PointerLocationEvaluator.java @@ -20,7 +20,6 @@ import org.eclipse.ditto.json.JsonKey; import org.eclipse.ditto.json.JsonPointer; -import org.eclipse.ditto.policies.model.enforcers.tree.PointerLocation; /** * This function is based on a JSON pointer as reference. It determines the relative location of any other JSON diff --git a/policies/model/src/test/java/org/eclipse/ditto/policies/model/ImmutablePolicyRevisionTest.java b/policies/model/src/test/java/org/eclipse/ditto/policies/model/ImmutablePolicyRevisionTest.java index 4c414581ea..2fb1df1ed2 100755 --- a/policies/model/src/test/java/org/eclipse/ditto/policies/model/ImmutablePolicyRevisionTest.java +++ b/policies/model/src/test/java/org/eclipse/ditto/policies/model/ImmutablePolicyRevisionTest.java @@ -17,7 +17,6 @@ import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; @@ -59,7 +58,7 @@ public void toLongReturnsExpected() { @Test public void toStringReturnsExpected() { - assertThat(underTest.toString()).isEqualTo(String.valueOf(DEFAULT_VALUE)); + assertThat(underTest.toString()).hasToString(String.valueOf(DEFAULT_VALUE)); } @Test diff --git a/policies/model/src/test/java/org/eclipse/ditto/policies/model/ImmutableResourceKeyTest.java b/policies/model/src/test/java/org/eclipse/ditto/policies/model/ImmutableResourceKeyTest.java index 0c02c08031..a29cf7f6d4 100755 --- a/policies/model/src/test/java/org/eclipse/ditto/policies/model/ImmutableResourceKeyTest.java +++ b/policies/model/src/test/java/org/eclipse/ditto/policies/model/ImmutableResourceKeyTest.java @@ -19,7 +19,6 @@ import org.eclipse.ditto.json.JsonPointer; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; @@ -66,7 +65,7 @@ public void testToStringWorksAsExpected() { final String expected = "thing:/foo/bar"; final ResourceKey underTest = ImmutableResourceKey.newInstance("thing", JsonPointer.of("/foo/bar")); - assertThat(underTest.toString()).isEqualTo(expected); + assertThat(underTest.toString()).hasToString(expected); } } diff --git a/policies/model/src/test/java/org/eclipse/ditto/policies/model/ImmutableSubjectIdTest.java b/policies/model/src/test/java/org/eclipse/ditto/policies/model/ImmutableSubjectIdTest.java index 14e3e4d386..c2d3f26b43 100755 --- a/policies/model/src/test/java/org/eclipse/ditto/policies/model/ImmutableSubjectIdTest.java +++ b/policies/model/src/test/java/org/eclipse/ditto/policies/model/ImmutableSubjectIdTest.java @@ -19,7 +19,6 @@ import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable; import org.eclipse.ditto.base.model.entity.id.restriction.LengthRestrictionTestBase; -import org.junit.Ignore; import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; @@ -68,7 +67,7 @@ public void createNewSubjectIdSuccess() { public void ignoresUrlDelimiter() { final SubjectId underTest = ImmutableSubjectId.of("://abc:def"); - assertThat(underTest.getIssuer().toString()).isEqualTo("://abc"); + assertThat(underTest.getIssuer().toString()).hasToString("://abc"); assertThat(underTest.getSubject()).isEqualTo("def"); } @@ -76,7 +75,7 @@ public void ignoresUrlDelimiter() { public void subjectIdCanHaveMaximumLengthOf256Characters() { final String subjectIdWithMaximumLength = generateStringWithMaxLength(ISSUER_WITH_SEPARATOR); final SubjectId subjectId = ImmutableSubjectId.of(subjectIdWithMaximumLength); - assertThat(subjectId.toString()).isEqualTo(subjectIdWithMaximumLength); + assertThat(subjectId.toString()).hasToString(subjectIdWithMaximumLength); } @Test @@ -96,7 +95,7 @@ public void createInvalidAttribute() { @Test public void handlesNonUrlIssuer() { final SubjectId underTest = ImmutableSubjectId.of("abc:def"); - assertThat(underTest.getIssuer().toString()).isEqualTo("abc"); + assertThat(underTest.getIssuer().toString()).hasToString("abc"); assertThat(underTest.getSubject()).isEqualTo("def"); } @@ -105,8 +104,8 @@ public void newSubjectIdWithPlaceholderInputCreatesSubjectIdWithEmptyIssuerAndPl final String placeholderInput = "a{{ prefix:name }}z"; final SubjectId underTest = ImmutableSubjectId.of(placeholderInput); - assertThat(underTest.toString()).isEqualTo(placeholderInput); - assertThat(underTest.getIssuer().toString()).isEqualTo(""); + assertThat(underTest.toString()).hasToString(placeholderInput); + assertThat(underTest.getIssuer().toString()).isEmpty(); assertThat(underTest.getSubject()).isEqualTo(placeholderInput); } diff --git a/policies/model/src/test/java/org/eclipse/ditto/policies/model/ImmutableSubjectIssuerTest.java b/policies/model/src/test/java/org/eclipse/ditto/policies/model/ImmutableSubjectIssuerTest.java index 0def505944..3cc9f746c3 100755 --- a/policies/model/src/test/java/org/eclipse/ditto/policies/model/ImmutableSubjectIssuerTest.java +++ b/policies/model/src/test/java/org/eclipse/ditto/policies/model/ImmutableSubjectIssuerTest.java @@ -17,7 +17,6 @@ import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf; import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable; -import org.junit.Ignore; import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; @@ -45,7 +44,7 @@ public void createSubjectIssuerWithNonEmptySubjectIssuerValue() { final SubjectIssuer emptySubjectIssuer = ImmutableSubjectIssuer.of(nonEmpty); - assertThat(emptySubjectIssuer.toString()).isEqualTo(nonEmpty); + assertThat(emptySubjectIssuer.toString()).hasToString(nonEmpty); } @Test @@ -60,7 +59,7 @@ public void createSubjectIssuerWithEmptySubjectIssuerValue() { final SubjectIssuer emptySubjectIssuer = ImmutableSubjectIssuer.of(empty); - assertThat(emptySubjectIssuer.toString()).isEqualTo(empty); + assertThat(emptySubjectIssuer.toString()).hasToString(empty); } } diff --git a/policies/model/src/test/java/org/eclipse/ditto/policies/model/ImmutableSubjectTypeTest.java b/policies/model/src/test/java/org/eclipse/ditto/policies/model/ImmutableSubjectTypeTest.java index 11daee602d..31c0bd93a5 100755 --- a/policies/model/src/test/java/org/eclipse/ditto/policies/model/ImmutableSubjectTypeTest.java +++ b/policies/model/src/test/java/org/eclipse/ditto/policies/model/ImmutableSubjectTypeTest.java @@ -16,7 +16,6 @@ import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf; import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable; -import org.junit.Ignore; import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; @@ -43,7 +42,7 @@ public void toStringReturnsExpected() { final String expected = "Foo"; final SubjectType underTest = ImmutableSubjectType.of(expected); - assertThat(underTest.toString()).isEqualTo(expected); + assertThat(underTest.toString()).hasToString(expected); } } diff --git a/policies/model/src/test/java/org/eclipse/ditto/policies/model/PoliciesModelFactoryTest.java b/policies/model/src/test/java/org/eclipse/ditto/policies/model/PoliciesModelFactoryTest.java index ddcb9ab249..eccbd48e87 100755 --- a/policies/model/src/test/java/org/eclipse/ditto/policies/model/PoliciesModelFactoryTest.java +++ b/policies/model/src/test/java/org/eclipse/ditto/policies/model/PoliciesModelFactoryTest.java @@ -14,9 +14,9 @@ import static org.assertj.core.api.Assertions.assertThat; +import org.eclipse.ditto.base.model.entity.id.restriction.LengthRestrictionTestBase; import org.eclipse.ditto.json.JsonFactory; import org.eclipse.ditto.json.JsonPointer; -import org.eclipse.ditto.base.model.entity.id.restriction.LengthRestrictionTestBase; import org.junit.Test; /** @@ -32,9 +32,9 @@ public void resourceKeysFromDifferentInstantiationsAreEqual() { final ResourceKey key4 = PoliciesModelFactory.newResourceKey(JsonPointer.of("thing:").append(JsonPointer.of("foo/bar"))); - assertThat(key1).isEqualTo(key2); - assertThat(key1).isEqualTo(key3); - assertThat(key1).isEqualTo(key4); + assertThat(key1).isEqualTo(key2) + .isEqualTo(key3) + .isEqualTo(key4); } @Test(expected = PolicyEntryInvalidException.class) @@ -52,4 +52,5 @@ public void createValidMaxLengthResourceKey() { public void createTooLargeResourceKey() { PoliciesModelFactory.newResourceKey(generateStringExceedingMaxLength("thing:")); } + } diff --git a/policies/model/src/test/java/org/eclipse/ditto/policies/model/PolicyIdTest.java b/policies/model/src/test/java/org/eclipse/ditto/policies/model/PolicyIdTest.java index 8a7fcf25c5..5ac5c875c2 100644 --- a/policies/model/src/test/java/org/eclipse/ditto/policies/model/PolicyIdTest.java +++ b/policies/model/src/test/java/org/eclipse/ditto/policies/model/PolicyIdTest.java @@ -20,7 +20,6 @@ import org.eclipse.ditto.base.model.entity.id.EntityId; import org.eclipse.ditto.base.model.entity.id.NamespacedEntityId; -import org.junit.Ignore; import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; @@ -75,27 +74,27 @@ public void invalidNameThrowsPolicyIdInvalidException() { @Test public void toStringConcatenatesNamespaceAndName() { - assertThat(PolicyId.of("namespace", "name").toString()).isEqualTo("namespace:name"); - assertThat(PolicyId.of("namespace:name").toString()).isEqualTo("namespace:name"); + assertThat(PolicyId.of("namespace", "name").toString()).hasToString("namespace:name"); + assertThat(PolicyId.of("namespace:name").toString()).hasToString("namespace:name"); } @Test public void returnsCorrectNamespace() { - assertThat(PolicyId.of("namespace", "name").getNamespace()).isEqualTo("namespace"); - assertThat(PolicyId.of("namespace:name").getNamespace()).isEqualTo("namespace"); + assertThat(PolicyId.of("namespace", "name").getNamespace()).hasToString("namespace"); + assertThat(PolicyId.of("namespace:name").getNamespace()).hasToString("namespace"); } @Test public void returnsCorrectName() { - assertThat(PolicyId.of("namespace", "name").getName()).isEqualTo("name"); - assertThat(PolicyId.of("namespace:name").getName()).isEqualTo("name"); + assertThat(PolicyId.of("namespace", "name").getName()).hasToString("name"); + assertThat(PolicyId.of("namespace:name").getName()).hasToString("name"); } @Test public void inNamespaceWithRandomNameHasCorrectNamespace() { final PolicyId randomPolicyId = PolicyId.inNamespaceWithRandomName("namespace"); - assertThat(randomPolicyId.getNamespace()).isEqualTo("namespace"); + assertThat(randomPolicyId.getNamespace()).hasToString("namespace"); assertThat(randomPolicyId.getName()).isNotEmpty(); } diff --git a/policies/model/src/test/java/org/eclipse/ditto/policies/model/assertions/PolicyAssert.java b/policies/model/src/test/java/org/eclipse/ditto/policies/model/assertions/PolicyAssert.java index d66b7d4dc2..8f49dbed50 100755 --- a/policies/model/src/test/java/org/eclipse/ditto/policies/model/assertions/PolicyAssert.java +++ b/policies/model/src/test/java/org/eclipse/ditto/policies/model/assertions/PolicyAssert.java @@ -53,7 +53,7 @@ public PolicyAssert hasId(final PolicyId expectedIdentifier) { final PolicyId actualId = actual.getEntityId().orElse(null); - assertThat((CharSequence) actualId).isEqualTo(expectedIdentifier) // + assertThat((CharSequence) actualId).isEqualTo(expectedIdentifier) .overridingErrorMessage("Expected Policy identifier to be \n<%s> but was \n<%s>", String.valueOf(expectedIdentifier), String.valueOf(actualId)); @@ -65,7 +65,7 @@ public PolicyAssert hasNamespace(final String expectedNamespace) { final String actualNamespace = actual.getNamespace().orElse(null); - assertThat(actualNamespace).isEqualTo(expectedNamespace) // + assertThat(actualNamespace).isEqualTo(expectedNamespace) .overridingErrorMessage("Expected Thing namespace to be \n<%s> but was \n<%s>", expectedNamespace, actualNamespace); @@ -75,7 +75,7 @@ public PolicyAssert hasNamespace(final String expectedNamespace) { public PolicyAssert hasLabel(final Label expectedLabel) { isNotNull(); - assertThat(actual.getLabels()).contains(expectedLabel) // + assertThat(actual.getLabels()).contains(expectedLabel) .overridingErrorMessage("Expected Labels to contain \n<%s> but did not: \n<%s>", expectedLabel, actual.getLabels()); @@ -85,7 +85,7 @@ public PolicyAssert hasLabel(final Label expectedLabel) { public PolicyAssert doesNotHaveLabel(final Label expectedLabel) { isNotNull(); - assertThat(actual.getLabels()).doesNotContain(expectedLabel) // + assertThat(actual.getLabels()).doesNotContain(expectedLabel) .overridingErrorMessage("Expected Labels to NOT contain \n<%s> but it did: \n<%s>", expectedLabel, actual.getLabels()); @@ -98,7 +98,7 @@ public PolicyAssert hasSubjectFor(final Label label, final SubjectId subjectId) final PolicyEntry policyEntry = actual.getEntryFor(label).get(); - assertThat(policyEntry.getSubjects().getSubject(subjectId)).isPresent() // + assertThat(policyEntry.getSubjects().getSubject(subjectId)).isPresent() .overridingErrorMessage( "Expected Label <%s> to contain Subject for SubjectId \n<%s> " + "but did not: \n<%s>", label, subjectId, policyEntry.getSubjects()); @@ -112,7 +112,7 @@ public PolicyAssert doesNotHaveSubjectFor(final Label label, final SubjectId sub final PolicyEntry policyEntry = actual.getEntryFor(label).get(); - assertThat(policyEntry.getSubjects().getSubject(subjectId)).isEmpty() // + assertThat(policyEntry.getSubjects().getSubject(subjectId)).isEmpty() .overridingErrorMessage( "Expected Label <%s> to NOT contain Subject for SubjectId \n<%s> " + "but it did: \n<%s>", label, subjectId, @@ -128,7 +128,7 @@ public PolicyAssert hasSubjectTypeFor(final Label label, final SubjectId subject final Subject subject = actual.getEntryFor(label).get().getSubjects().getSubject(subjectId).get(); - assertThat(subject.getType()).isEqualTo(expectedSubjectType) // + assertThat(subject.getType()).isEqualTo(expectedSubjectType) .overridingErrorMessage( "Expected Label <%s> to contain for SubjectId <%s> SubjectType " + "\n<%s> but did not: \n<%s>", label, @@ -147,7 +147,7 @@ public PolicyAssert hasResourceFor(final Label label, final ResourceKey resource final PolicyEntry policyEntry = actual.getEntryFor(label).get(); - assertThat(policyEntry.getResources().getResource(resourceKey)).isPresent() // + assertThat(policyEntry.getResources().getResource(resourceKey)).isPresent() .overridingErrorMessage( "Expected Label <%s> to contain Resource for path \n<%s> " + "but did not: \n<%s>", label, resourceKey, policyEntry.getResources()); @@ -165,7 +165,7 @@ public PolicyAssert doesNotHaveResourceFor(final Label label, final ResourceKey final PolicyEntry policyEntry = actual.getEntryFor(label).get(); - assertThat(policyEntry.getResources().getResource(resourceKey)).isEmpty() // + assertThat(policyEntry.getResources().getResource(resourceKey)).isEmpty() .overridingErrorMessage( "Expected Label <%s> to NOT contain Resource for path \n<%s> " + "but it did: \n<%s>", label, resourceKey, policyEntry.getResources()); @@ -186,7 +186,7 @@ public PolicyAssert hasResourceEffectedPermissionsFor(final Label label, final R final Resource resource = actual.getEntryFor(label).get().getResources().getResource(resourceKey).get(); - assertThat(resource.getEffectedPermissions()).isEqualTo(expectedEffectedPermissions) // + assertThat(resource.getEffectedPermissions()).isEqualTo(expectedEffectedPermissions) .overridingErrorMessage( "Expected Label <%s> to contain for Resource path <%s> EffectedPermissions " + "\n<%s> but did not: \n<%s>", @@ -202,7 +202,7 @@ public PolicyAssert hasLifecycle(final PolicyLifecycle expectedLifecycle) { assertThat(lifecycleOptional.isPresent() && Objects.equals(lifecycleOptional.get(), expectedLifecycle)) // .overridingErrorMessage("Expected Policy lifecycle to have lifecycle \n<%s> but it had \n<%s>", - expectedLifecycle, lifecycleOptional.orElse(null)) // + expectedLifecycle, lifecycleOptional.orElse(null)) .isTrue(); return this; @@ -213,10 +213,10 @@ public PolicyAssert hasNoLifecycle() { final Optional actualLifecycleOptional = actual.getLifecycle(); - assertThat(actualLifecycleOptional.isPresent()) // + assertThat(actualLifecycleOptional) .overridingErrorMessage("Expected Policy not to have a lifecycle but it had <%s>", - actualLifecycleOptional.orElse(null)) // - .isFalse(); + actualLifecycleOptional.orElse(null)) + .isNotPresent(); return this; } @@ -228,7 +228,7 @@ public PolicyAssert hasRevision(final PolicyRevision expectedRevision) { assertThat(revisionOptional) // .overridingErrorMessage("Expected Policy revision to be \n<%s> but it was \n<%s>", expectedRevision, - revisionOptional.orElse(null)) // + revisionOptional.orElse(null)) .contains(expectedRevision); return this; @@ -239,10 +239,10 @@ public PolicyAssert hasNoRevision() { final Optional actualRevisionOptional = actual.getRevision(); - assertThat(actualRevisionOptional.isPresent()) // + assertThat(actualRevisionOptional) // .overridingErrorMessage("Expected Policy not have a revision but it had <%s>", - actualRevisionOptional.orElse(null)) // - .isFalse(); + actualRevisionOptional.orElse(null)) + .isNotPresent(); return this; } @@ -254,7 +254,7 @@ public PolicyAssert hasModified(final Instant expectedmodified) { assertThat(modifiedOptional) // .overridingErrorMessage("Expected Policy modified to be \n<%s> but it was \n<%s>", expectedmodified, - modifiedOptional.orElse(null)) // + modifiedOptional.orElse(null)) .contains(expectedmodified); return this; @@ -263,12 +263,12 @@ public PolicyAssert hasModified(final Instant expectedmodified) { public PolicyAssert hasNoModified() { isNotNull(); - final Optional actualmodifiedOptional = actual.getModified(); + final Optional actualModifiedOptional = actual.getModified(); - assertThat(actualmodifiedOptional.isPresent()) // + assertThat(actualModifiedOptional) .overridingErrorMessage("Expected Policy not have a modified but it had <%s>", - actualmodifiedOptional.orElse(null)) // - .isFalse(); + actualModifiedOptional.orElse(null)) + .isNotPresent(); return this; } @@ -280,10 +280,9 @@ public PolicyAssert isModifiedAfter(final Instant Instant) { final Instant modified = actual.getModified().get(); - assertThat(modified.isAfter(Instant)) // + assertThat(modified.isAfter(Instant)) .overridingErrorMessage("Expected <%s> to be after <%s> but it was not", - modified, - Instant) // + modified, Instant) .isTrue(); return this; @@ -296,10 +295,9 @@ public PolicyAssert isNotModifiedAfter(final Instant Instant) { final Instant modified = actual.getModified().get(); - assertThat(modified.isBefore(Instant)) // + assertThat(modified.isBefore(Instant)) .overridingErrorMessage("Expected <%s> to be before <%s> but it was not", - modified, - Instant) // + modified, Instant) .isTrue(); return this; diff --git a/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/AbstractPolicyCommandStrategy.java b/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/AbstractPolicyCommandStrategy.java index 04f7dba84c..3c92c124d2 100644 --- a/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/AbstractPolicyCommandStrategy.java +++ b/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/AbstractPolicyCommandStrategy.java @@ -178,8 +178,7 @@ protected PolicyEntry potentiallyAdjustPolicyEntry(final PolicyEntry policyEntry protected Subjects potentiallyAdjustSubjects(final Subjects subjects) { return Subjects.newInstance(subjects.stream() .map(this::potentiallyAdjustSubject) - .collect(Collectors.toList()) - ); + .toList()); } /** diff --git a/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/TopLevelPolicyActionCommandStrategy.java b/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/TopLevelPolicyActionCommandStrategy.java index 3b15b7f5c1..d5e82708ff 100644 --- a/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/TopLevelPolicyActionCommandStrategy.java +++ b/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/TopLevelPolicyActionCommandStrategy.java @@ -28,14 +28,13 @@ import org.eclipse.ditto.base.model.headers.DittoHeaders; import org.eclipse.ditto.base.model.headers.WithDittoHeaders; import org.eclipse.ditto.base.model.headers.entitytag.EntityTag; -import org.eclipse.ditto.policies.model.Policy; -import org.eclipse.ditto.policies.model.PolicyEntry; -import org.eclipse.ditto.policies.model.PolicyId; -import org.eclipse.ditto.policies.service.common.config.PolicyConfig; +import org.eclipse.ditto.base.model.signals.commands.Command; import org.eclipse.ditto.internal.utils.persistentactors.results.Result; import org.eclipse.ditto.internal.utils.persistentactors.results.ResultFactory; import org.eclipse.ditto.internal.utils.persistentactors.results.ResultVisitor; -import org.eclipse.ditto.base.model.signals.commands.Command; +import org.eclipse.ditto.policies.model.Policy; +import org.eclipse.ditto.policies.model.PolicyEntry; +import org.eclipse.ditto.policies.model.PolicyId; import org.eclipse.ditto.policies.model.signals.commands.actions.ActivateTokenIntegration; import org.eclipse.ditto.policies.model.signals.commands.actions.DeactivateTokenIntegration; import org.eclipse.ditto.policies.model.signals.commands.actions.PolicyActionCommand; @@ -44,6 +43,7 @@ import org.eclipse.ditto.policies.model.signals.commands.exceptions.PolicyActionFailedException; import org.eclipse.ditto.policies.model.signals.events.PolicyActionEvent; import org.eclipse.ditto.policies.model.signals.events.PolicyEvent; +import org.eclipse.ditto.policies.service.common.config.PolicyConfig; import akka.actor.ActorSystem; @@ -75,7 +75,7 @@ protected Result> doApply(final Context context, .map(nonNullPolicy::getEntryFor) .flatMap(Optional::stream) .filter(policyEntry -> actionCommand.isApplicable(policyEntry, dittoHeaders.getAuthorizationContext())) - .collect(Collectors.toList()); + .toList(); final AbstractPolicyActionCommandStrategy strategy = policyActionCommandStrategyMap.get(actionCommand.getName()); diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/placeholders/ImmutableResourcePlaceholder.java b/protocol/src/main/java/org/eclipse/ditto/protocol/placeholders/ImmutableResourcePlaceholder.java index 80dc0458d4..3d6f27bee8 100644 --- a/protocol/src/main/java/org/eclipse/ditto/protocol/placeholders/ImmutableResourcePlaceholder.java +++ b/protocol/src/main/java/org/eclipse/ditto/protocol/placeholders/ImmutableResourcePlaceholder.java @@ -15,7 +15,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import java.util.Optional; import javax.annotation.concurrent.Immutable; diff --git a/protocol/src/test/java/org/eclipse/ditto/protocol/adapter/HeadersFromTopicPathTest.java b/protocol/src/test/java/org/eclipse/ditto/protocol/adapter/HeadersFromTopicPathTest.java index 3718073f8d..3922b01d0d 100644 --- a/protocol/src/test/java/org/eclipse/ditto/protocol/adapter/HeadersFromTopicPathTest.java +++ b/protocol/src/test/java/org/eclipse/ditto/protocol/adapter/HeadersFromTopicPathTest.java @@ -99,7 +99,7 @@ public void shallExtractEntityId() { HeadersFromTopicPath.Extractor::entityIdExtractor); // Assert - assertThat(dittoHeaders.get(DittoHeaderDefinition.ENTITY_ID.getKey())).isEqualTo(expectedDittoEntityId); + assertThat(dittoHeaders).containsKey(DittoHeaderDefinition.ENTITY_ID.getKey()); } @Test diff --git a/rql/query/src/main/java/org/eclipse/ditto/rql/query/expression/ThingsFieldExpressionFactoryImpl.java b/rql/query/src/main/java/org/eclipse/ditto/rql/query/expression/ThingsFieldExpressionFactoryImpl.java index 88c7f17300..fbc706fea1 100644 --- a/rql/query/src/main/java/org/eclipse/ditto/rql/query/expression/ThingsFieldExpressionFactoryImpl.java +++ b/rql/query/src/main/java/org/eclipse/ditto/rql/query/expression/ThingsFieldExpressionFactoryImpl.java @@ -68,26 +68,29 @@ public ExistsFieldExpression existsBy(final String propertyNameWithOptionalLeadi return FieldExpressionUtil.parseFeatureField(propertyName) .flatMap(f -> f.getFeatureId() .map(id -> f.getProperty().map( - // property - property -> new FeatureIdPropertyExpressionImpl(id, property)) - // desiredProperty - .orElse(f.getDesiredProperty().map(desiredProperty -> new FeatureIdDesiredPropertyExpressionImpl(id, desiredProperty)) - .orElseGet(() -> { - if (f.isProperties()) { - // we have a feature ID and the properties path, - // but no property - return new FeatureIdPropertiesExpressionImpl(id); - } else if (f.isDesiredProperties()) { - // we have a feature ID and the desired properties path, - // but no desired property - return new FeatureIdDesiredPropertiesExpressionImpl(id); - } else if (f.isDefinition()) { - return new FeatureDefinitionExpressionImpl(id); - } else { - // we have a feature ID but no property path - return new FeatureExpressionImpl(id); - } - })) + // property + property -> new FeatureIdPropertyExpressionImpl(id, property)) + // desiredProperty + .orElse(f.getDesiredProperty() + .map( + desiredProperty -> new FeatureIdDesiredPropertyExpressionImpl(id, + desiredProperty)) + .orElseGet(() -> { + if (f.isProperties()) { + // we have a feature ID and the properties path, + // but no property + return new FeatureIdPropertiesExpressionImpl(id); + } else if (f.isDesiredProperties()) { + // we have a feature ID and the desired properties path, + // but no desired property + return new FeatureIdDesiredPropertiesExpressionImpl(id); + } else if (f.isDefinition()) { + return new FeatureDefinitionExpressionImpl(id); + } else { + // we have a feature ID but no property path + return new FeatureExpressionImpl(id); + } + })) ) ) @@ -133,10 +136,10 @@ private static String stripLeadingSlash(final String propertyName) { } /** - * internal factory method for fields where the filter and the sortOptions field expression is the same. + * Internal factory method for fields where the filter and the sortOptions field expression is the same. * - * @throws IllegalArgumentException if the property can not be mapped. Because of this, call this method last in the - * workflow. + * @throws IllegalArgumentException if the property can not be mapped. Because of this, call this method last in + * the workflow. */ private FieldExpression common(final String propertyName) { if (FieldExpressionUtil.isAttributeFieldName(propertyName)) { diff --git a/rql/query/src/main/java/org/eclipse/ditto/rql/query/things/ModelBasedThingsFieldExpressionFactory.java b/rql/query/src/main/java/org/eclipse/ditto/rql/query/things/ModelBasedThingsFieldExpressionFactory.java index d85dcad4c1..85e3d49779 100644 --- a/rql/query/src/main/java/org/eclipse/ditto/rql/query/things/ModelBasedThingsFieldExpressionFactory.java +++ b/rql/query/src/main/java/org/eclipse/ditto/rql/query/things/ModelBasedThingsFieldExpressionFactory.java @@ -44,6 +44,7 @@ public final class ModelBasedThingsFieldExpressionFactory implements ThingsField addMapping(hashMap, Thing.JsonFields.CREATED); addMapping(hashMap, Thing.JsonFields.MODIFIED); addMapping(hashMap, Thing.JsonFields.DEFINITION); + addMapping(hashMap, Thing.JsonFields.METADATA); filteringSimpleFieldMappings = Collections.unmodifiableMap(hashMap); } @@ -59,7 +60,7 @@ private ModelBasedThingsFieldExpressionFactory(final Collection> /** * Returns the ModelBasedThingsFieldExpressionFactory instance without any {@code Placeholder}s. * - * @return the singletone ModelBasedThingsFieldExpressionFactory. + * @return the singleton ModelBasedThingsFieldExpressionFactory. */ public static ModelBasedThingsFieldExpressionFactory getInstance() { return INSTANCE; diff --git a/rql/search-option-parser/src/test/java/org/eclipse/ditto/rql/parser/thingsearch/options/rql/RqlOptionsParserTest.java b/rql/search-option-parser/src/test/java/org/eclipse/ditto/rql/parser/thingsearch/options/rql/RqlOptionsParserTest.java index ccd9477083..e7a3fe92b9 100755 --- a/rql/search-option-parser/src/test/java/org/eclipse/ditto/rql/parser/thingsearch/options/rql/RqlOptionsParserTest.java +++ b/rql/search-option-parser/src/test/java/org/eclipse/ditto/rql/parser/thingsearch/options/rql/RqlOptionsParserTest.java @@ -38,7 +38,7 @@ public final class RqlOptionsParserTest { @Test public void parseSortWithOnePropertyAscending() throws ParserException { final List