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

Fix long getting casted to double in ObjectAdapter #219

Merged
merged 3 commits into from
Mar 10, 2024
Merged

Fix long getting casted to double in ObjectAdapter #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8561b9f
fix long getting casted to double
SentryMan Mar 8, 2024
6fde440
Merge remote-tracking branch 'upstream/main' into unknown-double
SentryMan Mar 8, 2024
123fe94
fix tests
SentryMan Mar 8, 2024
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
25 changes: 19 additions & 6 deletions blackbox-test/src/test/java/org/example/other/ObjectAdapterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import io.avaje.jsonb.JsonType;
import io.avaje.jsonb.JsonWriter;
import io.avaje.jsonb.Jsonb;
import io.avaje.jsonb.Types;

import org.junit.jupiter.api.Test;

import java.io.StringWriter;
Expand Down Expand Up @@ -68,7 +70,7 @@ void mixedArray() {
Object val = objectType.fromJson("[42,false,true,\"hi\",true]");
assertThat(val).isInstanceOf(List.class);
List list = (List) val;
assertThat(list).isEqualTo(List.of(42.0, false, true, "hi", true));
assertThat(list).isEqualTo(List.of(42L, false, true, "hi", true));
}

@SuppressWarnings("unchecked")
Expand All @@ -79,7 +81,7 @@ void fromJson_readingMap() {

assertThat(value).isInstanceOf(Map.class);
Map<String, Object> asMap = (Map<String, Object>) value;
assertThat(asMap.get("id")).isEqualTo(42D);
assertThat(asMap.get("id")).isEqualTo(42L);
assertThat(asMap.get("name")).isEqualTo("rob");

Object fromJsonViaType = objectType.fromJson("{\"id\":42,\"name\":\"rob\"}");
Expand All @@ -96,7 +98,7 @@ void fromJson_readingListOfMap() {

List<Map<String, Object>> asListOfMap = (List<Map<String, Object>>) value;
assertThat(asListOfMap).hasSize(2);
assertThat(asListOfMap.get(0).get("id")).isEqualTo(42D);
assertThat(asListOfMap.get(0).get("id")).isEqualTo(42L);
assertThat(asListOfMap.get(0).get("name")).isEqualTo("rob");

StringWriter sw = new StringWriter();
Expand All @@ -105,12 +107,12 @@ void fromJson_readingListOfMap() {
jsonWriter.close();
String asJson = sw.toString();

assertThat(asJson).isEqualTo("[{\"id\":42.0,\"name\":\"rob\"},{\"id\":43.0,\"name\":\"bob\"}]");
assertThat(asJson).isEqualTo("[{\"id\":42,\"name\":\"rob\"},{\"id\":43,\"name\":\"bob\"}]");


// a bit easier using JsonType compared to JsonAdapter
String asJson2 = objectType.toJson(value);
assertThat(asJson2).isEqualTo("[{\"id\":42.0,\"name\":\"rob\"},{\"id\":43.0,\"name\":\"bob\"}]");
assertThat(asJson2).isEqualTo("[{\"id\":42,\"name\":\"rob\"},{\"id\":43,\"name\":\"bob\"}]");
}

@SuppressWarnings("unchecked")
Expand All @@ -130,8 +132,19 @@ void readingNested() {
var entry = (Map<String, Object>) list.get(0);

assertThat(entry).hasSize(3);
assertThat(entry.get("path")).isEqualTo(42.0D);
assertThat(entry.get("path")).isEqualTo(42L);
assertThat(entry.get("property")).isEqualTo("foo");
assertThat(entry.get("message")).isEqualTo("must not be blank");
}

@Test
void testIntegerParsing() {

JsonType<List<Map<String, Object>>> listMapType =
jsonb.type(Types.listOf(Types.mapOf(Object.class)));
String input = "[ {\"food\": \"sushi\", \"amount\": 5}]";

List<Map<String, Object>> l = listMapType.fromJson(input);
assertThat("5").isEqualTo(l.get(0).get("amount").toString());
}
}
5 changes: 4 additions & 1 deletion jsonb/src/main/java/io/avaje/jsonb/core/BasicTypeAdapters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,10 @@ public Object fromJson(JsonReader reader) {
return this.stringAdapter.fromJson(reader);
case NUMBER:
var d = this.doubleAdapter.fromJson(reader);
return (d % 1 == 0) ? d.longValue() : d;
if (d % 1 == 0) {
return d.longValue();
}
return d;
case BOOLEAN:
return this.booleanAdapter.fromJson(reader);
case NULL:
Expand Down
Loading