just skip fields that can't be checked; no validation customization

Author: jhump

jsonpb/jsonpb.go

@@ -50,6 +50,7 @@ import (
 	"strconv"
 	"strings"
 	"time"
+	"unicode"
 
 	"github.com/golang/protobuf/proto"
 
@@ -1107,13 +1108,6 @@ func (s mapKeys) Less(i, j int) bool {
 // This function is used by both Marshal and Unmarshal.  While required fields only exist in a
 // proto2 message, a proto3 message can contain proto2 message(s).
 func checkRequiredFields(pb proto.Message) error {
-	type validatingMessage interface {
-		ValidateRecursive() error
-	}
-	if vm, ok := pb.(validatingMessage); ok {
-		return vm.ValidateRecursive()
-	}
-
 	// Most well-known type messages do not contain required fields.  The "Any" type may contain
 	// a message that has required fields.
 	//
@@ -1141,6 +1135,16 @@ func checkRequiredFields(pb proto.Message) error {
 	for i := 0; i < v.NumField(); i++ {
 		field := v.Field(i)
 		sfield := v.Type().Field(i)
+
+		var exported bool
+		for _, r := range sfield.Name {
+			exported = unicode.IsUpper(r)
+			break
+		}
+		if !exported {
+			continue
+		}
+
 		if strings.HasPrefix(sfield.Name, "XXX_") {
 			continue
 		}
@@ -1163,8 +1167,12 @@ func checkRequiredFields(pb proto.Message) error {
 			sfield = v.Type().Field(0)
 		}
 
+		protoTag := sfield.Tag.Get("protobuf")
+		if protoTag == "" {
+			continue
+		}
 		var prop proto.Properties
-		prop.Init(sfield.Type, sfield.Name, sfield.Tag.Get("protobuf"), &sfield)
+		prop.Init(sfield.Type, sfield.Name, protoTag, &sfield)
 
 		switch field.Kind() {
 		case reflect.Map:

jsonpb/jsonpb_test.go

@@ -34,7 +34,6 @@ package jsonpb
 import (
 	"bytes"
 	"encoding/json"
-	"errors"
 	"io"
 	"math"
 	"reflect"
@@ -535,7 +534,7 @@ func TestMarshalAnyJSONPBMarshaler(t *testing.T) {
 }
 
 func TestMarshalWithCustomValidation(t *testing.T) {
-	msg := dynamicMessage{rawJson: `{ "foo": "bar", "baz": [0, 1, 2, 3] }`, dummy1: &dynamicMessage{}}
+	msg := dynamicMessage{rawJson: `{ "foo": "bar", "baz": [0, 1, 2, 3] }`, dummy: &dynamicMessage{}}
 
 	js, err := new(Marshaler).MarshalToString(&msg)
 	if err != nil {
@@ -545,13 +544,6 @@ func TestMarshalWithCustomValidation(t *testing.T) {
 	if err != nil {
 		t.Errorf("an unexpected error occurred when unmarshalling from json: %v", err)
 	}
-
-	// tickle an error in custom validation
-	msg.dummy2 = int32(len(msg.rawJson) + 1)
-	_, err = new(Marshaler).MarshalToString(&msg)
-	if err == nil {
-		t.Errorf("marshalling to json should have generated validation error but did not")
-	}
 }
 
 // Test marshaling message containing unset required fields should produce error.
@@ -1028,10 +1020,7 @@ type dynamicMessage struct {
 
 	// an unexported nested message is present just to ensure that it
 	// won't result in a panic (see issue #509)
-	dummy1 *dynamicMessage `protobuf:"bytes,2,opt,name=dummy1"`
-
-	// this is used to implement a custom validation rule
-	dummy2 int32 `protobuf:"varint,3,opt,name=dummy2"`
+	dummy *dynamicMessage `protobuf:"bytes,2,opt,name=dummy"`
 }
 
 func (m *dynamicMessage) Reset() {
@@ -1054,13 +1043,6 @@ func (m *dynamicMessage) UnmarshalJSONPB(jum *Unmarshaler, js []byte) error {
 	return nil
 }
 
-func (m *dynamicMessage) ValidateRecursive() error {
-	if int(m.dummy2) > len(m.rawJson) {
-		return errors.New("dummy2 should be <= rawJson length")
-	}
-	return nil
-}
-
 // Test unmarshaling message containing unset required fields should produce error.
 func TestUnmarshalUnsetRequiredFields(t *testing.T) {
 	tests := []struct {