tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

tbel fix_bug tbDate from String without TZ RFC_1123

pull/9778/head
nick 3 years ago
parent
e1d421ed5e
commit
39b0959c77
2 changed files with 51 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 42
      common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbDate.java
  2. 58
      common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbDateTest.java

42
common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbDate.java
View File

@ -494,22 +494,31 @@ public class TbDate implements Serializable, Cloneable {
// assuming "2007-12-03T10:15:30.00" ZoneId.systemDefault() instant
// assuming "2007-12-03T10:15:30.00-04:00" TZ instant
// assuming "2007-12-03T10:15:30.00+04:00" TZ instant
Instant inst = validateDateWithTZ(s);
if (inst == null) {
LocalDateTime dt = LocalDateTime.parse(s);
return parseInstant(dt.getYear(), dt.getMonthValue(), dt.getDayOfMonth(), dt.getHour(), dt.getMinute(),
dt.getSecond(),dt.getNano()/1000000, ZoneId.systemDefault());
} else {
return inst;
}
return OffsetDateTime.parse(s).toInstant();
}
else {
// assuming RFC-1123 value "Tue, 3 Jun 2008 11:05:30 GMT-02:00"
return Instant.from(DateTimeFormatter.RFC_1123_DATE_TIME.parse(s));
}
} catch (final DateTimeParseException ex) {
final ConversionException exception = new ConversionException("Cannot parse value [" + s + "] as instant", ex);
throw exception;
try {
if (s.length() > 0 && Character.isDigit(s.charAt(0))) {
long timeMS = parse(s);
if (timeMS != -1) {
return Instant.ofEpochMilli(timeMS);
} else {
final ConversionException exception = new ConversionException("Cannot parse value [" + s + "] as instant", ex);
throw exception;
}
} else {
// assuming RFC-1123 value "Tue, 3 Jun 2008 11:05:30 -0200"
// The offset ID without colons or seconds.
return getInstantWithLocalZoneOffsetId_RFC_1123(s);
}
} catch (final DateTimeParseException e) {
final ConversionException exception = new ConversionException("Cannot parse value [" + s + "] as instant", ex);
throw exception;
}
}
}
@ -525,11 +534,12 @@ public class TbDate implements Serializable, Cloneable {
return zonedDateTime.toInstant();
}
private static Instant validateDateWithTZ(String s) {
try {
return OffsetDateTime.parse(s).toInstant();
} catch (DateTimeParseException e) {
return null;
}
private static Instant getInstantWithLocalZoneOffsetId_RFC_1123(String value) {
String s = value.trim() + " GMT";
Instant instant = Instant.from(DateTimeFormatter.RFC_1123_DATE_TIME.parse(s));
ZoneId systemZone = ZoneId.systemDefault(); // my timezone
String id = systemZone.getRules().getOffset(instant).getId();
value = value.trim() + " " + id.replaceAll(":", "");
return Instant.from(DateTimeFormatter.RFC_1123_DATE_TIME.parse(value));
}
}

58
common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbDateTest.java
View File

@ -357,9 +357,18 @@ class TbDateTest {
stringDateTZ = "2023-09-06T01:04:05.00-02:00";
d = new TbDate(stringDateTZ);
Assert.assertEquals("2023-09-06T03:04:05Z", d.toISOString());
// Without_TZ
stringDateTZ = "2023-08-06T04:04:05.123";
d = new TbDate(stringDateTZ);
Assert.assertEquals("2023-08-06 04:04:05", d.toLocaleString());
String stringDateRFC_1123 = "Sat, 3 Jun 2023 11:05:30 GMT";
d = new TbDate(stringDateRFC_1123);
Assert.assertEquals("2023-06-03T11:05:30Z", d.toISOString());
// without TZ
stringDateRFC_1123 = "Sat, 3 Jun 2023 11:05:30";
d = new TbDate(stringDateRFC_1123);
Assert.assertEquals("2023-06-03 11:05:30", d.toLocaleString());
stringDateRFC_1123 = "Sat, 3 Jun 2023 01:04:05 +043056";
d = new TbDate(stringDateRFC_1123);
Assert.assertEquals("2023-06-02T20:33:09Z", d.toISOString());
@ -370,11 +379,23 @@ class TbDateTest {
d = new TbDate(stringDateRFC_1123);
Assert.assertEquals("2024-02-29T14:05:30Z", d.toISOString());
String stringDateZ_error = "2023-09-06T01:04:05.00+045";
String expectedMessage = "Cannot parse value";
String finalStringDateZ_error0 = "2023-09-06T01:04:05.00+045";
Exception actual = assertThrows(ConversionException.class, () -> {
new TbDate(stringDateZ_error);
new TbDate(finalStringDateZ_error0);
});
assertTrue(actual.getMessage().contains(expectedMessage));
String finalStringDateZ_error1 = "2023-08-06T04:04:05.123+04:00:00:00";
actual = assertThrows(ConversionException.class, () -> {
new TbDate(finalStringDateZ_error1);
});
assertTrue(actual.getMessage().contains(expectedMessage));
String finalStringDateZ_error2 ="2023-08-06T04:04:05.123+4";
actual = assertThrows(ConversionException.class, () -> {
new TbDate(finalStringDateZ_error2);
});
String expectedMessage = "Cannot parse value";
assertTrue(actual.getMessage().contains(expectedMessage));
String stringDateRFC_1123_error = "Tue, 3 Jun 2023 11:05:30 GMT";
@ -385,12 +406,8 @@ class TbDateTest {
}
@Test
void TestParse () {
String stringDateUTC = "2023-09-06T01:04:05.345Z";
TbDate d = new TbDate(stringDateUTC);
Assert.assertEquals(1693962245345L, d.parseSecondMilli());
Assert.assertEquals(1693962245L, d.parseSecond());
String stringDateStart = "1970-01-01T00:00:00Z";
d = new TbDate(stringDateStart);
TbDate d = new TbDate(stringDateStart);
long actualMillis = TbDate.parse("1970-01-01 T00:00:00");
Assert.assertEquals(-d.getLocaleZoneOffset().getTotalSeconds() * 1000, actualMillis);
String pattern = "yyyy-MM-dd HH:mm:ss.SSS";
@ -498,31 +515,6 @@ class TbDateTest {
Assert.assertEquals(expected, d.toLocaleString());
}
@Test
void Test_DateString_Without_TZ() {
String dateStr = "2023-08-06T04:04:05.123";
String expected = "2023-08-06 04:04:05";
TbDate d = new TbDate(dateStr);
Assert.assertEquals(expected, d.toLocaleString());
}
@Test
void Test_DateString_Without_FailedTZ() {
try {
TbDate d = new TbDate("2023-08-06T04:04:05.123+04:00:00:00");
Assert.fail("Should throw ConversionException");
} catch (ConversionException e) {
Assert.assertTrue(e.getMessage().contains("Cannot parse value [2023-08-06T04:04:05.123+04:00:00:00] as instant"));
}
try {
TbDate d = new TbDate("2023-08-06T04:04:05.123+4");
Assert.fail("Should throw ConversionException");
} catch (ConversionException e) {
Assert.assertTrue(e.getMessage().contains("Cannot parse value [2023-08-06T04:04:05.123+4] as instant"));
}
}
@Test
void Test_Get_LocalDateTime_With_TZ() {
int hrs = 8;

Write Preview
Loading…
Cancel
Save