Codegen improvements (#2528)

* Make constructors non-private.

This removes an extra synthetic class that is otherwise generated to
allow the Builder to create its parent class and vice versa.

* Move e2e tests to its own package

This avoids a conflict with the test proto messages in protoc plugin's
unit tests.

Author: vkryachko

encoders/protoc-gen-firebase-encoders/src/main/kotlin/com/google/firebase/encoders/proto/codegen/CodeGenerator.kt

@@ -246,7 +246,7 @@ internal class Gen(
         }
         val messageTypeName = ClassName.bestGuess(type.name)
 
-        val constructor = MethodSpec.constructorBuilder().addModifiers(Modifier.PRIVATE)
+        val constructor = MethodSpec.constructorBuilder()
         messageClass.addMethod(MethodSpec.methodBuilder("newBuilder")
                 .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
                 .returns(ClassName.bestGuess("Builder"))
@@ -351,7 +351,7 @@ internal class Gen(
                 .addCode("return new \$T(\$L);\n", messageTypeName, buildMethodArgs)
                 .build())
 
-        val builderConstructor = MethodSpec.constructorBuilder().addModifiers(Modifier.PRIVATE)
+        val builderConstructor = MethodSpec.constructorBuilder()
 
         for (field in type.fields) {
             builder.addField(FieldSpec.builder(field.typeName, "${field.name}_", Modifier.PRIVATE).build())

encoders/protoc-gen-firebase-encoders/tests/code-gen-cfg.textproto

@@ -1,8 +1,8 @@
 vendor_package: "com.example"
 
-include: "com.google.firebase.testing.LinkedListProto"
-include: "com.google.firebase.testing.Other"
-include: "com.google.firebase.testing.SimpleProto"
-include: "com.google.firebase.testing.Types"
-include: "com.google.firebase.testing.Types32"
-include: "com.google.firebase.testing.Types64"
+include: "com.google.firebase.testing.e2e.LinkedListProto"
+include: "com.google.firebase.testing.e2e.Other"
+include: "com.google.firebase.testing.e2e.SimpleProto"
+include: "com.google.firebase.testing.e2e.Types"
+include: "com.google.firebase.testing.e2e.Types32"
+include: "com.google.firebase.testing.e2e.Types64"

encoders/protoc-gen-firebase-encoders/tests/src/test/java/com/google/firebase/testing/CodeGenTests.java renamed to encoders/protoc-gen-firebase-encoders/tests/src/test/java/com/google/firebase/testing/e2e/CodeGenTests.java

@@ -12,16 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.testing;
+package com.google.firebase.testing.e2e;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.example.com.google.firebase.testing.LinkedListProto;
-import com.example.com.google.firebase.testing.Other;
-import com.example.com.google.firebase.testing.SimpleProto;
-import com.example.com.google.firebase.testing.Types;
-import com.example.com.google.firebase.testing.Types32;
-import com.example.com.google.firebase.testing.Types64;
+import com.example.com.google.firebase.testing.e2e.LinkedListProto;
+import com.example.com.google.firebase.testing.e2e.Other;
+import com.example.com.google.firebase.testing.e2e.SimpleProto;
+import com.example.com.google.firebase.testing.e2e.Types;
+import com.example.com.google.firebase.testing.e2e.Types32;
+import com.example.com.google.firebase.testing.e2e.Types64;
 import com.example.google.protobuf.Timestamp;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;

encoders/protoc-gen-firebase-encoders/tests/src/test/proto/cycle.proto

@@ -15,7 +15,7 @@
 
 syntax = "proto3";
 
-package com.google.firebase.testing;
+package com.google.firebase.testing.e2e;
 
 message LinkedListProto {
   int32 value = 1;

encoders/protoc-gen-firebase-encoders/tests/src/test/proto/simple.proto

@@ -15,7 +15,7 @@
 
 syntax = "proto3";
 
-package com.google.firebase.testing;
+package com.google.firebase.testing.e2e;
 
 import "google/protobuf/timestamp.proto";
 

encoders/protoc-gen-firebase-encoders/tests/src/test/proto/types.proto

@@ -15,7 +15,7 @@
 
 syntax = "proto3";
 
-package com.google.firebase.testing;
+package com.google.firebase.testing.e2e;
 
 message Types32 {
   int32 i = 1;