Index: third_party/protobuf/java/core/src/main/java/com/google/protobuf/Message.java |
diff --git a/third_party/protobuf/java/src/main/java/com/google/protobuf/Message.java b/third_party/protobuf/java/core/src/main/java/com/google/protobuf/Message.java |
similarity index 89% |
rename from third_party/protobuf/java/src/main/java/com/google/protobuf/Message.java |
rename to third_party/protobuf/java/core/src/main/java/com/google/protobuf/Message.java |
index 9516d71f296e86bafb8fe6a4bcb3ce8d85a7777d..94590fb91b3b5c75eb9ecd34e1a4c2a0534fe7b3 100644 |
--- a/third_party/protobuf/java/src/main/java/com/google/protobuf/Message.java |
+++ b/third_party/protobuf/java/core/src/main/java/com/google/protobuf/Message.java |
@@ -51,6 +51,7 @@ import java.util.Map; |
public interface Message extends MessageLite, MessageOrBuilder { |
// (From MessageLite, re-declared here only for return type covariance.) |
+ @Override |
Parser<? extends Message> getParserForType(); |
@@ -97,7 +98,10 @@ public interface Message extends MessageLite, MessageOrBuilder { |
// Builders |
// (From MessageLite, re-declared here only for return type covariance.) |
+ @Override |
Builder newBuilderForType(); |
+ |
+ @Override |
Builder toBuilder(); |
/** |
@@ -106,6 +110,7 @@ public interface Message extends MessageLite, MessageOrBuilder { |
interface Builder extends MessageLite.Builder, MessageOrBuilder { |
// (From MessageLite.Builder, re-declared here only for return type |
// covariance.) |
+ @Override |
Builder clear(); |
/** |
@@ -131,18 +136,27 @@ public interface Message extends MessageLite, MessageOrBuilder { |
// (From MessageLite.Builder, re-declared here only for return type |
// covariance.) |
+ @Override |
Message build(); |
+ |
+ @Override |
Message buildPartial(); |
+ |
+ @Override |
Builder clone(); |
+ |
+ @Override |
Builder mergeFrom(CodedInputStream input) throws IOException; |
- Builder mergeFrom(CodedInputStream input, |
- ExtensionRegistryLite extensionRegistry) |
- throws IOException; |
+ |
+ @Override |
+ Builder mergeFrom(CodedInputStream input, ExtensionRegistryLite extensionRegistry) |
+ throws IOException; |
/** |
* Get the message's type's descriptor. |
* See {@link Message#getDescriptorForType()}. |
*/ |
+ @Override |
Descriptors.Descriptor getDescriptorForType(); |
/** |
@@ -240,27 +254,39 @@ public interface Message extends MessageLite, MessageOrBuilder { |
// (From MessageLite.Builder, re-declared here only for return type |
// covariance.) |
+ @Override |
Builder mergeFrom(ByteString data) throws InvalidProtocolBufferException; |
- Builder mergeFrom(ByteString data, |
- ExtensionRegistryLite extensionRegistry) |
- throws InvalidProtocolBufferException; |
+ |
+ @Override |
+ Builder mergeFrom(ByteString data, ExtensionRegistryLite extensionRegistry) |
+ throws InvalidProtocolBufferException; |
+ |
+ @Override |
Builder mergeFrom(byte[] data) throws InvalidProtocolBufferException; |
- Builder mergeFrom(byte[] data, int off, int len) |
- throws InvalidProtocolBufferException; |
- Builder mergeFrom(byte[] data, |
- ExtensionRegistryLite extensionRegistry) |
- throws InvalidProtocolBufferException; |
- Builder mergeFrom(byte[] data, int off, int len, |
- ExtensionRegistryLite extensionRegistry) |
- throws InvalidProtocolBufferException; |
+ |
+ @Override |
+ Builder mergeFrom(byte[] data, int off, int len) throws InvalidProtocolBufferException; |
+ |
+ @Override |
+ Builder mergeFrom(byte[] data, ExtensionRegistryLite extensionRegistry) |
+ throws InvalidProtocolBufferException; |
+ |
+ @Override |
+ Builder mergeFrom(byte[] data, int off, int len, ExtensionRegistryLite extensionRegistry) |
+ throws InvalidProtocolBufferException; |
+ |
+ @Override |
Builder mergeFrom(InputStream input) throws IOException; |
- Builder mergeFrom(InputStream input, |
- ExtensionRegistryLite extensionRegistry) |
- throws IOException; |
- boolean mergeDelimitedFrom(InputStream input) |
- throws IOException; |
- boolean mergeDelimitedFrom(InputStream input, |
- ExtensionRegistryLite extensionRegistry) |
- throws IOException; |
+ |
+ @Override |
+ Builder mergeFrom(InputStream input, ExtensionRegistryLite extensionRegistry) |
+ throws IOException; |
+ |
+ @Override |
+ boolean mergeDelimitedFrom(InputStream input) throws IOException; |
+ |
+ @Override |
+ boolean mergeDelimitedFrom(InputStream input, ExtensionRegistryLite extensionRegistry) |
+ throws IOException; |
} |
} |