Browse Source

Change logic similar to existing on PE

pull/7858/head
Andrii Landiak 4 years ago
parent
commit
8c2c0d372b
  1. 25
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rest/TbHttpClient.java

25
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rest/TbHttpClient.java

@ -192,11 +192,7 @@ public class TbHttpClient {
config.isIgnoreRequestBody()) {
entity = new HttpEntity<>(headers);
} else {
String data = msg.getData();
if (config.isTrimDoubleQuotes()) {
data = trimDoubleQuotes(data);
}
entity = new HttpEntity<>(data, headers);
entity = new HttpEntity<>(getData(msg), headers);
}
URI uri = buildEncodedUri(endpointUrl);
@ -247,6 +243,18 @@ public class TbHttpClient {
return uri;
}
private String getData(TbMsg msg) {
String data = msg.getData();
if (config.isTrimDoubleQuotes()) {
final String dataBefore = data;
data = data.replaceAll("^\"|\"$", "");;
log.trace("Trimming double quotes. Before trim: [{}], after trim: [{}]", dataBefore, data);
}
return data;
}
private TbMsg processResponse(TbContext ctx, TbMsg origMsg, ResponseEntity<String> response) {
TbMsgMetaData metaData = origMsg.getMetaData();
metaData.putValue(STATUS, response.getStatusCode().name());
@ -338,11 +346,4 @@ public class TbHttpClient {
}
}
private static String trimDoubleQuotes(String s) {
if (s.startsWith("\"") && s.endsWith("\"")) {
return s.substring(1, s.length() - 1);
}
return s;
}
}

Loading…
Cancel
Save