Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public static LocalDate parseLocalDate(Map<String, Object> sourceMap, String key

public static LocalDate parseLocalDate(String dateString, String key, String root) {
try {
if (dateString == null) {
if (Strings.isNullOrBlank(dateString)) {
return null;
}
return LocalDate.parse(dateString);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,11 @@ public void testParseLocalDate_FromString_ReturnsNull_WhenNull() {
assertThat(DateParser.parseLocalDate((String) null, KEY, ROOT), nullValue());
}

public void testParseLocalDate_FromString_ReturnsNull_WhenEmptyString() {
assertThat(DateParser.parseLocalDate("", KEY, ROOT), nullValue());
assertThat(DateParser.parseLocalDate(" ", KEY, ROOT), nullValue());
}

public void testParseLocalDate_FromString_Throws_WhenInvalidFormat() {
var e = expectThrows(IllegalArgumentException.class, () -> DateParser.parseLocalDate(INVALID_DATE_FORMAT, KEY, ROOT));
assertThat(e.getMessage(), containsString(pathToKey(ROOT, KEY)));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1026,15 +1026,15 @@ public void testHandlesNullDatesInHeuristics() {
}

public void testFiltersEndpointsWithInvalidReleaseDate() {
var id1 = "id1";
var invalidId = "invalid_id";
var invalidId2 = "invalid_id2";
var validDateId = "valid_date_id";
var blankDateId = "blank_date_id";
var invalidDateId = "invalid_date_id";
var status = STATUS_GA;

var response = new ElasticInferenceServiceAuthorizationResponseEntity(
List.of(
new ElasticInferenceServiceAuthorizationResponseEntity.AuthorizedEndpoint(
id1,
validDateId,
"name1",
createTaskTypeObject(EIS_CHAT_PATH, TaskType.CHAT_COMPLETION.toString()),
status,
Expand All @@ -1046,7 +1046,7 @@ public void testFiltersEndpointsWithInvalidReleaseDate() {
null
),
new ElasticInferenceServiceAuthorizationResponseEntity.AuthorizedEndpoint(
invalidId,
invalidDateId,
"name2",
createTaskTypeObject(EIS_CHAT_PATH, TaskType.CHAT_COMPLETION.toString()),
status,
Expand All @@ -1058,13 +1058,13 @@ public void testFiltersEndpointsWithInvalidReleaseDate() {
null
),
new ElasticInferenceServiceAuthorizationResponseEntity.AuthorizedEndpoint(
invalidId2,
blankDateId,
"name3",
createTaskTypeObject(EIS_CHAT_PATH, TaskType.CHAT_COMPLETION.toString()),
status,
null,
TEST_RELEASE_DATE,
"",
" ",
null,
null,
null,
null
Expand All @@ -1073,19 +1073,20 @@ public void testFiltersEndpointsWithInvalidReleaseDate() {
);

var auth = ElasticInferenceServiceAuthorizationModel.of(response, "url");
assertThat(auth.getEndpointIds(), is(Set.of(id1)));
assertThat(auth.getEndpointIds(), is(Set.of(validDateId, blankDateId)));
assertTrue(auth.isAuthorized());
}

public void testFiltersEndpointsWithInvalidEndOfLifeDate() {
var id1 = "id1";
var invalidId = "invalid_id";
var validDateId = "valid_date_id";
var invalidDateId = "invalid_date_id";
var blankDateId = "blank_date_id";
var status = STATUS_GA;

var response = new ElasticInferenceServiceAuthorizationResponseEntity(
List.of(
new ElasticInferenceServiceAuthorizationResponseEntity.AuthorizedEndpoint(
id1,
validDateId,
"name1",
createTaskTypeObject(EIS_CHAT_PATH, TaskType.CHAT_COMPLETION.toString()),
status,
Expand All @@ -1097,22 +1098,34 @@ public void testFiltersEndpointsWithInvalidEndOfLifeDate() {
null
),
new ElasticInferenceServiceAuthorizationResponseEntity.AuthorizedEndpoint(
invalidId,
invalidDateId,
"name2",
createTaskTypeObject(EIS_CHAT_PATH, TaskType.CHAT_COMPLETION.toString()),
status,
null,
"",
TEST_RELEASE_DATE,
"invalid-date-format",
null,
null,
null
),
new ElasticInferenceServiceAuthorizationResponseEntity.AuthorizedEndpoint(
blankDateId,
"name2",
createTaskTypeObject(EIS_CHAT_PATH, TaskType.CHAT_COMPLETION.toString()),
status,
null,
TEST_RELEASE_DATE,
" ",
null,
null,
null
)
)
);

var auth = ElasticInferenceServiceAuthorizationModel.of(response, "url");
assertThat(auth.getEndpointIds(), is(Set.of(id1)));
assertThat(auth.getEndpointIds(), is(Set.of(validDateId, blankDateId)));
assertTrue(auth.isAuthorized());
}

Expand Down
Loading