Add relative time and date #6

Merged
stne3960 merged 5 commits from relative_dates into main 2025-11-03 23:38:56 +01:00
Showing only changes of commit e75826acca - Show all commits

View File

@ -44,11 +44,27 @@ public class MockService {
Pattern.compile("\\{datetime([+-])(\\d+)d@(\\d{1,2}:\\d{2})(?::(\\w+|[^}]+))?}");
private static final Pattern DATE_OFFSET_PATTERN = Pattern.compile("\\{date([+-])(\\d+)d(?::(\\w+|[^}]+))?}");
private static final int GROUP_ONE = 1;
private static final int GROUP_TWO = 2;
private static final int GROUP_THREE = 3;
private static final int GROUP_FOUR = 4;
private static final int GROUP_FIVE = 5;
// Placeholder pattern groups
private static final int PLACEHOLDER_KEY = 1;
private static final int PLACEHOLDER_TYPE = 2;
// Date/time pattern groups
private static final int DATETIME_SIGN = 1;
private static final int DATETIME_DAYS = 2;
private static final int DATETIME_HOURS = 3;
private static final int DATETIME_MINUTES = 4;
private static final int DATETIME_FORMAT = 5;
// Date/time at specific time pattern groups
private static final int AT_TIME_SIGN = 1;
private static final int AT_TIME_DAYS = 2;
private static final int AT_TIME_TIME = 3;
private static final int AT_TIME_FORMAT = 4;
// Date offset pattern groups
private static final int DATE_SIGN = 1;
private static final int DATE_DAYS = 2;
private static final int DATE_FORMAT = 3;
/**
@ -170,8 +186,8 @@ public class MockService {
Matcher matcher = PLACEHOLDER_PATTERN.matcher(str);
// If the string is a single placeholder (e.g. "{id:int}" or "{id}"), resolve and return its value
if (matcher.matches()) {
String key = matcher.group(GROUP_ONE);
String type = matcher.group(GROUP_TWO);
String key = matcher.group(PLACEHOLDER_KEY);
String type = matcher.group(PLACEHOLDER_TYPE);
String raw = resolveValue(key, pathVariables, globals);
return convertWithType(raw, type);
}
@ -179,8 +195,8 @@ public class MockService {
// Otherwise: perform inline replacement for all placeholders in the string
StringBuilder sb = new StringBuilder();
while (matcher.find()) {
String key = matcher.group(GROUP_ONE);
String type = matcher.group(GROUP_TWO);
String key = matcher.group(PLACEHOLDER_KEY);
String type = matcher.group(PLACEHOLDER_TYPE);
String raw = resolveValue(key, pathVariables, globals);
Object replacement = convertWithType(raw, type);
matcher.appendReplacement(sb, Matcher.quoteReplacement(String.valueOf(replacement)));
@ -218,11 +234,11 @@ public class MockService {
// Process datetime with offset (e.g., {datetime+2d4h30m} or {datetime+2d4h30m:rfc3339})
Matcher dateTimeOffsetMatcher = DATETIME_OFFSET_PATTERN.matcher(result);
if (dateTimeOffsetMatcher.find()) {
String sign = dateTimeOffsetMatcher.group(GROUP_ONE);
String daysStr = dateTimeOffsetMatcher.group(GROUP_TWO);
String hoursStr = dateTimeOffsetMatcher.group(GROUP_THREE);
String minutesStr = dateTimeOffsetMatcher.group(GROUP_FOUR);
String format = dateTimeOffsetMatcher.group(GROUP_FIVE);
String sign = dateTimeOffsetMatcher.group(DATETIME_SIGN);
String daysStr = dateTimeOffsetMatcher.group(DATETIME_DAYS);
String hoursStr = dateTimeOffsetMatcher.group(DATETIME_HOURS);
String minutesStr = dateTimeOffsetMatcher.group(DATETIME_MINUTES);
String format = dateTimeOffsetMatcher.group(DATETIME_FORMAT);
LocalDateTime now = LocalDateTime.now();
LocalDateTime target = calculateDateTimeWithOffset(now, sign, daysStr, hoursStr, minutesStr);
@ -234,10 +250,10 @@ public class MockService {
// Process datetime with days at specific time (e.g., {datetime+2d@13:00} or {datetime+2d@13:00:rfc3339})
Matcher dateTimeAtTimeMatcher = DATETIME_AT_TIME_PATTERN.matcher(result);
if (dateTimeAtTimeMatcher.find()) {
String sign = dateTimeAtTimeMatcher.group(GROUP_ONE);
int days = Integer.parseInt(dateTimeAtTimeMatcher.group(GROUP_TWO));
String timeStr = dateTimeAtTimeMatcher.group(GROUP_THREE);
String format = dateTimeAtTimeMatcher.group(GROUP_FOUR);
String sign = dateTimeAtTimeMatcher.group(AT_TIME_SIGN);
int days = Integer.parseInt(dateTimeAtTimeMatcher.group(AT_TIME_DAYS));
String timeStr = dateTimeAtTimeMatcher.group(AT_TIME_TIME);
String format = dateTimeAtTimeMatcher.group(AT_TIME_FORMAT);
LocalDate targetDate = LocalDate.now();
if ("+".equals(sign)) {
@ -256,9 +272,9 @@ public class MockService {
// Process date with offset (e.g., {date-4d} or {date-4d:MMM dd, yyyy})
Matcher dateOffsetMatcher = DATE_OFFSET_PATTERN.matcher(result);
if (dateOffsetMatcher.find()) {
String sign = dateOffsetMatcher.group(GROUP_ONE);
int days = Integer.parseInt(dateOffsetMatcher.group(GROUP_TWO));
String format = dateOffsetMatcher.group(GROUP_THREE);
String sign = dateOffsetMatcher.group(DATE_SIGN);
int days = Integer.parseInt(dateOffsetMatcher.group(DATE_DAYS));
String format = dateOffsetMatcher.group(DATE_FORMAT);
LocalDate target = LocalDate.now();
if ("+".equals(sign)) {