Skip to content

Commit

Permalink
cleanup some tests, javadoc and TODOs
Browse files Browse the repository at this point in the history
Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch.io>
  • Loading branch information
dguggemos committed Dec 10, 2021
1 parent f37bb93 commit c4b04ec
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 53 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

/**
* Describes the reason why a thing is being updated in the search index.
*
* @since 2.3.0
*/
public enum UpdateReason {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@ private void updateThings(final ThingsOutOfSync updateThings) {
.info("Out-of-sync things are reported: <{}>", updateThings);
updateThings.getThingIds().forEach(thingId ->
forwardToShardRegion(
// TODO define update reason
UpdateThing.of(ThingId.of(thingId), UpdateReason.THING_UPDATE, updateThings.getDittoHeaders()),
UpdateThing.of(ThingId.of(thingId), UpdateReason.BACKGROUND_SYNC,
updateThings.getDittoHeaders()),
UpdateThing::getEntityId,
UpdateThing::getType,
UpdateThing::toJson,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import org.eclipse.ditto.things.model.ThingId;
import org.eclipse.ditto.things.model.ThingsModelFactory;
import org.eclipse.ditto.things.model.signals.events.ThingCreated;
import org.eclipse.ditto.things.model.signals.events.ThingModified;
import org.eclipse.ditto.thingsearch.api.UpdateReason;
import org.eclipse.ditto.thingsearch.service.persistence.write.model.Metadata;
import org.eclipse.ditto.thingsearch.service.persistence.write.model.ThingWriteModel;
Expand Down Expand Up @@ -115,56 +114,6 @@ public void createThing() {
};
}

@Test
public void thingTagWithHigherSequenceNumberTriggersSync() {
final long revision = 7L;
final Thing currentThing = ThingsModelFactory.newThingBuilder()
.setId(THING_ID)
.setPolicyId(POLICY_ID)
.setRevision(revision)
.build();
final long thingTagRevision = revision + 9L;

new TestKit(actorSystem) {
{
final ActorRef underTest = createThingUpdaterActor();

underTest.tell(ThingModified.of(currentThing, revision, Instant.now(), DittoHeaders.empty(), null),
ActorRef.noSender());
final Metadata metadata = changeQueueTestProbe.expectMsgClass(Metadata.class);
Assertions.assertThat((CharSequence) metadata.getThingId()).isEqualTo(THING_ID);
Assertions.assertThat(metadata.getThingRevision()).isEqualTo(revision);
Assertions.assertThat(metadata.getPolicyId()).isEmpty();
Assertions.assertThat(metadata.getPolicyRevision()).contains(-1L);
}
};
}

@Test
public void thingTagWithLowerSequenceNumberDoesNotTriggerSync() {
final long revision = 7L;
final Thing currentThing = ThingsModelFactory.newThingBuilder()
.setId(THING_ID)
.setPolicyId(POLICY_ID)
.setRevision(revision)
.build();
final long thingTagRevision = revision - 2L;

new TestKit(actorSystem) {
{
final ActorRef underTest = createThingUpdaterActor();

underTest.tell(ThingModified.of(currentThing, revision, Instant.now(), DittoHeaders.empty(), null),
ActorRef.noSender());
final Metadata metadata = changeQueueTestProbe.expectMsgClass(Metadata.class);
Assertions.assertThat((CharSequence) metadata.getThingId()).isEqualTo(THING_ID);
Assertions.assertThat(metadata.getThingRevision()).isEqualTo(revision);
Assertions.assertThat(metadata.getPolicyId()).isEmpty();
Assertions.assertThat(metadata.getPolicyRevision()).contains(-1L);
}
};
}

@Test
public void policyReferenceTagTriggersPolicyUpdate() {
final long newPolicyRevision = REVISION + 2L;
Expand Down

0 comments on commit c4b04ec

Please sign in to comment.