Skip to content

Commit aa72856

Browse files
gil-logHyeokJoon
authored andcommitted
FEAT:(CORE) codestyle 파일들 적용
1 parent 8246482 commit aa72856

File tree

2 files changed

+35
-45
lines changed

2 files changed

+35
-45
lines changed

lib/src/main/java/kr/teamo2/utils/TimeUtil.java

Lines changed: 30 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -27,33 +27,20 @@ public class TimeUtil {
2727
public static final ZoneId UTC_ZONE_ID = ZoneId.of("UTC");
2828

2929
public static final ZoneId KST_ZONE_ID = ZoneId.of("Asia/Seoul");
30-
30+
public static final DateTimeFormatter STANDARD_ONLY_DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
31+
public static final DateTimeFormatter YYYY_MM_DD_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMdd");
3132
private static final DateTimeFormatter STANDARD_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
32-
3333
private static final DateTimeFormatter STANDARD_SPACE_SPLIT_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
34-
35-
public static final DateTimeFormatter STANDARD_ONLY_DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
36-
3734
private static final DateTimeFormatter STANDARD_HH_MM_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm");
38-
3935
private static final DateTimeFormatter STANDARD_ZONED_DATE_TIME_FORMATTER = DateTimeFormatter.ISO_ZONED_DATE_TIME;
40-
4136
private static final DateTimeFormatter UTC_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'");
42-
4337
private static final DateTimeFormatter HH_MM_FORMATTER = DateTimeFormatter.ofPattern("HH:mm");
44-
4538
private static final DateTimeFormatter H_M_FORMATTER = new DateTimeFormatterBuilder()
46-
.appendPattern("H:m")
47-
.toFormatter();
48-
39+
.appendPattern("H:m")
40+
.toFormatter();
4941
private static final DateTimeFormatter YYYY_MM_DD_MINUS_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
50-
5142
private static final DateTimeFormatter YYYY_MM_DD_SLASH_FORMATTER = DateTimeFormatter.ofPattern("yyyy/MM/dd");
52-
5343
private static final DateTimeFormatter[] YYYY_MM_DD_FORMATTERS = new DateTimeFormatter[]{YYYY_MM_DD_MINUS_FORMATTER, YYYY_MM_DD_SLASH_FORMATTER};
54-
55-
public static final DateTimeFormatter YYYY_MM_DD_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMdd");
56-
5744
private static final DateTimeFormatter ZONED_DATETIME_STANDARD_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssXXX");
5845

5946
public static LocalTime toLocalTime(Integer hour, Integer minutes) {
@@ -84,7 +71,7 @@ public static LocalDate toLocalDate(Integer month, Integer day) {
8471
}
8572
try {
8673
return LocalDate.of(LocalDate.now()
87-
.getYear(), month, day);
74+
.getYear(), month, day);
8875
} catch (DateTimeException e) {
8976
return null;
9077
}
@@ -106,41 +93,41 @@ public static LocalDate toLocalDate(String localDate) {
10693
return null;
10794
}
10895
return Arrays
109-
.stream(YYYY_MM_DD_FORMATTERS)
110-
.map(formatter -> {
111-
try {
112-
return LocalDate.parse(localDate, formatter);
113-
} catch (DateTimeParseException e) {
114-
return null;
115-
}
116-
})
117-
.filter(Objects::nonNull)
118-
.findAny()
119-
.orElse(null);
96+
.stream(YYYY_MM_DD_FORMATTERS)
97+
.map(formatter -> {
98+
try {
99+
return LocalDate.parse(localDate, formatter);
100+
} catch (DateTimeParseException e) {
101+
return null;
102+
}
103+
})
104+
.filter(Objects::nonNull)
105+
.findAny()
106+
.orElse(null);
120107
}
121108

122109
public static LocalDateTime toLocalDateTime(String dateTime) {
123110
if (dateTime == null) {
124111
return null;
125112
}
126113
return List.of(STANDARD_FORMATTER, STANDARD_HH_MM_FORMATTER, STANDARD_SPACE_SPLIT_FORMATTER, STANDARD_ZONED_DATE_TIME_FORMATTER)
127-
.stream()
128-
.map(formatter -> {
129-
try {
130-
return LocalDateTime.parse(dateTime, formatter);
131-
} catch (DateTimeParseException e) {
132-
return null;
133-
}
134-
})
135-
.filter(Objects::nonNull)
136-
.findAny()
137-
.orElse(null);
114+
.stream()
115+
.map(formatter -> {
116+
try {
117+
return LocalDateTime.parse(dateTime, formatter);
118+
} catch (DateTimeParseException e) {
119+
return null;
120+
}
121+
})
122+
.filter(Objects::nonNull)
123+
.findAny()
124+
.orElse(null);
138125
}
139126

140127
public static String toString(ZonedDateTime zonedDateTime) {
141128
try {
142129
if (zonedDateTime.getZone()
143-
.equals(ZoneOffset.UTC)) {
130+
.equals(ZoneOffset.UTC)) {
144131
return zonedDateTime.format(UTC_FORMATTER);
145132
} else {
146133
return zonedDateTime.format(ZONED_DATETIME_STANDARD_FORMATTER);
@@ -216,8 +203,8 @@ public static Set<LocalDate> extractDatesByDayOfWeek(LocalDate startDate, LocalD
216203
return Set.of();
217204
}
218205
return startDate.datesUntil(endDate.plusDays(1))
219-
.filter(date -> Arrays.stream(dayOfWeeks).anyMatch(dayOfWeek -> dayOfWeek == date.getDayOfWeek()))
220-
.collect(Collectors.toSet());
206+
.filter(date -> Arrays.stream(dayOfWeeks).anyMatch(dayOfWeek -> dayOfWeek == date.getDayOfWeek()))
207+
.collect(Collectors.toSet());
221208
}
222209

223210
public static boolean isDateWithInRange(LocalDate date, LocalDate startDateInclusive, LocalDate endDateInclusive) {

lib/src/test/java/kr/teamo2/utils/TimeUtilTest.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
package kr.teamo2.utils;
22

3-
import static org.junit.jupiter.api.Assertions.*;
3+
import static org.junit.jupiter.api.Assertions.assertEquals;
4+
import static org.junit.jupiter.api.Assertions.assertFalse;
5+
import static org.junit.jupiter.api.Assertions.assertNotNull;
6+
import static org.junit.jupiter.api.Assertions.assertNull;
7+
import static org.junit.jupiter.api.Assertions.assertTrue;
48

59
import java.time.DayOfWeek;
610
import java.time.LocalDate;
711
import java.time.LocalDateTime;
812
import java.time.LocalTime;
913
import java.util.Set;
10-
1114
import org.junit.jupiter.api.Test;
1215

1316
class TimeUtilTest {

0 commit comments

Comments
 (0)