Browse Source

fix_convertValue in EntityDataAdapter

pull/6959/head
Yuriy Lytvynchuk 4 years ago
parent
commit
b08fd39bdc
  1. 5
      dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityDataAdapter.java
  2. 3
      dao/src/test/java/org/thingsboard/server/dao/sql/query/EntityDataAdapterTest.java

5
dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityDataAdapter.java

@ -81,7 +81,10 @@ public class EntityDataAdapter {
if (value != null) {
String strVal = value.toString();
// check number
if (strVal.length() > 0 && NumberUtils.isParsable(strVal)) {
if (NumberUtils.isParsable(strVal)) {
if (strVal.startsWith("0") && !strVal.startsWith("0.")) {
return strVal;
}
try {
long longVal = Long.parseLong(strVal);
return Long.toString(longVal);

3
dao/src/test/java/org/thingsboard/server/dao/sql/query/EntityDataAdapterTest.java

@ -25,5 +25,6 @@ public class EntityDataAdapterTest {
public void testConvertValue() {
assertThat(EntityDataAdapter.convertValue("500")).isEqualTo("500");
assertThat(EntityDataAdapter.convertValue("500D")).isEqualTo("500D"); //do not convert to Double !!!
assertThat(EntityDataAdapter.convertValue("0101010521130565")).isEqualTo("0101010521130565");
}
}
}
Loading…
Cancel
Save