|
35 | 35 | import java.time.format.FormatStyle; |
36 | 36 | import java.time.temporal.ChronoUnit; |
37 | 37 | import java.time.temporal.TemporalAccessor; |
38 | | -import java.util.Arrays; |
39 | 38 | import java.util.Locale; |
40 | 39 | import java.util.function.BiFunction; |
41 | 40 |
|
@@ -73,21 +72,37 @@ public TbDate(long dateMilliSecond) { |
73 | 72 | instant = Instant.ofEpochMilli(dateMilliSecond); |
74 | 73 | } |
75 | 74 |
|
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) { |
77 | 80 | this(year, month, date, 0, 0, 0, 0, tz); |
78 | 81 | } |
79 | 82 |
|
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) { |
81 | 88 | this(year, month, date, hrs, min, 0, 0, tz); |
82 | 89 | } |
83 | 90 |
|
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) { |
85 | 96 | this(year, month, date, hrs, min, second, 0, tz); |
86 | 97 | } |
87 | 98 |
|
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); |
91 | 106 | } |
92 | 107 |
|
93 | 108 | public Instant getInstant() { |
|
0 commit comments