feat: support optional for java & cpp (#651)

Signed-off-by: acrazing <[email protected]>
bufbuild · Oct 3, 2022 · e2b309c · e2b309c
1 parent a86024e
commit e2b309c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/templates/cc/msg.go b/templates/cc/msg.go
@@ -116,6 +116,11 @@ bool Validate(const {{ class . }}& m, pgv::ValidationMsg* err) {
 		{{ range .NonOneOfFields }}
 			{{- render (context .) -}}
 		{{ end -}}
+		{{ range .SyntheticOneOfFields }}
+			if ({{ hasAccessor (context .) }}) {
+				{{ render (context .) }}
+			}
+		{{ end }}
 		{{ range .RealOneOfs }}
 			switch (m.{{ .Name }}_case()) {
 				{{ range .Fields -}}

diff --git a/templates/java/msg.go b/templates/java/msg.go
@@ -15,6 +15,9 @@ const msgInnerTpl = `
 	{{- range .NonOneOfFields }}
 		{{ renderConstants (context .) }}
 	{{ end }}
+	{{ range .SyntheticOneOfFields }}
+		{{ renderConstants (context .) }}
+	{{ end }}
 	{{ range .RealOneOfs }}
 		{{ template "oneOfConst" . }}
 	{{ end }}
@@ -27,6 +30,11 @@ const msgInnerTpl = `
 	{{ range .NonOneOfFields -}}
 		{{ render (context .) }}
 	{{ end -}}
+	{{ range .SyntheticOneOfFields }}
+		if ({{ hasAccessor (context .) }}) {
+			{{ render (context .) }}
+		}
+	{{ end }}
 	{{ range .RealOneOfs }}
 		{{ template "oneOf" . }}
 	{{- end -}}