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

QueryBuilders cleanup (add and deprecate) #8667

Merged
merged 1 commit into from Dec 1, 2014

Conversation

dadoonet
Copy link
Member

Some QueryBuilders are missing or have a different naming than the other ones.

This patch is applied to branch 1.x and master (elasticsearch 1.5 and 2.0):

Added

  • templateQuery(...)
  • commonTermsQuery(...)
  • queryStringQuery(...)
  • simpleQueryStringQuery(...)

Deprecated

  • commonTerms(...)
  • queryString(...)
  • simpleQueryString(...)

Closes #8721

@jpountz
Copy link
Contributor

jpountz commented Nov 27, 2014

LGTM

Would it make sense to delay the removals of textPhrase, ... to 2.0? Hard removals in a minor version can be a bit frustrating from a user perspective even if they have been deprecated for a long time.

@dadoonet
Copy link
Member Author

I agree we can report the removal to 2.0.
If no objection with that, I'll update the PR accordingly.

@dadoonet dadoonet self-assigned this Nov 30, 2014
@dadoonet
Copy link
Member Author

@jpountz PR updated accordingly. WDYT?

@dadoonet dadoonet assigned jpountz and unassigned dadoonet Nov 30, 2014
@jpountz
Copy link
Contributor

jpountz commented Dec 1, 2014

LGTM

@dadoonet
Copy link
Member Author

dadoonet commented Dec 1, 2014

@clintongormley I added the breaking label as it's a breaking change in 2.0.0. Should I update migrate_2_0.asciidoc in master? Or should we have an equivalent file to migrate_2_0.asciidoc in java api doc?

@dadoonet dadoonet changed the title java: QueryBuilders cleanup java: QueryBuilders cleanup (add and deprecate) Dec 1, 2014
@dadoonet
Copy link
Member Author

dadoonet commented Dec 1, 2014

@clintongormley I opened a new issue to split properly both operations: deprecate in 1.5 then remove in 2.0. See #8721. So I removed here the breaking label and added it to #8721.

Some QueryBuilders are missing or have a different naming than the other ones.

This patch is applied to branch 1.x and master (elasticsearch 1.5 and 2.0):

Added
-----

* `templateQuery(...)`
* `commonTermsQuery(...)`
* `queryStringQuery(...)`
* `simpleQueryStringQuery(...)`

Deprecated
----------

* `commonTerms(...)`
* `queryString(...)`
* `simpleQueryString(...)`
@dadoonet dadoonet merged commit 317192b into elastic:master Dec 1, 2014
@dadoonet dadoonet deleted the cleanup/7828-querybuilders branch December 1, 2014 14:13
@clintongormley
Copy link

@clintongormley I added the breaking label as it's a breaking change in 2.0.0. Should I update migrate_2_0.asciidoc in master? Or should we have an equivalent file to migrate_2_0.asciidoc in java api doc?

You can just add a section about breaking changes in the Java API to the migration page in the main docs, I'd say.

dadoonet added a commit that referenced this pull request Dec 3, 2014
Related to #8667:

Some QueryBuilders have been deprecated in 1.x branches. We removed them in 2.0.

Removed
-------

* `textPhrase(...)`
* `textPhrasePrefix(...)`
* `textPhrasePrefixQuery(...)`
* `filtered(...)`
* `inQuery(...)`
* `commonTerms(...)`
* `queryString(...)`
* `simpleQueryString(...)`

Closes #8721.
@clintongormley clintongormley changed the title java: QueryBuilders cleanup (add and deprecate) QueryBuilders cleanup (add and deprecate) Jun 6, 2015
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.

java: QueryBuilders cleanup: remove deprecated
3 participants