organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Update verification methods' names.

Browse source
This commit is contained in:
Feng Xiao 2014-10-02 17:46:39 -07:00
parent 345d49a51e
commit 725326f1ee
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
java/src/main/java/com/google/protobuf/DynamicMessage.java
View file

@ -490,7 +490,7 @@ public final class DynamicMessage extends AbstractMessage {
// because of some internal features we support. Should figure it out
// and move this check to a more appropriate place.
if (field.getType() == FieldDescriptor.Type.ENUM) {
verifyEnumValue(field, value);
ensureEnumValueDescriptor(field, value);
}
OneofDescriptor oneofDescriptor = field.getContainingOneof();
if (oneofDescriptor != null) {
@ -578,8 +578,9 @@ public final class DynamicMessage extends AbstractMessage {
}
}
/** Verifies that the value is EnumValueDescriptor and matchs Enum Type. */
private void verifySingleEnumValue(FieldDescriptor field, Object value) {
/** Verifies that the value is EnumValueDescriptor and matches Enum Type. */
private void ensureSingularEnumValueDescriptor(
FieldDescriptor field, Object value) {
if (value == null) {
throw new NullPointerException();
}
@ -594,13 +595,14 @@ public final class DynamicMessage extends AbstractMessage {
}
/** Verifies the value for an enum field. */
private void verifyEnumValue(FieldDescriptor field, Object value) {
private void ensureEnumValueDescriptor(
FieldDescriptor field, Object value) {
if (field.isRepeated()) {
for (Object item : (List) value) {
verifySingleEnumValue(field, item);
ensureSingularEnumValueDescriptor(field, item);
}
} else {
verifySingleEnumValue(field, value);
ensureSingularEnumValueDescriptor(field, value);
}
}