Skip to content

Commit 4d3016a

Browse files
cowtowncodercowtowncoder
committed
Merge branch '2.18'
2 parents f1dd58a + 050b7a4 commit 4d3016a

File tree

2 files changed

+25
-28
lines changed

2 files changed

+25
-28
lines changed

‎csv/src/main/java/tools/jackson/dataformat/csv/CsvParser.java

+15-17
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ public boolean isExpectedNumberIntToken()
609609
JsonToken t = _currToken;
610610
if (t == JsonToken.VALUE_STRING) {
611611
if (_reader.isExpectedNumberIntToken()) {
612-
_currToken = JsonToken.VALUE_NUMBER_INT;
612+
_updateToken(JsonToken.VALUE_NUMBER_INT);
613613
return true;
614614
}
615615
return false;
@@ -628,24 +628,24 @@ public JsonToken nextToken() throws JacksonException
628628
_binaryValue = null;
629629
switch (_state) {
630630
case STATE_DOC_START:
631-
return (_currToken = _handleStartDoc());
631+
return _updateToken(_handleStartDoc());
632632
case STATE_RECORD_START:
633-
return (_currToken = _handleRecordStart());
633+
return _updateToken(_handleRecordStart());
634634
case STATE_NEXT_ENTRY:
635-
return (_currToken = _handleNextEntry());
635+
return _updateToken(_handleNextEntry());
636636
case STATE_NAMED_VALUE:
637-
return (_currToken = _handleNamedValue());
637+
return _updateToken(_handleNamedValue());
638638
case STATE_UNNAMED_VALUE:
639-
return (_currToken = _handleUnnamedValue());
639+
return _updateToken(_handleUnnamedValue());
640640
case STATE_IN_ARRAY:
641-
return (_currToken = _handleArrayValue());
641+
return _updateToken(_handleArrayValue());
642642
case STATE_SKIP_EXTRA_COLUMNS:
643643
// Need to just skip whatever remains
644644
return _skipUntilEndOfLine();
645645
case STATE_MISSING_NAME:
646-
return (_currToken = _handleMissingName());
646+
return _updateToken(_handleMissingName());
647647
case STATE_MISSING_VALUE:
648-
return (_currToken = _handleMissingValue());
648+
return _updateToken(_handleMissingValue());
649649
case STATE_DOC_END:
650650
try {
651651
_reader.close();
@@ -676,8 +676,7 @@ public boolean nextName(SerializableString str) throws JacksonException
676676
// Optimize for expected case of getting PROPERTY_NAME:
677677
if (_state == STATE_NEXT_ENTRY) {
678678
_binaryValue = null;
679-
JsonToken t = _handleNextEntry();
680-
_currToken = t;
679+
final JsonToken t = _updateToken(_handleNextEntry());
681680
if (t == JsonToken.PROPERTY_NAME) {
682681
return str.getValue().equals(_currentName);
683682
}
@@ -693,8 +692,7 @@ public String nextName() throws JacksonException
693692
// Optimize for expected case of getting PROPERTY_NAME:
694693
if (_state == STATE_NEXT_ENTRY) {
695694
_binaryValue = null;
696-
JsonToken t = _handleNextEntry();
697-
_currToken = t;
695+
final JsonToken t = _updateToken(_handleNextEntry());
698696
if (t == JsonToken.PROPERTY_NAME) {
699697
return _currentName;
700698
}
@@ -710,12 +708,12 @@ public String nextTextValue() throws JacksonException
710708
_binaryValue = null;
711709
JsonToken t;
712710
if (_state == STATE_NAMED_VALUE) {
713-
_currToken = t = _handleNamedValue();
711+
t = _updateToken(_handleNamedValue());
714712
if (t == JsonToken.VALUE_STRING) {
715713
return _currentValue;
716714
}
717715
} else if (_state == STATE_UNNAMED_VALUE) {
718-
_currToken = t = _handleUnnamedValue();
716+
t = _updateToken(_handleUnnamedValue());
719717
if (t == JsonToken.VALUE_STRING) {
720718
return _currentValue;
721719
}
@@ -1120,7 +1118,7 @@ protected final JsonToken _skipUntilEndOfLine() throws JacksonException
11201118
// and check just in case
11211119
_streamReadContext = _streamReadContext.clearAndGetParent();
11221120
_state = _reader.startNewLine() ? STATE_RECORD_START : STATE_DOC_END;
1123-
return (_currToken = _streamReadContext.inArray()
1121+
return _updateToken(_streamReadContext.inArray()
11241122
? JsonToken.END_ARRAY : JsonToken.END_OBJECT);
11251123
}
11261124

@@ -1344,7 +1342,7 @@ public ByteArrayBuilder _getByteArrayBuilder()
13441342

13451343
protected void _startArray(CsvSchema.Column column)
13461344
{
1347-
_currToken = JsonToken.START_ARRAY;
1345+
_updateToken(JsonToken.START_ARRAY);
13481346
_streamReadContext = _streamReadContext.createChildArrayContext(_reader.getCurrentRow(),
13491347
_reader.getCurrentColumn());
13501348
_state = STATE_IN_ARRAY;

‎yaml/src/main/java/tools/jackson/dataformat/yaml/YAMLParser.java

+10-11
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ public JsonToken nextToken() throws JacksonException
354354
if (evt == null) {
355355
_currentAnchor = Optional.empty();
356356
_lastTagEvent = null;
357-
return (_currToken = null);
357+
return _updateTokenToNull();
358358
}
359359
_lastEvent = evt;
360360
// One complication: property names are only inferred from the fact that we are
@@ -371,7 +371,7 @@ public JsonToken nextToken() throws JacksonException
371371
_reportMismatchedEndMarker('}', ']');
372372
}
373373
_streamReadContext = _streamReadContext.getParent();
374-
return (_currToken = JsonToken.END_OBJECT);
374+
return _updateToken(JsonToken.END_OBJECT);
375375
}
376376
_reportError("Expected a property name (Scalar value in YAML), got this instead: "+evt);
377377
}
@@ -396,7 +396,7 @@ public JsonToken nextToken() throws JacksonException
396396
final String name = scalar.getValue();
397397
_currentName = name;
398398
_streamReadContext.setCurrentName(name);
399-
return (_currToken = JsonToken.PROPERTY_NAME);
399+
return _updateToken(JsonToken.PROPERTY_NAME);
400400
}
401401
} else if (_streamReadContext.inArray()) {
402402
_streamReadContext.valueRead();
@@ -409,8 +409,7 @@ public JsonToken nextToken() throws JacksonException
409409
case Scalar:
410410
// scalar values are probably the commonest:
411411
JsonToken t = _decodeScalar((ScalarEvent) evt);
412-
_currToken = t;
413-
return t;
412+
return _updateToken(t);
414413
case MappingStart:
415414
// followed by maps, then arrays
416415
Optional<Mark> m = evt.getStartMark();
@@ -419,7 +418,7 @@ public JsonToken nextToken() throws JacksonException
419418
_streamReadContext = _streamReadContext.createChildObjectContext(
420419
m.map(mark -> mark.getLine()).orElse(0), m.map(mark -> mark.getColumn()).orElse(0));
421420
_streamReadConstraints.validateNestingDepth(_streamReadContext.getNestingDepth());
422-
return (_currToken = JsonToken.START_OBJECT);
421+
return _updateToken(JsonToken.START_OBJECT);
423422

424423
case MappingEnd:
425424
// actually error; can not have map-end here
@@ -431,21 +430,21 @@ public JsonToken nextToken() throws JacksonException
431430
_streamReadContext = _streamReadContext.createChildArrayContext(
432431
mrk.map(mark -> mark.getLine()).orElse(0), mrk.map(mark -> mark.getColumn()).orElse(0));
433432
_streamReadConstraints.validateNestingDepth(_streamReadContext.getNestingDepth());
434-
return (_currToken = JsonToken.START_ARRAY);
433+
return _updateToken(JsonToken.START_ARRAY);
435434

436435
case SequenceEnd:
437436
if (!_streamReadContext.inArray()) { // sanity check is optional, but let's do it for now
438437
_reportMismatchedEndMarker(']', '}');
439438
}
440439
_streamReadContext = _streamReadContext.getParent();
441-
return (_currToken = JsonToken.END_ARRAY);
440+
return _updateToken(JsonToken.END_ARRAY);
442441

443442
// after this, less common tokens:
444443
case DocumentEnd:
445444
// [dataformat-yaml#72]: logical end of doc; fine. Two choices; either skip,
446445
// or return null as marker (but do NOT close). Earlier returned `null`, but
447446
// to allow multi-document reading should actually just skip.
448-
// return (_currToken = null);
447+
// return _updateTokenToNull();
449448
continue;
450449

451450
case DocumentStart:
@@ -459,12 +458,12 @@ public JsonToken nextToken() throws JacksonException
459458
_textValue = alias.getAnchor().orElseThrow(() -> new RuntimeException("Alias must be provided.")).getValue();
460459
_cleanedTextValue = null;
461460
// for now, nothing to do: in future, maybe try to expose as ObjectIds?
462-
return (_currToken = JsonToken.VALUE_STRING);
461+
return _updateToken(JsonToken.VALUE_STRING);
463462

464463
case StreamEnd:
465464
// end-of-input; force closure
466465
close();
467-
return (_currToken = null);
466+
return _updateTokenToNull();
468467

469468
case StreamStart:
470469
// useless, skip

0 commit comments

Comments
 (0)