Skip to content
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

Jump to bottom

Fix several types when serializing/deserializing #538

Merged
merged 1 commit into from
Feb 12, 2019
Merged

Fix several types when serializing/deserializing #538

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
23 changes: 12 additions & 11 deletions algoliasearch-common/src/main/java/com/algolia/search/objects/IgnorePlurals.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.JsonSerializer;
Expand All @@ -14,7 +12,6 @@
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import java.io.IOException;
import java.io.Serializable;
import java.util.Arrays;
import java.util.List;

@JsonDeserialize(using = IgnorePluralsDeserializer.class)
Expand Down Expand Up @@ -92,11 +89,11 @@ public String toString() {
class IgnorePluralsDeserializer extends JsonDeserializer<IgnorePlurals> {

@Override
public IgnorePlurals deserialize(JsonParser p, DeserializationContext ctxt)
throws IOException, JsonProcessingException {
JsonToken currentToken = p.getCurrentToken();
if (currentToken.equals(JsonToken.VALUE_STRING)) {
return IgnorePlurals.of(Arrays.asList(p.getValueAsString().split(",")));
public IgnorePlurals deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {

if (p.isExpectedStartArrayToken()) {
List languages = p.readValueAs(List.class);
return IgnorePlurals.of(languages);
}

return IgnorePlurals.of(p.getBooleanValue());
Expand All @@ -108,12 +105,16 @@ class IgnorePluralsSerializer extends JsonSerializer<IgnorePlurals> {
@SuppressWarnings("unchecked")
@Override
public void serialize(IgnorePlurals value, JsonGenerator gen, SerializerProvider serializers)
throws IOException, JsonProcessingException {
throws IOException {
if (value instanceof IgnorePluralsBoolean) {
gen.writeBoolean((Boolean) value.getInsideValue());
} else if (value instanceof IgnorePluralsListString) {
List<String> list = (List<String>) value.getInsideValue();
gen.writeString(String.join(",", list));
List<String> languages = (List<String>) value.getInsideValue();
gen.writeStartArray();
for (String lang : languages) {
gen.writeString(lang);
}
gen.writeEndArray();
}
}
}
8 changes: 4 additions & 4 deletions algoliasearch-tests/src/test/java/com/algolia/search/JacksonParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,11 @@ public void serializeIgnorePlurals() throws IOException {
settings =
new IndexSettings().setIgnorePlurals(IgnorePlurals.of(Collections.singletonList("en")));
assertThat(DEFAULT_OBJECT_MAPPER.writeValueAsString(settings))
.isEqualTo("{\"ignorePlurals\":\"en\"}");
.isEqualTo("{\"ignorePlurals\":[\"en\"]}");

settings = new IndexSettings().setIgnorePlurals(Arrays.asList("en", "fr"));
assertThat(DEFAULT_OBJECT_MAPPER.writeValueAsString(settings))
.isEqualTo("{\"ignorePlurals\":\"en,fr\"}");
.isEqualTo("{\"ignorePlurals\":[\"en\",\"fr\"]}");
}

@Test
Expand All @@ -138,13 +138,13 @@ public void deserializeIgnorePlurals() throws IOException {

ignorePlurals =
DEFAULT_OBJECT_MAPPER
.readValue("{\"ignorePlurals\":\"en\"}", IndexSettings.class)
.readValue("{\"ignorePlurals\":[\"en\"]}", IndexSettings.class)
.getIgnorePlurals();
assertThat(ignorePlurals).isEqualTo(IgnorePlurals.of(Collections.singletonList("en")));

ignorePlurals =
DEFAULT_OBJECT_MAPPER
.readValue("{\"ignorePlurals\":\"en,fr\"}", IndexSettings.class)
.readValue("{\"ignorePlurals\":[\"en\",\"fr\"]}", IndexSettings.class)
.getIgnorePlurals();
assertThat(ignorePlurals).isEqualTo(IgnorePlurals.of(Arrays.asList("en", "fr")));
}
Expand Down