Skip to content

Fix failing tests in Meilisearch 1.16 CI #875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Strift merged 4 commits into from
Jul 30, 2025
+9 −8
Merged

Fix failing tests in Meilisearch 1.16 CI #875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
548decc
Format date to UTC
Strift Jul 30, 2025
b9ecfb5
Expect 4 keys instead of 2
Strift Jul 30, 2025
39a57c0
Make createUtcDateFormat thread-safe
Strift Jul 30, 2025
5e550ec
Don't check number of keys
Strift Jul 30, 2025
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
12 changes: 9 additions & 3 deletions src/main/java/com/meilisearch/sdk/json/GsonKeyTypeAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
import com.google.gson.stream.JsonWriter;
import com.meilisearch.sdk.model.Key;
import java.io.IOException;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.TimeZone;

public class GsonKeyTypeAdapter extends TypeAdapter<Key> {

Expand All @@ -24,7 +24,13 @@ public class GsonKeyTypeAdapter extends TypeAdapter<Key> {
private static final String KEY_EXPIRES_AT = "expiresAt";
private static final String KEY_CREATED_AT = "createdAt";
private static final String KEY_UPDATED_AT = "updatedAt";
private static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
private static final ThreadLocal<SimpleDateFormat> DATE_FORMAT =
ThreadLocal.withInitial(
() -> {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
format.setTimeZone(TimeZone.getTimeZone("UTC"));
return format;
});

@Override
public void write(JsonWriter writer, Key key) throws IOException {
Expand Down Expand Up @@ -134,7 +140,7 @@ private void writeDate(JsonWriter writer, String key, Date value) throws IOExcep
if (value == null) {
return;
}
writer.name(key).value(DATE_FORMAT.format(value));
writer.name(key).value(DATE_FORMAT.get().format(value));
}

private void readStartObject(JsonReader reader) throws IOException {
Expand Down
5 changes: 0 additions & 5 deletions src/test/java/com/meilisearch/integration/KeysTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.meilisearch.integration;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.arrayWithSize;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
Expand Down Expand Up @@ -45,8 +44,6 @@ public void testClientGetKeys() throws Exception {
Results<Key> result = client.getKeys();
Key[] keys = result.getResults();

assertThat(keys, is(arrayWithSize(2)));

for (Key key : keys) {
assertThat(key.getKey(), is(notNullValue()));
assertThat(key.getUid(), is(notNullValue()));
Expand All @@ -65,8 +62,6 @@ public void testClientGetKeysWithJacksonJsonHandler() throws Exception {
Results<Key> result = clientJackson.getKeys();
Key[] keys = result.getResults();

assertThat(keys, is(arrayWithSize(2)));

for (Key key : keys) {
assertThat(key.getKey(), is(notNullValue()));
assertThat(key.getActions(), is(notNullValue()));
Expand Down