[Proto migration] Use protos when creating LOIs #2529
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gino-m
requested changes
Jun 29, 2024
ground/src/main/java/com/google/android/ground/persistence/remote/firebase/ModelToProtoExt.kt
Outdated
Show resolved
Hide resolved
ground/src/main/java/com/google/android/ground/persistence/remote/firebase/ModelToProtoExt.kt
Outdated
Show resolved
Hide resolved
|
/gcbrun |
gino-m
requested changes
Jul 1, 2024
ground/src/main/java/com/google/android/ground/model/geometry/Geometry.kt
Outdated
Show resolved
Hide resolved
ground/src/main/java/com/google/android/ground/model/geometry/Geometry.kt
Outdated
Show resolved
Hide resolved
ground/src/main/java/com/google/android/ground/persistence/remote/firebase/ModelToProtoExt.kt
Outdated
Show resolved
Hide resolved
ground/src/main/java/com/google/android/ground/persistence/remote/firebase/ModelToProtoExt.kt
Outdated
Show resolved
Hide resolved
gino-m
reviewed
Jul 2, 2024
.../main/java/com/google/android/ground/persistence/remote/firebase/protobuf/ModelToProtoExt.kt
Outdated
Show resolved
Hide resolved
gino-m
reviewed
Jul 2, 2024
.../main/java/com/google/android/ground/persistence/remote/firebase/protobuf/ModelToProtoExt.kt
Outdated
Show resolved
Hide resolved
gino-m
requested changes
Jul 4, 2024
There was a problem hiding this comment.
It appears the issue is that the protobuf-lite codegen doesn't behave how the original author (me) expected wrt oneofs. The generated TypeCase enum and respective "*TypeCase_" field contains the number of the set field, and the "*Type_" field contains the actual message.
I think the easiest way is to use the TypeCase enum to get the field names and values when its encountered; the enum value's in lowercase correspond to the field names, and their values correspond to the field numbers. Wdyt?
.../main/java/com/google/android/ground/persistence/remote/firebase/protobuf/ModelToProtoExt.kt
Outdated
Show resolved
Hide resolved
...java/com/google/android/ground/persistence/remote/firebase/protobuf/ModelToProtoExtKtTest.kt
Outdated
Show resolved
Hide resolved
|
#2537 adds support for oneofs in proto->Firestore conversion. |
|
@sufyanAbbasi Could you please take a look at this one too? |
shobhitagarwal1612
changed the title
gino-m
changed the title
gino-m
approved these changes
Jul 16, 2024
gino-m
requested changes
Jul 16, 2024
...a/com/google/android/ground/persistence/remote/firebase/protobuf/LoiMutationConverterTest.kt
Outdated
Show resolved
Hide resolved
...a/com/google/android/ground/persistence/remote/firebase/protobuf/LoiMutationConverterTest.kt
Outdated
Show resolved
Hide resolved
gino-m
reviewed
Jul 16, 2024
...a/com/google/android/ground/persistence/remote/firebase/protobuf/LoiMutationConverterTest.kt
Outdated
Show resolved
Hide resolved
gino-m
reviewed
Jul 16, 2024
.../main/java/com/google/android/ground/persistence/remote/firebase/protobuf/ModelToProtoExt.kt
Outdated
Show resolved
Hide resolved
gino-m
approved these changes
Jul 16, 2024
|
Nicely done! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2499
Fixes #2541
@sufyanAbbasi @gino-m PTAL?