Skip to content

Commit

Permalink
Add events for desired properties to ThingChange
Browse files Browse the repository at this point in the history 
Part of ditto issue #697
Signed-off-by: David Schwilk <david.schwilk@bosch.io>
  • Loading branch information
@DerSchwilk
DerSchwilk committed Oct 28, 2020
1 parent 52f6bc7 commit 49ea543
Showing 1 changed file with 80 additions and 0 deletions.
80 changes: 80 additions & 0 deletions java/src/main/java/org/eclipse/ditto/client/internal/DefaultDittoClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,12 @@
import org.eclipse.ditto.signals.events.things.AttributesModified;
import org.eclipse.ditto.signals.events.things.FeatureCreated;
import org.eclipse.ditto.signals.events.things.FeatureDeleted;
import org.eclipse.ditto.signals.events.things.FeatureDesiredPropertiesCreated;
import org.eclipse.ditto.signals.events.things.FeatureDesiredPropertiesDeleted;
import org.eclipse.ditto.signals.events.things.FeatureDesiredPropertiesModified;
import org.eclipse.ditto.signals.events.things.FeatureDesiredPropertyCreated;
import org.eclipse.ditto.signals.events.things.FeatureDesiredPropertyDeleted;
import org.eclipse.ditto.signals.events.things.FeatureDesiredPropertyModified;
import org.eclipse.ditto.signals.events.things.FeatureModified;
import org.eclipse.ditto.signals.events.things.FeaturePropertiesCreated;
import org.eclipse.ditto.signals.events.things.FeaturePropertiesDeleted;
Expand Down Expand Up @@ -104,6 +110,8 @@ public final class DefaultDittoClient implements DittoClient, DisconnectedDittoC
private static final String FEATURE_PATTERN = THING_PATTERN + "/features/{1}";
private static final String FEATURE_PROPERTIES_PATTERN = THING_PATTERN + "/features/{1}/properties";
private static final String FEATURE_PROPERTY_PATTERN = THING_PATTERN + "/features/{1}/properties{2}";
private static final String FEATURE_DESIRED_PROPERTIES_PATTERN = THING_PATTERN + "/features/{1}/desiredProperties";
private static final String FEATURE_DESIRED_PROPERTY_PATTERN = THING_PATTERN + "/features/{1}/desiredProperties{2}";

private final TwinImpl twin;
private final LiveImpl live;
Expand Down Expand Up @@ -586,6 +594,78 @@ private static void registerKeyBasedHandlersForIncomingEvents(final PointerBus b
e.getRevision(), e.getTimestamp().orElse(null), extra, e.getDittoHeaders(),
emitAcknowledgement)
);

/*
* Feature Desired Properties
*/
SelectorUtil.addHandlerForThingEvent(LOGGER, bus, FeatureDesiredPropertiesCreated.TYPE,
FeatureDesiredPropertiesCreated.class,
e -> MessageFormat.format(FEATURE_DESIRED_PROPERTIES_PATTERN, e.getThingEntityId(),
e.getFeatureId()),
(e, extra) -> new ImmutableChange(e.getThingEntityId(), ChangeAction.CREATED,
JsonPointer.empty(),
e.getDesiredProperties().toJson(e.getImplementedSchemaVersion()),
e.getRevision(), e.getTimestamp().orElse(null), extra, e.getDittoHeaders(),
emitAcknowledgement)
);

SelectorUtil.addHandlerForThingEvent(LOGGER, bus, FeatureDesiredPropertiesModified.TYPE,
FeatureDesiredPropertiesModified.class,
e -> MessageFormat.format(FEATURE_DESIRED_PROPERTIES_PATTERN, e.getThingEntityId(),
e.getFeatureId()),
(e, extra) -> new ImmutableChange(e.getThingEntityId(), ChangeAction.UPDATED,
JsonPointer.empty(),
e.getDesiredProperties().toJson(e.getImplementedSchemaVersion()),
e.getRevision(), e.getTimestamp().orElse(null), extra, e.getDittoHeaders(),
emitAcknowledgement)
);

SelectorUtil.addHandlerForThingEvent(LOGGER, bus, FeatureDesiredPropertiesDeleted.TYPE,
FeatureDesiredPropertiesDeleted.class,
e -> MessageFormat.format(FEATURE_DESIRED_PROPERTIES_PATTERN, e.getThingEntityId(),
e.getFeatureId()),
(e, extra) -> new ImmutableChange(e.getThingEntityId(), ChangeAction.DELETED,
JsonPointer.empty(),
null,
e.getRevision(), e.getTimestamp().orElse(null), extra, e.getDittoHeaders(),
emitAcknowledgement)
);

/*
* Feature Desired Property
*/
SelectorUtil.addHandlerForThingEvent(LOGGER, bus, FeatureDesiredPropertyCreated.TYPE,
FeatureDesiredPropertyCreated.class,
e -> MessageFormat.format(FEATURE_DESIRED_PROPERTY_PATTERN, e.getThingEntityId(),
e.getFeatureId(), e.getDesiredPropertyPointer()),
(e, extra) -> new ImmutableChange(e.getThingEntityId(), ChangeAction.CREATED,
e.getDesiredPropertyPointer(),
e.getDesiredPropertyValue(),
e.getRevision(), e.getTimestamp().orElse(null), extra, e.getDittoHeaders(),
emitAcknowledgement)
);

SelectorUtil.addHandlerForThingEvent(LOGGER, bus, FeatureDesiredPropertyModified.TYPE,
FeatureDesiredPropertyModified.class,
e -> MessageFormat.format(FEATURE_DESIRED_PROPERTY_PATTERN, e.getThingEntityId(),
e.getFeatureId(), e.getDesiredPropertyPointer()),
(e, extra) -> new ImmutableChange(e.getThingEntityId(), ChangeAction.UPDATED,
e.getDesiredPropertyPointer(),
e.getDesiredPropertyValue(),
e.getRevision(), e.getTimestamp().orElse(null), extra, e.getDittoHeaders(),
emitAcknowledgement)
);

SelectorUtil.addHandlerForThingEvent(LOGGER, bus, FeatureDesiredPropertyDeleted.TYPE,
FeatureDesiredPropertyDeleted.class,
e -> MessageFormat.format(FEATURE_DESIRED_PROPERTY_PATTERN, e.getThingEntityId(),
e.getFeatureId(), e.getDesiredPropertyPointer()),
(e, extra) -> new ImmutableChange(e.getThingEntityId(), ChangeAction.DELETED,
e.getDesiredPropertyPointer(),
null,
e.getRevision(), e.getTimestamp().orElse(null), extra, e.getDittoHeaders(),
emitAcknowledgement)
);
}

@Override
Expand Down

0 comments on commit 49ea543

Please sign in to comment.