Move the RubyMessage.java JSON "include defaults" to use alwaysPrintFieldsWithNoPresence.

protobuf-github-bot · zhangskz · commit b5beba3aa15f · 2024-02-05T14:27:48.000-05:00
This is no different on proto3 but treats proto2-optional differently (to make it consistent with proto3-optional).

PiperOrigin-RevId: 604354927
diff --git a/ruby/src/main/java/com/google/protobuf/jruby/RubyMessage.java b/ruby/src/main/java/com/google/protobuf/jruby/RubyMessage.java
@@ -700,7 +700,7 @@ public static IRubyObject encodeJson(
           options.fastARef(runtime.newSymbol("format_enums_as_integers"));
 
       if (emitDefaults != null && emitDefaults.isTrue()) {
-        printer = printer.includingDefaultValueFields();
+        printer = printer.alwaysPrintFieldsWithNoPresence();
       }
 
       if (preserveNames != null && preserveNames.isTrue()) {

Original file line number	Diff line number	Diff line change
`@@ -700,7 +700,7 @@ public static IRubyObject encodeJson(`
`700`	`700`	`options.fastARef(runtime.newSymbol("format_enums_as_integers"));`
`701`	`701`
`702`	`702`	`if (emitDefaults != null && emitDefaults.isTrue()) {`
`703`		`- printer = printer.includingDefaultValueFields();`
	`703`	`+ printer = printer.alwaysPrintFieldsWithNoPresence();`
`704`	`704`	`}`
`705`	`705`
`706`	`706`	`if (preserveNames != null && preserveNames.isTrue()) {`