Update third_party/protobuf to protobuf-v3.0.0-beta-3

third_party/protobuf/conformance/ConformanceJavaLite.java

 
 import com.google.protobuf.conformance.Conformance;
-import com.google.protobuf.util.JsonFormat;
-import com.google.protobuf.util.JsonFormat.TypeRegistry;
 import com.google.protobuf.InvalidProtocolBufferException;
 
-class ConformanceJava {
+class ConformanceJavaLite {
   private int testCount = 0;
-  private TypeRegistry typeRegistry;
 
   private boolean readFromStdin(byte[] buf, int len) throws Exception {
     int ofs = 0;
     while (len > 0) {
       int read = System.in.read(buf, ofs, len);
       if (read == -1) {
         return false;  // EOF
       }
       ofs += read;
       len -= read;
@@ skipping 33 matching lines @@
     switch (request.getPayloadCase()) {
       case PROTOBUF_PAYLOAD: {
         try {
           testMessage = Conformance.TestAllTypes.parseFrom(request.getProtobufPayload());
         } catch (InvalidProtocolBufferException e) {
           return Conformance.ConformanceResponse.newBuilder().setParseError(e.getMessage()).build();
         }
         break;
       }
       case JSON_PAYLOAD: {
-        try {
-          Conformance.TestAllTypes.Builder builder = Conformance.TestAllTypes.newBuilder();
-          JsonFormat.parser().usingTypeRegistry(typeRegistry)
-              .merge(request.getJsonPayload(), builder);
-          testMessage = builder.build();
-        } catch (InvalidProtocolBufferException e) {
-          return Conformance.ConformanceResponse.newBuilder().setParseError(e.getMessage()).build();
-        }
-        break;
+        return Conformance.ConformanceResponse.newBuilder().setSkipped(
+            "Lite runtime does not suport Json Formant.").build();
       }
       case PAYLOAD_NOT_SET: {
         throw new RuntimeException("Request didn't have payload.");
       }
 
       default: {
         throw new RuntimeException("Unexpected payload case.");
       }
     }
 
     switch (request.getRequestedOutputFormat()) {
       case UNSPECIFIED:
         throw new RuntimeException("Unspecified output format.");
 
       case PROTOBUF:
         return Conformance.ConformanceResponse.newBuilder().setProtobufPayload(testMessage.toByteString()).build();
 
       case JSON:
-        try {
-          return Conformance.ConformanceResponse.newBuilder().setJsonPayload(
-              JsonFormat.printer().usingTypeRegistry(typeRegistry).print(testMessage)).build();
-        } catch (InvalidProtocolBufferException | IllegalArgumentException e) {
-          return Conformance.ConformanceResponse.newBuilder().setSerializeError(
-              e.getMessage()).build();
-        }
+        return Conformance.ConformanceResponse.newBuilder().setSkipped(
+            "Lite runtime does not suport Json Formant.").build();
 
       default: {
         throw new RuntimeException("Unexpected request output.");
       }
     }
   }
 
   private boolean doTestIo() throws Exception {
     int bytes = readLittleEndianIntFromStdin();
 
@@ skipping 12 matching lines @@
     Conformance.ConformanceResponse response = doTest(request);
     byte[] serializedOutput = response.toByteArray();
 
     writeLittleEndianIntToStdout(serializedOutput.length);
     writeToStdout(serializedOutput);
 
     return true;
   }
 
   public void run() throws Exception {
-    typeRegistry = TypeRegistry.newBuilder().add(
-        Conformance.TestAllTypes.getDescriptor()).build();
     while (doTestIo()) {
-      // Empty.
+      this.testCount++;
     }
 
-    System.err.println("ConformanceJava: received EOF from test runner after " +
+    System.err.println("ConformanceJavaLite: received EOF from test runner after " +
         this.testCount + " tests");
   }
 
   public static void main(String[] args) throws Exception {
-    new ConformanceJava().run();
+    new ConformanceJavaLite().run();
   }
 }