Firestore: Port @DocumentId to server SDK #5743

ghost · 2019-07-15T19:36:11Z

Also add MapperTests.

BenWhitehead

A few small questions, nothing major.

I assume this is being ported from the android SDK, is there a bread crumb we can to that implementation for a record of where this code is coming from?

BenWhitehead · 2019-07-17T18:54:38Z

...lients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentSnapshot.java

-    return data == null ? null : CustomClassMapper.convertToCustomClass(getData(), valueType);
+    return data == null
+        ? null
+        : CustomClassMapper.convertToCustomClass(getData(), valueType, docRef);


Is it valid to pass data in here, rather than calling getData() again?

BenWhitehead · 2019-07-17T19:01:02Z

...-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/TestUtil.java

+import java.util.Map;
+
+/** A set of utilities for tests */
+public class TestUtil {


Can this be package local since it's only used for firestore tests?

BenWhitehead · 2019-07-17T19:05:08Z

google-cloud-clients/google-cloud-firestore/pom.xml

+          <artifactId>jackson-databind</artifactId>
+          <version>2.9.8</version>
+          <scope>test</scope>
+      </dependency>


Duplicate dependency declaration, and formatting in consistent with the rest of the file.

BenWhitehead · 2019-07-17T19:12:57Z

...ients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/CustomClassMapper.java

  }
+
+  /** Holds information a deserialization operation needs to complete the job. */
+  static class DeserializeContext {


Any reason this is package-private instead of private?

codecov · 2019-07-17T19:59:48Z

Codecov Report

Merging #5743 into master will increase coverage by 0.75%.
The diff coverage is 77.77%.

@@             Coverage Diff              @@
##             master    #5743      +/-   ##
============================================
+ Coverage     46.42%   47.17%   +0.75%     
- Complexity    23633    25115    +1482     
============================================
  Files          2389     2389              
  Lines        254506   259831    +5325     
  Branches      28467    29420     +953     
============================================
+ Hits         118144   122582    +4438     
- Misses       127547   128321     +774     
- Partials       8815     8928     +113

Impacted Files	Coverage Δ	Complexity Δ
...a/com/google/cloud/firestore/DocumentSnapshot.java	`85.71% <0%> (ø)`	`55 <0> (ø)`	⬇️
...java/com/google/cloud/firestore/QuerySnapshot.java	`68.51% <100%> (+1.21%)`	`9 <0> (ø)`	⬇️
.../com/google/cloud/firestore/CustomClassMapper.java	`77.29% <77.87%> (+36.54%)`	`102 <1> (+47)`	⬆️
...re/src/main/java/com/google/cloud/BaseService.java	`55.55% <0%> (-6.95%)`	`2% <0%> (ø)`
...re/src/main/java/com/google/cloud/RetryHelper.java	`50% <0%> (-3.85%)`	`2% <0%> (ø)`
...le/cloud/compute/deprecated/DeprecationStatus.java	`88.63% <0%> (-3.13%)`	`20% <0%> (ø)`
...m/google/cloud/tasks/v2beta3/CloudTasksClient.java	`57.43% <0%> (-2.68%)`	`67% <0%> (+16%)`
...va/com/google/cloud/tasks/v2/CloudTasksClient.java	`57.43% <0%> (-2.68%)`	`67% <0%> (+16%)`
...m/google/cloud/tasks/v2beta2/CloudTasksClient.java	`57.14% <0%> (-2.39%)`	`79% <0%> (+19%)`
...oogle/cloud/firestore/v1/FirestoreAdminClient.java	`59.84% <0%> (-2.23%)`	`38% <0%> (+8%)`
... and 649 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 41551f5...e6af407. Read the comment docs.

ghost

The best doc i can find explaining this is https://docs.google.com/document/d/1seUfCzHSv7WXJgoJrtVMCh36HTco7lIrMHZlwCErs40/edit?usp=sharing

Requires corp account to view.

ghost · 2019-07-17T19:51:29Z

google-cloud-clients/google-cloud-firestore/pom.xml

+          <artifactId>jackson-databind</artifactId>
+          <version>2.9.8</version>
+          <scope>test</scope>
+      </dependency>


ghost · 2019-07-17T19:51:39Z

...lients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentSnapshot.java

-    return data == null ? null : CustomClassMapper.convertToCustomClass(getData(), valueType);
+    return data == null
+        ? null
+        : CustomClassMapper.convertToCustomClass(getData(), valueType, docRef);


ghost · 2019-07-17T19:52:06Z

...-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/TestUtil.java

+import java.util.Map;
+
+/** A set of utilities for tests */
+public class TestUtil {


ghost · 2019-07-17T19:53:41Z

...ients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/CustomClassMapper.java

  }
+
+  /** Holds information a deserialization operation needs to complete the job. */
+  static class DeserializeContext {


BenWhitehead · 2019-07-17T20:16:35Z

Thanks for addressing my comments and adding the link to the doc @hui-wu.

Can you run the code formatter again, that is one of the builds that are currently failing.

schmidt-sebastian · 2019-07-18T01:29:23Z

...-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/TestUtil.java

+import java.util.Map;
+
+/** A set of utilities for tests */
+class TestUtil {


There is already a TestUtil: https://github.com/googleapis/google-cloud-java/blob/master/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/LocalFirestoreHelper.java

Please move your helper to this class. Thanks!

schmidt-sebastian

LGTM, but please merge the two TestUtil classes.

wu-hui added 2 commits July 15, 2019 14:42

Port documentId to server sdk

48305f6

Properly formatted

a8a3550

googlebot added the cla: yes This human has signed the Contributor License Agreement. label Jul 15, 2019

chingor13 changed the title ~~Port @DocumentId to server SDK~~ Firestore: Port @DocumentId to server SDK Jul 17, 2019

chingor13 requested review from BenWhitehead and schmidt-sebastian July 17, 2019 18:43

BenWhitehead suggested changes Jul 17, 2019

View reviewed changes

wu-hui added 2 commits July 17, 2019 15:56

addressing comments #1

56ce731

Merge branch 'master' into wuandy/PortDocumentId

abe37fc

ghost commented Jul 17, 2019

View reviewed changes

BenWhitehead approved these changes Jul 17, 2019

View reviewed changes

Reformatted.

db1e579

schmidt-sebastian reviewed Jul 18, 2019

View reviewed changes

schmidt-sebastian approved these changes Jul 18, 2019

View reviewed changes

wu-hui added 2 commits July 18, 2019 11:38

Merge test utilities

944001d

merge test utilities

e6af407

BenWhitehead merged commit 2b28ae1 into googleapis:master Jul 18, 2019

chingor13 mentioned this pull request Jul 24, 2019

Release google-cloud-java v0.102.0 #5852

Merged

Firestore: Port @DocumentId to server SDK #5743

Firestore: Port @DocumentId to server SDK #5743

Uh oh!

Conversation

ghost commented Jul 15, 2019

Uh oh!

BenWhitehead left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

codecov bot commented Jul 17, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

ghost left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

BenWhitehead commented Jul 17, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

schmidt-sebastian left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

codecov bot commented Jul 17, 2019 •

edited

Loading