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

Format AbstractFilteringTestCase #77217

Merged
merged 2 commits into from
Sep 3, 2021
Merged

Conversation

nik9000
Copy link
Member

@nik9000 nik9000 commented Sep 2, 2021

AbstractFilteringTestCase had a ton of carefully formatted
XContentBuilder calls that would have been totally unreadable after
the formatter worked its magic. So I formatted a bunch of them by hand
and extracted the rest to json files.

`AbstractFilteringTestCase` had a ton of carefully formatted
`XContentBuilder` calls that would have been totally unreadable after
the formatter worked its magic. So I formatted a bunch of them by hand
and extracted the rest to json files.
@nik9000 nik9000 added >test Issues or PRs that are addressing/adding tests :Core/Infra/Core Core issues without another label v8.0.0 v7.16.0 labels Sep 2, 2021
@nik9000 nik9000 requested a review from tlrx September 2, 2021 21:35
@elasticmachine elasticmachine added the Team:Core/Infra Meta label for core/infra team label Sep 2, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-core-infra (Team:Core/Infra)

@nik9000
Copy link
Member Author

nik9000 commented Sep 2, 2021

I tried to extract the json to a file if it was about half a page or so. I figured casual readers wouldn't read a half page of json and an interested reader would be willing to look up the file.

@nik9000
Copy link
Member Author

nik9000 commented Sep 2, 2021

I also added one of the direct subclasses of AbstractFilteringTestCase which has a bunch of careful formatting. Like before I manually formatted stuff and then ran formatter to make sure it didn't make a huge mess.

Copy link
Member

@tlrx tlrx left a comment

Choose a reason for hiding this comment

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

LGTM - thanks for doing this Nik!

@nik9000
Copy link
Member Author

nik9000 commented Sep 3, 2021

LGTM - thanks for doing this Nik!

I'm happy to do it! I ran the formatter on the file just to see what would happen. It was made me so very very sad.

@nik9000 nik9000 merged commit aa2aa9b into elastic:master Sep 3, 2021
@elasticsearchmachine
Copy link
Collaborator

💔 Backport failed

Status Branch Result
7.x Commit could not be cherrypicked due to conflicts

To backport manually run backport --upstream elastic/elasticsearch --pr 77217

@nik9000
Copy link
Member Author

nik9000 commented Sep 3, 2021

To backport manually run backport --upstream elastic/elasticsearch --pr 77217

With great respect, I will do it my own way.

nik9000 added a commit to nik9000/elasticsearch that referenced this pull request Sep 3, 2021
`AbstractFilteringTestCase` had a ton of carefully formatted
`XContentBuilder` calls that would have been totally unreadable after
the formatter worked its magic. So I formatted a bunch of them by hand
and extracted the rest to json files.
@nik9000
Copy link
Member Author

nik9000 commented Sep 3, 2021

Backport is #77254. Made with good old git cherry-pick

elasticsearchmachine pushed a commit that referenced this pull request Sep 3, 2021
`AbstractFilteringTestCase` had a ton of carefully formatted
`XContentBuilder` calls that would have been totally unreadable after
the formatter worked its magic. So I formatted a bunch of them by hand
and extracted the rest to json files.
wjp719 added a commit to wjp719/elasticsearch that referenced this pull request Sep 4, 2021
* master: (128 commits)
  Mute DieWithDignityIT (elastic#77283)
  Fix randomization in MlNodeShutdownIT (elastic#77281)
  Add target_node_name for REPLACE shutdown type (elastic#77151)
  [DOCS] Adds information about version compatibility headers (elastic#77096)
  Fix template equals when mappings are wrapped (elastic#77008)
  Fix TextFieldMapper Retaining a Reference to its Builder (elastic#77251)
  Move die with dignity to be a test module (elastic#77136)
  Update task names for rest compatiblity (elastic#75267)
  [ML] adjusting bwc serialization for elastic#77256 (elastic#77257)
  Move `index.hidden` from Static to Dynamic settings (elastic#77218)
  Handle cgroups v2 in `OsProbe` (elastic#77128)
  Choose postings format from FieldMapper instead of MappedFieldType (elastic#77234)
  Add segment sorter for data streams (elastic#75195)
  Update skip after backport (elastic#77212)
  [ML] adding new defer_definition_decompression parameter to put trained model API (elastic#77189)
  [ML] Fix bug in inference stats persister for when feature reset is called
  Only check replicas in cancelling existing recoveries. (elastic#60564)
  Format `AbstractFilteringTestCase` (elastic#77217)
  [DOCS] Fixes line breaks. (elastic#77248)
  Convert 'routing' values in REST API tests to strings
  ...

# Conflicts:
#	server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
:Core/Infra/Core Core issues without another label Team:Core/Infra Meta label for core/infra team >test Issues or PRs that are addressing/adding tests v7.16.0 v8.0.0-alpha2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants