Skip to content

Moe Sync #367

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.

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 6 commits into from
Apr 29, 2019
Merged

Moe Sync #367

merged 6 commits into from
Apr 29, 2019

Conversation

ronshapiro
Copy link
Contributor

This code has been reviewed and submitted internally. Feel free to discuss on the PR and we can submit follow-up changes as necessary.

Commits:

Give parallelStream() the same treatment as stream()

Fixes #365

d3d2f7a


Remove a branch that is never taken

Fixes https://github.com/google/google-java-format/pull/337/files

6930fca


Refactor max line length handling

35b9cb6


Add support for custom google-java-format jar

Adds --google-java-format-jar option that lets the user specify a path to the google-java-format-jar.

Fixes #44, #227

4099dca


Update to Truth 0.44.

e00def0


Migrate from assertThat(foo).named("foo") to assertWithMessage("foo").that(foo).

(The exact change is slightly different in some cases, like when using custom subjects or check(), but it's always a migration from named(...) to [assert]WithMessage(...).)

named(...) is being removed.

This CL may slightly modify the failure messages produced, but all the old information will still be present.

842cc62

cushon and others added 6 commits April 25, 2019 19:19
Fixes #365

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=244264487
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=244858188
Adds --google-java-format-jar option that lets the user specify a path to the google-java-format-jar.

Fixes #44, #227

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=244863050
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=244880260
….that(foo).

(The exact change is slightly different in some cases, like when using custom subjects or check(), but it's always a migration from named(...) to [assert]WithMessage(...).)

named(...) is being removed.

This CL may slightly modify the failure messages produced, but all the old information will still be present.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=245027655
@googlebot
Copy link

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of all the commit author(s), set the cla label to yes (if enabled on your project), and then merge this pull request when appropriate.

ℹ️ Googlers: Go here for more info.

@googlebot
Copy link

A Googler has manually verified that the CLAs look good.

(Googler, please make sure the reason for overriding the CLA status is clearly documented in these comments.)

ℹ️ Googlers: Go here for more info.

@ronshapiro ronshapiro merged commit 1ab8de2 into master Apr 29, 2019
@ronshapiro ronshapiro deleted the sync-master-2019/04/25 branch April 29, 2019 15:40
@Stephan202 Stephan202 mentioned this pull request Apr 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

treat .parallelStream() like .stream()? google-java-format-diff.py is unusable without rolling your own wrapper script
4 participants