Skip to content
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

Distinct feature #53

Merged
merged 17 commits into from Nov 10, 2015
Merged

Distinct feature #53

merged 17 commits into from Nov 10, 2015

Conversation

etourdot
Copy link
Contributor

@etourdot etourdot commented Nov 1, 2015

This a PR proposition for #50 enhancement

@karianna karianna added this to the 3.2.0 milestone Nov 2, 2015
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.*;
import java.util.function.Function;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We prefer explicit imports over wildcards

@karianna
Copy link
Contributor

karianna commented Nov 2, 2015

This is looking good so far... Also will need an example added (vertx-mongo-client/src/main/java/examples/Examples.java) and the packge-info updated to show that example

@etourdot
Copy link
Contributor Author

etourdot commented Nov 3, 2015

Corrections done.
Thanks for the review.

@karianna
Copy link
Contributor

karianna commented Nov 3, 2015

I'm happy with this @johnoliver ?

@karianna
Copy link
Contributor

karianna commented Nov 3, 2015

And thanks for the great contribution!

@karianna
Copy link
Contributor

karianna commented Nov 9, 2015

@etourdot Our apologies for taking so long, unfortunately mainline has moved on slightly. Are you able to merge the changes (resolve conflicts) and push again?

@johnoliver
Copy link
Contributor

Eurgh, SO sorry about this. Was about to merge this but then merged a different change ahead of this and its now non-mergable. If you can pull from master and push I will merge it.

Be careful when merging, there is a new test MongoClientTestBase.testContexts, that needs to be kept in the merge. Also I think your own batch PR that we accepted has a conflict with this.

@etourdot
Copy link
Contributor Author

etourdot commented Nov 9, 2015

No problem, i will resolve conflicts tonight

Emmanuel Tourdot added 2 commits November 9, 2015 17:30
Conflicts:
	vertx-mongo-client/src/main/java/io/vertx/ext/mongo/impl/MongoClientImpl.java
	vertx-mongo-client/src/test/java/io/vertx/ext/mongo/MongoClientTestBase.java
@etourdot
Copy link
Contributor Author

etourdot commented Nov 9, 2015

Conflicts resolved

@karianna
Copy link
Contributor

@johnoliver all yours for a final review

johnoliver added a commit that referenced this pull request Nov 10, 2015
@johnoliver johnoliver merged commit ea7bff9 into vert-x3:master Nov 10, 2015
@johnoliver
Copy link
Contributor

Thank you very much for the contribution

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

Successfully merging this pull request may close these issues.

None yet

4 participants