Skip to content

issue-673 fix #674

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

issue-673 fix #674

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
5 changes: 5 additions & 0 deletions src/main/java/org/eclipse/yasson/internal/deserializer/YassonParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,11 @@ public Event next() {
return next;
}

@Override
public Event currentEvent() {
return context.getLastValueEvent();
}

@Override
public String getString() {
return delegate.getString();
Expand Down
23 changes: 22 additions & 1 deletion src/main/java/org/eclipse/yasson/internal/jsonstructure/JsonStructureToParserAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ public Event next() {
return next;
}

@Override
public Event currentEvent() {
return iterators.peek().getValueEvent(getValue());
}

@Override
public String getString() {
return iterators.peek().getString();
Expand All @@ -103,6 +108,11 @@ public BigDecimal getBigDecimal() {
return getJsonNumberValue().bigDecimalValue();
}

@Override
public JsonValue getValue() {
return iterators.peek().getValue();
}

@Override
public JsonObject getObject() {
JsonStructureIterator current = iterators.peek();
Expand All @@ -115,6 +125,17 @@ public JsonObject getObject() {
}
}

@Override
public JsonArray getArray() {
JsonStructureIterator current = iterators.peek();
if (current instanceof JsonArrayIterator) {
iterators.pop();
return getValue().asJsonArray();
} else {
throw new JsonbException(Messages.getMessage(MessageKeys.INTERNAL_ERROR, "Outside of array context"));
}
}

private JsonNumber getJsonNumberValue() {
JsonStructureIterator iterator = iterators.peek();
JsonValue value = iterator.getValue();
Expand All @@ -123,7 +144,7 @@ private JsonNumber getJsonNumberValue() {
}
return (JsonNumber) value;
}

@Override
public JsonLocation getLocation() {
throw new JsonbException("Operation not supported");
Expand Down