Skip to content

Commit f03a1cc

Browse files
TbDate - use strict constructors instead of constructors with var args
1 parent efca0ec commit f03a1cc

File tree

1 file changed

+22
-7
lines changed
  • common/script/script-api/src/main/java/org/thingsboard/script/api/tbel

1 file changed

+22
-7
lines changed

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

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import java.time.format.FormatStyle;
3636
import java.time.temporal.ChronoUnit;
3737
import java.time.temporal.TemporalAccessor;
38-
import java.util.Arrays;
3938
import java.util.Locale;
4039
import java.util.function.BiFunction;
4140

@@ -73,21 +72,37 @@ public TbDate(long dateMilliSecond) {
7372
instant = Instant.ofEpochMilli(dateMilliSecond);
7473
}
7574

76-
public TbDate(int year, int month, int date, String... tz) {
75+
public TbDate(int year, int month, int date) {
76+
this(year, month, date, 0, 0, 0, 0, null);
77+
}
78+
79+
public TbDate(int year, int month, int date, String tz) {
7780
this(year, month, date, 0, 0, 0, 0, tz);
7881
}
7982

80-
public TbDate(int year, int month, int date, int hrs, int min, String... tz) {
83+
public TbDate(int year, int month, int date, int hrs, int min) {
84+
this(year, month, date, hrs, min, 0, 0, null);
85+
}
86+
87+
public TbDate(int year, int month, int date, int hrs, int min, String tz) {
8188
this(year, month, date, hrs, min, 0, 0, tz);
8289
}
8390

84-
public TbDate(int year, int month, int date, int hrs, int min, int second, String... tz) {
91+
public TbDate(int year, int month, int date, int hrs, int min, int second) {
92+
this(year, month, date, hrs, min, second, 0, null);
93+
}
94+
95+
public TbDate(int year, int month, int date, int hrs, int min, int second, String tz) {
8596
this(year, month, date, hrs, min, second, 0, tz);
8697
}
8798

88-
public TbDate(int year, int month, int date, int hrs, int min, int second, int secondMilli, String... tz) {
89-
ZoneId zoneId = tz.length > 0 ? ZoneId.of(Arrays.stream(tz).findFirst().get()) : ZoneId.systemDefault();
90-
instant = parseInstant(year, month, date, hrs, min, second, secondMilli, zoneId);
99+
public TbDate(int year, int month, int date, int hrs, int min, int second, int milliSecond) {
100+
this(year, month, date, hrs, min, second, milliSecond, null);
101+
}
102+
103+
public TbDate(int year, int month, int date, int hrs, int min, int second, int milliSecond, String tz) {
104+
ZoneId zoneId = tz != null && tz.length() > 0 ? ZoneId.of(tz) : ZoneId.systemDefault();
105+
instant = parseInstant(year, month, date, hrs, min, second, milliSecond, zoneId);
91106
}
92107

93108
public Instant getInstant() {

0 commit comments

Comments
 (0)