| Index: third_party/protobuf/java/core/src/main/java/com/google/protobuf/WireFormat.java
|
| diff --git a/third_party/protobuf/java/src/main/java/com/google/protobuf/WireFormat.java b/third_party/protobuf/java/core/src/main/java/com/google/protobuf/WireFormat.java
|
| similarity index 96%
|
| rename from third_party/protobuf/java/src/main/java/com/google/protobuf/WireFormat.java
|
| rename to third_party/protobuf/java/core/src/main/java/com/google/protobuf/WireFormat.java
|
| index 8dbe1ae33c76249f63faca962e05e3956ca213e8..6a58b0811b48222a474ef6e8cc00bd3b59b3677b 100644
|
| --- a/third_party/protobuf/java/src/main/java/com/google/protobuf/WireFormat.java
|
| +++ b/third_party/protobuf/java/core/src/main/java/com/google/protobuf/WireFormat.java
|
| @@ -116,16 +116,24 @@ public final class WireFormat {
|
| FIXED32 (JavaType.INT , WIRETYPE_FIXED32 ),
|
| BOOL (JavaType.BOOLEAN , WIRETYPE_VARINT ),
|
| STRING (JavaType.STRING , WIRETYPE_LENGTH_DELIMITED) {
|
| - public boolean isPackable() { return false; }
|
| + @Override
|
| + public boolean isPackable() {
|
| + return false; }
|
| },
|
| GROUP (JavaType.MESSAGE , WIRETYPE_START_GROUP ) {
|
| - public boolean isPackable() { return false; }
|
| + @Override
|
| + public boolean isPackable() {
|
| + return false; }
|
| },
|
| MESSAGE (JavaType.MESSAGE , WIRETYPE_LENGTH_DELIMITED) {
|
| - public boolean isPackable() { return false; }
|
| + @Override
|
| + public boolean isPackable() {
|
| + return false; }
|
| },
|
| BYTES (JavaType.BYTE_STRING, WIRETYPE_LENGTH_DELIMITED) {
|
| - public boolean isPackable() { return false; }
|
| + @Override
|
| + public boolean isPackable() {
|
| + return false; }
|
| },
|
| UINT32 (JavaType.INT , WIRETYPE_VARINT ),
|
| ENUM (JavaType.ENUM , WIRETYPE_VARINT ),
|
| @@ -170,18 +178,21 @@ public final class WireFormat {
|
| enum Utf8Validation {
|
| /** Eagerly parses to String; silently accepts invalid UTF8 bytes. */
|
| LOOSE {
|
| + @Override
|
| Object readString(CodedInputStream input) throws IOException {
|
| return input.readString();
|
| }
|
| },
|
| /** Eagerly parses to String; throws an IOException on invalid bytes. */
|
| STRICT {
|
| + @Override
|
| Object readString(CodedInputStream input) throws IOException {
|
| return input.readStringRequireUtf8();
|
| }
|
| },
|
| /** Keep data as ByteString; validation/conversion to String is lazy. */
|
| LAZY {
|
| + @Override
|
| Object readString(CodedInputStream input) throws IOException {
|
| return input.readBytes();
|
| }
|
|
|