Browse Source

merge else if into one for transformMsg method in TbAbstractGetEntityDetailsNode

pull/8661/head
ShvaykaD 4 years ago
parent
commit
5cfcd1946d
  1. 10
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetEntityDetailsNode.java

10
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetEntityDetailsNode.java

@ -90,13 +90,11 @@ public abstract class TbAbstractGetEntityDetailsNode<C extends TbAbstractGetEnti
return Futures.transformAsync(propertiesFuture, jsonElement -> { return Futures.transformAsync(propertiesFuture, jsonElement -> {
if (jsonElement == null) { if (jsonElement == null) {
return Futures.immediateFuture(null); return Futures.immediateFuture(null);
} else if (messageData.getDataSource().equals(DataSource.METADATA)) {
Map<String, String> metadataMap = gson.fromJson(jsonElement.toString(), TYPE);
return Futures.immediateFuture(ctx.transformMsg(msg, msg.getType(), msg.getOriginator(), new TbMsgMetaData(metadataMap), msg.getData()));
} else { } else {
if (messageData.getDataSource().equals(DataSource.METADATA)) { return Futures.immediateFuture(ctx.transformMsg(msg, msg.getType(), msg.getOriginator(), msg.getMetaData(), gson.toJson(jsonElement)));
Map<String, String> metadataMap = gson.fromJson(jsonElement.toString(), TYPE);
return Futures.immediateFuture(ctx.transformMsg(msg, msg.getType(), msg.getOriginator(), new TbMsgMetaData(metadataMap), msg.getData()));
} else {
return Futures.immediateFuture(ctx.transformMsg(msg, msg.getType(), msg.getOriginator(), msg.getMetaData(), gson.toJson(jsonElement)));
}
} }
}, MoreExecutors.directExecutor()); }, MoreExecutors.directExecutor());
} }

Loading…
Cancel
Save