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

Use Jsonb more effectively #5047

Merged
merged 2 commits into from
May 13, 2022
Merged

Use Jsonb more effectively #5047

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c74de89
Addresses #3702
dansiviter Apr 23, 2022
a4035f2
Bumping copyright
dansiviter Apr 23, 2022
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
23 changes: 11 additions & 12 deletions ...a/json-binding/src/main/java/org/glassfish/jersey/jsonb/internal/JsonBindingProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2022 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -19,9 +19,17 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;

import org.glassfish.jersey.jsonb.LocalizationMessages;
import org.glassfish.jersey.message.internal.AbstractMessageReaderWriterProvider;
import org.glassfish.jersey.message.internal.EntityInputStream;

import jakarta.json.bind.Jsonb;
import jakarta.json.bind.JsonbBuilder;
import jakarta.json.bind.JsonbException;
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.ProcessingException;
import jakarta.ws.rs.Produces;
Expand All @@ -34,14 +42,6 @@
import jakarta.ws.rs.ext.Provider;
import jakarta.ws.rs.ext.Providers;

import jakarta.json.bind.Jsonb;
import jakarta.json.bind.JsonbBuilder;
import jakarta.json.bind.JsonbException;

import org.glassfish.jersey.jsonb.LocalizationMessages;
import org.glassfish.jersey.message.internal.AbstractMessageReaderWriterProvider;
import org.glassfish.jersey.message.internal.EntityInputStream;

/**
* Entity provider (reader and writer) for JSONB.
*
Expand Down Expand Up @@ -100,9 +100,8 @@ public void writeTo(Object o, Class<?> type, Type genericType,
OutputStream entityStream) throws IOException, WebApplicationException {
Jsonb jsonb = getJsonb(type);
try {
entityStream.write(jsonb.toJson(o).getBytes(AbstractMessageReaderWriterProvider.getCharset(mediaType)));
entityStream.flush();
} catch (IOException e) {
jsonb.toJson(o, genericType, new OutputStreamWriter(entityStream, getCharset(mediaType)));
} catch (JsonbException e) {
throw new ProcessingException(LocalizationMessages.ERROR_JSONB_SERIALIZATION(), e);
}
}
Expand Down