From d6f56030d883fd10b9a31cb1331e05bde86d1b38 Mon Sep 17 00:00:00 2001 From: Robert Muir Date: Sat, 12 Sep 2015 02:11:06 -0400 Subject: [PATCH] ban setAccessible from core code. In addition to being a big security problem, setAccessible is a risk for java 9 migration. We need to clean up our code so we can ban it and eventually enforce this with security manager for third-party code, too, or we may have problems. Instead of using setAccessible, use the correct modifier (e.g. public). TODO: ban in tests TODO: ban in security manager at runtime --- .../elasticsearch/action/ActionRequest.java | 2 +- .../cluster/health/ClusterHealthRequest.java | 2 +- .../health/TransportClusterHealthAction.java | 4 +- .../hotthreads/NodesHotThreadsRequest.java | 2 +- .../TransportNodesHotThreadsAction.java | 4 +- .../node/info/TransportNodesInfoAction.java | 4 +- .../cluster/node/stats/NodesStatsRequest.java | 2 +- .../node/stats/TransportNodesStatsAction.java | 4 +- .../delete/DeleteRepositoryRequest.java | 2 +- .../get/GetRepositoriesRequest.java | 2 +- .../put/PutRepositoryRequest.java | 2 +- .../verify/VerifyRepositoryRequest.java | 2 +- .../create/CreateSnapshotRequest.java | 2 +- .../snapshots/get/GetSnapshotsRequest.java | 2 +- .../restore/RestoreSnapshotRequest.java | 2 +- .../status/TransportNodesSnapshotsStatus.java | 6 +- .../cluster/stats/ClusterStatsRequest.java | 2 +- .../stats/TransportClusterStatsAction.java | 4 +- .../cache/clear/ClearIndicesCacheRequest.java | 2 +- .../indices/close/CloseIndexRequest.java | 2 +- .../indices/create/CreateIndexRequest.java | 2 +- .../indices/delete/DeleteIndexRequest.java | 2 +- .../exists/indices/IndicesExistsRequest.java | 2 +- .../exists/types/TypesExistsRequest.java | 2 +- .../admin/indices/flush/FlushRequest.java | 2 +- .../get/GetFieldMappingsIndexRequest.java | 4 +- .../mapping/put/PutMappingRequest.java | 2 +- .../admin/indices/open/OpenIndexRequest.java | 2 +- .../admin/indices/refresh/RefreshRequest.java | 2 +- .../settings/put/UpdateSettingsRequest.java | 2 +- .../shards/IndicesShardStoresRequest.java | 2 +- .../template/put/PutIndexTemplateRequest.java | 2 +- .../upgrade/post/ShardUpgradeRequest.java | 4 +- .../upgrade/post/UpgradeSettingsRequest.java | 2 +- .../query/ShardValidateQueryRequest.java | 4 +- .../validate/query/ValidateQueryRequest.java | 2 +- .../TransportRenderSearchTemplateAction.java | 2 +- .../warmer/delete/DeleteWarmerRequest.java | 2 +- .../indices/warmer/put/PutWarmerRequest.java | 2 +- .../action/bulk/BulkShardRequest.java | 2 +- .../action/exists/ExistsRequest.java | 2 +- .../action/exists/ShardExistsRequest.java | 4 +- .../action/explain/ExplainRequest.java | 2 +- .../elasticsearch/action/get/GetRequest.java | 2 +- .../action/get/MultiGetShardRequest.java | 2 +- .../percolate/PercolateShardRequest.java | 2 +- .../TransportShardMultiPercolateAction.java | 2 +- .../action/suggest/ShardSuggestRequest.java | 4 +- .../action/suggest/SuggestRequest.java | 2 +- .../broadcast/BroadcastShardRequest.java | 2 +- .../node/TransportBroadcastByNodeAction.java | 4 +- .../action/support/nodes/BaseNodeRequest.java | 2 +- .../single/shard/SingleShardRequest.java | 2 +- .../MultiTermVectorsShardRequest.java | 2 +- .../termvectors/dfs/DfsOnlyRequest.java | 2 +- .../termvectors/dfs/ShardDfsOnlyRequest.java | 4 +- .../action/index/NodeIndexDeletedAction.java | 8 +- .../index/NodeMappingRefreshAction.java | 2 +- .../action/shard/ShardStateAction.java | 4 +- .../DefaultConstructionProxyFactory.java | 8 +- .../common/inject/SingleFieldInjector.java | 3 - .../common/inject/SingleMethodInjector.java | 4 - .../assistedinject/AssistedConstructor.java | 1 - .../assistedinject/FactoryProvider2.java | 4 +- .../inject/internal/ProviderMethod.java | 2 - .../inject/multibindings/MapBinder.java | 73 +++++++++++-------- .../inject/multibindings/Multibinder.java | 4 +- .../discovery/zen/ZenDiscovery.java | 4 +- .../zen/fd/MasterFaultDetection.java | 4 +- .../discovery/zen/fd/NodesFaultDetection.java | 2 +- .../zen/membership/MembershipAction.java | 12 +-- .../zen/ping/unicast/UnicastZenPing.java | 4 +- .../gateway/LocalAllocateDangledIndices.java | 4 +- .../TransportNodesListGatewayMetaState.java | 6 +- ...ransportNodesListGatewayStartedShards.java | 8 +- .../indices/flush/SyncedFlushService.java | 8 +- .../recovery/RecoveryCleanFilesRequest.java | 4 +- .../recovery/RecoveryFileChunkRequest.java | 4 +- .../recovery/RecoveryFilesInfoRequest.java | 4 +- .../RecoveryFinalizeRecoveryRequest.java | 4 +- ...ryPrepareForTranslogOperationsRequest.java | 4 +- .../RecoveryTranslogOperationsRequest.java | 4 +- .../recovery/StartRecoveryRequest.java | 2 +- .../indices/store/IndicesStore.java | 4 +- .../TransportNodesListShardStoreMetaData.java | 6 +- .../VerifyNodeRepositoryAction.java | 4 +- .../uri/URLIndexShardRepository.java | 2 +- .../rest/action/cat/RestCountAction.java | 2 +- .../rest/action/cat/RestRecoveryAction.java | 2 +- .../action/SearchServiceTransportAction.java | 12 +-- .../snapshots/RestoreService.java | 4 +- .../snapshots/SnapshotShardsService.java | 2 +- .../transport/RequestHandlerRegistry.java | 7 +- .../transport/TransportRequest.java | 2 +- .../TransportActionFilterChainTests.java | 2 +- .../replication/ShardReplicationTests.java | 4 +- .../TransportClientNodesServiceTests.java | 2 +- .../script/NativeScriptTests.java | 2 +- .../elasticsearch/script/ScriptFieldIT.java | 8 +- .../functionscore/ExplainableScriptIT.java | 2 +- .../AbstractSimpleTransportTestCase.java | 10 +-- .../resources/forbidden/core-signatures.txt | 4 + .../AzureComputeSettingsFilter.java | 2 +- .../storage/AzureStorageSettingsFilter.java | 2 +- .../azure/AzureComputeServiceSimpleMock.java | 2 +- .../storage/AzureStorageServiceMock.java | 2 +- .../TransportDeleteByQueryAction.java | 2 +- .../discovery/multicast/MulticastZenPing.java | 4 +- 108 files changed, 216 insertions(+), 210 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/action/ActionRequest.java b/core/src/main/java/org/elasticsearch/action/ActionRequest.java index 3cae6449117..24cf68025ba 100644 --- a/core/src/main/java/org/elasticsearch/action/ActionRequest.java +++ b/core/src/main/java/org/elasticsearch/action/ActionRequest.java @@ -30,7 +30,7 @@ import java.io.IOException; */ public abstract class ActionRequest extends TransportRequest { - protected ActionRequest() { + public ActionRequest() { super(); } diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java index debbf6af8e7..32114f6ff9e 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java +++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java @@ -47,7 +47,7 @@ public class ClusterHealthRequest extends MasterNodeReadRequest= request.waitForActiveShards()) { waitForCounter++; } - if (request.indices().length > 0) { + if (request.indices() != null && request.indices().length > 0) { try { indexNameExpressionResolver.concreteIndices(clusterState, IndicesOptions.strictExpand(), request.indices()); waitForCounter++; diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java index f57903f1196..7c8f797fdcb 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java +++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java @@ -38,7 +38,7 @@ public class NodesHotThreadsRequest extends BaseNodesRequest { private boolean breaker; private boolean script; - protected NodesStatsRequest() { + public NodesStatsRequest() { } /** diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java index b3d1bd43739..450834dc5ef 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java +++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java @@ -88,11 +88,11 @@ public class TransportNodesStatsAction extends TransportNodesAction private String[] snapshots = Strings.EMPTY_ARRAY; - GetSnapshotsRequest() { + public GetSnapshotsRequest() { } /** diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java index 00e84fa5967..7b349e47dec 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java +++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java @@ -64,7 +64,7 @@ public class RestoreSnapshotRequest extends MasterNodeRequest { + public static class Request extends BaseNodesRequest { private SnapshotId[] snapshotIds; @@ -203,11 +203,11 @@ public class TransportNodesSnapshotsStatus extends TransportNodesAction { - ClusterStatsRequest() { + public ClusterStatsRequest() { } /** diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java index 5ed40c5db0d..daddae47e0a 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java +++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java @@ -145,11 +145,11 @@ public class TransportClusterStatsAction extends TransportNodesAction im private String[] indices; private IndicesOptions indicesOptions = IndicesOptions.fromOptions(false, false, true, false); - CloseIndexRequest() { + public CloseIndexRequest() { } /** diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java index 48342f90295..62b8722b531 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java @@ -78,7 +78,7 @@ public class CreateIndexRequest extends AcknowledgedRequest private boolean updateAllTypes = false; - CreateIndexRequest() { + public CreateIndexRequest() { } /** diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequest.java index 2ac92bd7892..7c957eaebfc 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequest.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequest.java @@ -44,7 +44,7 @@ public class DeleteIndexRequest extends MasterNodeRequest im private IndicesOptions indicesOptions = IndicesOptions.fromOptions(false, true, true, true); private TimeValue timeout = AcknowledgedRequest.DEFAULT_ACK_TIMEOUT; - DeleteIndexRequest() { + public DeleteIndexRequest() { } /** diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequest.java index e822f45e7f6..bc0112f1505 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequest.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequest.java @@ -37,7 +37,7 @@ public class IndicesExistsRequest extends MasterNodeReadRequest { private boolean force = false; private boolean waitIfOngoing = false; - FlushRequest() { + public FlushRequest() { } /** diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsIndexRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsIndexRequest.java index fefcce66ffa..59844430b36 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsIndexRequest.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsIndexRequest.java @@ -29,7 +29,7 @@ import org.elasticsearch.common.io.stream.StreamOutput; import java.io.IOException; -class GetFieldMappingsIndexRequest extends SingleShardRequest { +public class GetFieldMappingsIndexRequest extends SingleShardRequest { private boolean probablySingleFieldRequest; private boolean includeDefaults; @@ -38,7 +38,7 @@ class GetFieldMappingsIndexRequest extends SingleShardRequest im private boolean updateAllTypes = false; - PutMappingRequest() { + public PutMappingRequest() { } /** diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequest.java index 94a66d80462..3f3b5f5c31c 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequest.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequest.java @@ -39,7 +39,7 @@ public class OpenIndexRequest extends AcknowledgedRequest impl private String[] indices; private IndicesOptions indicesOptions = IndicesOptions.fromOptions(false, false, false, true); - OpenIndexRequest() { + public OpenIndexRequest() { } /** diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java index b0cb49c8874..ab9186c987f 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java @@ -33,7 +33,7 @@ import org.elasticsearch.action.support.broadcast.BroadcastRequest; */ public class RefreshRequest extends BroadcastRequest { - RefreshRequest() { + public RefreshRequest() { } /** diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequest.java index 501da327d5b..c654d6926fa 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequest.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequest.java @@ -48,7 +48,7 @@ public class UpdateSettingsRequest extends AcknowledgedRequest customs = new HashMap<>(); - PutIndexTemplateRequest() { + public PutIndexTemplateRequest() { } /** diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeRequest.java index 9731a983c38..550a5b15f66 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeRequest.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeRequest.java @@ -30,11 +30,11 @@ import java.io.IOException; /** * */ -final class ShardUpgradeRequest extends BroadcastShardRequest { +public final class ShardUpgradeRequest extends BroadcastShardRequest { private UpgradeRequest request = new UpgradeRequest(); - ShardUpgradeRequest() { + public ShardUpgradeRequest() { } ShardUpgradeRequest(ShardId shardId, UpgradeRequest request) { diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequest.java index f1e32f64be7..278367cc3b2 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequest.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequest.java @@ -39,7 +39,7 @@ public class UpgradeSettingsRequest extends AcknowledgedRequest> versions; - UpgradeSettingsRequest() { + public UpgradeSettingsRequest() { } /** diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryRequest.java index 648ab21afd6..808d1a5da2f 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryRequest.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryRequest.java @@ -32,7 +32,7 @@ import java.io.IOException; /** * Internal validate request executed directly against a specific index shard. */ -class ShardValidateQueryRequest extends BroadcastShardRequest { +public class ShardValidateQueryRequest extends BroadcastShardRequest { private BytesReference source; private String[] types = Strings.EMPTY_ARRAY; @@ -43,7 +43,7 @@ class ShardValidateQueryRequest extends BroadcastShardRequest { @Nullable private String[] filteringAliases; - ShardValidateQueryRequest() { + public ShardValidateQueryRequest() { } diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequest.java index 3499852c515..20fb5414f4a 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequest.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequest.java @@ -55,7 +55,7 @@ public class ValidateQueryRequest extends BroadcastRequest long nowInMillis; - ValidateQueryRequest() { + public ValidateQueryRequest() { this(Strings.EMPTY_ARRAY); } diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/validate/template/TransportRenderSearchTemplateAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/validate/template/TransportRenderSearchTemplateAction.java index ab3090a5a81..55b1d5e93ee 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/validate/template/TransportRenderSearchTemplateAction.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/validate/template/TransportRenderSearchTemplateAction.java @@ -38,7 +38,7 @@ public class TransportRenderSearchTemplateAction extends HandledTransportAction< private final ScriptService scriptService; @Inject - protected TransportRenderSearchTemplateAction(ScriptService scriptService, Settings settings, ThreadPool threadPool, + public TransportRenderSearchTemplateAction(ScriptService scriptService, Settings settings, ThreadPool threadPool, TransportService transportService, ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver) { super(settings, RenderSearchTemplateAction.NAME, threadPool, transportService, actionFilters, indexNameExpressionResolver, RenderSearchTemplateRequest.class); this.scriptService = scriptService; diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/DeleteWarmerRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/DeleteWarmerRequest.java index 50747ddecff..61b033f5f26 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/DeleteWarmerRequest.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/DeleteWarmerRequest.java @@ -42,7 +42,7 @@ public class DeleteWarmerRequest extends AcknowledgedRequest impl private SearchRequest searchRequest; - PutWarmerRequest() { + public PutWarmerRequest() { } /** diff --git a/core/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java b/core/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java index 6bda7b259ee..ec150385678 100644 --- a/core/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java +++ b/core/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java @@ -37,7 +37,7 @@ public class BulkShardRequest extends ReplicationRequest { private boolean refresh; - BulkShardRequest() { + public BulkShardRequest() { } BulkShardRequest(BulkRequest bulkRequest, String index, int shardId, boolean refresh, BulkItemRequest[] items) { diff --git a/core/src/main/java/org/elasticsearch/action/exists/ExistsRequest.java b/core/src/main/java/org/elasticsearch/action/exists/ExistsRequest.java index 32ff0b1e014..0000676b3ca 100644 --- a/core/src/main/java/org/elasticsearch/action/exists/ExistsRequest.java +++ b/core/src/main/java/org/elasticsearch/action/exists/ExistsRequest.java @@ -55,7 +55,7 @@ public class ExistsRequest extends BroadcastRequest { long nowInMillis; - ExistsRequest() { + public ExistsRequest() { } /** diff --git a/core/src/main/java/org/elasticsearch/action/exists/ShardExistsRequest.java b/core/src/main/java/org/elasticsearch/action/exists/ShardExistsRequest.java index 276e6ea117e..d57b1d99010 100644 --- a/core/src/main/java/org/elasticsearch/action/exists/ShardExistsRequest.java +++ b/core/src/main/java/org/elasticsearch/action/exists/ShardExistsRequest.java @@ -29,7 +29,7 @@ import org.elasticsearch.index.shard.ShardId; import java.io.IOException; -class ShardExistsRequest extends BroadcastShardRequest { +public class ShardExistsRequest extends BroadcastShardRequest { private float minScore; @@ -42,7 +42,7 @@ class ShardExistsRequest extends BroadcastShardRequest { @Nullable private String[] filteringAliases; - ShardExistsRequest() { + public ShardExistsRequest() { } ShardExistsRequest(ShardId shardId, @Nullable String[] filteringAliases, ExistsRequest request) { diff --git a/core/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java b/core/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java index e7d703ed33d..2b796b08f9c 100644 --- a/core/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java +++ b/core/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java @@ -49,7 +49,7 @@ public class ExplainRequest extends SingleShardRequest { long nowInMillis; - ExplainRequest() { + public ExplainRequest() { } public ExplainRequest(String index, String type, String id) { diff --git a/core/src/main/java/org/elasticsearch/action/get/GetRequest.java b/core/src/main/java/org/elasticsearch/action/get/GetRequest.java index 108abc9ae7c..84032826202 100644 --- a/core/src/main/java/org/elasticsearch/action/get/GetRequest.java +++ b/core/src/main/java/org/elasticsearch/action/get/GetRequest.java @@ -63,7 +63,7 @@ public class GetRequest extends SingleShardRequest implements Realti private long version = Versions.MATCH_ANY; private boolean ignoreErrorsOnGeneratedFields; - GetRequest() { + public GetRequest() { type = "_all"; } diff --git a/core/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java b/core/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java index a45c1c1280a..6715319bc32 100644 --- a/core/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java +++ b/core/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java @@ -40,7 +40,7 @@ public class MultiGetShardRequest extends SingleShardRequest items; - MultiGetShardRequest() { + public MultiGetShardRequest() { } diff --git a/core/src/main/java/org/elasticsearch/action/percolate/PercolateShardRequest.java b/core/src/main/java/org/elasticsearch/action/percolate/PercolateShardRequest.java index b03c667c939..cdd967a6412 100644 --- a/core/src/main/java/org/elasticsearch/action/percolate/PercolateShardRequest.java +++ b/core/src/main/java/org/elasticsearch/action/percolate/PercolateShardRequest.java @@ -39,7 +39,7 @@ public class PercolateShardRequest extends BroadcastShardRequest { private int numberOfShards; private long startTime; - PercolateShardRequest() { + public PercolateShardRequest() { } PercolateShardRequest(ShardId shardId, int numberOfShards, PercolateRequest request) { diff --git a/core/src/main/java/org/elasticsearch/action/percolate/TransportShardMultiPercolateAction.java b/core/src/main/java/org/elasticsearch/action/percolate/TransportShardMultiPercolateAction.java index 915588928a7..9803229b276 100644 --- a/core/src/main/java/org/elasticsearch/action/percolate/TransportShardMultiPercolateAction.java +++ b/core/src/main/java/org/elasticsearch/action/percolate/TransportShardMultiPercolateAction.java @@ -118,7 +118,7 @@ public class TransportShardMultiPercolateAction extends TransportSingleShardActi private String preference; private List items; - Request() { + public Request() { } Request(MultiPercolateRequest multiPercolateRequest, String concreteIndex, int shardId, String preference) { diff --git a/core/src/main/java/org/elasticsearch/action/suggest/ShardSuggestRequest.java b/core/src/main/java/org/elasticsearch/action/suggest/ShardSuggestRequest.java index 794dd9badf7..80facf74878 100644 --- a/core/src/main/java/org/elasticsearch/action/suggest/ShardSuggestRequest.java +++ b/core/src/main/java/org/elasticsearch/action/suggest/ShardSuggestRequest.java @@ -30,11 +30,11 @@ import java.io.IOException; /** * Internal suggest request executed directly against a specific index shard. */ -final class ShardSuggestRequest extends BroadcastShardRequest { +public final class ShardSuggestRequest extends BroadcastShardRequest { private BytesReference suggestSource; - ShardSuggestRequest() { + public ShardSuggestRequest() { } ShardSuggestRequest(ShardId shardId, SuggestRequest request) { diff --git a/core/src/main/java/org/elasticsearch/action/suggest/SuggestRequest.java b/core/src/main/java/org/elasticsearch/action/suggest/SuggestRequest.java index c75e262bac4..764975eb7b7 100644 --- a/core/src/main/java/org/elasticsearch/action/suggest/SuggestRequest.java +++ b/core/src/main/java/org/elasticsearch/action/suggest/SuggestRequest.java @@ -58,7 +58,7 @@ public final class SuggestRequest extends BroadcastRequest { private BytesReference suggestSource; - SuggestRequest() { + public SuggestRequest() { } /** diff --git a/core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardRequest.java b/core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardRequest.java index e416cd517e1..8e22a90b9d7 100644 --- a/core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardRequest.java +++ b/core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardRequest.java @@ -38,7 +38,7 @@ public abstract class BroadcastShardRequest extends TransportRequest implements protected OriginalIndices originalIndices; - protected BroadcastShardRequest() { + public BroadcastShardRequest() { } protected BroadcastShardRequest(ShardId shardId, BroadcastRequest request) { diff --git a/core/src/main/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeAction.java b/core/src/main/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeAction.java index b7625b029eb..09ac73b9236 100644 --- a/core/src/main/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeAction.java +++ b/core/src/main/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeAction.java @@ -405,14 +405,14 @@ public abstract class TransportBroadcastByNodeAction shards; protected Request indicesLevelRequest; - protected NodeRequest() { + public NodeRequest() { } public NodeRequest(String nodeId, Request request, List shards) { diff --git a/core/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeRequest.java b/core/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeRequest.java index e25577e2f70..35b303c7e5c 100644 --- a/core/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeRequest.java +++ b/core/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeRequest.java @@ -32,7 +32,7 @@ public abstract class BaseNodeRequest extends TransportRequest { private String nodeId; - protected BaseNodeRequest() { + public BaseNodeRequest() { } diff --git a/core/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardRequest.java b/core/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardRequest.java index edc54735f80..5d3484fdf98 100644 --- a/core/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardRequest.java +++ b/core/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardRequest.java @@ -49,7 +49,7 @@ public abstract class SingleShardRequest extends A ShardId internalShardId; private boolean threadedOperation = true; - protected SingleShardRequest() { + public SingleShardRequest() { } protected SingleShardRequest(String index) { diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardRequest.java b/core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardRequest.java index ee02e69b557..5f541b02c71 100644 --- a/core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardRequest.java +++ b/core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardRequest.java @@ -37,7 +37,7 @@ public class MultiTermVectorsShardRequest extends SingleShardRequest requests; - MultiTermVectorsShardRequest() { + public MultiTermVectorsShardRequest() { } diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/dfs/DfsOnlyRequest.java b/core/src/main/java/org/elasticsearch/action/termvectors/dfs/DfsOnlyRequest.java index 0171a90ec95..86d575d486f 100644 --- a/core/src/main/java/org/elasticsearch/action/termvectors/dfs/DfsOnlyRequest.java +++ b/core/src/main/java/org/elasticsearch/action/termvectors/dfs/DfsOnlyRequest.java @@ -44,7 +44,7 @@ public class DfsOnlyRequest extends BroadcastRequest { long nowInMillis; - DfsOnlyRequest() { + public DfsOnlyRequest() { } diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/dfs/ShardDfsOnlyRequest.java b/core/src/main/java/org/elasticsearch/action/termvectors/dfs/ShardDfsOnlyRequest.java index 687910c5922..95a9a821ad0 100644 --- a/core/src/main/java/org/elasticsearch/action/termvectors/dfs/ShardDfsOnlyRequest.java +++ b/core/src/main/java/org/elasticsearch/action/termvectors/dfs/ShardDfsOnlyRequest.java @@ -29,11 +29,11 @@ import org.elasticsearch.search.internal.ShardSearchTransportRequest; import java.io.IOException; -class ShardDfsOnlyRequest extends BroadcastShardRequest { +public class ShardDfsOnlyRequest extends BroadcastShardRequest { private ShardSearchTransportRequest shardSearchRequest = new ShardSearchTransportRequest(); - ShardDfsOnlyRequest() { + public ShardDfsOnlyRequest() { } diff --git a/core/src/main/java/org/elasticsearch/cluster/action/index/NodeIndexDeletedAction.java b/core/src/main/java/org/elasticsearch/cluster/action/index/NodeIndexDeletedAction.java index 769551d8732..3373263cc10 100644 --- a/core/src/main/java/org/elasticsearch/cluster/action/index/NodeIndexDeletedAction.java +++ b/core/src/main/java/org/elasticsearch/cluster/action/index/NodeIndexDeletedAction.java @@ -133,12 +133,12 @@ public class NodeIndexDeletedAction extends AbstractComponent { } } - static class NodeIndexDeletedMessage extends TransportRequest { + public static class NodeIndexDeletedMessage extends TransportRequest { String index; String nodeId; - NodeIndexDeletedMessage() { + public NodeIndexDeletedMessage() { } NodeIndexDeletedMessage(String index, String nodeId) { @@ -161,12 +161,12 @@ public class NodeIndexDeletedAction extends AbstractComponent { } } - static class NodeIndexStoreDeletedMessage extends TransportRequest { + public static class NodeIndexStoreDeletedMessage extends TransportRequest { String index; String nodeId; - NodeIndexStoreDeletedMessage() { + public NodeIndexStoreDeletedMessage() { } NodeIndexStoreDeletedMessage(String index, String nodeId) { diff --git a/core/src/main/java/org/elasticsearch/cluster/action/index/NodeMappingRefreshAction.java b/core/src/main/java/org/elasticsearch/cluster/action/index/NodeMappingRefreshAction.java index c6cb7b508b0..13229159837 100644 --- a/core/src/main/java/org/elasticsearch/cluster/action/index/NodeMappingRefreshAction.java +++ b/core/src/main/java/org/elasticsearch/cluster/action/index/NodeMappingRefreshAction.java @@ -79,7 +79,7 @@ public class NodeMappingRefreshAction extends AbstractComponent { private String[] types; private String nodeId; - NodeMappingRefreshRequest() { + public NodeMappingRefreshRequest() { } public NodeMappingRefreshRequest(String index, String indexUUID, String[] types, String nodeId) { diff --git a/core/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java b/core/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java index 41ddb49bb65..7036158cdc2 100644 --- a/core/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java +++ b/core/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java @@ -244,7 +244,7 @@ public class ShardStateAction extends AbstractComponent { } } - static class ShardRoutingEntry extends TransportRequest { + public static class ShardRoutingEntry extends TransportRequest { ShardRouting shardRouting; String indexUUID = IndexMetaData.INDEX_UUID_NA_VALUE; @@ -253,7 +253,7 @@ public class ShardStateAction extends AbstractComponent { volatile boolean processed; // state field, no need to serialize - ShardRoutingEntry() { + public ShardRoutingEntry() { } ShardRoutingEntry(ShardRouting shardRouting, String indexUUID, String message, @Nullable Throwable failure) { diff --git a/core/src/main/java/org/elasticsearch/common/inject/DefaultConstructionProxyFactory.java b/core/src/main/java/org/elasticsearch/common/inject/DefaultConstructionProxyFactory.java index 52ad8fb1a8f..437ad035450 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/DefaultConstructionProxyFactory.java +++ b/core/src/main/java/org/elasticsearch/common/inject/DefaultConstructionProxyFactory.java @@ -43,12 +43,6 @@ class DefaultConstructionProxyFactory implements ConstructionProxyFactory @SuppressWarnings("unchecked") // the injection point is for a constructor of T final Constructor constructor = (Constructor) injectionPoint.getMember(); - // Use FastConstructor if the constructor is public. - if (Modifier.isPublic(constructor.getModifiers())) { - } else { - constructor.setAccessible(true); - } - return new ConstructionProxy() { @Override public T newInstance(Object... arguments) throws InvocationTargetException { @@ -57,7 +51,7 @@ class DefaultConstructionProxyFactory implements ConstructionProxyFactory } catch (InstantiationException e) { throw new AssertionError(e); // shouldn't happen, we know this is a concrete type } catch (IllegalAccessException e) { - throw new AssertionError(e); // a security manager is blocking us, we're hosed + throw new AssertionError("Wrong access modifiers on " + constructor, e); // a security manager is blocking us, we're hosed } } diff --git a/core/src/main/java/org/elasticsearch/common/inject/SingleFieldInjector.java b/core/src/main/java/org/elasticsearch/common/inject/SingleFieldInjector.java index dd0e09efcf1..a1375de789f 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/SingleFieldInjector.java +++ b/core/src/main/java/org/elasticsearch/common/inject/SingleFieldInjector.java @@ -39,9 +39,6 @@ class SingleFieldInjector implements SingleMemberInjector { this.injectionPoint = injectionPoint; this.field = (Field) injectionPoint.getMember(); this.dependency = injectionPoint.getDependencies().get(0); - - // Ewwwww... - field.setAccessible(true); factory = injector.getInternalFactory(dependency.getKey(), errors); } diff --git a/core/src/main/java/org/elasticsearch/common/inject/SingleMethodInjector.java b/core/src/main/java/org/elasticsearch/common/inject/SingleMethodInjector.java index aa2f81d77d8..65f7b0692a8 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/SingleMethodInjector.java +++ b/core/src/main/java/org/elasticsearch/common/inject/SingleMethodInjector.java @@ -49,10 +49,6 @@ class SingleMethodInjector implements SingleMemberInjector { if (!Modifier.isPrivate(modifiers) && !Modifier.isProtected(modifiers)) { } - if (!Modifier.isPublic(modifiers)) { - method.setAccessible(true); - } - return new MethodInvoker() { @Override public Object invoke(Object target, Object... parameters) diff --git a/core/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedConstructor.java b/core/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedConstructor.java index 3973d9eb7e8..e3410bf97b3 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedConstructor.java +++ b/core/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedConstructor.java @@ -88,7 +88,6 @@ class AssistedConstructor { * supplied arguments. */ public T newInstance(Object[] args) throws Throwable { - constructor.setAccessible(true); try { return constructor.newInstance(args); } catch (InvocationTargetException e) { diff --git a/core/src/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider2.java b/core/src/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider2.java index 3eef8f2b29c..821d729cbaa 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider2.java +++ b/core/src/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider2.java @@ -53,7 +53,7 @@ import static org.elasticsearch.common.inject.internal.Annotations.getKey; * @author jessewilson@google.com (Jesse Wilson) * @author dtm@google.com (Daniel Martin) */ -final class FactoryProvider2 implements InvocationHandler, Provider { +public final class FactoryProvider2 implements InvocationHandler, Provider { /** * if a factory method parameter isn't annotated, it gets this annotation. @@ -173,7 +173,7 @@ final class FactoryProvider2 implements InvocationHandler, Provider { * all factory methods will be able to build the target types. */ @Inject - void initialize(Injector injector) { + public void initialize(Injector injector) { if (this.injector != null) { throw new ConfigurationException(Collections.singletonList(new Message(FactoryProvider2.class, "Factories.create() factories may only be used in one Injector!"))); diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethod.java b/core/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethod.java index 23dba6f25e0..84fbae4bec2 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethod.java +++ b/core/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethod.java @@ -54,8 +54,6 @@ public class ProviderMethod implements ProviderWithDependencies { this.method = method; this.parameterProviders = parameterProviders; this.exposed = method.getAnnotation(Exposed.class) != null; - - method.setAccessible(true); } public Key getKey() { diff --git a/core/src/main/java/org/elasticsearch/common/inject/multibindings/MapBinder.java b/core/src/main/java/org/elasticsearch/common/inject/multibindings/MapBinder.java index 5b1757a7863..01bd59f7d93 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/multibindings/MapBinder.java +++ b/core/src/main/java/org/elasticsearch/common/inject/multibindings/MapBinder.java @@ -17,6 +17,7 @@ package org.elasticsearch.common.inject.multibindings; import com.google.common.collect.ImmutableSet; + import org.elasticsearch.common.inject.*; import org.elasticsearch.common.inject.binder.LinkedBindingBuilder; import org.elasticsearch.common.inject.multibindings.Multibinder.RealMultibinder; @@ -227,7 +228,7 @@ public abstract class MapBinder { *

*

We use a subclass to hide 'implements Module' from the public API. */ - private static final class RealMapBinder extends MapBinder implements Module { + public static final class RealMapBinder extends MapBinder implements Module { private final TypeLiteral valueType; private final Key> mapKey; private final Key>> providerMapKey; @@ -260,8 +261,48 @@ public abstract class MapBinder { binder.getProvider(valueKey))); return binder.bind(valueKey); } + + public static class MapBinderProviderWithDependencies implements ProviderWithDependencies>> { + private Map> providerMap; + + @SuppressWarnings("rawtypes") // code is silly stupid with generics + private final RealMapBinder binder; + private final Set> dependencies; + private final Provider>>> provider; + + @SuppressWarnings("rawtypes") // code is silly stupid with generics + MapBinderProviderWithDependencies(RealMapBinder binder, Set> dependencies, Provider>>> provider) { + this.binder = binder; + this.dependencies = dependencies; + this.provider = provider; + } - @Override + @SuppressWarnings({"unchecked", "unused"}) // code is silly stupid with generics + @Inject + public void initialize() { + binder.binder = null; + + Map> providerMapMutable = new LinkedHashMap<>(); + for (Entry> entry : provider.get()) { + Multibinder.checkConfiguration(providerMapMutable.put(entry.getKey(), entry.getValue()) == null, + "Map injection failed due to duplicated key \"%s\"", entry.getKey()); + } + + providerMap = Collections.unmodifiableMap(providerMapMutable); + } + + @Override + public Map> get() { + return providerMap; + } + + @Override + public Set> getDependencies() { + return dependencies; + } + } + + @Override @SuppressWarnings({"rawtypes", "unchecked"}) // code is silly stupid with generics public void configure(Binder binder) { Multibinder.checkConfiguration(!isInitialized(), "MapBinder was already initialized"); @@ -271,33 +312,7 @@ public abstract class MapBinder { // binds a Map> from a collection of Map> final Provider>>> entrySetProvider = binder .getProvider(entrySetBinder.getSetKey()); - binder.bind(providerMapKey).toProvider(new ProviderWithDependencies>>() { - private Map> providerMap; - - @SuppressWarnings("unused") - @Inject - void initialize() { - RealMapBinder.this.binder = null; - - Map> providerMapMutable = new LinkedHashMap<>(); - for (Entry> entry : entrySetProvider.get()) { - Multibinder.checkConfiguration(providerMapMutable.put(entry.getKey(), entry.getValue()) == null, - "Map injection failed due to duplicated key \"%s\"", entry.getKey()); - } - - providerMap = Collections.unmodifiableMap(providerMapMutable); - } - - @Override - public Map> get() { - return providerMap; - } - - @Override - public Set> getDependencies() { - return dependencies; - } - }); + binder.bind(providerMapKey).toProvider(new MapBinderProviderWithDependencies(RealMapBinder.this, dependencies, entrySetProvider)); final Provider>> mapProvider = binder.getProvider(providerMapKey); binder.bind(mapKey).toProvider(new ProviderWithDependencies>() { diff --git a/core/src/main/java/org/elasticsearch/common/inject/multibindings/Multibinder.java b/core/src/main/java/org/elasticsearch/common/inject/multibindings/Multibinder.java index 50c87d7795a..87ee3c3c991 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/multibindings/Multibinder.java +++ b/core/src/main/java/org/elasticsearch/common/inject/multibindings/Multibinder.java @@ -193,7 +193,7 @@ public abstract class Multibinder { *

We use a subclass to hide 'implements Module, Provider' from the public * API. */ - static final class RealMultibinder extends Multibinder + public static final class RealMultibinder extends Multibinder implements Module, Provider>, HasDependencies { private final TypeLiteral elementType; @@ -236,7 +236,7 @@ public abstract class Multibinder { * contents are only evaluated when get() is invoked. */ @Inject - void initialize(Injector injector) { + public void initialize(Injector injector) { providers = new ArrayList<>(); List> dependencies = new ArrayList<>(); for (Binding entry : injector.findBindingsByType(elementType)) { diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java b/core/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java index 878e5bdb535..ca863b7010e 100644 --- a/core/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java +++ b/core/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java @@ -1131,7 +1131,7 @@ public class ZenDiscovery extends AbstractLifecycleComponent implemen return rejoinOnMasterGone; } - static class RejoinClusterRequest extends TransportRequest { + public static class RejoinClusterRequest extends TransportRequest { private String fromNodeId; @@ -1139,7 +1139,7 @@ public class ZenDiscovery extends AbstractLifecycleComponent implemen this.fromNodeId = fromNodeId; } - RejoinClusterRequest() { + public RejoinClusterRequest() { } @Override diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/fd/MasterFaultDetection.java b/core/src/main/java/org/elasticsearch/discovery/zen/fd/MasterFaultDetection.java index 9dfaef728b3..5ec3f9a899a 100644 --- a/core/src/main/java/org/elasticsearch/discovery/zen/fd/MasterFaultDetection.java +++ b/core/src/main/java/org/elasticsearch/discovery/zen/fd/MasterFaultDetection.java @@ -386,14 +386,14 @@ public class MasterFaultDetection extends FaultDetection { } - private static class MasterPingRequest extends TransportRequest { + public static class MasterPingRequest extends TransportRequest { private String nodeId; private String masterNodeId; private ClusterName clusterName; - private MasterPingRequest() { + public MasterPingRequest() { } private MasterPingRequest(String nodeId, String masterNodeId, ClusterName clusterName) { diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/fd/NodesFaultDetection.java b/core/src/main/java/org/elasticsearch/discovery/zen/fd/NodesFaultDetection.java index 41a524b2629..a79c00357c8 100644 --- a/core/src/main/java/org/elasticsearch/discovery/zen/fd/NodesFaultDetection.java +++ b/core/src/main/java/org/elasticsearch/discovery/zen/fd/NodesFaultDetection.java @@ -271,7 +271,7 @@ public class NodesFaultDetection extends FaultDetection { private long clusterStateVersion = ClusterState.UNKNOWN_VERSION; - PingRequest() { + public PingRequest() { } PingRequest(String nodeId, ClusterName clusterName, DiscoveryNode masterNode, long clusterStateVersion) { diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java b/core/src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java index dae17ef8b05..419ed94078c 100644 --- a/core/src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java +++ b/core/src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java @@ -105,11 +105,11 @@ public class MembershipAction extends AbstractComponent { .txGet(timeout.millis(), TimeUnit.MILLISECONDS); } - static class JoinRequest extends TransportRequest { + public static class JoinRequest extends TransportRequest { DiscoveryNode node; - private JoinRequest() { + public JoinRequest() { } private JoinRequest(DiscoveryNode node) { @@ -156,9 +156,9 @@ public class MembershipAction extends AbstractComponent { } } - static class ValidateJoinRequest extends TransportRequest { + public static class ValidateJoinRequest extends TransportRequest { - ValidateJoinRequest() { + public ValidateJoinRequest() { } } @@ -171,11 +171,11 @@ public class MembershipAction extends AbstractComponent { } } - static class LeaveRequest extends TransportRequest { + public static class LeaveRequest extends TransportRequest { private DiscoveryNode node; - private LeaveRequest() { + public LeaveRequest() { } private LeaveRequest(DiscoveryNode node) { diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java b/core/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java index 741f877a55c..7e24ebc85ec 100644 --- a/core/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java +++ b/core/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java @@ -523,13 +523,13 @@ public class UnicastZenPing extends AbstractLifecycleComponent implemen } } - static class UnicastPingRequest extends TransportRequest { + public static class UnicastPingRequest extends TransportRequest { int id; TimeValue timeout; PingResponse pingResponse; - UnicastPingRequest() { + public UnicastPingRequest() { } @Override diff --git a/core/src/main/java/org/elasticsearch/gateway/LocalAllocateDangledIndices.java b/core/src/main/java/org/elasticsearch/gateway/LocalAllocateDangledIndices.java index 36c3af0d60b..e783007c8ca 100644 --- a/core/src/main/java/org/elasticsearch/gateway/LocalAllocateDangledIndices.java +++ b/core/src/main/java/org/elasticsearch/gateway/LocalAllocateDangledIndices.java @@ -188,12 +188,12 @@ public class LocalAllocateDangledIndices extends AbstractComponent { } } - static class AllocateDangledRequest extends TransportRequest { + public static class AllocateDangledRequest extends TransportRequest { DiscoveryNode fromNode; IndexMetaData[] indices; - AllocateDangledRequest() { + public AllocateDangledRequest() { } AllocateDangledRequest(DiscoveryNode fromNode, IndexMetaData[] indices) { diff --git a/core/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayMetaState.java b/core/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayMetaState.java index accccc4616c..240c00a03cd 100644 --- a/core/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayMetaState.java +++ b/core/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayMetaState.java @@ -120,7 +120,7 @@ public class TransportNodesListGatewayMetaState extends TransportNodesAction { + public static class Request extends BaseNodesRequest { public Request() { } @@ -177,9 +177,9 @@ public class TransportNodesListGatewayMetaState extends TransportNodesAction { + public static class Request extends BaseNodesRequest { private ShardId shardId; private String indexUUID; @@ -233,12 +233,12 @@ public class TransportNodesListGatewayStartedShards extends TransportNodesAction } - static class NodeRequest extends BaseNodeRequest { + public static class NodeRequest extends BaseNodeRequest { private ShardId shardId; private String indexUUID; - NodeRequest() { + public NodeRequest() { } NodeRequest(String nodeId, TransportNodesListGatewayStartedShards.Request request) { @@ -275,7 +275,7 @@ public class TransportNodesListGatewayStartedShards extends TransportNodesAction private long version = -1; private Throwable storeException = null; - NodeGatewayStartedShards() { + public NodeGatewayStartedShards() { } public NodeGatewayStartedShards(DiscoveryNode node, long version) { this(node, version, null); diff --git a/core/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java b/core/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java index 5cd034a1538..b27945c60e9 100644 --- a/core/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java +++ b/core/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java @@ -435,10 +435,10 @@ public class SyncedFlushService extends AbstractComponent { return new InFlightOpsResponse(opCount); } - final static class PreSyncedFlushRequest extends TransportRequest { + public final static class PreSyncedFlushRequest extends TransportRequest { private ShardId shardId; - PreSyncedFlushRequest() { + public PreSyncedFlushRequest() { } public PreSyncedFlushRequest(ShardId shardId) { @@ -500,7 +500,7 @@ public class SyncedFlushService extends AbstractComponent { } } - static final class SyncedFlushRequest extends TransportRequest { + public static final class SyncedFlushRequest extends TransportRequest { private String syncId; private Engine.CommitId expectedCommitId; @@ -600,7 +600,7 @@ public class SyncedFlushService extends AbstractComponent { } - static final class InFlightOpsRequest extends TransportRequest { + public static final class InFlightOpsRequest extends TransportRequest { private ShardId shardId; diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryCleanFilesRequest.java b/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryCleanFilesRequest.java index b0d224c41ef..c040c25736a 100644 --- a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryCleanFilesRequest.java +++ b/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryCleanFilesRequest.java @@ -30,7 +30,7 @@ import java.io.IOException; /** * */ -class RecoveryCleanFilesRequest extends TransportRequest { +public class RecoveryCleanFilesRequest extends TransportRequest { private long recoveryId; private ShardId shardId; @@ -38,7 +38,7 @@ class RecoveryCleanFilesRequest extends TransportRequest { private Store.MetadataSnapshot snapshotFiles; private int totalTranslogOps = RecoveryState.Translog.UNKNOWN; - RecoveryCleanFilesRequest() { + public RecoveryCleanFilesRequest() { } RecoveryCleanFilesRequest(long recoveryId, ShardId shardId, Store.MetadataSnapshot snapshotFiles, int totalTranslogOps) { diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFileChunkRequest.java b/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFileChunkRequest.java index e0c0701aaac..8fd08d9f8fb 100644 --- a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFileChunkRequest.java +++ b/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFileChunkRequest.java @@ -34,7 +34,7 @@ import java.io.IOException; /** * */ -public final class RecoveryFileChunkRequest extends TransportRequest { // public for testing +public final class RecoveryFileChunkRequest extends TransportRequest { private boolean lastChunk; private long recoveryId; private ShardId shardId; @@ -45,7 +45,7 @@ public final class RecoveryFileChunkRequest extends TransportRequest { // publi private int totalTranslogOps; - RecoveryFileChunkRequest() { + public RecoveryFileChunkRequest() { } public RecoveryFileChunkRequest(long recoveryId, ShardId shardId, StoreFileMetaData metaData, long position, BytesReference content, diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFilesInfoRequest.java b/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFilesInfoRequest.java index d28ae270f9e..d9a2a19f49f 100644 --- a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFilesInfoRequest.java +++ b/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFilesInfoRequest.java @@ -31,7 +31,7 @@ import java.util.List; /** * */ -class RecoveryFilesInfoRequest extends TransportRequest { +public class RecoveryFilesInfoRequest extends TransportRequest { private long recoveryId; private ShardId shardId; @@ -43,7 +43,7 @@ class RecoveryFilesInfoRequest extends TransportRequest { int totalTranslogOps; - RecoveryFilesInfoRequest() { + public RecoveryFilesInfoRequest() { } RecoveryFilesInfoRequest(long recoveryId, ShardId shardId, List phase1FileNames, List phase1FileSizes, diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFinalizeRecoveryRequest.java b/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFinalizeRecoveryRequest.java index e3f6ac1a989..e8d5c0f299f 100644 --- a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFinalizeRecoveryRequest.java +++ b/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFinalizeRecoveryRequest.java @@ -29,13 +29,13 @@ import java.io.IOException; /** * */ -class RecoveryFinalizeRecoveryRequest extends TransportRequest { +public class RecoveryFinalizeRecoveryRequest extends TransportRequest { private long recoveryId; private ShardId shardId; - RecoveryFinalizeRecoveryRequest() { + public RecoveryFinalizeRecoveryRequest() { } RecoveryFinalizeRecoveryRequest(long recoveryId, ShardId shardId) { diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java b/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java index dbc4a1503c1..3d5d7052c9d 100644 --- a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java +++ b/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java @@ -29,13 +29,13 @@ import java.io.IOException; /** * */ -class RecoveryPrepareForTranslogOperationsRequest extends TransportRequest { +public class RecoveryPrepareForTranslogOperationsRequest extends TransportRequest { private long recoveryId; private ShardId shardId; private int totalTranslogOps = RecoveryState.Translog.UNKNOWN; - RecoveryPrepareForTranslogOperationsRequest() { + public RecoveryPrepareForTranslogOperationsRequest() { } RecoveryPrepareForTranslogOperationsRequest(long recoveryId, ShardId shardId, int totalTranslogOps) { diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsRequest.java b/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsRequest.java index 345c179bc3b..5cc294ace6e 100644 --- a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsRequest.java +++ b/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsRequest.java @@ -31,14 +31,14 @@ import java.util.List; /** * */ -class RecoveryTranslogOperationsRequest extends TransportRequest { +public class RecoveryTranslogOperationsRequest extends TransportRequest { private long recoveryId; private ShardId shardId; private List operations; private int totalTranslogOps = RecoveryState.Translog.UNKNOWN; - RecoveryTranslogOperationsRequest() { + public RecoveryTranslogOperationsRequest() { } RecoveryTranslogOperationsRequest(long recoveryId, ShardId shardId, List operations, int totalTranslogOps) { diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java b/core/src/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java index 9cbe305318c..31280dc2214 100644 --- a/core/src/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java +++ b/core/src/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java @@ -47,7 +47,7 @@ public class StartRecoveryRequest extends TransportRequest { private RecoveryState.Type recoveryType; - StartRecoveryRequest() { + public StartRecoveryRequest() { } /** diff --git a/core/src/main/java/org/elasticsearch/indices/store/IndicesStore.java b/core/src/main/java/org/elasticsearch/indices/store/IndicesStore.java index f87e2c4e911..7ecd66fb48a 100644 --- a/core/src/main/java/org/elasticsearch/indices/store/IndicesStore.java +++ b/core/src/main/java/org/elasticsearch/indices/store/IndicesStore.java @@ -396,13 +396,13 @@ public class IndicesStore extends AbstractComponent implements ClusterStateListe } } - private static class ShardActiveRequest extends TransportRequest { + public static class ShardActiveRequest extends TransportRequest { protected TimeValue timeout = null; private ClusterName clusterName; private String indexUUID; private ShardId shardId; - ShardActiveRequest() { + public ShardActiveRequest() { } ShardActiveRequest(ClusterName clusterName, String indexUUID, ShardId shardId, TimeValue timeout) { diff --git a/core/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java b/core/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java index d72e145d526..9b96fdec100 100644 --- a/core/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java +++ b/core/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java @@ -258,7 +258,7 @@ public class TransportNodesListShardStoreMetaData extends TransportNodesAction { + public static class Request extends BaseNodesRequest { private ShardId shardId; @@ -331,13 +331,13 @@ public class TransportNodesListShardStoreMetaData extends TransportNodesAction { } catch (NoSuchMethodException e) { throw new IllegalStateException("failed to create constructor (does it have a default constructor?) for request " + request, e); } - this.requestConstructor.setAccessible(true); } @Override public Request call() throws Exception { - return requestConstructor.newInstance(); + try { + return requestConstructor.newInstance(); + } catch (IllegalAccessException e) { + throw new IllegalStateException("Could not access '" + requestConstructor + "'. Implementations must be a public class and have a public no-arg ctor.", e); + } } } } diff --git a/core/src/main/java/org/elasticsearch/transport/TransportRequest.java b/core/src/main/java/org/elasticsearch/transport/TransportRequest.java index bd2e83db4fa..ddf54179476 100644 --- a/core/src/main/java/org/elasticsearch/transport/TransportRequest.java +++ b/core/src/main/java/org/elasticsearch/transport/TransportRequest.java @@ -36,7 +36,7 @@ public abstract class TransportRequest extends TransportMessage { + public static class Request extends ReplicationRequest { int shardId; public AtomicBoolean processedOnPrimary = new AtomicBoolean(); public AtomicInteger processedOnReplicas = new AtomicInteger(); - Request() { + public Request() { } Request(ShardId shardId) { diff --git a/core/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java b/core/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java index a1e10b088ad..98cef9783fc 100644 --- a/core/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java +++ b/core/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java @@ -173,7 +173,7 @@ public class TransportClientNodesServiceTests extends ESTestCase { } } - private static class TestRequest extends TransportRequest { + public static class TestRequest extends TransportRequest { } diff --git a/core/src/test/java/org/elasticsearch/script/NativeScriptTests.java b/core/src/test/java/org/elasticsearch/script/NativeScriptTests.java index e97b97f2c89..cf7f7b1ec82 100644 --- a/core/src/test/java/org/elasticsearch/script/NativeScriptTests.java +++ b/core/src/test/java/org/elasticsearch/script/NativeScriptTests.java @@ -95,7 +95,7 @@ public class NativeScriptTests extends ESTestCase { } } - static class MyNativeScriptFactory implements NativeScriptFactory { + public static class MyNativeScriptFactory implements NativeScriptFactory { @Override public ExecutableScript newScript(@Nullable Map params) { return new MyScript(); diff --git a/core/src/test/java/org/elasticsearch/script/ScriptFieldIT.java b/core/src/test/java/org/elasticsearch/script/ScriptFieldIT.java index d3f0923b61c..4fdfbb09e5e 100644 --- a/core/src/test/java/org/elasticsearch/script/ScriptFieldIT.java +++ b/core/src/test/java/org/elasticsearch/script/ScriptFieldIT.java @@ -77,7 +77,7 @@ public class ScriptFieldIT extends ESIntegTestCase { } } - static class IntArrayScriptFactory implements NativeScriptFactory { + public static class IntArrayScriptFactory implements NativeScriptFactory { @Override public ExecutableScript newScript(@Nullable Map params) { return new IntScript(); @@ -96,7 +96,7 @@ public class ScriptFieldIT extends ESIntegTestCase { } } - static class LongArrayScriptFactory implements NativeScriptFactory { + public static class LongArrayScriptFactory implements NativeScriptFactory { @Override public ExecutableScript newScript(@Nullable Map params) { return new LongScript(); @@ -115,7 +115,7 @@ public class ScriptFieldIT extends ESIntegTestCase { } } - static class FloatArrayScriptFactory implements NativeScriptFactory { + public static class FloatArrayScriptFactory implements NativeScriptFactory { @Override public ExecutableScript newScript(@Nullable Map params) { return new FloatScript(); @@ -134,7 +134,7 @@ public class ScriptFieldIT extends ESIntegTestCase { } } - static class DoubleArrayScriptFactory implements NativeScriptFactory { + public static class DoubleArrayScriptFactory implements NativeScriptFactory { @Override public ExecutableScript newScript(@Nullable Map params) { return new DoubleScript(); diff --git a/core/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptIT.java b/core/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptIT.java index ad9c0af267b..1b942f660da 100644 --- a/core/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptIT.java +++ b/core/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptIT.java @@ -96,7 +96,7 @@ public class ExplainableScriptIT extends ESIntegTestCase { } } - static class MyNativeScriptFactory implements NativeScriptFactory { + public static class MyNativeScriptFactory implements NativeScriptFactory { @Override public ExecutableScript newScript(@Nullable Map params) { return new MyScript(); diff --git a/core/src/test/java/org/elasticsearch/transport/AbstractSimpleTransportTestCase.java b/core/src/test/java/org/elasticsearch/transport/AbstractSimpleTransportTestCase.java index 4499d92066e..85315be1ff5 100644 --- a/core/src/test/java/org/elasticsearch/transport/AbstractSimpleTransportTestCase.java +++ b/core/src/test/java/org/elasticsearch/transport/AbstractSimpleTransportTestCase.java @@ -742,7 +742,7 @@ public abstract class AbstractSimpleTransportTestCase extends ESTestCase { } - static class StringMessageRequest extends TransportRequest { + public static class StringMessageRequest extends TransportRequest { private String message; private long timeout; @@ -752,7 +752,7 @@ public abstract class AbstractSimpleTransportTestCase extends ESTestCase { this.timeout = timeout; } - StringMessageRequest() { + public StringMessageRequest() { } public StringMessageRequest(String message) { @@ -803,7 +803,7 @@ public abstract class AbstractSimpleTransportTestCase extends ESTestCase { } - static class Version0Request extends TransportRequest { + public static class Version0Request extends TransportRequest { int value1; @@ -821,7 +821,7 @@ public abstract class AbstractSimpleTransportTestCase extends ESTestCase { } } - static class Version1Request extends Version0Request { + public static class Version1Request extends Version0Request { int value2; @@ -1213,7 +1213,7 @@ public abstract class AbstractSimpleTransportTestCase extends ESTestCase { assertTrue(nodeB.address().sameHost(addressB.get())); } - private static class TestRequest extends TransportRequest { + public static class TestRequest extends TransportRequest { } private static class TestResponse extends TransportResponse { diff --git a/dev-tools/src/main/resources/forbidden/core-signatures.txt b/dev-tools/src/main/resources/forbidden/core-signatures.txt index 3a925e64d3c..19af292b737 100644 --- a/dev-tools/src/main/resources/forbidden/core-signatures.txt +++ b/dev-tools/src/main/resources/forbidden/core-signatures.txt @@ -83,3 +83,7 @@ java.util.concurrent.Future#cancel(boolean) @defaultMessage Don't try reading from paths that are not configured in Environment, resolve from Environment instead org.elasticsearch.common.io.PathUtils#get(java.lang.String, java.lang.String[]) org.elasticsearch.common.io.PathUtils#get(java.net.URI) + +@defaultMessage Do not violate java's access system +java.lang.reflect.AccessibleObject#setAccessible(boolean) +java.lang.reflect.AccessibleObject#setAccessible(java.lang.reflect.AccessibleObject[], boolean) diff --git a/plugins/cloud-azure/src/main/java/org/elasticsearch/cloud/azure/management/AzureComputeSettingsFilter.java b/plugins/cloud-azure/src/main/java/org/elasticsearch/cloud/azure/management/AzureComputeSettingsFilter.java index e584cefffa2..c4a1837fdaf 100644 --- a/plugins/cloud-azure/src/main/java/org/elasticsearch/cloud/azure/management/AzureComputeSettingsFilter.java +++ b/plugins/cloud-azure/src/main/java/org/elasticsearch/cloud/azure/management/AzureComputeSettingsFilter.java @@ -29,7 +29,7 @@ import static org.elasticsearch.cloud.azure.management.AzureComputeService.Manag public class AzureComputeSettingsFilter extends AbstractComponent { @Inject - protected AzureComputeSettingsFilter(Settings settings, SettingsFilter settingsFilter) { + public AzureComputeSettingsFilter(Settings settings, SettingsFilter settingsFilter) { super(settings); // Cloud management API settings we need to hide settingsFilter.addFilter(KEYSTORE_PATH); diff --git a/plugins/cloud-azure/src/main/java/org/elasticsearch/cloud/azure/storage/AzureStorageSettingsFilter.java b/plugins/cloud-azure/src/main/java/org/elasticsearch/cloud/azure/storage/AzureStorageSettingsFilter.java index ac23f0c2463..da3aa8c15d1 100644 --- a/plugins/cloud-azure/src/main/java/org/elasticsearch/cloud/azure/storage/AzureStorageSettingsFilter.java +++ b/plugins/cloud-azure/src/main/java/org/elasticsearch/cloud/azure/storage/AzureStorageSettingsFilter.java @@ -29,7 +29,7 @@ import static org.elasticsearch.cloud.azure.storage.AzureStorageService.Storage. public class AzureStorageSettingsFilter extends AbstractComponent { @Inject - protected AzureStorageSettingsFilter(Settings settings, SettingsFilter settingsFilter) { + public AzureStorageSettingsFilter(Settings settings, SettingsFilter settingsFilter) { super(settings); // Cloud storage API settings needed to be hidden settingsFilter.addFilter(ACCOUNT); diff --git a/plugins/cloud-azure/src/test/java/org/elasticsearch/cloud/azure/AzureComputeServiceSimpleMock.java b/plugins/cloud-azure/src/test/java/org/elasticsearch/cloud/azure/AzureComputeServiceSimpleMock.java index 997a8aa17dc..e3033152f4f 100644 --- a/plugins/cloud-azure/src/test/java/org/elasticsearch/cloud/azure/AzureComputeServiceSimpleMock.java +++ b/plugins/cloud-azure/src/test/java/org/elasticsearch/cloud/azure/AzureComputeServiceSimpleMock.java @@ -52,7 +52,7 @@ public class AzureComputeServiceSimpleMock extends AzureComputeServiceAbstractMo } @Inject - protected AzureComputeServiceSimpleMock(Settings settings) { + public AzureComputeServiceSimpleMock(Settings settings) { super(settings); } diff --git a/plugins/cloud-azure/src/test/java/org/elasticsearch/cloud/azure/storage/AzureStorageServiceMock.java b/plugins/cloud-azure/src/test/java/org/elasticsearch/cloud/azure/storage/AzureStorageServiceMock.java index 96ee895267c..8fe19232c26 100644 --- a/plugins/cloud-azure/src/test/java/org/elasticsearch/cloud/azure/storage/AzureStorageServiceMock.java +++ b/plugins/cloud-azure/src/test/java/org/elasticsearch/cloud/azure/storage/AzureStorageServiceMock.java @@ -46,7 +46,7 @@ public class AzureStorageServiceMock extends AbstractLifecycleComponent blobs = new ConcurrentHashMap<>(); @Inject - protected AzureStorageServiceMock(Settings settings) { + public AzureStorageServiceMock(Settings settings) { super(settings); } diff --git a/plugins/delete-by-query/src/main/java/org/elasticsearch/action/deletebyquery/TransportDeleteByQueryAction.java b/plugins/delete-by-query/src/main/java/org/elasticsearch/action/deletebyquery/TransportDeleteByQueryAction.java index 7f06ce6a6a5..890a60ce3c8 100644 --- a/plugins/delete-by-query/src/main/java/org/elasticsearch/action/deletebyquery/TransportDeleteByQueryAction.java +++ b/plugins/delete-by-query/src/main/java/org/elasticsearch/action/deletebyquery/TransportDeleteByQueryAction.java @@ -57,7 +57,7 @@ public class TransportDeleteByQueryAction extends HandledTransportAction implem } } - static class MulticastPingResponse extends TransportRequest { + public static class MulticastPingResponse extends TransportRequest { int id; PingResponse pingResponse; - MulticastPingResponse() { + public MulticastPingResponse() { } @Override