Skip to content

Commit 8a8679a

Browse files
committed
Fix #63
1 parent 14aa5f5 commit 8a8679a

File tree

6 files changed

+19
-11
lines changed

6 files changed

+19
-11
lines changed

jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/JSON.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,7 @@ public enum Feature
257257
*
258258
* @since 2.8 (enabled by default since 2.10)
259259
*/
260-
USE_FIELDS(false, true),
261-
260+
USE_FIELDS(true, true),
262261
;
263262

264263
/*

jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/impl/ArrayReader.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ public Object readNext(JSONReader r, JsonParser p) throws IOException {
2626
if (p.hasToken(JsonToken.VALUE_NULL)) {
2727
return null;
2828
}
29-
throw JSONObjectException.from(p, "Unexpected token "+p.getCurrentToken()+"; should get START_ARRAY");
29+
throw JSONObjectException.from(p, "Unexpected token %s; should get START_ARRAY",
30+
p.getCurrentToken());
3031
}
3132

3233
CollectionBuilder b = r._collectionBuilder(null);
@@ -60,4 +61,4 @@ public Object read(JSONReader r, JsonParser p) throws IOException {
6061
} while (p.nextToken() != JsonToken.END_ARRAY);
6162
return b.buildArray(_elementType);
6263
}
63-
}
64+
}

jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/impl/ValueReaderLocator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ protected ValueReader collectionReader(Class<?> collectionType, ResolvedType val
172172
List<ResolvedType> params = valueType.typeParametersFor(Map.class);
173173
valueReader = mapReader(rawValueType, params.get(1));
174174
} else {
175-
valueReader = createReader(null, rawValueType, rawValueType);
175+
valueReader = findReader(rawValueType);
176176
}
177177
return new CollectionReader(collectionType, valueReader);
178178
}
@@ -195,7 +195,7 @@ protected ValueReader mapReader(Class<?> mapType, ResolvedType valueType)
195195
List<ResolvedType> params = valueType.typeParametersFor(Map.class);
196196
valueReader = mapReader(rawValueType, params.get(1));
197197
} else {
198-
valueReader = createReader(null, rawValueType, rawValueType);
198+
valueReader = findReader(rawValueType);
199199
}
200200
return new MapReader(mapType, valueReader);
201201
}

jr-objects/src/test/java/com/fasterxml/jackson/jr/ob/SimpleFieldTest.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,16 @@ protected XY() { }
1818
public void setY(int value) { y = value; }
1919
}
2020

21-
public void testDefaulSettings() {
22-
assertFalse(JSON.std.isEnabled(JSON.Feature.USE_FIELDS));
21+
public void testDefaultSettings() {
22+
// Changed in 2.10
23+
assertTrue(JSON.std.isEnabled(JSON.Feature.USE_FIELDS));
24+
}
25+
26+
public void testSerializeWithoutField() throws Exception
27+
{
28+
String json = JSON.std.without(JSON.Feature.USE_FIELDS)
29+
.asString(new XY(1, 2));
30+
assertEquals(aposToQuotes("{'y':2}"), json);
2331
}
2432

2533
public void testSerializeWithField() throws Exception

jr-objects/src/test/java/com/fasterxml/jackson/jr/ob/WriteBeansTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ public byte[] getStuff() {
2222
}
2323

2424
static class BeanBase {
25-
public int _value;
25+
int _value;
2626

2727
public int getValue() { return _value; }
2828
public void setValue(int v) { _value = v; }
2929
}
3030

3131
static class BaseImpl extends BeanBase {
32-
public int _extra;
32+
int _extra;
3333

3434
protected BaseImpl() { }
3535
public BaseImpl(int v, int x) {

release-notes/VERSION-2.x

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Project: jackson-jr
66

77
2.10.0 (not yet released)
88

9-
No changes since 2.9
9+
#63: Change default for `JSON.Feature.USE_FIELDS` to `true` (from false) in 2.10
1010

1111
2.9.9 (not yet released)
1212

0 commit comments

Comments
 (0)