Index: third_party/protobuf/java/core/src/main/java/com/google/protobuf/AbstractParser.java |
diff --git a/third_party/protobuf/java/src/main/java/com/google/protobuf/AbstractParser.java b/third_party/protobuf/java/core/src/main/java/com/google/protobuf/AbstractParser.java |
similarity index 77% |
rename from third_party/protobuf/java/src/main/java/com/google/protobuf/AbstractParser.java |
rename to third_party/protobuf/java/core/src/main/java/com/google/protobuf/AbstractParser.java |
index 1a4c63110a18c80afbf6bb62e85ff023a25e63bb..66b0ee3bd5494537c4d53772d7cf0a7361730edb 100644 |
--- a/third_party/protobuf/java/src/main/java/com/google/protobuf/AbstractParser.java |
+++ b/third_party/protobuf/java/core/src/main/java/com/google/protobuf/AbstractParser.java |
@@ -78,26 +78,27 @@ public abstract class AbstractParser<MessageType extends MessageLite> |
private static final ExtensionRegistryLite EMPTY_REGISTRY |
= ExtensionRegistryLite.getEmptyRegistry(); |
+ @Override |
public MessageType parsePartialFrom(CodedInputStream input) |
throws InvalidProtocolBufferException { |
return parsePartialFrom(input, EMPTY_REGISTRY); |
} |
- public MessageType parseFrom(CodedInputStream input, |
- ExtensionRegistryLite extensionRegistry) |
+ @Override |
+ public MessageType parseFrom(CodedInputStream input, ExtensionRegistryLite extensionRegistry) |
throws InvalidProtocolBufferException { |
return checkMessageInitialized( |
parsePartialFrom(input, extensionRegistry)); |
} |
- public MessageType parseFrom(CodedInputStream input) |
- throws InvalidProtocolBufferException { |
+ @Override |
+ public MessageType parseFrom(CodedInputStream input) throws InvalidProtocolBufferException { |
return parseFrom(input, EMPTY_REGISTRY); |
} |
- public MessageType parsePartialFrom(ByteString data, |
- ExtensionRegistryLite extensionRegistry) |
- throws InvalidProtocolBufferException { |
+ @Override |
+ public MessageType parsePartialFrom(ByteString data, ExtensionRegistryLite extensionRegistry) |
+ throws InvalidProtocolBufferException { |
MessageType message; |
try { |
CodedInputStream input = data.newCodedInput(); |
@@ -113,24 +114,25 @@ public abstract class AbstractParser<MessageType extends MessageLite> |
} |
} |
- public MessageType parsePartialFrom(ByteString data) |
- throws InvalidProtocolBufferException { |
+ @Override |
+ public MessageType parsePartialFrom(ByteString data) throws InvalidProtocolBufferException { |
return parsePartialFrom(data, EMPTY_REGISTRY); |
} |
- public MessageType parseFrom(ByteString data, |
- ExtensionRegistryLite extensionRegistry) |
+ @Override |
+ public MessageType parseFrom(ByteString data, ExtensionRegistryLite extensionRegistry) |
throws InvalidProtocolBufferException { |
return checkMessageInitialized(parsePartialFrom(data, extensionRegistry)); |
} |
- public MessageType parseFrom(ByteString data) |
- throws InvalidProtocolBufferException { |
+ @Override |
+ public MessageType parseFrom(ByteString data) throws InvalidProtocolBufferException { |
return parseFrom(data, EMPTY_REGISTRY); |
} |
- public MessageType parsePartialFrom(byte[] data, int off, int len, |
- ExtensionRegistryLite extensionRegistry) |
+ @Override |
+ public MessageType parsePartialFrom( |
+ byte[] data, int off, int len, ExtensionRegistryLite extensionRegistry) |
throws InvalidProtocolBufferException { |
try { |
CodedInputStream input = CodedInputStream.newInstance(data, off, len); |
@@ -146,47 +148,50 @@ public abstract class AbstractParser<MessageType extends MessageLite> |
} |
} |
+ @Override |
public MessageType parsePartialFrom(byte[] data, int off, int len) |
throws InvalidProtocolBufferException { |
return parsePartialFrom(data, off, len, EMPTY_REGISTRY); |
} |
- public MessageType parsePartialFrom(byte[] data, |
- ExtensionRegistryLite extensionRegistry) |
+ @Override |
+ public MessageType parsePartialFrom(byte[] data, ExtensionRegistryLite extensionRegistry) |
throws InvalidProtocolBufferException { |
return parsePartialFrom(data, 0, data.length, extensionRegistry); |
} |
- public MessageType parsePartialFrom(byte[] data) |
- throws InvalidProtocolBufferException { |
+ @Override |
+ public MessageType parsePartialFrom(byte[] data) throws InvalidProtocolBufferException { |
return parsePartialFrom(data, 0, data.length, EMPTY_REGISTRY); |
} |
- public MessageType parseFrom(byte[] data, int off, int len, |
- ExtensionRegistryLite extensionRegistry) |
+ @Override |
+ public MessageType parseFrom( |
+ byte[] data, int off, int len, ExtensionRegistryLite extensionRegistry) |
throws InvalidProtocolBufferException { |
return checkMessageInitialized( |
parsePartialFrom(data, off, len, extensionRegistry)); |
} |
+ @Override |
public MessageType parseFrom(byte[] data, int off, int len) |
throws InvalidProtocolBufferException { |
return parseFrom(data, off, len, EMPTY_REGISTRY); |
} |
- public MessageType parseFrom(byte[] data, |
- ExtensionRegistryLite extensionRegistry) |
+ @Override |
+ public MessageType parseFrom(byte[] data, ExtensionRegistryLite extensionRegistry) |
throws InvalidProtocolBufferException { |
return parseFrom(data, 0, data.length, extensionRegistry); |
} |
- public MessageType parseFrom(byte[] data) |
- throws InvalidProtocolBufferException { |
+ @Override |
+ public MessageType parseFrom(byte[] data) throws InvalidProtocolBufferException { |
return parseFrom(data, EMPTY_REGISTRY); |
} |
- public MessageType parsePartialFrom(InputStream input, |
- ExtensionRegistryLite extensionRegistry) |
+ @Override |
+ public MessageType parsePartialFrom(InputStream input, ExtensionRegistryLite extensionRegistry) |
throws InvalidProtocolBufferException { |
CodedInputStream codedInput = CodedInputStream.newInstance(input); |
MessageType message = parsePartialFrom(codedInput, extensionRegistry); |
@@ -198,26 +203,26 @@ public abstract class AbstractParser<MessageType extends MessageLite> |
return message; |
} |
- public MessageType parsePartialFrom(InputStream input) |
- throws InvalidProtocolBufferException { |
+ @Override |
+ public MessageType parsePartialFrom(InputStream input) throws InvalidProtocolBufferException { |
return parsePartialFrom(input, EMPTY_REGISTRY); |
} |
- public MessageType parseFrom(InputStream input, |
- ExtensionRegistryLite extensionRegistry) |
+ @Override |
+ public MessageType parseFrom(InputStream input, ExtensionRegistryLite extensionRegistry) |
throws InvalidProtocolBufferException { |
return checkMessageInitialized( |
parsePartialFrom(input, extensionRegistry)); |
} |
- public MessageType parseFrom(InputStream input) |
- throws InvalidProtocolBufferException { |
+ @Override |
+ public MessageType parseFrom(InputStream input) throws InvalidProtocolBufferException { |
return parseFrom(input, EMPTY_REGISTRY); |
} |
+ @Override |
public MessageType parsePartialDelimitedFrom( |
- InputStream input, |
- ExtensionRegistryLite extensionRegistry) |
+ InputStream input, ExtensionRegistryLite extensionRegistry) |
throws InvalidProtocolBufferException { |
int size; |
try { |
@@ -233,21 +238,21 @@ public abstract class AbstractParser<MessageType extends MessageLite> |
return parsePartialFrom(limitedInput, extensionRegistry); |
} |
+ @Override |
public MessageType parsePartialDelimitedFrom(InputStream input) |
throws InvalidProtocolBufferException { |
return parsePartialDelimitedFrom(input, EMPTY_REGISTRY); |
} |
- public MessageType parseDelimitedFrom( |
- InputStream input, |
- ExtensionRegistryLite extensionRegistry) |
+ @Override |
+ public MessageType parseDelimitedFrom(InputStream input, ExtensionRegistryLite extensionRegistry) |
throws InvalidProtocolBufferException { |
return checkMessageInitialized( |
parsePartialDelimitedFrom(input, extensionRegistry)); |
} |
- public MessageType parseDelimitedFrom(InputStream input) |
- throws InvalidProtocolBufferException { |
+ @Override |
+ public MessageType parseDelimitedFrom(InputStream input) throws InvalidProtocolBufferException { |
return parseDelimitedFrom(input, EMPTY_REGISTRY); |
} |
} |