Merge branch '2.19' into issue-167-solve-ordering-problem-of-record-constructor-params

cowtowncoder · web-flow · commit 0ef1a8863a75 · 2024-10-20T17:17:19.000-07:00
diff --git a/jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/impl/BeanReader.java b/jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/impl/BeanReader.java
@@ -137,7 +137,7 @@ public Object readNext(JSONReader r, JsonParser p) throws IOException
     }
 
     private Object readRecord(JSONReader r, JsonParser p) throws Exception {
-        final Object[] values = new Object[propertiesByName().size()];
+        final Object[] values = new Object[_propsByName.size()];
 
         String propName;
         for (; (propName = p.nextFieldName()) != null;) {
@@ -159,7 +159,7 @@ private Object readRecord(JSONReader r, JsonParser p) throws Exception {
     @Override
     public Object read(JSONReader r, JsonParser p) throws IOException
     {
-        JsonToken t = p.getCurrentToken();
+        JsonToken t = p.currentToken();
 
         try {
             switch (t) {

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ public Object readNext(JSONReader r, JsonParser p) throws IOException`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`private Object readRecord(JSONReader r, JsonParser p) throws Exception {`
`140`		`- final Object[] values = new Object[propertiesByName().size()];`
	`140`	`+ final Object[] values = new Object[_propsByName.size()];`
`141`	`141`
`142`	`142`	`String propName;`
`143`	`143`	`for (; (propName = p.nextFieldName()) != null;) {`
`@@ -159,7 +159,7 @@ private Object readRecord(JSONReader r, JsonParser p) throws Exception {`
`159`	`159`	`@Override`
`160`	`160`	`public Object read(JSONReader r, JsonParser p) throws IOException`
`161`	`161`	`{`
`162`		`- JsonToken t = p.getCurrentToken();`
	`162`	`+ JsonToken t = p.currentToken();`
`163`	`163`
`164`	`164`	`try {`
`165`	`165`	`switch (t) {`