Skip to content

Codegen improvements #2528

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 19, 2021
Merged

Codegen improvements #2528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50035be
Make constructors non-private.
vkryachko Mar 18, 2021
c1da93d
Move e2e tests to its own package
vkryachko Mar 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...base-encoders/src/main/kotlin/com/google/firebase/encoders/proto/codegen/CodeGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down Expand Up @@ -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())
Expand Down
12 changes: 6 additions & 6 deletions encoders/protoc-gen-firebase-encoders/tests/code-gen-cfg.textproto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
14 changes: 7 additions & 7 deletions ...google/firebase/testing/CodeGenTests.java → ...le/firebase/testing/e2e/CodeGenTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion encoders/protoc-gen-firebase-encoders/tests/src/test/proto/cycle.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

syntax = "proto3";

package com.google.firebase.testing;
package com.google.firebase.testing.e2e;

message LinkedListProto {
int32 value = 1;
Expand Down
2 changes: 1 addition & 1 deletion encoders/protoc-gen-firebase-encoders/tests/src/test/proto/simple.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

syntax = "proto3";

package com.google.firebase.testing;
package com.google.firebase.testing.e2e;

import "google/protobuf/timestamp.proto";

Expand Down
2 changes: 1 addition & 1 deletion encoders/protoc-gen-firebase-encoders/tests/src/test/proto/types.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

syntax = "proto3";

package com.google.firebase.testing;
package com.google.firebase.testing.e2e;

message Types32 {
int32 i = 1;
Expand Down