all: rename IsInitialized as CheckInitialized
An Is prefix implies it returns a boolean.
A Check prefix better suggests that it could return an error.
Change-Id: I6ffcb32099a944c656c07654c294a0980efb2d0e
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/220338
Reviewed-by: Damien Neil <dneil@google.com>
diff --git a/internal/impl/isinit.go b/internal/impl/checkinit.go
similarity index 92%
rename from internal/impl/isinit.go
rename to internal/impl/checkinit.go
index 4bd978f..b82341e 100644
--- a/internal/impl/isinit.go
+++ b/internal/impl/checkinit.go
@@ -12,17 +12,17 @@
piface "google.golang.org/protobuf/runtime/protoiface"
)
-func (mi *MessageInfo) isInitialized(in piface.IsInitializedInput) (piface.IsInitializedOutput, error) {
+func (mi *MessageInfo) checkInitialized(in piface.CheckInitializedInput) (piface.CheckInitializedOutput, error) {
var p pointer
if ms, ok := in.Message.(*messageState); ok {
p = ms.pointer()
} else {
p = in.Message.(*messageReflectWrapper).pointer()
}
- return piface.IsInitializedOutput{}, mi.isInitializedPointer(p)
+ return piface.CheckInitializedOutput{}, mi.checkInitializedPointer(p)
}
-func (mi *MessageInfo) isInitializedPointer(p pointer) error {
+func (mi *MessageInfo) checkInitializedPointer(p pointer) error {
mi.init()
if !mi.needsInitCheck {
return nil
diff --git a/internal/impl/codec_field.go b/internal/impl/codec_field.go
index bc998d3..6204e65 100644
--- a/internal/impl/codec_field.go
+++ b/internal/impl/codec_field.go
@@ -167,7 +167,7 @@
if !ok {
return nil
}
- return proto.IsInitialized(m)
+ return proto.CheckInitialized(m)
},
merge: func(dst, src pointer, f *coderFieldInfo, opts mergeOptions) {
sm, ok := src.WeakFields().get(f.num)
@@ -219,7 +219,7 @@
},
isInit: func(p pointer, f *coderFieldInfo) error {
m := asMessage(p.AsValueOf(ft).Elem())
- return proto.IsInitialized(m)
+ return proto.CheckInitialized(m)
},
merge: mergeMessage,
}
@@ -257,7 +257,7 @@
}
func isInitMessageInfo(p pointer, f *coderFieldInfo) error {
- return f.mi.isInitializedPointer(p.Elem())
+ return f.mi.checkInitializedPointer(p.Elem())
}
func sizeMessage(m proto.Message, tagsize int, _ marshalOptions) int {
@@ -307,7 +307,7 @@
func isInitMessageValue(v pref.Value) error {
m := v.Message().Interface()
- return proto.IsInitialized(m)
+ return proto.CheckInitialized(m)
}
var coderMessageValue = valueCoderFuncs{
@@ -374,7 +374,7 @@
},
isInit: func(p pointer, f *coderFieldInfo) error {
m := asMessage(p.AsValueOf(ft).Elem())
- return proto.IsInitialized(m)
+ return proto.CheckInitialized(m)
},
merge: mergeMessage,
}
@@ -509,7 +509,7 @@
func isInitMessageSliceInfo(p pointer, f *coderFieldInfo) error {
s := p.PointerSlice()
for _, v := range s {
- if err := f.mi.isInitializedPointer(v); err != nil {
+ if err := f.mi.checkInitializedPointer(v); err != nil {
return err
}
}
@@ -567,7 +567,7 @@
s := p.PointerSlice()
for _, v := range s {
m := asMessage(v.AsValueOf(goType.Elem()))
- if err := proto.IsInitialized(m); err != nil {
+ if err := proto.CheckInitialized(m); err != nil {
return err
}
}
@@ -629,7 +629,7 @@
list := listv.List()
for i, llen := 0, list.Len(); i < llen; i++ {
m := list.Get(i).Message().Interface()
- if err := proto.IsInitialized(m); err != nil {
+ if err := proto.CheckInitialized(m); err != nil {
return err
}
}
diff --git a/internal/impl/codec_map.go b/internal/impl/codec_map.go
index dfeb944..dd5f8c7 100644
--- a/internal/impl/codec_map.go
+++ b/internal/impl/codec_map.go
@@ -320,7 +320,7 @@
iter := mapRange(mapv)
for iter.Next() {
val := pointerOfValue(iter.Value())
- if err := mi.isInitializedPointer(val); err != nil {
+ if err := mi.checkInitializedPointer(val); err != nil {
return err
}
}
diff --git a/internal/impl/codec_message.go b/internal/impl/codec_message.go
index 08f4d5a..a86468a 100644
--- a/internal/impl/codec_message.go
+++ b/internal/impl/codec_message.go
@@ -148,8 +148,8 @@
mi.methods.Flags |= piface.SupportUnmarshalDiscardUnknown
mi.methods.Unmarshal = mi.unmarshal
}
- if mi.methods.IsInitialized == nil {
- mi.methods.IsInitialized = mi.isInitialized
+ if mi.methods.CheckInitialized == nil {
+ mi.methods.CheckInitialized = mi.checkInitialized
}
if mi.methods.Merge == nil {
mi.methods.Merge = mi.merge