Skip to content
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

Jump to bottom

Close Parsers and Generators #586

Merged
merged 1 commit into from
Mar 31, 2023
Merged

Close Parsers and Generators #586

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
72 changes: 46 additions & 26 deletions src/main/java/org/eclipse/yasson/internal/JsonBinding.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,54 +57,64 @@ private <T> T deserialize(final Type type, final JsonParser parser, final Deseri

@Override
public <T> T fromJson(String str, Class<T> type) throws JsonbException {
final JsonParser parser = jsonbContext.getJsonProvider().createParser(new StringReader(str));
final DeserializationContextImpl unmarshaller = new DeserializationContextImpl(jsonbContext);
return deserialize(type, parser, unmarshaller);
try (JsonParser parser = jsonbContext.getJsonProvider().createParser(new StringReader(str))) {
final DeserializationContextImpl unmarshaller = new DeserializationContextImpl(jsonbContext);
return deserialize(type, parser, unmarshaller);
}
}

@Override
public <T> T fromJson(String str, Type type) throws JsonbException {
JsonParser parser = jsonbContext.getJsonProvider().createParser(new StringReader(str));
DeserializationContextImpl unmarshaller = new DeserializationContextImpl(jsonbContext);
return deserialize(type, parser, unmarshaller);
try (JsonParser parser = jsonbContext.getJsonProvider().createParser(new StringReader(str))) {
DeserializationContextImpl unmarshaller = new DeserializationContextImpl(jsonbContext);
return deserialize(type, parser, unmarshaller);
}
}

@Override
public <T> T fromJson(Reader reader, Class<T> type) throws JsonbException {
JsonParser parser = jsonbContext.getJsonProvider().createParser(reader);
DeserializationContextImpl unmarshaller = new DeserializationContextImpl(jsonbContext);
return deserialize(type, parser, unmarshaller);
try (JsonParser parser = jsonbContext.getJsonProvider().createParser(reader)) {
DeserializationContextImpl unmarshaller = new DeserializationContextImpl(jsonbContext);
return deserialize(type, parser, unmarshaller);
}
}

@Override
public <T> T fromJson(Reader reader, Type type) throws JsonbException {
JsonParser parser = jsonbContext.getJsonProvider().createParser(reader);
DeserializationContextImpl unmarshaller = new DeserializationContextImpl(jsonbContext);
return deserialize(type, parser, unmarshaller);
try (JsonParser parser = jsonbContext.getJsonProvider().createParser(reader)) {
DeserializationContextImpl unmarshaller = new DeserializationContextImpl(jsonbContext);
return deserialize(type, parser, unmarshaller);
}
}

@Override
public <T> T fromJson(InputStream stream, Class<T> clazz) throws JsonbException {
DeserializationContextImpl unmarshaller = new DeserializationContextImpl(jsonbContext);
return deserialize(clazz, inputStreamParser(stream), unmarshaller);
try (JsonParser parser = inputStreamParser(stream)) {
return deserialize(clazz, inputStreamParser(stream), unmarshaller);
}
}

@Override
public <T> T fromJson(InputStream stream, Type type) throws JsonbException {
DeserializationContextImpl unmarshaller = new DeserializationContextImpl(jsonbContext);
return deserialize(type, inputStreamParser(stream), unmarshaller);
try (JsonParser parser = inputStreamParser(stream)) {
return deserialize(type, inputStreamParser(stream), unmarshaller);
}
}

@Override
public <T> T fromJsonStructure(JsonStructure jsonStructure, Class<T> type) throws JsonbException {
JsonParser parser = new JsonStructureToParserAdapter(jsonStructure);
return deserialize(type, parser, new DeserializationContextImpl(jsonbContext));
try (JsonParser parser = new JsonStructureToParserAdapter(jsonStructure)) {
return deserialize(type, parser, new DeserializationContextImpl(jsonbContext));
}
}

@Override
public <T> T fromJsonStructure(JsonStructure jsonStructure, Type runtimeType) throws JsonbException {
JsonParser parser = new JsonStructureToParserAdapter(jsonStructure);
return deserialize(runtimeType, parser, new DeserializationContextImpl(jsonbContext));
try (JsonParser parser = new JsonStructureToParserAdapter(jsonStructure)) {
return deserialize(runtimeType, parser, new DeserializationContextImpl(jsonbContext));
}
}

private JsonParser inputStreamParser(InputStream stream) {
Expand All @@ -117,29 +127,35 @@ private JsonParser inputStreamParser(InputStream stream) {
@Override
public String toJson(Object object) throws JsonbException {
StringWriter writer = new StringWriter();
final JsonGenerator generator = writerGenerator(writer);
new SerializationContextImpl(jsonbContext).marshall(object, generator);
try (JsonGenerator generator = writerGenerator(writer)) {
new SerializationContextImpl(jsonbContext).marshall(object, generator);
}
return writer.toString();
}

@Override
public String toJson(Object object, Type type) throws JsonbException {
StringWriter writer = new StringWriter();
final JsonGenerator generator = writerGenerator(writer);
new SerializationContextImpl(jsonbContext, type).marshall(object, generator);
try (JsonGenerator generator = writerGenerator(writer)) {
new SerializationContextImpl(jsonbContext, type).marshall(object, generator);
}
return writer.toString();
}

@Override
public void toJson(Object object, Writer writer) throws JsonbException {
final SerializationContextImpl marshaller = new SerializationContextImpl(jsonbContext);
marshaller.marshallWithoutClose(object, writerGenerator(writer));
try (JsonGenerator generator = writerGenerator(writer)) {
marshaller.marshallWithoutClose(object, generator);
}
}

@Override
public void toJson(Object object, Type type, Writer writer) throws JsonbException {
final SerializationContextImpl marshaller = new SerializationContextImpl(jsonbContext, type);
marshaller.marshallWithoutClose(object, writerGenerator(writer));
try (JsonGenerator generator = writerGenerator(writer)) {
marshaller.marshallWithoutClose(object, generator);
}
}

private JsonGenerator writerGenerator(Writer writer) {
Expand All @@ -153,13 +169,17 @@ private JsonGenerator writerGenerator(Writer writer) {
@Override
public void toJson(Object object, OutputStream stream) throws JsonbException {
final SerializationContextImpl marshaller = new SerializationContextImpl(jsonbContext);
marshaller.marshall(object, streamGenerator(stream));
try (JsonGenerator generator = streamGenerator(stream)) {
marshaller.marshall(object, generator);
}
}

@Override
public void toJson(Object object, Type type, OutputStream stream) throws JsonbException {
final SerializationContextImpl marshaller = new SerializationContextImpl(jsonbContext, type);
marshaller.marshall(object, streamGenerator(stream));
try (JsonGenerator generator = streamGenerator(stream)) {
marshaller.marshall(object, generator);
}
}

@Override
Expand Down