-
Notifications
You must be signed in to change notification settings - Fork 65
JOHNZON-441 - implement currentEvent for RewindableJsonParser and JsonValueParserAdapter #145
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.
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
jungm
wants to merge
1
commit into
apache:master
Choose a base branch
from
jungm:issue/JOHNZON-441
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+373
−154
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
304 changes: 159 additions & 145 deletions
304
johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JsonValueParserAdapter.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,145 +1,159 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.johnzon.jsonb; | ||
|
|
||
| import java.math.BigDecimal; | ||
| import java.util.function.Supplier; | ||
|
|
||
| import jakarta.json.JsonNumber; | ||
| import jakarta.json.JsonString; | ||
| import jakarta.json.JsonValue; | ||
| import jakarta.json.stream.JsonLocation; | ||
| import jakarta.json.stream.JsonParser; | ||
| import jakarta.json.stream.JsonParserFactory; | ||
|
|
||
| import org.apache.johnzon.mapper.jsonp.RewindableJsonParser; | ||
|
|
||
| class JsonValueParserAdapter<T extends JsonValue> implements JsonParser { | ||
|
|
||
| private static class JsonStringParserAdapter extends JsonValueParserAdapter<JsonString> { | ||
|
|
||
| public JsonStringParserAdapter(JsonString jsonValue) { | ||
| super(jsonValue); | ||
| } | ||
|
|
||
| @Override | ||
| public String getString() { | ||
| return getValue().getString(); | ||
| } | ||
| } | ||
|
|
||
| private static class JsonNumberParserAdapter extends JsonValueParserAdapter<JsonNumber> { | ||
|
|
||
| public JsonNumberParserAdapter(JsonNumber jsonValue) { | ||
| super(jsonValue); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isIntegralNumber() { | ||
| return getValue().isIntegral(); | ||
| } | ||
|
|
||
| @Override | ||
| public int getInt() { | ||
| return getValue().intValueExact(); | ||
| } | ||
|
|
||
| @Override | ||
| public long getLong() { | ||
| return getValue().longValueExact(); | ||
| } | ||
|
|
||
| @Override | ||
| public BigDecimal getBigDecimal() { | ||
| return getValue().bigDecimalValue(); | ||
| } | ||
| } | ||
|
|
||
| public static JsonParser createFor(final JsonValue jsonValue, | ||
| final Supplier<JsonParserFactory> parserFactoryProvider) { | ||
| return new RewindableJsonParser(doCreate(jsonValue, parserFactoryProvider)); | ||
| } | ||
|
|
||
| private static JsonParser doCreate(final JsonValue jsonValue, | ||
| final Supplier<JsonParserFactory> parserFactoryProvider) { | ||
| switch (jsonValue.getValueType()) { | ||
| case OBJECT: return parserFactoryProvider.get().createParser(jsonValue.asJsonObject()); | ||
| case ARRAY: return parserFactoryProvider.get().createParser(jsonValue.asJsonArray()); | ||
| case STRING: return new JsonStringParserAdapter((JsonString) jsonValue); | ||
| case NUMBER: return new JsonNumberParserAdapter((JsonNumber) jsonValue); | ||
| default: return new JsonValueParserAdapter<>(jsonValue); | ||
| } | ||
| } | ||
|
|
||
| private final T jsonValue; | ||
|
|
||
| JsonValueParserAdapter(T jsonValue) { | ||
| this.jsonValue = jsonValue; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean hasNext() { | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public Event next() { | ||
| throw new UnsupportedOperationException("next() no supported for " + jsonValue.getValueType()); | ||
| } | ||
|
|
||
| @Override | ||
| public String getString() { | ||
| throw new UnsupportedOperationException("next() no supported for " + jsonValue.getValueType()); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isIntegralNumber() { | ||
| throw new UnsupportedOperationException("isIntegralNumber() not supported for " + jsonValue.getValueType()); | ||
| } | ||
|
|
||
| @Override | ||
| public int getInt() { | ||
| throw new UnsupportedOperationException("getInt() not supported for " + jsonValue.getValueType()); | ||
| } | ||
|
|
||
| @Override | ||
| public long getLong() { | ||
| throw new UnsupportedOperationException("getLong() not supported for " + jsonValue.getValueType()); | ||
| } | ||
|
|
||
| @Override | ||
| public BigDecimal getBigDecimal() { | ||
| throw new UnsupportedOperationException("getBigDecimal() not supported for " + jsonValue.getValueType()); | ||
| } | ||
|
|
||
| @Override | ||
| public JsonLocation getLocation() { | ||
| throw new UnsupportedOperationException("getLocation() not supported for " + jsonValue.getValueType()); | ||
| } | ||
|
|
||
| @Override | ||
| public void close() { | ||
| // no-op | ||
| } | ||
|
|
||
| @Override | ||
| public T getValue() { | ||
| return jsonValue; | ||
| } | ||
| } | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.johnzon.jsonb; | ||
|
|
||
| import java.math.BigDecimal; | ||
| import java.util.function.Supplier; | ||
|
|
||
| import jakarta.json.JsonNumber; | ||
| import jakarta.json.JsonString; | ||
| import jakarta.json.JsonValue; | ||
| import jakarta.json.stream.JsonLocation; | ||
| import jakarta.json.stream.JsonParser; | ||
| import jakarta.json.stream.JsonParserFactory; | ||
|
|
||
| import org.apache.johnzon.mapper.jsonp.RewindableJsonParser; | ||
|
|
||
| class JsonValueParserAdapter<T extends JsonValue> implements JsonParser { | ||
|
|
||
| private static class JsonStringParserAdapter extends JsonValueParserAdapter<JsonString> { | ||
|
|
||
| public JsonStringParserAdapter(JsonString jsonValue) { | ||
| super(jsonValue); | ||
| } | ||
|
|
||
| @Override | ||
| public String getString() { | ||
| return getValue().getString(); | ||
| } | ||
| } | ||
|
|
||
| private static class JsonNumberParserAdapter extends JsonValueParserAdapter<JsonNumber> { | ||
|
|
||
| public JsonNumberParserAdapter(JsonNumber jsonValue) { | ||
| super(jsonValue); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isIntegralNumber() { | ||
| return getValue().isIntegral(); | ||
| } | ||
|
|
||
| @Override | ||
| public int getInt() { | ||
| return getValue().intValueExact(); | ||
| } | ||
|
|
||
| @Override | ||
| public long getLong() { | ||
| return getValue().longValueExact(); | ||
| } | ||
|
|
||
| @Override | ||
| public BigDecimal getBigDecimal() { | ||
| return getValue().bigDecimalValue(); | ||
| } | ||
| } | ||
|
|
||
| public static JsonParser createFor(final JsonValue jsonValue, | ||
| final Supplier<JsonParserFactory> parserFactoryProvider) { | ||
| return new RewindableJsonParser(doCreate(jsonValue, parserFactoryProvider)); | ||
| } | ||
|
|
||
| private static JsonParser doCreate(final JsonValue jsonValue, | ||
| final Supplier<JsonParserFactory> parserFactoryProvider) { | ||
| switch (jsonValue.getValueType()) { | ||
| case OBJECT: return parserFactoryProvider.get().createParser(jsonValue.asJsonObject()); | ||
| case ARRAY: return parserFactoryProvider.get().createParser(jsonValue.asJsonArray()); | ||
| case STRING: return new JsonStringParserAdapter((JsonString) jsonValue); | ||
| case NUMBER: return new JsonNumberParserAdapter((JsonNumber) jsonValue); | ||
| default: return new JsonValueParserAdapter<>(jsonValue); | ||
| } | ||
| } | ||
|
|
||
| private final T jsonValue; | ||
|
|
||
| JsonValueParserAdapter(T jsonValue) { | ||
| this.jsonValue = jsonValue; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean hasNext() { | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public Event next() { | ||
| throw new UnsupportedOperationException("next() no supported for " + jsonValue.getValueType()); | ||
| } | ||
|
|
||
| @Override | ||
| public Event currentEvent() { | ||
| switch (jsonValue.getValueType()) { | ||
| case STRING: return Event.VALUE_STRING; | ||
| case NUMBER: return Event.VALUE_NUMBER; | ||
| case TRUE: return Event.VALUE_TRUE; | ||
| case FALSE: return Event.VALUE_FALSE; | ||
| case NULL: return Event.VALUE_NULL; | ||
| case OBJECT: return Event.START_OBJECT; | ||
| case ARRAY: return Event.START_ARRAY; | ||
| default: throw new UnsupportedOperationException("currentEvent() not supported for " + jsonValue.getValueType()); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public String getString() { | ||
| throw new UnsupportedOperationException("next() no supported for " + jsonValue.getValueType()); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isIntegralNumber() { | ||
| throw new UnsupportedOperationException("isIntegralNumber() not supported for " + jsonValue.getValueType()); | ||
| } | ||
|
|
||
| @Override | ||
| public int getInt() { | ||
| throw new UnsupportedOperationException("getInt() not supported for " + jsonValue.getValueType()); | ||
| } | ||
|
|
||
| @Override | ||
| public long getLong() { | ||
| throw new UnsupportedOperationException("getLong() not supported for " + jsonValue.getValueType()); | ||
| } | ||
|
|
||
| @Override | ||
| public BigDecimal getBigDecimal() { | ||
| throw new UnsupportedOperationException("getBigDecimal() not supported for " + jsonValue.getValueType()); | ||
| } | ||
|
|
||
| @Override | ||
| public JsonLocation getLocation() { | ||
| throw new UnsupportedOperationException("getLocation() not supported for " + jsonValue.getValueType()); | ||
| } | ||
|
|
||
| @Override | ||
| public void close() { | ||
| // no-op | ||
| } | ||
|
|
||
| @Override | ||
| public T getValue() { | ||
| return jsonValue; | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe rework so the diff is accurate? (content is ok once done)