Skip to content

Commit

Permalink
Issue #559: Moved TestNameCorrelationId to ditto-base-model to avoid …
Browse files Browse the repository at this point in the history 
…circular dependencies.

Beforehand it was placed in ditto-internal-utils-test which depends on ditto-base-model.

Signed-off-by: Juergen Fickel <juergen.fickel@bosch.io>
  • Loading branch information
Juergen Fickel committed Oct 26, 2021
1 parent 0a842d6 commit 05ff1f9
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 36 deletions.
1 change: 1 addition & 0 deletions base/model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
<configuration>
<includes>
<include>org/eclipse/ditto/base/model/assertions/*</include>
<include>org/eclipse/ditto/base/model/correlationid/*</include>
<include>org/eclipse/ditto/base/model/entity/id/restriction/*</include>
<include>org/eclipse/ditto/base/model/signals/*</include>
<include>org/eclipse/ditto/base/model/signals/assertions/*</include>
Expand Down
6 changes: 3 additions & 3 deletions ...ils/test/correlationid/CorrelationId.java → ...se/model/correlationid/CorrelationId.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.ditto.internal.utils.test.correlationid;
package org.eclipse.ditto.base.model.correlationid;

import static org.eclipse.ditto.base.model.common.ConditionChecker.checkNotNull;

Expand Down Expand Up @@ -102,7 +102,7 @@ public CharSequence subSequence(final int i, final int i1) {

@Override
public int compareTo(final CorrelationId correlationId) {
return CharSequence.compare(value, correlationId.toString());
return value.compareTo(correlationId.toString());
}

@Override
Expand All @@ -113,7 +113,7 @@ public boolean equals(@Nullable final Object o) {
if (o == null || getClass() != o.getClass()) {
return false;
}
final var that = (CorrelationId) o;
final CorrelationId that = (CorrelationId) o;
return Objects.equals(value, that.value);
}

Expand Down
6 changes: 3 additions & 3 deletions .../correlationid/TestNameCorrelationId.java → .../correlationid/TestNameCorrelationId.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.ditto.internal.utils.test.correlationid;
package org.eclipse.ditto.base.model.correlationid;

import java.text.MessageFormat;
import java.util.UUID;
Expand Down Expand Up @@ -46,15 +46,15 @@ public static TestNameCorrelationId newInstance() {

@Override
protected void starting(final Description description) {
final var testClass = description.getTestClass();
final Class<?> testClass = description.getTestClass();
correlationId = CorrelationId.of(MessageFormat.format(CORRELATION_ID_PATTERN,
testClass.getName(),
description.getMethodName(),
getRandomPart()));
}

private static String getRandomPart() {
final var randomUuid = String.valueOf(UUID.randomUUID());
final String randomUuid = String.valueOf(UUID.randomUUID());
return randomUuid.substring(0, 7);
}

Expand Down
6 changes: 6 additions & 0 deletions connectivity/service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,12 @@ jmh-generator-annprocess). jmh-generator-annprocess overwrites the whole META-IN
<artifactId>akka-testkit_${scala.version}</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.ditto</groupId>
<artifactId>ditto-base-model</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.ditto</groupId>
<artifactId>ditto-base-service</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion .../ditto/connectivity/service/messaging/httppush/HttpPushRoundTripSignalsValidatorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
import org.assertj.core.api.Assertions;
import org.eclipse.ditto.base.model.acks.AcknowledgementLabel;
import org.eclipse.ditto.base.model.common.HttpStatus;
import org.eclipse.ditto.base.model.correlationid.TestNameCorrelationId;
import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
import org.eclipse.ditto.base.model.headers.DittoHeaders;
import org.eclipse.ditto.base.model.signals.acks.Acknowledgement;
import org.eclipse.ditto.connectivity.model.MessageSendingFailedException;
import org.eclipse.ditto.connectivity.service.messaging.monitoring.logs.ConnectionLogger;
import org.eclipse.ditto.internal.utils.test.correlationid.TestNameCorrelationId;
import org.eclipse.ditto.json.JsonObject;
import org.eclipse.ditto.json.JsonPointer;
import org.eclipse.ditto.json.JsonValue;
Expand Down
2 changes: 1 addition & 1 deletion ...to/internal/models/signal/correlation/CommandAndCommandResponseMatchingValidatorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
import org.eclipse.ditto.base.model.acks.AcknowledgementLabel;
import org.eclipse.ditto.base.model.common.HttpStatus;
import org.eclipse.ditto.base.model.common.ResponseType;
import org.eclipse.ditto.base.model.correlationid.TestNameCorrelationId;
import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
import org.eclipse.ditto.base.model.headers.DittoHeaders;
import org.eclipse.ditto.base.model.signals.acks.Acknowledgement;
import org.eclipse.ditto.base.model.signals.commands.CommandResponse;
import org.eclipse.ditto.internal.utils.test.correlationid.TestNameCorrelationId;
import org.eclipse.ditto.json.JsonObject;
import org.eclipse.ditto.json.JsonPointer;
import org.eclipse.ditto.json.JsonValue;
Expand Down
40 changes: 12 additions & 28 deletions ...clipse/ditto/things/model/signals/commands/exceptions/ThingNotCreatableExceptionTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,32 @@

import org.eclipse.ditto.base.model.assertions.DittoBaseAssertions;
import org.eclipse.ditto.base.model.common.HttpStatus;
import org.eclipse.ditto.base.model.correlationid.TestNameCorrelationId;
import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
import org.eclipse.ditto.base.model.headers.DittoHeaders;
import org.eclipse.ditto.base.model.signals.GlobalErrorRegistry;
import org.eclipse.ditto.json.JsonObject;
import org.eclipse.ditto.json.JsonObjectBuilder;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestName;

/**
* Unit test for {@link ThingNotCreatableException}.
*/
public final class ThingNotCreatableExceptionTest {

@Rule
public final TestName testName = new TestName();
public final TestNameCorrelationId testNameCorrelationId = TestNameCorrelationId.newInstance();

private DittoHeaders dittoHeaders;

@Before
public void before() {
dittoHeaders = DittoHeaders.newBuilder()
.correlationId(testNameCorrelationId.getCorrelationId())
.build();
}

@Test
public void assertImmutability() {
Expand All @@ -46,8 +56,6 @@ public void assertImmutability() {

@Test
public void instanceFromBuilderForPolicyMissing() {
final DittoHeaders dittoHeaders = DittoHeaders.newBuilder().correlationId(testName.getMethodName()).build();

final ThingNotCreatableException underTest =
ThingNotCreatableException.newBuilderForPolicyMissing(THING_ID, POLICY_ID)
.dittoHeaders(dittoHeaders)
Expand All @@ -64,8 +72,6 @@ public void instanceFromBuilderForPolicyMissing() {

@Test
public void instanceFromBuilderForPolicyExisting() {
final DittoHeaders dittoHeaders = DittoHeaders.newBuilder().correlationId(testName.getMethodName()).build();

final ThingNotCreatableException underTest =
ThingNotCreatableException.newBuilderForPolicyExisting(THING_ID, POLICY_ID)
.dittoHeaders(dittoHeaders)
Expand All @@ -84,8 +90,6 @@ public void instanceFromBuilderForPolicyExisting() {

@Test
public void instanceForLiveChannel() {
final DittoHeaders dittoHeaders = DittoHeaders.newBuilder().correlationId(testName.getMethodName()).build();

final ThingNotCreatableException underTest = ThingNotCreatableException.forLiveChannel(dittoHeaders);

assertThat(underTest)
Expand All @@ -99,8 +103,6 @@ public void instanceForLiveChannel() {

@Test
public void setDittoHeaders() {
final DittoHeaders dittoHeaders = DittoHeaders.newBuilder().correlationId(testName.getMethodName()).build();

final ThingNotCreatableException thingNotCreatableException =
ThingNotCreatableException.forLiveChannel(DittoHeaders.empty());

Expand All @@ -117,8 +119,6 @@ public void setDittoHeaders() {

@Test
public void instanceForLiveChannelToJson() {
final DittoHeaders dittoHeaders = DittoHeaders.newBuilder().correlationId(testName.getMethodName()).build();

final ThingNotCreatableException underTest = ThingNotCreatableException.forLiveChannel(dittoHeaders);

final JsonObjectBuilder expectedJsonObject = JsonObject.newBuilder()
Expand All @@ -132,8 +132,6 @@ public void instanceForLiveChannelToJson() {

@Test
public void instanceForMissingPolicyFromJson() {
final DittoHeaders dittoHeaders = DittoHeaders.newBuilder().correlationId(testName.getMethodName()).build();

final ThingNotCreatableException thingNotCreatableException =
ThingNotCreatableException.forLiveChannel(dittoHeaders);

Expand All @@ -145,8 +143,6 @@ public void instanceForMissingPolicyFromJson() {

@Test
public void instanceForMissingPolicyToJson() {
final DittoHeaders dittoHeaders = DittoHeaders.newBuilder().correlationId(testName.getMethodName()).build();

final ThingNotCreatableException underTest =
ThingNotCreatableException.newBuilderForPolicyMissing(THING_ID, POLICY_ID)
.dittoHeaders(dittoHeaders)
Expand All @@ -163,8 +159,6 @@ public void instanceForMissingPolicyToJson() {

@Test
public void instanceForLiveChannelFromJson() {
final DittoHeaders dittoHeaders = DittoHeaders.newBuilder().correlationId(testName.getMethodName()).build();

final ThingNotCreatableException thingNotCreatableException =
ThingNotCreatableException.newBuilderForPolicyMissing(THING_ID, POLICY_ID)
.dittoHeaders(dittoHeaders)
Expand All @@ -178,8 +172,6 @@ public void instanceForLiveChannelFromJson() {

@Test
public void instanceForExistingPolicyToJson() {
final DittoHeaders dittoHeaders = DittoHeaders.newBuilder().correlationId(testName.getMethodName()).build();

final ThingNotCreatableException underTest =
ThingNotCreatableException.newBuilderForPolicyExisting(THING_ID, POLICY_ID)
.dittoHeaders(dittoHeaders)
Expand All @@ -196,8 +188,6 @@ public void instanceForExistingPolicyToJson() {

@Test
public void instanceForExistingPolicyFromJson() {
final DittoHeaders dittoHeaders = DittoHeaders.newBuilder().correlationId(testName.getMethodName()).build();

final ThingNotCreatableException thingNotCreatableException =
ThingNotCreatableException.newBuilderForPolicyExisting(THING_ID, POLICY_ID)
.dittoHeaders(dittoHeaders)
Expand All @@ -211,8 +201,6 @@ public void instanceForExistingPolicyFromJson() {

@Test
public void parseInstanceForMissingPolicy() {
final DittoHeaders dittoHeaders = DittoHeaders.newBuilder().correlationId(testName.getMethodName()).build();

final ThingNotCreatableException thingNotCreatableException =
ThingNotCreatableException.newBuilderForPolicyMissing(THING_ID, POLICY_ID)
.dittoHeaders(dittoHeaders)
Expand All @@ -228,8 +216,6 @@ public void parseInstanceForMissingPolicy() {

@Test
public void parseInstanceForExistingPolicy() {
final DittoHeaders dittoHeaders = DittoHeaders.newBuilder().correlationId(testName.getMethodName()).build();

final ThingNotCreatableException thingNotCreatableException =
ThingNotCreatableException.newBuilderForPolicyExisting(THING_ID, POLICY_ID)
.dittoHeaders(dittoHeaders)
Expand All @@ -245,8 +231,6 @@ public void parseInstanceForExistingPolicy() {

@Test
public void parseInstanceForLiveChannel() {
final DittoHeaders dittoHeaders = DittoHeaders.newBuilder().correlationId(testName.getMethodName()).build();

final ThingNotCreatableException thingNotCreatableException =
ThingNotCreatableException.forLiveChannel(dittoHeaders);

Expand Down

0 comments on commit 05ff1f9

Please sign in to comment.