Merge pull request #2832 from pherl/javaep

Fix java code according to error prone.

java/core/src/test/java/com/google/protobuf/TestUtil.java

@@ -2602,6 +2602,9 @@ public final class TestUtil {
       case FOO_CORD:
         Assert.assertTrue(message.hasFooCord());
         break;
+      case FOO_STRING_PIECE:
+        Assert.assertTrue(message.hasFooStringPiece());
+        break;
       case FOO_BYTES:
         Assert.assertTrue(message.hasFooBytes());
         break;

src/google/protobuf/compiler/java/java_message_lite.cc

@@ -345,7 +345,7 @@ void ImmutableMessageLiteGenerator::Generate(io::Printer* printer) {
   }
 
   printer->Print(
-    "@java.lang.SuppressWarnings(\"unchecked\")\n"
+    "@java.lang.SuppressWarnings({\"unchecked\", \"fallthrough\"})\n"
     "protected final Object dynamicMethod(\n"
     "    com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,\n"
     "    Object arg0, Object arg1) {\n"