Use numbers instead of type names as map keys in FileDescriptorResolver (#144)

Author: pranjalvachaspati-toast

protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/descriptor/FileDescriptorResolver.kt

@@ -25,7 +25,6 @@ import com.squareup.kotlinpoet.TypeSpec
 import com.toasttab.protokt.codegen.impl.bindMargin
 import com.toasttab.protokt.codegen.impl.embed
 import com.toasttab.protokt.codegen.impl.namedCodeBlock
-import com.toasttab.protokt.codegen.impl.toParamName
 import com.toasttab.protokt.codegen.protoc.Enum
 import com.toasttab.protokt.codegen.protoc.Message
 import com.toasttab.protokt.codegen.protoc.Protocol
@@ -58,21 +57,21 @@ private constructor(
                                 """
                                     |lazy {
                                     |    val descriptorData = arrayOf(
-                                    |%descriptorData:L
+                                    |        %descriptorData:L
                                     |    )
                                     |
                                     |    %fileDescriptor:T.buildFrom(
                                     |        descriptorData,
                                     |        listOf(
-                                    |${dependencyLines(dependencies)}
+                                    |            ${dependencyLines(dependencies)}
                                     |        )
                                     |    )
                                     |}
                                 """.bindMargin(),
                                 mapOf(
                                     "descriptorData" to descriptorLines(),
                                     "fileDescriptor" to ClassName("com.toasttab.protokt", "FileDescriptor")
-                                ) + dependencies.associateBy { it.toParamName() }
+                                ) + dependencies.withIndex().associateBy { "param${it.index}" }.mapValues { it.value.value }
                             )
                         ).build()
                 )
@@ -98,7 +97,7 @@ private constructor(
         )
 
     private fun dependencyLines(dependencies: List<TypeName>) =
-        dependencies.joinToString(",\n") { "%${it.toParamName()}:T.descriptor" }
+        dependencies.withIndex().joinToString(",\n") { "%param${it.index}:T.descriptor" }
 
     private fun clearJsonInfo(fileDescriptorProto: DescriptorProtos.FileDescriptorProto) =
         fileDescriptorProto.toBuilder()

testing/runtime-tests/src/main/proto/toasttab/protokt/testing/rt/data/evil_names.proto

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2021 Toast Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto3";
+
+// This is in a different packages since the test was created because of a bug
+// that triggered with reserved keywords (specifically `data`) in the package name.
+package toasttab.protokt.testing.rt.data;
+
+
+message Foo {
+  bool data = 1;
+  bool null = 2;
+  bool abstract = 3;
+  bool continue = 4;
+}

testing/runtime-tests/src/main/proto/toasttab/protokt/testing/rt/data/import_evil_names.proto

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2021 Toast Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto3";
+
+package toasttab.protokt.testing.rt.data;
+
+import "toasttab/protokt/testing/rt/data/evil_names.proto";
+
+message Bar {
+  Foo foo = 1;
+}

testing/runtime-tests/src/test/kotlin/com/toasttab/protokt/testing/rt/EvilNamesTest.kt

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2021 Toast Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.toasttab.protokt.testing.rt
+
+import com.google.common.truth.Truth.assertThat
+import org.junit.jupiter.api.Test
+import toasttab.protokt.testing.rt.data.EvilNames
+import toasttab.protokt.testing.rt.data.ImportEvilNames
+
+class EvilNamesTest {
+    @Test
+    fun `ensure package has reserved word in package name`() {
+        assertThat(EvilNames::class.qualifiedName).contains(".data.")
+        assertThat(ImportEvilNames::class.qualifiedName).contains(".data.")
+    }
+}