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.

Sign up for GitHub

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

Jump to bottom

[Style] Fix line lengths in action.admin.indices #34890

Merged
merged 4 commits into from
Oct 26, 2018
Merged

[Style] Fix line lengths in action.admin.indices #34890

merged 4 commits into from
Oct 26, 2018

Conversation

gwbrown
Copy link
Contributor

@gwbrown gwbrown commented Oct 25, 2018

Clean up lines over 140 characters in the the
org.elasticsearch.action.admin.indices packages

Relates to #34884

@gwbrown
[Style] Fix line lengths in action.admin.indices
5e22f76 
Clean up lines over 140 characters in the the
`org.elasticsearch.action.admin.indices` packages
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-core-infra

@dakrone dakrone mentioned this pull request Oct 25, 2018
Closed
33 tasks
nik9000
nik9000 approved these changes Oct 25, 2018
View reviewed changes
Copy link
Member

@nik9000 nik9000 left a comment

Choose a reason for hiding this comment

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

LGTM except for 24 place I'd like you to hit tab one extra time so the class body doesn't mix in with the class declaration.

...java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java Outdated
@@ -22,7 +22,8 @@
import org.elasticsearch.action.support.broadcast.BroadcastOperationRequestBuilder;
import org.elasticsearch.client.ElasticsearchClient;

public class ClearIndicesCacheRequestBuilder extends BroadcastOperationRequestBuilder<ClearIndicesCacheRequest, ClearIndicesCacheResponse, ClearIndicesCacheRequestBuilder> {
public class ClearIndicesCacheRequestBuilder
extends BroadcastOperationRequestBuilder<ClearIndicesCacheRequest, ClearIndicesCacheResponse, ClearIndicesCacheRequestBuilder> {
Copy link
Member

Choose a reason for hiding this comment

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

Could you indent this one more time so it doesn't line up with the class body?

...r/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequestBuilder.java Outdated Show resolved Hide resolved
.../java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequestBuilder.java Outdated
@@ -22,7 +22,8 @@
import org.elasticsearch.action.support.master.MasterNodeReadOperationRequestBuilder;
import org.elasticsearch.client.ElasticsearchClient;

public class IndicesExistsRequestBuilder extends MasterNodeReadOperationRequestBuilder<IndicesExistsRequest, IndicesExistsResponse, IndicesExistsRequestBuilder> {
public class IndicesExistsRequestBuilder
extends MasterNodeReadOperationRequestBuilder<IndicesExistsRequest, IndicesExistsResponse, IndicesExistsRequestBuilder> {
Copy link
Member

Choose a reason for hiding this comment

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

Here too!

...main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequestBuilder.java Outdated
@@ -27,7 +27,8 @@
* A builder for {@link TypesExistsRequest}.
*/
@Deprecated
public class TypesExistsRequestBuilder extends MasterNodeReadOperationRequestBuilder<TypesExistsRequest, TypesExistsResponse, TypesExistsRequestBuilder> {
public class TypesExistsRequestBuilder
extends MasterNodeReadOperationRequestBuilder<TypesExistsRequest, TypesExistsResponse, TypesExistsRequestBuilder> {
Copy link
Member

Choose a reason for hiding this comment

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

Here too!

server/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java Outdated
@@ -35,13 +35,15 @@
/**
* Flush Action.
*/
public class TransportFlushAction extends TransportBroadcastReplicationAction<FlushRequest, FlushResponse, ShardFlushRequest, ReplicationResponse> {
public class TransportFlushAction
extends TransportBroadcastReplicationAction<FlushRequest, FlushResponse, ShardFlushRequest, ReplicationResponse> {
Copy link
Member

Choose a reason for hiding this comment

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

And here too!

...g/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java Outdated
@@ -37,15 +37,17 @@
/**
* Delete index action.
*/
public class TransportDeleteIndexTemplateAction extends TransportMasterNodeAction<DeleteIndexTemplateRequest, AcknowledgedResponse> {
public class TransportDeleteIndexTemplateAction
extends TransportMasterNodeAction<DeleteIndexTemplateRequest, AcknowledgedResponse> {
Copy link
Member

Choose a reason for hiding this comment

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

And this one too!

...ava/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequestBuilder.java Outdated
@@ -21,7 +21,8 @@
import org.elasticsearch.action.support.master.MasterNodeReadOperationRequestBuilder;
import org.elasticsearch.client.ElasticsearchClient;

public class GetIndexTemplatesRequestBuilder extends MasterNodeReadOperationRequestBuilder<GetIndexTemplatesRequest, GetIndexTemplatesResponse, GetIndexTemplatesRequestBuilder> {
public class GetIndexTemplatesRequestBuilder
extends MasterNodeReadOperationRequestBuilder<GetIndexTemplatesRequest, GetIndexTemplatesResponse, GetIndexTemplatesRequestBuilder> {
Copy link
Member

Choose a reason for hiding this comment

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

And this one!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I broke this one out onto separate lines because an extra tab makes it go over 140.

...ain/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequestBuilder.java Outdated
@@ -22,7 +22,8 @@
import org.elasticsearch.action.support.broadcast.BroadcastOperationRequestBuilder;
import org.elasticsearch.client.ElasticsearchClient;

public class UpgradeStatusRequestBuilder extends BroadcastOperationRequestBuilder<UpgradeStatusRequest, UpgradeStatusResponse, UpgradeStatusRequestBuilder> {
public class UpgradeStatusRequestBuilder
extends BroadcastOperationRequestBuilder<UpgradeStatusRequest, UpgradeStatusResponse, UpgradeStatusRequestBuilder> {
Copy link
Member

Choose a reason for hiding this comment

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

And this one!

.../java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequestBuilder.java Outdated
@@ -30,7 +30,8 @@
/**
* Builder for an update index settings request
*/
public class UpgradeSettingsRequestBuilder extends AcknowledgedRequestBuilder<UpgradeSettingsRequest, AcknowledgedResponse, UpgradeSettingsRequestBuilder> {
public class UpgradeSettingsRequestBuilder
extends AcknowledgedRequestBuilder<UpgradeSettingsRequest, AcknowledgedResponse, UpgradeSettingsRequestBuilder> {
Copy link
Member

Choose a reason for hiding this comment

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

And this one!

...java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java Outdated
@@ -59,7 +59,8 @@
import java.util.concurrent.atomic.AtomicReferenceArray;
import java.util.function.LongSupplier;

public class TransportValidateQueryAction extends TransportBroadcastAction<ValidateQueryRequest, ValidateQueryResponse, ShardValidateQueryRequest, ShardValidateQueryResponse> {
public class TransportValidateQueryAction
extends TransportBroadcastAction<ValidateQueryRequest, ValidateQueryResponse, ShardValidateQueryRequest, ShardValidateQueryResponse> {
Copy link
Member

Choose a reason for hiding this comment

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

And this one!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I broke this one out onto separate lines because an extra tab makes it go over 140.

dakrone
dakrone approved these changes Oct 25, 2018
View reviewed changes
Copy link
Member

@dakrone dakrone left a comment

Choose a reason for hiding this comment

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

LGTM assuming CI is happy :)

@gwbrown gwbrown merged commit 5c2c1f4 into elastic:master Oct 26, 2018
@gwbrown
Copy link
Contributor Author

gwbrown commented Oct 26, 2018

I messed up the commit message on the backport and left out the PR number so it didn't get linked here, the backport of this is e30bee7

jasontedor added a commit to jasontedor/elasticsearch that referenced this pull request Oct 26, 2018
@jasontedor
Merge branch 'master' of github.com:elastic/elasticsearch into ccr-docs
738c0fe 
* 'master' of github.com:elastic/elasticsearch:
  Fix line length for org.elasticsearch.common.* files (elastic#34888)
  [ML] Extract common native process base class (elastic#34856)
  Refactor children aggregator into a generic ParentJoinAggregator (elastic#34845)
  [Style] Fix line lengths in action.admin.indices (elastic#34890)
  HLRC - add support for source exists API (elastic#34519)
  [CCR] Retry when no index shard stats can be found (elastic#34852)
  [Docs] audit logfile structured format (elastic#34584)
  [Test] Fix FullClusterRestartIT.testShrink() with copy_settings param (elastic#34853)
  Fix LineLength Check Suppressions: index.fielddata (elastic#34891)
  TEST: Stablize Minio Free Port Search (elastic#34894)
  Delete flaky SettingsBasedHostProviderIT test (elastic#34813)
  [ML] Include message in field_stats for text log files (elastic#34861)
  [TEST] HLRC: Expand failure messages in API checks (elastic#34838)
  Lowercase static final DeprecationLogger instance names (elastic#34887)
jasontedor added a commit to martijnvg/elasticsearch that referenced this pull request Oct 26, 2018
@jasontedor
Merge branch 'master' into pr/34912
3463180 
* master:
  Introduce cross-cluster replication API docs (elastic#34726)
  Responses can use Writeable.Reader interface (elastic#34655)
  SQL: Provide null-safe scripts for Not and Neg (elastic#34877)
  Fix put/resume follow request parsing (elastic#34913)
  Fix line length for org.elasticsearch.common.* files (elastic#34888)
  [ML] Extract common native process base class (elastic#34856)
  Refactor children aggregator into a generic ParentJoinAggregator (elastic#34845)
  [Style] Fix line lengths in action.admin.indices (elastic#34890)
  HLRC - add support for source exists API (elastic#34519)
kcm pushed a commit that referenced this pull request Oct 30, 2018
@gwbrown @kcm
[Style] Fix line lengths in action.admin.indices (#34890)
7716310 
Clean up lines over 140 characters in the the
`org.elasticsearch.action.admin.indices` packages
@gwbrown gwbrown deleted the style/action-admin-indices branch December 7, 2018 04:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nik9000 nik9000 nik9000 approved these changes

@dakrone dakrone dakrone approved these changes

Assignees
No one assigned
Labels
:Core/Infra/Core Core issues without another label >non-issue >refactoring v6.6.0 v7.0.0-beta1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@gwbrown @elasticmachine @dakrone @nik9000 @colings86