lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Hotfix for DMF UPDATE_ATTRIBUTES handling

Browse Source
This commit is contained in:
Stefan Behl
2018-07-31 10:57:44 +02:00
parent 95f98e9aaa
commit cc1cc38c38
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerService.java
View File

@@ -250,10 +250,21 @@ public class AmqpMessageHandlerService extends BaseAmqpService {
private void updateAttributes(final Message message) { private void updateAttributes(final Message message) {
final DmfAttributeUpdate attributeUpdate = convertMessage(message, DmfAttributeUpdate.class); final DmfAttributeUpdate attributeUpdate = convertMessage(message, DmfAttributeUpdate.class);
final String thingId = getStringHeaderKey(message, MessageHeaderKey.THING_ID, "ThingId is null"); final String thingId = getStringHeaderKey(message, MessageHeaderKey.THING_ID, "ThingId is null");
if (attributeUpdate.getAttributes().entrySet().stream()
.anyMatch(e -> !AmqpMessageHandlerService.isAttributeEntryValid(e))) {
throw new MessageConversionException(
"The received UPDATE_ATTRIBUTES message contains attribute entries which violate the existing length constraints (keys must not exceed 32 characters, values must not exceed 128 characters).");
}
controllerManagement.updateControllerAttributes(thingId, attributeUpdate.getAttributes(), controllerManagement.updateControllerAttributes(thingId, attributeUpdate.getAttributes(),
getUpdateMode(attributeUpdate)); getUpdateMode(attributeUpdate));
} }
private static boolean isAttributeEntryValid(final Entry<String, String> e) {
if (e == null) return true;
return e.getKey() != null && e.getKey().length() <= 32 && (e.getValue() == null || (e.getValue() != null
&& e.getValue().length() <= 128));
}
/** /**
* Method to update the action status of an action through the event. * Method to update the action status of an action through the event.
* *