Skip to content

Fix FileInfo.fields deserialization when API returns an empty array #438

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

Closed
amalsaidov wants to merge 1 commit into from
Closed

Fix FileInfo.fields deserialization when API returns an empty array #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions src/main/java/com/crowdin/client/sourcefiles/model/FileInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.crowdin.client.sourcefiles.model;

import com.crowdin.client.core.http.impl.json.EmptyArrayToNullDeserializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import lombok.Data;

import java.util.Map;
Expand All @@ -20,5 +22,6 @@ public class FileInfo {
/**
* Custom fields (Enterprise only)
*/
@JsonDeserialize(using = EmptyArrayToNullDeserializer.class)
private Map<String, Object> fields;
}
25 changes: 25 additions & 0 deletions src/test/java/com/crowdin/client/sourcefiles/FileOptionsDeserializationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import static java.util.Collections.singletonList;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;

public class FileOptionsDeserializationTest {
Expand Down Expand Up @@ -172,6 +173,30 @@ public void exportOptionsSerialization() {
jsonTransformer.convert(md));
}

@Test
public void fieldsEmptyArrayDeserializesToNullForFile() {
// Enterprise API returns an empty array instead of an object when a file has no custom fields
FileResponseObject response = jsonTransformer.parse(
"{\"data\":{\"id\":1,\"revisionId\":1,\"fields\":[]}}", FileResponseObject.class);
assertInstanceOf(File.class, response.getData());
assertNull(response.getData().getFields());
}

@Test
public void fieldsEmptyArrayDeserializesToNullForFileInfo() {
FileResponseObject response = jsonTransformer.parse(
"{\"data\":{\"id\":1,\"fields\":[]}}", FileResponseObject.class);
assertInstanceOf(FileInfo.class, response.getData());
assertNull(response.getData().getFields());
}

@Test
public void fieldsObjectIsStillDeserialized() {
FileResponseObject response = jsonTransformer.parse(
"{\"data\":{\"id\":1,\"revisionId\":1,\"fields\":{\"some-field\":\"value\"}}}", FileResponseObject.class);
assertEquals("value", response.getData().getFields().get("some-field"));
}

private void assertImportRoundTrip(String fileType, ImportOptions options) {
File file = parseFile(fileType, "importOptions", jsonTransformer.convert(options));
assertInstanceOf(ImportOptions.class, file.getImportOptions());
Expand Down
Loading