Avoid package name m due to protoc bug for java generated code

thesamet · thesamet · commit 18659acd8bae · 2022-10-27T23:20:28.000-07:00
diff --git a/proptest/src/test/scala/GraphGen.scala b/proptest/src/test/scala/GraphGen.scala
@@ -27,9 +27,9 @@ object GraphGen {
 
     def generateName: Gen[String] = SchemaGenerators.identifier.retryUntil(isNameAvailable)
 
-    // See https://github.com/google/protobuf/issues/2738
+    // See https://github.com/protocolbuffers/protobuf/issues/10834
     def generateJavaPackageName: Gen[String] =
-      SchemaGenerators.identifier.retryUntil(s => s != "key" && isNameAvailable(s))
+      SchemaGenerators.identifier.retryUntil(s => s != "m" && isNameAvailable(s))
   }
 
   val ROOT_NAMESPACE = Namespace(Set("foo", "bar"), None)

Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,9 @@ object GraphGen {`
`27`	`27`
`28`	`28`	`def generateName: Gen[String] = SchemaGenerators.identifier.retryUntil(isNameAvailable)`
`29`	`29`
`30`		`- // See https://github.com/google/protobuf/issues/2738`
	`30`	`+ // See https://github.com/protocolbuffers/protobuf/issues/10834`
`31`	`31`	`def generateJavaPackageName: Gen[String] =`
`32`		`- SchemaGenerators.identifier.retryUntil(s => s != "key" && isNameAvailable(s))`
	`32`	`+ SchemaGenerators.identifier.retryUntil(s => s != "m" && isNameAvailable(s))`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`val ROOT_NAMESPACE = Namespace(Set("foo", "bar"), None)`