jsonpb: use CheckInitialized

dsnet · dsnet · commit 97960cd98aee · 2020-02-25T18:48:51.000Z
Change-Id: Id2ba5826577960f283a90a766435353e6399c060 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/220687 Reviewed-by: Damien Neil <dneil@google.com>
diff --git a/go.mod b/go.mod
@@ -4,5 +4,5 @@ go 1.9
 
 require (
 	github.com/google/go-cmp v0.4.0
-	google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64
+	google.golang.org/protobuf v0.0.0-20200224223749-2dabbe471100
 )
diff --git a/go.sum b/go.sum
@@ -1,10 +1,12 @@
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64 h1:BhpvsYSxWvxATQJYrD9UKX1U3jo+Bxq195IzJGtyh40=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200224223749-2dabbe471100 h1:i1uRQ2Eod1FWX6jGO/l8K0oMIwtCWeEmeDtLy5YABYc=
+google.golang.org/protobuf v0.0.0-20200224223749-2dabbe471100/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
diff --git a/jsonpb/decode.go b/jsonpb/decode.go
@@ -128,7 +128,7 @@ func (u *Unmarshaler) UnmarshalNext(d *json.Decoder, m proto.Message) error {
 		if err := u.unmarshalMessage(mr, raw); err != nil {
 			return err
 		}
-		return protoV2.IsInitialized(mr.Interface())
+		return protoV2.CheckInitialized(mr.Interface())
 	}
 }
 
diff --git a/jsonpb/encode.go b/jsonpb/encode.go
@@ -109,7 +109,7 @@ func (jm *Marshaler) marshal(m proto.Message) ([]byte, error) {
 	} else {
 		// Check for unpopulated required fields first.
 		m2 := protoimpl.X.MessageOf(m)
-		if err := protoV2.IsInitialized(m2.Interface()); err != nil {
+		if err := protoV2.CheckInitialized(m2.Interface()); err != nil {
 			return nil, err
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,5 @@ go 1.9`
`4`	`4`
`5`	`5`	`require (`
`6`	`6`	`github.com/google/go-cmp v0.4.0`
`7`		`- google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64`
	`7`	`+ google.golang.org/protobuf v0.0.0-20200224223749-2dabbe471100`
`8`	`8`	`)`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ func (u Unmarshaler) UnmarshalNext(d json.Decoder, m proto.Message) error {`
`128`	`128`	`if err := u.unmarshalMessage(mr, raw); err != nil {`
`129`	`129`	`return err`
`130`	`130`	`}`
`131`		`- return protoV2.IsInitialized(mr.Interface())`
	`131`	`+ return protoV2.CheckInitialized(mr.Interface())`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ func (jm *Marshaler) marshal(m proto.Message) ([]byte, error) {`
`109`	`109`	`} else {`
`110`	`110`	`// Check for unpopulated required fields first.`
`111`	`111`	`m2 := protoimpl.X.MessageOf(m)`
`112`		`- if err := protoV2.IsInitialized(m2.Interface()); err != nil {`
	`112`	`+ if err := protoV2.CheckInitialized(m2.Interface()); err != nil {`
`113`	`113`	`return nil, err`
`114`	`114`	`}`
`115`	`115`