grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ProtoUtil.jsonMarshaller can be supplied a JsonFormat Parser and Printer 

This allows for customizing the printer and parser behaviour
This commit is contained in:
dave 2016-11-01 21:54:10 -04:00 committed by Eric Anderson
parent f6c333eefe
commit 540f70e870
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
protobuf/src/main/java/io/grpc/protobuf/ProtoUtils.java
View File

@ -36,6 +36,7 @@ import com.google.protobuf.Message;
import com.google.protobuf.Message.Builder; import com.google.protobuf.Message.Builder;
import com.google.protobuf.MessageLite; import com.google.protobuf.MessageLite;
import com.google.protobuf.util.JsonFormat; import com.google.protobuf.util.JsonFormat;
import com.google.protobuf.util.JsonFormat.Parser;
import com.google.protobuf.util.JsonFormat.Printer; import com.google.protobuf.util.JsonFormat.Printer;
import io.grpc.ExperimentalApi; import io.grpc.ExperimentalApi;
@ -78,9 +79,20 @@ public class ProtoUtils {
*/ */
@ExperimentalApi("https://github.com/grpc/grpc-java/issues/1786") @ExperimentalApi("https://github.com/grpc/grpc-java/issues/1786")
public static <T extends Message> Marshaller<T> jsonMarshaller(final T defaultInstance) { public static <T extends Message> Marshaller<T> jsonMarshaller(final T defaultInstance) {
final Parser parser = JsonFormat.parser();
final Printer printer = JsonFormat.printer(); final Printer printer = JsonFormat.printer();
// TODO(carl-mastrangelo): Add support for ExtensionRegistry (TypeRegistry?) return jsonMarshaller(defaultInstance, parser, printer);
final JsonFormat.Parser parser = JsonFormat.parser(); }
/**
* Create a {@code Marshaller} for json protos of the same type as {@code defaultInstance}.
*
* <p>This is an unstable API and has not been optimized yet for performance.
*/
@ExperimentalApi("https://github.com/grpc/grpc-java/issues/1786")
public static <T extends Message> Marshaller<T> jsonMarshaller(
final T defaultInstance, final Parser parser, final Printer printer) {
final Charset charset = Charset.forName("UTF-8"); final Charset charset = Charset.forName("UTF-8");
return new Marshaller<T>() { return new Marshaller<T>() {