Fixing java and protoc builds

3 years ago · 349738dde5
parent b7fe12e367
commit 349738dde5
9 changed files with 630 additions and 619 deletions
--- a/4
+++ b/4
@ -163,7 +163,6 @@ cc_library(
        "src/google/protobuf/arenastring.cc",
        "src/google/protobuf/extension_set.cc",
        "src/google/protobuf/generated_enum_util.cc",
-        "src/google/protobuf/generated_message_table_driven_lite.cc",
        "src/google/protobuf/generated_message_tctable_lite.cc",
        "src/google/protobuf/generated_message_util.cc",
        "src/google/protobuf/implicit_weak_message.cc",
@ -225,7 +224,6 @@ cc_library(
        "src/google/protobuf/field_mask.pb.cc",
        "src/google/protobuf/generated_message_bases.cc",
        "src/google/protobuf/generated_message_reflection.cc",
-        "src/google/protobuf/generated_message_table_driven.cc",
        "src/google/protobuf/generated_message_tctable_full.cc",
        "src/google/protobuf/io/gzip_stream.cc",
        "src/google/protobuf/io/printer.cc",
@ -501,6 +499,8 @@ cc_library(
        "src/google/protobuf/compiler/plugin.cc",
        "src/google/protobuf/compiler/plugin.pb.cc",
        "src/google/protobuf/compiler/python/python_generator.cc",
+        "src/google/protobuf/compiler/python/python_helpers.cc",
+        "src/google/protobuf/compiler/python/python_pyi_generator.cc",
        "src/google/protobuf/compiler/ruby/ruby_generator.cc",
        "src/google/protobuf/compiler/subprocess.cc",
        "src/google/protobuf/compiler/zip_writer.cc",
--- a/java/core/BUILD
+++ b/java/core/BUILD
@ -27,6 +27,7 @@ LITE_SRCS = [
    "src/main/java/com/google/protobuf/CodedInputStreamReader.java",
    "src/main/java/com/google/protobuf/CodedOutputStream.java",
    "src/main/java/com/google/protobuf/CodedOutputStreamWriter.java",
+    "src/main/java/com/google/protobuf/CompileTimeConstant.java",
    "src/main/java/com/google/protobuf/DoubleArrayList.java",
    "src/main/java/com/google/protobuf/ExperimentalApi.java",
    "src/main/java/com/google/protobuf/ExtensionLite.java",
@ -41,6 +42,7 @@ LITE_SRCS = [
    "src/main/java/com/google/protobuf/FloatArrayList.java",
    "src/main/java/com/google/protobuf/GeneratedMessageInfoFactory.java",
    "src/main/java/com/google/protobuf/GeneratedMessageLite.java",
+    "src/main/java/com/google/protobuf/InlineMe.java",
    "src/main/java/com/google/protobuf/IntArrayList.java",
    "src/main/java/com/google/protobuf/Internal.java",
    "src/main/java/com/google/protobuf/InvalidProtocolBufferException.java",
--- a/java/core/src/test/proto/com/google/protobuf/dynamic_message_test.proto
+++ b/java/core/src/test/proto/com/google/protobuf/dynamic_message_test.proto
@ -28,20 +28,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-<<<<<<<< HEAD:java/kotlin-lite/src/test/proto/com/google/protobuf/multiple_files_proto3.proto
-syntax = "proto3";
-
-package protobuf.kotlin.generator;
-
-option java_package = "com.google.protobuf.kotlin.generator";
-option java_multiple_files = true;
-
-enum NestedEnum { FOO = 0; }
-
-message MultipleFilesMessageA {}
-
-message MultipleFilesMessageB {}
-========
 syntax = "proto2";

 package dynamic_message_test;
@ -54,4 +40,3 @@ message EmptyMessage {}
 message MessageWithMapFields {
  map<string, EmptyMessage> string_message_map = 1;
 }
->>>>>>>> refs/tags/sync-piper:java/core/src/test/proto/com/google/protobuf/dynamic_message_test.proto
--- a/java/kotlin-lite/src/test/kotlin/com/google/protobuf/Proto2LiteTest.kt
+++ b/java/kotlin-lite/src/test/kotlin/com/google/protobuf/Proto2LiteTest.kt
--- a/java/kotlin-lite/src/test/proto/com/google/protobuf/multiple_files_proto3.proto
+++ b/java/kotlin-lite/src/test/proto/com/google/protobuf/multiple_files_proto3.proto
@ -28,7 +28,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-<<<<<<<< HEAD:java/kotlin-lite/src/test/proto/com/google/protobuf/multiple_files_proto3.proto
 syntax = "proto3";

 package protobuf.kotlin.generator;
@ -41,17 +40,3 @@ enum NestedEnum { FOO = 0; }
 message MultipleFilesMessageA {}

 message MultipleFilesMessageB {}
-========
-syntax = "proto2";
-
-package dynamic_message_test;
-
-option java_package = "dynamicmessagetest";
-option java_outer_classname = "DynamicMessageTestProto";
-
-message EmptyMessage {}
-
-message MessageWithMapFields {
-  map<string, EmptyMessage> string_message_map = 1;
-}
->>>>>>>> refs/tags/sync-piper:java/core/src/test/proto/com/google/protobuf/dynamic_message_test.proto
--- a/java/kotlin/src/test/kotlin/com/google/protobuf/Proto2Test.kt
+++ b/java/kotlin/src/test/kotlin/com/google/protobuf/Proto2Test.kt
@ -58,7 +58,6 @@ import protobuf_unittest.UnittestProto.TestEmptyMessageWithExtensions
 import protobuf_unittest.copy
 import protobuf_unittest.foreignMessage
 import protobuf_unittest.optionalGroupExtension
-import protobuf_unittest.optionalNestedMessageOrNull
 import protobuf_unittest.repeatedGroupExtension
 import protobuf_unittest.testAllExtensions
 import protobuf_unittest.testAllTypes
@ -954,16 +953,4 @@ class Proto2Test {
      assertThat(hasDo_()).isFalse()
    }
  }
-
-  @Test
-  fun testGetOrNull() {
-    val noNestedMessage = testAllTypes {}
-    assertThat(noNestedMessage.optionalNestedMessageOrNull).isEqualTo(null)
-
-    val someNestedMessage = testAllTypes {
-      optionalNestedMessage = TestAllTypesKt.nestedMessage { bb = 118 }
-    }
-    assertThat(someNestedMessage.optionalNestedMessageOrNull)
-      .isEqualTo(TestAllTypesKt.nestedMessage { bb = 118 })
-  }
 }
--- a/java/kotlin/src/test/kotlin/com/google/protobuf/Proto3Test.kt
+++ b/java/kotlin/src/test/kotlin/com/google/protobuf/Proto3Test.kt
@ -44,7 +44,6 @@ import proto3_unittest.UnittestProto3.TestAllTypes
 import proto3_unittest.UnittestProto3.TestAllTypes.NestedEnum
 import proto3_unittest.UnittestProto3.TestEmptyMessage
 import proto3_unittest.copy
-import proto3_unittest.optionalNestedMessageOrNull
 import proto3_unittest.testAllTypes
 import proto3_unittest.testEmptyMessage
 import org.junit.Test
@ -87,61 +86,66 @@ class Proto3Test {
      assertThat(repeatedString).isEqualTo(listOf("5", "2", "3", "4"))

      repeatedNestedMessage.addAll(listOf(nestedMessage { bb = 1 }, nestedMessage { bb = 2 }))
-      assertThat(repeatedNestedMessage)
-        .isEqualTo(listOf(nestedMessage { bb = 1 }, nestedMessage { bb = 2 }))
+      assertThat(repeatedNestedMessage).isEqualTo(
+        listOf(
+          nestedMessage { bb = 1 },
+          nestedMessage { bb = 2 }
+        )
+      )
      repeatedNestedMessage += listOf(nestedMessage { bb = 3 }, nestedMessage { bb = 4 })
-      assertThat(repeatedNestedMessage)
-        .isEqualTo(
-          listOf(
-            nestedMessage { bb = 1 },
-            nestedMessage { bb = 2 },
-            nestedMessage { bb = 3 },
-            nestedMessage { bb = 4 }
-          )
+      assertThat(repeatedNestedMessage).isEqualTo(
+        listOf(
+          nestedMessage { bb = 1 },
+          nestedMessage { bb = 2 },
+          nestedMessage { bb = 3 },
+          nestedMessage { bb = 4 }
        )
+      )
      repeatedNestedMessage[0] = nestedMessage { bb = 5 }
-      assertThat(repeatedNestedMessage)
-        .isEqualTo(
-          listOf(
-            nestedMessage { bb = 5 },
-            nestedMessage { bb = 2 },
-            nestedMessage { bb = 3 },
-            nestedMessage { bb = 4 }
-          )
+      assertThat(repeatedNestedMessage).isEqualTo(
+        listOf(
+          nestedMessage { bb = 5 },
+          nestedMessage { bb = 2 },
+          nestedMessage { bb = 3 },
+          nestedMessage { bb = 4 }
        )
+      )

      repeatedNestedEnum.addAll(listOf(NestedEnum.FOO, NestedEnum.BAR))
      assertThat(repeatedNestedEnum).isEqualTo(listOf(NestedEnum.FOO, NestedEnum.BAR))
      repeatedNestedEnum += listOf(NestedEnum.BAZ, NestedEnum.FOO)
-      assertThat(repeatedNestedEnum)
-        .isEqualTo(listOf(NestedEnum.FOO, NestedEnum.BAR, NestedEnum.BAZ, NestedEnum.FOO))
+      assertThat(repeatedNestedEnum).isEqualTo(
+        listOf(NestedEnum.FOO, NestedEnum.BAR, NestedEnum.BAZ, NestedEnum.FOO)
+      )
      repeatedNestedEnum[0] = NestedEnum.BAR
-      assertThat(repeatedNestedEnum)
-        .isEqualTo(listOf(NestedEnum.BAR, NestedEnum.BAR, NestedEnum.BAZ, NestedEnum.FOO))
+      assertThat(repeatedNestedEnum).isEqualTo(
+        listOf(NestedEnum.BAR, NestedEnum.BAR, NestedEnum.BAZ, NestedEnum.FOO)
+      )
    }
  }

  @Test
  fun testClears() {
    assertThat(
-        testAllTypes {
-          optionalInt32 = 101
-          clearOptionalInt32()
+      testAllTypes {
+        optionalInt32 = 101
+        clearOptionalInt32()

-          optionalString = "115"
-          clearOptionalString()
+        optionalString = "115"
+        clearOptionalString()

-          optionalNestedMessage = TestAllTypesKt.nestedMessage { bb = 118 }
-          clearOptionalNestedMessage()
+        optionalNestedMessage = TestAllTypesKt.nestedMessage { bb = 118 }
+        clearOptionalNestedMessage()

-          optionalNestedEnum = NestedEnum.BAZ
-          clearOptionalNestedEnum()
+        optionalNestedEnum = NestedEnum.BAZ
+        clearOptionalNestedEnum()

-          oneofUint32 = 601
-          clearOneofUint32()
-        }
-      )
-      .isEqualTo(TestAllTypes.newBuilder().build())
+        oneofUint32 = 601
+        clearOneofUint32()
+      }
+    ).isEqualTo(
+      TestAllTypes.newBuilder().build()
+    )
  }

  @Test
@ -150,110 +154,126 @@ class Proto3Test {
      optionalInt32 = 101
      optionalString = "115"
    }
-    val modifiedMessage = message.copy { optionalInt32 = 201 }
+    val modifiedMessage = message.copy {
+      optionalInt32 = 201
+    }

-    assertThat(message)
-      .isEqualTo(TestAllTypes.newBuilder().setOptionalInt32(101).setOptionalString("115").build())
-    assertThat(modifiedMessage)
-      .isEqualTo(TestAllTypes.newBuilder().setOptionalInt32(201).setOptionalString("115").build())
+    assertThat(message).isEqualTo(
+      TestAllTypes.newBuilder()
+        .setOptionalInt32(101)
+        .setOptionalString("115")
+        .build()
+    )
+    assertThat(modifiedMessage).isEqualTo(
+      TestAllTypes.newBuilder()
+        .setOptionalInt32(201)
+        .setOptionalString("115")
+        .build()
+    )
  }

  @Test
  fun testOneof() {
    val message = testAllTypes {
      oneofString = "foo"
-      assertThat(oneofFieldCase).isEqualTo(TestAllTypes.OneofFieldCase.ONEOF_STRING)
+      assertThat(oneofFieldCase)
+        .isEqualTo(TestAllTypes.OneofFieldCase.ONEOF_STRING)
      assertThat(oneofString).isEqualTo("foo")
      clearOneofField()
-      assertThat(oneofFieldCase).isEqualTo(TestAllTypes.OneofFieldCase.ONEOFFIELD_NOT_SET)
+      assertThat(oneofFieldCase)
+        .isEqualTo(TestAllTypes.OneofFieldCase.ONEOFFIELD_NOT_SET)
      oneofUint32 = 5
    }

-    assertThat(message.getOneofFieldCase()).isEqualTo(TestAllTypes.OneofFieldCase.ONEOF_UINT32)
+    assertThat(message.getOneofFieldCase())
+      .isEqualTo(TestAllTypes.OneofFieldCase.ONEOF_UINT32)
    assertThat(message.getOneofUint32()).isEqualTo(5)
  }

  @Test
  fun testEmptyMessages() {
-    assertThat(testEmptyMessage {}).isEqualTo(TestEmptyMessage.newBuilder().build())
+    assertThat(
+      testEmptyMessage {}
+    ).isEqualTo(
+      TestEmptyMessage.newBuilder().build()
+    )
  }

  @Test
  fun testEvilNames() {
    assertThat(
-        evilNamesProto3 {
-          initialized = true
-          hasFoo = true
-          bar = "foo"
-          isInitialized = true
-          fooBar = "foo"
-          aLLCAPS += "foo"
-          aLLCAPSMAP[1] = true
-          hasUnderbarPrecedingNumeric1Foo = true
-          hasUnderbarPrecedingNumeric42Bar = true
-          hasUnderbarPrecedingNumeric123Foo42BarBaz = true
-          extension += "foo"
-          class_ = "foo"
-          int = 1.0
-          long = true
-          boolean = 1L
-          sealed = "foo"
-          interface_ = 1F
-          in_ = 1
-          object_ = "foo"
-          cachedSize_ = "foo"
-          serializedSize_ = true
-          value = "foo"
-          index = 1L
-          values += "foo"
-          newValues += "foo"
-          builder = true
-          k[1] = 1
-          v["foo"] = "foo"
-          key["foo"] = 1
-          map[1] = "foo"
-          pairs["foo"] = 1
-          LeadingUnderscore = "foo"
-          option = 1
-        }
-      )
-      .isEqualTo(
-        EvilNamesProto3.newBuilder()
-          .setInitialized(true)
-          .setHasFoo(true)
-          .setBar("foo")
-          .setIsInitialized(true)
-          .setFooBar("foo")
-          .addALLCAPS("foo")
-          .putALLCAPSMAP(1, true)
-          .setHasUnderbarPrecedingNumeric1Foo(true)
-          .setHasUnderbarPrecedingNumeric42Bar(true)
-          .setHasUnderbarPrecedingNumeric123Foo42BarBaz(true)
-          .addExtension("foo")
-          .setClass_("foo")
-          .setInt(1.0)
-          .setLong(true)
-          .setBoolean(1L)
-          .setSealed("foo")
-          .setInterface(1F)
-          .setIn(1)
-          .setObject("foo")
-          .setCachedSize_("foo")
-          .setSerializedSize_(true)
-          .setValue("foo")
-          .setIndex(1L)
-          .addValues("foo")
-          .addNewValues("foo")
-          .setBuilder(true)
-          .putK(1, 1)
-          .putV("foo", "foo")
-          .putKey("foo", 1)
-          .putMap(1, "foo")
-          .putPairs("foo", 1)
-          .setLeadingUnderscore("foo")
-          .setOption(1)
-          .build()
-      )
+      evilNamesProto3 {
+        initialized = true
+        hasFoo = true
+        bar = "foo"
+        isInitialized = true
+        fooBar = "foo"
+        aLLCAPS += "foo"
+        aLLCAPSMAP[1] = true
+        hasUnderbarPrecedingNumeric1Foo = true
+        hasUnderbarPrecedingNumeric42Bar = true
+        hasUnderbarPrecedingNumeric123Foo42BarBaz = true
+        extension += "foo"
+        class_ = "foo"
+        int = 1.0
+        long = true
+        boolean = 1L
+        sealed = "foo"
+        interface_ = 1F
+        in_ = 1
+        object_ = "foo"
+        cachedSize_ = "foo"
+        serializedSize_ = true
+        value = "foo"
+        index = 1L
+        values += "foo"
+        newValues += "foo"
+        builder = true
+        k[1] = 1
+        v["foo"] = "foo"
+        key["foo"] = 1
+        map[1] = "foo"
+        pairs["foo"] = 1
+        LeadingUnderscore = "foo"
+        option = 1
+      }
+    ).isEqualTo(
+      EvilNamesProto3.newBuilder()
+        .setInitialized(true)
+        .setHasFoo(true)
+        .setBar("foo")
+        .setIsInitialized(true)
+        .setFooBar("foo")
+        .addALLCAPS("foo")
+        .putALLCAPSMAP(1, true)
+        .setHasUnderbarPrecedingNumeric1Foo(true)
+        .setHasUnderbarPrecedingNumeric42Bar(true)
+        .setHasUnderbarPrecedingNumeric123Foo42BarBaz(true)
+        .addExtension("foo")
+        .setClass_("foo")
+        .setInt(1.0)
+        .setLong(true)
+        .setBoolean(1L)
+        .setSealed("foo")
+        .setInterface(1F)
+        .setIn(1)
+        .setObject("foo")
+        .setCachedSize_("foo")
+        .setSerializedSize_(true)
+        .setValue("foo")
+        .setIndex(1L)
+        .addValues("foo")
+        .addNewValues("foo")
+        .setBuilder(true)
+        .putK(1, 1)
+        .putV("foo", "foo")
+        .putKey("foo", 1)
+        .putMap(1, "foo")
+        .putPairs("foo", 1)
+        .setLeadingUnderscore("foo")
+        .setOption(1)
+        .build()
+    )

    assertThat(class_ {}).isEqualTo(Class.newBuilder().build())
  }
@ -330,22 +350,16 @@ class Proto3Test {

  @Test
  fun testMultipleFiles() {
-    assertThat(com.google.protobuf.kotlin.generator.multipleFilesMessageA {})
-      .isEqualTo(com.google.protobuf.kotlin.generator.MultipleFilesMessageA.newBuilder().build())
-
-    assertThat(com.google.protobuf.kotlin.generator.multipleFilesMessageB {})
-      .isEqualTo(com.google.protobuf.kotlin.generator.MultipleFilesMessageB.newBuilder().build())
-  }
-
-  @Test
-  fun testGetOrNull() {
-    val noNestedMessage = testAllTypes {}
-    assertThat(noNestedMessage.optionalNestedMessageOrNull).isEqualTo(null)
+    assertThat(
+      com.google.protobuf.kotlin.generator.multipleFilesMessageA {}
+    ).isEqualTo(
+      com.google.protobuf.kotlin.generator.MultipleFilesMessageA.newBuilder().build()
+    )

-    val someNestedMessage = testAllTypes {
-      optionalNestedMessage = TestAllTypesKt.nestedMessage { bb = 118 }
-    }
-    assertThat(someNestedMessage.optionalNestedMessageOrNull)
-      .isEqualTo(TestAllTypesKt.nestedMessage { bb = 118 })
+    assertThat(
+      com.google.protobuf.kotlin.generator.multipleFilesMessageB {}
+    ).isEqualTo(
+      com.google.protobuf.kotlin.generator.MultipleFilesMessageB.newBuilder().build()
+    )
  }
 }
--- a/java/lite/generate-test-sources-build.xml
+++ b/java/lite/generate-test-sources-build.xml
@ -5,6 +5,7 @@
        <arg value="--proto_path=${protobuf.source.dir}"/>
        <arg value="--proto_path=${protobuf.basedir}/java/core/${test.proto.dir}"/>
        <arg value="${protobuf.source.dir}/google/protobuf/descriptor.proto"/>
+        <arg value="${protobuf.source.dir}/google/protobuf/map_lite_unittest.proto"/>
        <arg value="${protobuf.source.dir}/google/protobuf/unittest.proto"/>
        <arg value="${protobuf.source.dir}/google/protobuf/unittest_import.proto"/>
        <arg value="${protobuf.source.dir}/google/protobuf/unittest_import_lite.proto"/>
--- a/java/lite/pom.xml
+++ b/java/lite/pom.xml
@ -105,6 +105,7 @@
                    <include>CodedInputStreamReader.java</include>
                    <include>CodedOutputStream.java</include>
                    <include>CodedOutputStreamWriter.java</include>
+                    <include>CompileTimeConstant.java</include>
                    <include>DoubleArrayList.java</include>
                    <include>ExperimentalApi.java</include>
                    <include>ExtensionLite.java</include>
@ -119,6 +120,7 @@
                    <include>FloatArrayList.java</include>
                    <include>GeneratedMessageInfoFactory.java</include>
                    <include>GeneratedMessageLite.java</include>
+                    <include>InlineMe.java</include>
                    <include>IntArrayList.java</include>
                    <include>Internal.java</include>
                    <include>InvalidProtocolBufferException.java</include>