Reject conflicting updates

[schmidt-sebastian]

This rejects updates that include ambiguous field definitions, such as "a.b" : "foo" and "a" : "foo"

Note that this includes the same google-java-format changes as #2565

[pongad]

Oh right, I forgot we had this variable.
I just realized; the cache isn't thread-safe right? Do we want to use AutoValue's Memoize annotation?
If this is not a concern LGTM; we can also fix this in another PR.

[schmidt-sebastian]

Oh right, I forgot we had this variable.
I just realized; the cache isn't thread-safe right? Do we want to use AutoValue's Memoize annotation?
If this is not a concern LGTM; we can also fix this in another PR.

Yes, this is indeed not thread-safe. I have the 'Memoize' annotation ready to go, but it requires us to update our dependency on AutoValue. We are currently on 1.2, while the release is up to 1.5.2 (which includes Memoize). Is that feasible?

[pongad]

Ah OK. I'm leaning towards updating AutoValue in its own PR. Looking through release notes, there are some changes that might break things. I'm OK with updating AutoValue version and adding Memoize in the same PR though.

Do you have cycles to pick this up?

[pongad]

@garrettjonesgoogle Do you also want to take a look? LGTM from me, so feel free to just merge if you think your review isn't necessary.

[garrettjonesgoogle]

We're trying to do a release, let's hold of on merging until that's done.

[schmidt-sebastian]

Do you have cycles to pick this up?

I can update Firestore, but I don't have cycles to update the rest of the repo.

[schmidt-sebastian]

As discussed offline with @pongad, this is good to merge.