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

Misc java fixes 220617 #1773

Merged
merged 8 commits into from
Jun 28, 2022
Merged

Misc java fixes 220617 #1773

merged 8 commits into from
Jun 28, 2022

Conversation

swallez
Copy link
Member

@swallez swallez commented Jun 27, 2022

@swallez swallez added backport 7.17 lang:java Affects/found in the Java client labels Jun 27, 2022
@swallez swallez requested a review from sethmlarson June 27, 2022 17:38
@sethmlarson
Copy link
Contributor

Should we add the schema-no-generics.json to our .gitignore?

Copy link
Contributor

@sethmlarson sethmlarson left a comment

Choose a reason for hiding this comment

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

If output/schema/schema-no-generics.json is removed then we should be good to go.

@swallez
Copy link
Member Author

swallez commented Jun 28, 2022

Good catch with schema-no-generics.json. Added to .gitignore.

@github-actions
Copy link
Contributor

Following you can find the validation results for the APIs you have changed.

API Status Request Response
indices.add_block 🟢 2/2 2/2
indices.analyze 🟢 20/20 20/20
indices.clear_cache 🟢 4/4 4/4
indices.clone 🟢 6/6 6/6
indices.close 🟢 42/42 42/42
indices.create_data_stream 🟢 25/25 25/25
indices.create 🔴 679/700 700/700
indices.data_streams_stats 🟢 4/4 4/4
indices.delete_alias 🟢 15/15 15/15
indices.delete_data_stream 🟢 27/27 27/27
indices.delete_index_template 🟢 1/1 1/1
indices.delete_template 🟢 9/9 9/9
indices.delete 🟢 104/104 104/104
indices.disk_usage 🟢 3/3 3/3
indices.exists_alias 🟢 36/36 36/36
indices.exists_index_template Missing test Missing test
indices.exists_template 🟢 15/15 15/15
indices.exists 🟢 39/39 39/39
indices.field_usage_stats 🟢 5/5 5/5
indices.flush 🟢 9/9 9/9
indices.forcemerge 🔴 4/4 3/4
indices.get_alias 🔴 82/82 70/82
indices.get_data_stream 🟢 12/12 12/12
indices.get_field_mapping 🔴 15/15 14/15
indices.get_index_template 🔴 16/16 14/16
indices.get_mapping 🔴 60/60 59/60
indices.get_settings 🔴 54/54 47/54
indices.get_template 🟢 30/30 30/30
indices.get 🔴 52/52 48/52
indices.migrate_to_data_stream Missing test Missing test
indices.modify_data_stream Missing test Missing test
indices.open 🟢 17/17 17/17
indices.promote_data_stream Missing test Missing test
indices.put_alias 🟢 54/54 54/54
indices.put_index_template 🔴 37/38 38/38
indices.put_mapping 🔴 69/71 71/71
indices.put_settings 🔴 46/49 49/49
indices.put_template 🔴 40/46 46/46
indices.recovery 🟢 11/11 11/11
indices.refresh 🟢 198/198 198/198
indices.reload_search_analyzers 🟢 2/2 2/2
indices.resolve_index 🟢 6/6 6/6
indices.rollover 🔴 15/16 16/16
indices.segments 🔴 6/6 4/6
indices.shard_stores 🔴 5/5 2/5
indices.shrink 🟢 5/5 5/5
indices.simulate_index_template 🟢 6/6 6/6
indices.simulate_template 🟢 4/4 4/4
indices.split 🟢 5/5 5/5
indices.stats 🟢 83/83 82/82
indices.unfreeze 🟢 1/1 1/1
indices.update_aliases 🟢 22/22 22/22
indices.validate_query 🟢 7/7 7/7
sql.translate 🟢 1/1 1/1

You can validate these APIs yourself by using the make validate target.

@swallez swallez merged commit 81791d0 into main Jun 28, 2022
@swallez swallez deleted the misc-java-fixes-220617 branch June 28, 2022 11:54
@github-actions
Copy link
Contributor

The backport to 7.17 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-7.17 7.17
# Navigate to the new working tree
cd .worktrees/backport-7.17
# Create a new branch
git switch --create backport-1773-to-7.17
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick --mainline 1 81791d0a76ad60b997a42e782a25d39a7b5b2363
# Push it to GitHub
git push --set-upstream origin backport-1773-to-7.17
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-7.17

Then, create a pull request where the base branch is 7.17 and the compare/head branch is backport-1773-to-7.17.

swallez added a commit that referenced this pull request Jun 28, 2022
* Fix MultiTermsRequest - elastic/elasticsearch-java#160
* TypeFieldMappings is a multi-key dictionary - elastic/elasticsearch-java#166
* Fix TranslateSqlResponse - elastic/elasticsearch-java#167
* Token filter properties are generally optional - elastic/elasticsearch-java#199
* Fix typo in IndexSettings.mapping and allow extended settings - elastic/elasticsearch-java#295
* ShardRecovery.stop_time_in_millis is optional - elastic/elasticsearch-java#202
swallez added a commit that referenced this pull request Jun 28, 2022
* Fix MultiTermsRequest - elastic/elasticsearch-java#160
* TypeFieldMappings is a multi-key dictionary - elastic/elasticsearch-java#166
* Fix TranslateSqlResponse - elastic/elasticsearch-java#167
* Token filter properties are generally optional - elastic/elasticsearch-java#199
* Fix typo in IndexSettings.mapping and allow extended settings - elastic/elasticsearch-java#295
* ShardRecovery.stop_time_in_millis is optional - elastic/elasticsearch-java#202
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 7.17 lang:java Affects/found in the Java client specification
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants