Skip to content

Implement @DocumentId annotation #464

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
17 commits merged into from
Jun 4, 2019
Merged

Implement @DocumentId annotation #464

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
371e088
add more instructions
wu-hui May 21, 2019
c659bae
more document
wu-hui May 21, 2019
2923e35
Add DocumentId annotation, and mark neccessary interface/call site up…
wu-hui May 22, 2019
ec067ed
undo readme change
wu-hui May 22, 2019
1533c5e
making it non-static
wu-hui May 22, 2019
c7d9508
Make it back to static
wu-hui May 23, 2019
cb89423
address comments
wu-hui May 23, 2019
2d5ec68
addressing more nits.
wu-hui May 23, 2019
90b2e25
initial checkin, tests not complete
wu-hui May 24, 2019
3cdfa85
completes feature.
wu-hui May 27, 2019
d24ea62
fix comments
wu-hui May 27, 2019
ef2382f
clean up
wu-hui May 27, 2019
a5d91bb
more cleanup and refactoring
wu-hui May 27, 2019
554ede5
addressing comments
wu-hui Jun 3, 2019
4f6d139
Merge branch 'master' into ImplementDocumentIdAnnotation
wu-hui Jun 3, 2019
0e84b0f
address error message nits
wu-hui Jun 4, 2019
0b27468
Merge branch 'master' into ImplementDocumentIdAnnotation
Jun 4, 2019
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
Prev Previous commit
Next Next commit
address error message nits
  • Loading branch information
@wu-hui
wu-hui committed Jun 4, 2019
commit 0e84b0f7e9a9d9469c7c49a7193a81524f659257
4 changes: 2 additions & 2 deletions firebase-firestore/src/main/java/com/google/firebase/firestore/util/CustomClassMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -813,7 +813,7 @@ private void populateDocumentIdProperties(
String message =
"'"
+ docIdPropertyName
+ "' is found from document "
+ "' was found from document "
+ context.documentRef.getPath()
+ ", cannot apply @DocumentId on this property for class "
+ clazz.getName();
Expand Down Expand Up @@ -959,7 +959,7 @@ private void applySetterAnnotations(Method method) {

if (method.isAnnotationPresent(DocumentId.class)) {
Class<?> paramType = method.getParameterTypes()[0];
ensureValidDocumentIdType("Method", "sets", paramType);
ensureValidDocumentIdType("Method", "accepts", paramType);
documentIdPropertyNames.add(propertyName(method));
}
}
Expand Down