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

Squash the rest of o.e.rest.action #19698

Merged
merged 1 commit into from
Aug 16, 2016
Merged

Conversation

nik9000
Copy link
Member

@nik9000 nik9000 commented Jul 30, 2016

Squashes all the subpackages of org.elasticsearch.rest.action down to
the following:

  • o.e.rest.action.admin - Administrative actions
  • o.e.rest.action.cat - Actions that make tables for greping
  • o.e.rest.action.document - Actions that act on documents
  • o.e.rest.action.ingest - Actions that act on ingest pipelines
  • o.e.rest.action.search - Actions that search

I'm tempted to merge search into document but the document
package feels fairly complete as is and Suggest isn't actually always
about documents either....

I'm also tempted to merge ingest into admin.cluster because the
latter contains the actions for dealing with stored scripts.

I've moved the o.e.rest.action.support into o.e.rest.action.

@nik9000
Copy link
Member Author

nik9000 commented Jul 30, 2016

I believe this is a net loss of about 10 packages. Mostly consolidating tiny packages into medium sized packages.

@nik9000
Copy link
Member Author

nik9000 commented Jul 30, 2016

Also package descriptions to all the packages in org.elasticsearch.rest.

@nik9000
Copy link
Member Author

nik9000 commented Jul 30, 2016

Marking it breaking-java because it moves some utility classes for handling REST. Plugins will have to change the import locations if they use them

@cbuescher
Copy link
Member

LGTM

Squashes all the subpackages of `org.elasticsearch.rest.action` down to
the following:
* `o.e.rest.action.admin` - Administrative actions
* `o.e.rest.action.cat` - Actions that make tables for `grep`ing
* `o.e.rest.action.document` - Actions that act on documents
* `o.e.rest.action.ingest` - Actions that act on ingest pipelines
* `o.e.rest.action.search` - Actions that search

I'm tempted to merge `search` into `document` but the `document`
package feels fairly complete as is and `Suggest` isn't actually always
about documents either....

I'm also tempted to merge `ingest` into `admin.cluster` because the
latter contains the actions for dealing with stored scripts.

I've moved the `o.e.rest.action.support` into `o.e.rest.action`.

I've also added `package-info.java`s to all packges in `o.e.rest`. I
figure if the package is too small to deserve a `package-info.java` file
then it is too small to deserve to be a package....

Also fixes checkstyle in all moved classes.
@nik9000 nik9000 merged commit 1452ab4 into elastic:master Aug 16, 2016
@nik9000
Copy link
Member Author

nik9000 commented Aug 16, 2016

Thanks for reviewing @cbuescher !

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.

3 participants