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

added Marshaller.oneOf(m1, m2) to JavaDSL (#1551) #1552

Merged
merged 2 commits into from Nov 29, 2017

Conversation

Projects
None yet
4 participants
@n1ko-w1ll
Contributor

n1ko-w1ll commented Nov 24, 2017

...to improve the Java DSL for two Marshallers (see #1551)

@akka-ci

This comment has been minimized.

Collaborator

akka-ci commented Nov 24, 2017

Can one of the repo owners verify this patch?

@jrudolph

This comment has been minimized.

Member

jrudolph commented Nov 28, 2017

OK TO TEST

@akka-ci

This comment has been minimized.

Collaborator

akka-ci commented Nov 28, 2017

Test FAILed.

@jrudolph

This comment has been minimized.

Member

jrudolph commented Nov 28, 2017

LGTM but PR validation failed because the code was not automatically formatted before being checked in. We enforce that all code has been auto-formatted so that running the build doesn't introduce spurious whitespace changes for the next person working on master.

Could you recompile so that the code is auto-formatted and commit the changes? Thanks.

@n1ko-w1ll

This comment has been minimized.

Contributor

n1ko-w1ll commented Nov 28, 2017

Okay, I‘ll reformat the code and update the PR tomorrow 👍

@akka-ci akka-ci added validating and removed needs-attention labels Nov 29, 2017

@n1ko-w1ll

This comment has been minimized.

Contributor

n1ko-w1ll commented Nov 29, 2017

I have different code style settings and IDE reformatted the copy & pasted javadoc. I've fixed the indentation.

@akka-ci akka-ci added tested and removed validating labels Nov 29, 2017

@akka-ci

This comment has been minimized.

Collaborator

akka-ci commented Nov 29, 2017

Test PASSed.

@ktoso

This comment has been minimized.

Member

ktoso commented Nov 29, 2017

I have different code style settings and IDE reformatted the copy & pasted javadoc. I've fixed the indentation.

If you compile using sbt it'll do the "right" formatting, independent of your IDE :)

@ktoso

ktoso approved these changes Nov 29, 2017

LGTM, thanks

@ktoso ktoso merged commit 731fcff into akka:master Nov 29, 2017

3 checks passed

Jenkins PR Validation Test PASSed.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
typesafe-cla-validator All users have signed the CLA
Details

@n1ko-w1ll n1ko-w1ll deleted the n1ko-w1ll:marshaller-oneof-java-1551 branch Nov 29, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment