Index: third_party/protobuf/java/core/src/main/java/com/google/protobuf/DynamicMessage.java |
diff --git a/third_party/protobuf/java/src/main/java/com/google/protobuf/DynamicMessage.java b/third_party/protobuf/java/core/src/main/java/com/google/protobuf/DynamicMessage.java |
similarity index 97% |
rename from third_party/protobuf/java/src/main/java/com/google/protobuf/DynamicMessage.java |
rename to third_party/protobuf/java/core/src/main/java/com/google/protobuf/DynamicMessage.java |
index 3ea1b688967fa97cc16b3470dea1b6ccb51fdeb4..859a9e8fc512e55c138c5a2939bd5edd40bd9743 100644 |
--- a/third_party/protobuf/java/src/main/java/com/google/protobuf/DynamicMessage.java |
+++ b/third_party/protobuf/java/core/src/main/java/com/google/protobuf/DynamicMessage.java |
@@ -156,18 +156,22 @@ public final class DynamicMessage extends AbstractMessage { |
// ----------------------------------------------------------------- |
// Implementation of Message interface. |
+ @Override |
public Descriptor getDescriptorForType() { |
return type; |
} |
+ @Override |
public DynamicMessage getDefaultInstanceForType() { |
return getDefaultInstance(type); |
} |
+ @Override |
public Map<FieldDescriptor, Object> getAllFields() { |
return fields.getAllFields(); |
} |
+ @Override |
public boolean hasOneof(OneofDescriptor oneof) { |
verifyOneofContainingType(oneof); |
FieldDescriptor field = oneofCases[oneof.getIndex()]; |
@@ -177,16 +181,19 @@ public final class DynamicMessage extends AbstractMessage { |
return true; |
} |
+ @Override |
public FieldDescriptor getOneofFieldDescriptor(OneofDescriptor oneof) { |
verifyOneofContainingType(oneof); |
return oneofCases[oneof.getIndex()]; |
} |
+ @Override |
public boolean hasField(FieldDescriptor field) { |
verifyContainingType(field); |
return fields.hasField(field); |
} |
+ @Override |
public Object getField(FieldDescriptor field) { |
verifyContainingType(field); |
Object result = fields.getField(field); |
@@ -202,16 +209,19 @@ public final class DynamicMessage extends AbstractMessage { |
return result; |
} |
+ @Override |
public int getRepeatedFieldCount(FieldDescriptor field) { |
verifyContainingType(field); |
return fields.getRepeatedFieldCount(field); |
} |
+ @Override |
public Object getRepeatedField(FieldDescriptor field, int index) { |
verifyContainingType(field); |
return fields.getRepeatedField(field, index); |
} |
+ @Override |
public UnknownFieldSet getUnknownFields() { |
return unknownFields; |
} |
@@ -264,19 +274,22 @@ public final class DynamicMessage extends AbstractMessage { |
return size; |
} |
+ @Override |
public Builder newBuilderForType() { |
return new Builder(type); |
} |
+ @Override |
public Builder toBuilder() { |
return newBuilderForType().mergeFrom(this); |
} |
+ @Override |
public Parser<DynamicMessage> getParserForType() { |
return new AbstractParser<DynamicMessage>() { |
+ @Override |
public DynamicMessage parsePartialFrom( |
- CodedInputStream input, |
- ExtensionRegistryLite extensionRegistry) |
+ CodedInputStream input, ExtensionRegistryLite extensionRegistry) |
throws InvalidProtocolBufferException { |
Builder builder = newBuilder(type); |
try { |
@@ -370,6 +383,7 @@ public final class DynamicMessage extends AbstractMessage { |
} |
} |
+ @Override |
public DynamicMessage build() { |
if (!isInitialized()) { |
throw newUninitializedMessageException( |
@@ -394,6 +408,7 @@ public final class DynamicMessage extends AbstractMessage { |
return buildPartial(); |
} |
+ @Override |
public DynamicMessage buildPartial() { |
fields.makeImmutable(); |
DynamicMessage result = |
@@ -411,22 +426,27 @@ public final class DynamicMessage extends AbstractMessage { |
return result; |
} |
+ @Override |
public boolean isInitialized() { |
return DynamicMessage.isInitialized(type, fields); |
} |
+ @Override |
public Descriptor getDescriptorForType() { |
return type; |
} |
+ @Override |
public DynamicMessage getDefaultInstanceForType() { |
return getDefaultInstance(type); |
} |
+ @Override |
public Map<FieldDescriptor, Object> getAllFields() { |
return fields.getAllFields(); |
} |
+ @Override |
public Builder newBuilderForField(FieldDescriptor field) { |
verifyContainingType(field); |
@@ -438,6 +458,7 @@ public final class DynamicMessage extends AbstractMessage { |
return new Builder(field.getMessageType()); |
} |
+ @Override |
public boolean hasOneof(OneofDescriptor oneof) { |
verifyOneofContainingType(oneof); |
FieldDescriptor field = oneofCases[oneof.getIndex()]; |
@@ -447,11 +468,13 @@ public final class DynamicMessage extends AbstractMessage { |
return true; |
} |
+ @Override |
public FieldDescriptor getOneofFieldDescriptor(OneofDescriptor oneof) { |
verifyOneofContainingType(oneof); |
return oneofCases[oneof.getIndex()]; |
} |
+ @Override |
public Builder clearOneof(OneofDescriptor oneof) { |
verifyOneofContainingType(oneof); |
FieldDescriptor field = oneofCases[oneof.getIndex()]; |
@@ -461,11 +484,13 @@ public final class DynamicMessage extends AbstractMessage { |
return this; |
} |
+ @Override |
public boolean hasField(FieldDescriptor field) { |
verifyContainingType(field); |
return fields.hasField(field); |
} |
+ @Override |
public Object getField(FieldDescriptor field) { |
verifyContainingType(field); |
Object result = fields.getField(field); |
@@ -481,6 +506,7 @@ public final class DynamicMessage extends AbstractMessage { |
return result; |
} |
+ @Override |
public Builder setField(FieldDescriptor field, Object value) { |
verifyContainingType(field); |
ensureIsMutable(); |
@@ -505,6 +531,7 @@ public final class DynamicMessage extends AbstractMessage { |
return this; |
} |
+ @Override |
public Builder clearField(FieldDescriptor field) { |
verifyContainingType(field); |
ensureIsMutable(); |
@@ -519,24 +546,27 @@ public final class DynamicMessage extends AbstractMessage { |
return this; |
} |
+ @Override |
public int getRepeatedFieldCount(FieldDescriptor field) { |
verifyContainingType(field); |
return fields.getRepeatedFieldCount(field); |
} |
+ @Override |
public Object getRepeatedField(FieldDescriptor field, int index) { |
verifyContainingType(field); |
return fields.getRepeatedField(field, index); |
} |
- public Builder setRepeatedField(FieldDescriptor field, |
- int index, Object value) { |
+ @Override |
+ public Builder setRepeatedField(FieldDescriptor field, int index, Object value) { |
verifyContainingType(field); |
ensureIsMutable(); |
fields.setRepeatedField(field, index, value); |
return this; |
} |
+ @Override |
public Builder addRepeatedField(FieldDescriptor field, Object value) { |
verifyContainingType(field); |
ensureIsMutable(); |
@@ -544,10 +574,12 @@ public final class DynamicMessage extends AbstractMessage { |
return this; |
} |
+ @Override |
public UnknownFieldSet getUnknownFields() { |
return unknownFields; |
} |
+ @Override |
public Builder setUnknownFields(UnknownFieldSet unknownFields) { |
if (getDescriptorForType().getFile().getSyntax() |
== Descriptors.FileDescriptor.Syntax.PROTO3) { |