From 9cb05060d307b587256233e2061cea10ffeaaa3c Mon Sep 17 00:00:00 2001 From: kimchy Date: Thu, 29 Apr 2010 00:37:08 +0300 Subject: [PATCH] continue abstracting json into xcontent --- .../action/TransportActionModule.java | 2 +- .../cluster/health/ClusterHealthResponse.java | 4 ++-- .../health/TransportClusterHealthAction.java | 2 +- .../action/admin/cluster/node/info/NodeInfo.java | 2 +- .../cluster/node/info/TransportNodesInfo.java | 4 ++-- .../node/shutdown/TransportNodesShutdown.java | 4 ++-- .../broadcast/TransportBroadcastPingAction.java | 2 +- .../TransportIndexReplicationPingAction.java | 2 +- .../TransportReplicationPingAction.java | 2 +- .../TransportShardReplicationPingAction.java | 2 +- .../ping/single/TransportSinglePingAction.java | 2 +- .../state/TransportClusterStateAction.java | 2 +- .../indices/alias/IndicesAliasesRequest.java | 2 +- .../alias/TransportIndicesAliasesAction.java | 2 +- .../clear/TransportClearIndicesCacheAction.java | 2 +- .../admin/indices/create/CreateIndexRequest.java | 2 +- .../create/TransportCreateIndexAction.java | 2 +- .../delete/TransportDeleteIndexAction.java | 2 +- .../indices/flush/TransportFlushAction.java | 2 +- .../snapshot/TransportGatewaySnapshotAction.java | 2 +- .../TransportIndexGatewaySnapshotAction.java | 2 +- .../TransportShardGatewaySnapshotAction.java | 2 +- .../mapping/put/TransportPutMappingAction.java | 2 +- .../optimize/TransportOptimizeAction.java | 2 +- .../indices/refresh/TransportRefreshAction.java | 2 +- .../admin/indices/status/IndexShardStatus.java | 2 +- .../action/admin/indices/status/IndexStatus.java | 2 +- .../indices/status/IndicesStatusResponse.java | 4 ++-- .../status/TransportIndicesStatusAction.java | 2 +- .../action/count/TransportCountAction.java | 2 +- .../action/delete/TransportDeleteAction.java | 2 +- .../TransportDeleteByQueryAction.java | 2 +- .../TransportIndexDeleteByQueryAction.java | 2 +- .../TransportShardDeleteByQueryAction.java | 2 +- .../elasticsearch/action/get/GetResponse.java | 4 ++-- .../action/get/TransportGetAction.java | 2 +- .../action/index/TransportIndexAction.java | 2 +- .../action/mlt/TransportMoreLikeThisAction.java | 6 +++--- .../action/search/SearchResponse.java | 2 -- .../action/search/TransportSearchAction.java | 2 +- .../search/TransportSearchScrollAction.java | 2 +- .../TransportSearchDfsQueryAndFetchAction.java | 2 +- .../TransportSearchDfsQueryThenFetchAction.java | 2 +- .../type/TransportSearchQueryAndFetchAction.java | 2 +- .../TransportSearchQueryThenFetchAction.java | 2 +- ...TransportSearchScrollQueryAndFetchAction.java | 2 +- ...ransportSearchScrollQueryThenFetchAction.java | 2 +- .../broadcast/BroadcastOperationResponse.java | 2 +- .../TransportBroadcastOperationAction.java | 2 +- .../support/nodes/NodesOperationResponse.java | 2 +- .../nodes/TransportNodesOperationAction.java | 2 +- ...TransportIndexReplicationOperationAction.java | 2 +- ...ansportIndicesReplicationOperationAction.java | 2 +- .../action/terms/TermsResponse.java | 2 +- .../action/terms/TransportTermsAction.java | 4 ++-- .../client/node/NodeAdminClient.java | 2 +- .../elasticsearch/client/node/NodeClient.java | 2 +- .../client/node/NodeClientModule.java | 2 +- .../client/node/NodeClusterAdminClient.java | 2 +- .../client/node/NodeIndicesAdminClient.java | 2 +- .../client/transport/ClientTransportModule.java | 2 +- .../client/transport/TransportClient.java | 8 ++++---- .../transport/TransportClientClusterModule.java | 2 +- .../transport/TransportClientClusterService.java | 2 +- .../transport/TransportClientNodesService.java | 4 ++-- .../action/ClientTransportActionModule.java | 2 +- .../ClientTransportClusterHealthAction.java | 2 +- .../info/ClientTransportNodesInfoAction.java | 2 +- .../ClientTransportNodesShutdownAction.java | 2 +- .../ClientTransportBroadcastPingAction.java | 2 +- .../ClientTransportReplicationPingAction.java | 2 +- .../single/ClientTransportSinglePingAction.java | 2 +- .../state/ClientTransportClusterStateAction.java | 2 +- .../ClientTransportIndicesAliasesAction.java | 2 +- .../ClientTransportClearIndicesCacheAction.java | 2 +- .../create/ClientTransportCreateIndexAction.java | 2 +- .../delete/ClientTransportDeleteIndexAction.java | 2 +- .../flush/ClientTransportFlushAction.java | 2 +- .../ClientTransportGatewaySnapshotAction.java | 2 +- .../create/ClientTransportPutMappingAction.java | 2 +- .../optimize/ClientTransportOptimizeAction.java | 2 +- .../refresh/ClientTransportRefreshAction.java | 2 +- .../ClientTransportIndicesStatusAction.java | 2 +- .../action/count/ClientTransportCountAction.java | 2 +- .../delete/ClientTransportDeleteAction.java | 2 +- .../ClientTransportDeleteByQueryAction.java | 2 +- .../action/get/ClientTransportGetAction.java | 2 +- .../action/index/ClientTransportIndexAction.java | 2 +- .../mlt/ClientTransportMoreLikeThisAction.java | 2 +- .../search/ClientTransportSearchAction.java | 2 +- .../ClientTransportSearchScrollAction.java | 2 +- .../action/terms/ClientTransportTermsAction.java | 2 +- .../support/InternalTransportAdminClient.java | 2 +- .../support/InternalTransportClient.java | 2 +- .../InternalTransportClusterAdminClient.java | 2 +- .../InternalTransportIndicesAdminClient.java | 2 +- .../org/elasticsearch/cluster/ClusterModule.java | 2 +- .../action/index/MappingUpdatedAction.java | 2 +- .../action/index/NodeIndexCreatedAction.java | 2 +- .../action/index/NodeIndexDeletedAction.java | 2 +- .../action/index/NodeMappingCreatedAction.java | 2 +- .../cluster/action/shard/ShardStateAction.java | 4 ++-- .../cluster/metadata/IndexMetaData.java | 4 ++-- .../elasticsearch/cluster/metadata/MetaData.java | 10 +++++----- .../cluster/metadata/MetaDataService.java | 8 ++++---- .../cluster/node/DiscoveryNode.java | 2 +- .../cluster/routing/ImmutableShardRouting.java | 2 +- .../cluster/routing/IndexRoutingTable.java | 6 +++--- .../cluster/routing/IndexShardRoutingTable.java | 4 ++-- .../cluster/routing/RoutingService.java | 2 +- .../cluster/routing/RoutingTable.java | 6 +++--- .../strategy/DefaultShardsRoutingStrategy.java | 2 +- .../cluster/service/InternalClusterService.java | 2 +- .../org/elasticsearch/index/IndexModule.java | 2 +- .../index/IndexServiceManagement.java | 2 +- .../analysis/ASCIIFoldingTokenFilterFactory.java | 4 ++-- .../index/analysis/AnalysisService.java | 4 ++-- .../index/analysis/AnalyzerProvider.java | 2 +- .../index/analysis/ArabicAnalyzerProvider.java | 8 ++++---- .../analysis/ArabicStemTokenFilterFactory.java | 4 ++-- .../analysis/BrazilianAnalyzerProvider.java | 8 ++++---- .../BrazilianStemTokenFilterFactory.java | 8 ++++---- .../index/analysis/ChineseAnalyzerProvider.java | 4 ++-- .../index/analysis/CjkAnalyzerProvider.java | 8 ++++---- .../index/analysis/CustomAnalyzerProvider.java | 4 ++-- .../index/analysis/CzechAnalyzerProvider.java | 8 ++++---- .../index/analysis/DutchAnalyzerProvider.java | 8 ++++---- .../analysis/DutchStemTokenFilterFactory.java | 8 ++++---- .../analysis/EdgeNGramTokenFilterFactory.java | 4 ++-- .../analysis/EdgeNGramTokenizerFactory.java | 4 ++-- .../index/analysis/FieldNameAnalyzer.java | 2 +- .../index/analysis/FrenchAnalyzerProvider.java | 8 ++++---- .../analysis/FrenchStemTokenFilterFactory.java | 8 ++++---- .../index/analysis/GermanAnalyzerProvider.java | 8 ++++---- .../analysis/GermanStemTokenFilterFactory.java | 8 ++++---- .../index/analysis/GreekAnalyzerProvider.java | 8 ++++---- .../index/analysis/KeywordAnalyzerProvider.java | 4 ++-- .../index/analysis/KeywordTokenizerFactory.java | 4 ++-- .../index/analysis/LengthTokenFilterFactory.java | 4 ++-- .../index/analysis/LetterTokenizerFactory.java | 4 ++-- .../analysis/LowerCaseTokenFilterFactory.java | 4 ++-- .../analysis/LowerCaseTokenizerFactory.java | 4 ++-- .../index/analysis/NGramTokenFilterFactory.java | 4 ++-- .../index/analysis/NGramTokenizerFactory.java | 4 ++-- .../index/analysis/PersianAnalyzerProvider.java | 8 ++++---- .../analysis/PorterStemTokenFilterFactory.java | 4 ++-- .../index/analysis/RussianAnalyzerProvider.java | 8 ++++---- .../analysis/RussianStemTokenFilterFactory.java | 4 ++-- .../analysis/ShingleTokenFilterFactory.java | 4 ++-- .../index/analysis/SimpleAnalyzerProvider.java | 4 ++-- .../index/analysis/StandardAnalyzerProvider.java | 8 ++++---- .../analysis/StandardTokenFilterFactory.java | 4 ++-- .../index/analysis/StandardTokenizerFactory.java | 4 ++-- .../index/analysis/StopAnalyzerProvider.java | 8 ++++---- .../index/analysis/StopTokenFilterFactory.java | 8 ++++---- .../index/analysis/ThaiAnalyzerProvider.java | 4 ++-- .../analysis/WhitespaceAnalyzerProvider.java | 4 ++-- .../analysis/WhitespaceTokenizerFactory.java | 4 ++-- .../elasticsearch/index/cache/IndexCache.java | 2 +- .../index/cache/IndexCacheModule.java | 2 +- .../index/cache/filter/FilterCacheModule.java | 2 +- .../index/cache/filter/none/NoneFilterCache.java | 2 +- .../index/cache/filter/soft/SoftFilterCache.java | 4 ++-- .../index/cache/filter/weak/WeakFilterCache.java | 4 ++-- .../deletionpolicy/DeletionPolicyModule.java | 2 +- .../deletionpolicy/KeepLastNDeletionPolicy.java | 2 +- .../KeepOnlyLastDeletionPolicy.java | 2 +- .../deletionpolicy/SnapshotDeletionPolicy.java | 4 ++-- .../elasticsearch/index/engine/EngineModule.java | 2 +- .../index/engine/robin/RobinEngine.java | 2 +- .../index/engine/robin/RobinEngineModule.java | 2 +- .../index/gateway/IndexGatewayModule.java | 2 +- .../index/gateway/IndexShardGatewayService.java | 2 +- .../index/gateway/fs/FsIndexGateway.java | 2 +- .../index/gateway/fs/FsIndexGatewayModule.java | 2 +- .../index/gateway/fs/FsIndexShardGateway.java | 4 ++-- .../index/gateway/none/NoneIndexGateway.java | 2 +- .../gateway/none/NoneIndexGatewayModule.java | 2 +- .../gateway/none/NoneIndexShardGateway.java | 2 +- .../index/mapper/DocumentFieldMappers.java | 6 +++--- .../elasticsearch/index/mapper/FieldMappers.java | 2 +- .../index/mapper/MapperService.java | 6 +++--- .../index/mapper/xcontent/MergeContext.java | 2 +- .../mapper/xcontent/XContentDocumentMapper.java | 16 ++++++++-------- .../xcontent/XContentFloatFieldMapper.java | 4 ++-- .../xcontent/XContentIntegerFieldMapper.java | 4 ++-- .../mapper/xcontent/XContentObjectMapper.java | 4 ++-- .../xcontent/XContentShortFieldMapper.java | 4 ++-- .../mapper/xcontent/XContentTypeFieldMapper.java | 2 +- .../mapper/xcontent/XContentTypeParser.java | 2 +- .../BalancedSegmentMergePolicyProvider.java | 2 +- .../policy/LogByteSizeMergePolicyProvider.java | 2 +- .../merge/policy/LogDocMergePolicyProvider.java | 2 +- .../index/merge/policy/MergePolicyModule.java | 2 +- .../ConcurrentMergeSchedulerProvider.java | 2 +- .../scheduler/SerialMergeSchedulerProvider.java | 2 +- .../index/query/IndexQueryParserService.java | 6 +++--- .../xcontent/XContentQueryParserRegistry.java | 10 +++++----- .../index/routing/OperationRoutingModule.java | 2 +- .../routing/plain/PlainOperationRouting.java | 2 +- .../plain/PlainOperationRoutingModule.java | 2 +- .../index/service/IndexService.java | 2 +- .../index/service/InternalIndexService.java | 12 ++++++------ .../index/shard/IndexShardManagement.java | 2 +- .../index/shard/IndexShardModule.java | 2 +- .../index/shard/recovery/RecoveryAction.java | 2 +- .../index/shard/service/InternalIndexShard.java | 2 +- .../similarity/DefaultSimilarityProvider.java | 4 ++-- .../index/similarity/SimilarityProvider.java | 2 +- .../index/similarity/SimilarityService.java | 4 ++-- .../index/store/StoreManagement.java | 2 +- .../elasticsearch/index/store/StoreModule.java | 4 ++-- .../index/store/fs/AbstractFsStore.java | 2 +- .../index/store/fs/MmapFsStore.java | 2 +- .../index/store/fs/MmapFsStoreModule.java | 2 +- .../elasticsearch/index/store/fs/NioFsStore.java | 2 +- .../index/store/fs/NioFsStoreModule.java | 2 +- .../index/store/fs/SimpleFsStore.java | 2 +- .../index/store/fs/SimpleFsStoreModule.java | 2 +- .../index/store/memory/ByteBufferStore.java | 2 +- .../index/store/memory/HeapStore.java | 2 +- .../index/store/memory/MemoryStoreModule.java | 2 +- .../elasticsearch/index/store/ram/RamStore.java | 2 +- .../index/store/ram/RamStoreModule.java | 2 +- .../index/translog/TranslogModule.java | 2 +- .../index/translog/memory/MemorySnapshot.java | 2 +- .../index/translog/memory/MemoryTranslog.java | 2 +- .../org/elasticsearch/rest/RestController.java | 2 +- .../java/org/elasticsearch/rest/RestModule.java | 2 +- .../rest/action/RestActionModule.java | 2 +- .../cluster/health/RestClusterHealthAction.java | 5 ++--- .../cluster/node/info/RestNodesInfoAction.java | 5 ++--- .../node/shutdown/RestNodesShutdownAction.java | 6 ++---- .../ping/broadcast/RestBroadcastPingAction.java | 3 +-- .../replication/RestReplicationPingAction.java | 3 +-- .../ping/single/RestSinglePingAction.java | 5 ++--- .../cache/clear/RestClearIndicesCacheAction.java | 4 ++-- .../indices/delete/RestDeleteIndexAction.java | 5 ++--- .../admin/indices/flush/RestFlushAction.java | 5 ++--- .../snapshot/RestGatewaySnapshotAction.java | 3 +-- .../mapping/put/RestPutMappingAction.java | 3 +-- .../indices/optimize/RestOptimizeAction.java | 4 ++-- .../admin/indices/refresh/RestRefreshAction.java | 3 +-- .../indices/status/RestIndicesStatusAction.java | 5 ++--- .../rest/action/delete/RestDeleteAction.java | 5 ++--- .../deletebyquery/RestDeleteByQueryAction.java | 5 ++--- .../rest/action/get/RestGetAction.java | 3 +-- .../rest/action/index/RestIndexAction.java | 5 ++--- .../rest/action/mlt/RestMoreLikeThisAction.java | 3 +-- .../action/search/RestSearchScrollAction.java | 3 +-- .../rest/action/terms/RestTermsAction.java | 5 ++--- .../java/org/elasticsearch/search/SearchHit.java | 1 - .../org/elasticsearch/search/SearchHits.java | 1 - .../org/elasticsearch/search/SearchModule.java | 2 +- .../elasticsearch/search/SearchParseElement.java | 1 - .../action/SearchServiceTransportAction.java | 2 +- .../search/controller/SearchPhaseController.java | 6 +++--- .../org/elasticsearch/search/dfs/DfsPhase.java | 2 +- .../org/elasticsearch/search/facets/Facet.java | 1 - .../elasticsearch/search/facets/FacetsPhase.java | 4 ++-- .../elasticsearch/search/fetch/FetchPhase.java | 4 ++-- .../search/highlight/HighlightPhase.java | 2 +- .../search/internal/InternalSearchHits.java | 3 +-- .../search/internal/InternalSearchResponse.java | 2 -- .../search/query/FromParseElement.java | 2 -- .../search/query/QueryParseElement.java | 1 - .../query/QueryParserNameParseElement.java | 1 - .../elasticsearch/search/query/QueryPhase.java | 4 ++-- 268 files changed, 411 insertions(+), 444 deletions(-) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/TransportActionModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/TransportActionModule.java index b3bbadbc885..d00e4c37f06 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/TransportActionModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/TransportActionModule.java @@ -19,7 +19,6 @@ package org.elasticsearch.action; -import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.action.admin.cluster.health.TransportClusterHealthAction; import org.elasticsearch.action.admin.cluster.node.info.TransportNodesInfo; import org.elasticsearch.action.admin.cluster.node.shutdown.TransportNodesShutdown; @@ -53,6 +52,7 @@ import org.elasticsearch.action.search.TransportSearchAction; import org.elasticsearch.action.search.TransportSearchScrollAction; import org.elasticsearch.action.search.type.*; import org.elasticsearch.action.terms.TransportTermsAction; +import org.elasticsearch.util.guice.inject.AbstractModule; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponse.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponse.java index 9a0070dffdd..a8d6a6003e1 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponse.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponse.java @@ -19,9 +19,9 @@ package org.elasticsearch.action.admin.cluster.health; +import org.elasticsearch.action.ActionResponse; import org.elasticsearch.util.gcommon.collect.ImmutableList; import org.elasticsearch.util.gcommon.collect.Maps; -import org.elasticsearch.action.ActionResponse; import org.elasticsearch.util.io.stream.StreamInput; import org.elasticsearch.util.io.stream.StreamOutput; @@ -30,8 +30,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import static org.elasticsearch.util.gcommon.collect.Lists.*; import static org.elasticsearch.action.admin.cluster.health.ClusterIndexHealth.*; +import static org.elasticsearch.util.gcommon.collect.Lists.*; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java index 158eb614bf6..bd93c6969e3 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.admin.cluster.health; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction; @@ -34,6 +33,7 @@ import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.timer.TimerService; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java index c2613aa0503..1a74ff7ae5d 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java @@ -19,9 +19,9 @@ package org.elasticsearch.action.admin.cluster.node.info; -import org.elasticsearch.util.gcommon.collect.ImmutableMap; import org.elasticsearch.action.support.nodes.NodeOperationResponse; import org.elasticsearch.cluster.node.DiscoveryNode; +import org.elasticsearch.util.gcommon.collect.ImmutableMap; import org.elasticsearch.util.io.stream.StreamInput; import org.elasticsearch.util.io.stream.StreamOutput; import org.elasticsearch.util.settings.ImmutableSettings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfo.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfo.java index e13ecd43f4b..6fc2c80adb7 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfo.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfo.java @@ -19,8 +19,6 @@ package org.elasticsearch.action.admin.cluster.node.info; -import org.elasticsearch.util.gcommon.collect.ImmutableMap; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.support.nodes.NodeOperationRequest; @@ -30,6 +28,8 @@ import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; import org.elasticsearch.util.MapBuilder; +import org.elasticsearch.util.gcommon.collect.ImmutableMap; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.ArrayList; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/TransportNodesShutdown.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/TransportNodesShutdown.java index b4db694ed5b..fca906a90a6 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/TransportNodesShutdown.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/TransportNodesShutdown.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.admin.cluster.node.shutdown; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.ElasticSearchIllegalStateException; import org.elasticsearch.action.TransportActions; @@ -31,6 +30,7 @@ import org.elasticsearch.node.Node; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; import org.elasticsearch.util.TimeValue; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.io.stream.StreamInput; import org.elasticsearch.util.io.stream.StreamOutput; import org.elasticsearch.util.settings.Settings; @@ -40,8 +40,8 @@ import java.util.List; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReferenceArray; -import static org.elasticsearch.util.gcommon.collect.Lists.*; import static org.elasticsearch.util.TimeValue.*; +import static org.elasticsearch.util.gcommon.collect.Lists.*; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/TransportBroadcastPingAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/TransportBroadcastPingAction.java index 16d164768a4..046f1e938dd 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/TransportBroadcastPingAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/TransportBroadcastPingAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.admin.cluster.ping.broadcast; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.ShardOperationFailedException; import org.elasticsearch.action.TransportActions; @@ -33,6 +32,7 @@ import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.List; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/TransportIndexReplicationPingAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/TransportIndexReplicationPingAction.java index 2731b6b5ee8..090251e8a6d 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/TransportIndexReplicationPingAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/TransportIndexReplicationPingAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.admin.cluster.ping.replication; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.support.replication.TransportIndexReplicationOperationAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.routing.GroupShardsIterator; @@ -28,6 +27,7 @@ import org.elasticsearch.index.Index; import org.elasticsearch.indices.IndexMissingException; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.concurrent.atomic.AtomicReferenceArray; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/TransportReplicationPingAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/TransportReplicationPingAction.java index 13070a47656..1878a77631d 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/TransportReplicationPingAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/TransportReplicationPingAction.java @@ -19,12 +19,12 @@ package org.elasticsearch.action.admin.cluster.ping.replication; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.support.replication.TransportIndicesReplicationOperationAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.concurrent.atomic.AtomicReferenceArray; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/TransportShardReplicationPingAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/TransportShardReplicationPingAction.java index 85de31c21d1..b1a608bc768 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/TransportShardReplicationPingAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/TransportShardReplicationPingAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.admin.cluster.ping.replication; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.support.replication.TransportShardReplicationOperationAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; @@ -28,6 +27,7 @@ import org.elasticsearch.cluster.routing.ShardsIterator; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/single/TransportSinglePingAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/single/TransportSinglePingAction.java index e80d0c6dfd9..e20375f4e5a 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/single/TransportSinglePingAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/single/TransportSinglePingAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.admin.cluster.ping.single; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.support.single.TransportSingleOperationAction; @@ -27,6 +26,7 @@ import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java index 1cbdc21f3b8..4c5af8400da 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java @@ -19,13 +19,13 @@ package org.elasticsearch.action.admin.cluster.state; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java index c2289d0252d..603aa41f0ab 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java @@ -19,10 +19,10 @@ package org.elasticsearch.action.admin.indices.alias; -import org.elasticsearch.util.gcommon.collect.Lists; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.support.master.MasterNodeOperationRequest; import org.elasticsearch.cluster.metadata.AliasAction; +import org.elasticsearch.util.gcommon.collect.Lists; import org.elasticsearch.util.io.stream.StreamInput; import org.elasticsearch.util.io.stream.StreamOutput; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java index 181533deca2..4801ad4985e 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.admin.indices.alias; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction; @@ -27,6 +26,7 @@ import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.metadata.MetaDataService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java index 4a00de6f18b..015dacd739b 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.admin.indices.cache.clear; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.ShardOperationFailedException; import org.elasticsearch.action.TransportActions; @@ -34,6 +33,7 @@ import org.elasticsearch.index.cache.IndexCache; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.List; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java index 645420015ae..b6f822ee90b 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java @@ -35,9 +35,9 @@ import java.io.IOException; import java.util.Map; import java.util.concurrent.TimeUnit; -import static org.elasticsearch.util.gcommon.collect.Maps.*; import static org.elasticsearch.action.Actions.*; import static org.elasticsearch.util.TimeValue.*; +import static org.elasticsearch.util.gcommon.collect.Maps.*; import static org.elasticsearch.util.json.Jackson.*; import static org.elasticsearch.util.settings.ImmutableSettings.Builder.*; import static org.elasticsearch.util.settings.ImmutableSettings.*; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java index 404e77c11f2..fabea81a18f 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.admin.indices.create; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction; @@ -27,6 +26,7 @@ import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.metadata.MetaDataService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java index 1bf1bca40d0..aa8b2d02b12 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.admin.indices.delete; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction; @@ -27,6 +26,7 @@ import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.metadata.MetaDataService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java index b7ee1a2cc3c..4a84fb5ed26 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.admin.indices.flush; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.ShardOperationFailedException; import org.elasticsearch.action.TransportActions; @@ -35,6 +34,7 @@ import org.elasticsearch.index.shard.service.IndexShard; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.List; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/TransportGatewaySnapshotAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/TransportGatewaySnapshotAction.java index 81faa5fb097..a884359060e 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/TransportGatewaySnapshotAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/TransportGatewaySnapshotAction.java @@ -19,12 +19,12 @@ package org.elasticsearch.action.admin.indices.gateway.snapshot; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.support.replication.TransportIndicesReplicationOperationAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.concurrent.atomic.AtomicReferenceArray; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/TransportIndexGatewaySnapshotAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/TransportIndexGatewaySnapshotAction.java index e7fac7b89db..84ad12d9243 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/TransportIndexGatewaySnapshotAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/TransportIndexGatewaySnapshotAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.admin.indices.gateway.snapshot; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.support.replication.TransportIndexReplicationOperationAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.routing.GroupShardsIterator; @@ -28,6 +27,7 @@ import org.elasticsearch.index.Index; import org.elasticsearch.indices.IndexMissingException; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.concurrent.atomic.AtomicReferenceArray; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/TransportShardGatewaySnapshotAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/TransportShardGatewaySnapshotAction.java index ec7d279f2ce..f29c493fc10 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/TransportShardGatewaySnapshotAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/TransportShardGatewaySnapshotAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.admin.indices.gateway.snapshot; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.support.replication.TransportShardReplicationOperationAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; @@ -29,6 +28,7 @@ import org.elasticsearch.index.gateway.IndexShardGatewayService; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java index e5e7a27d47b..3ae5488aa67 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.admin.indices.mapping.put; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction; @@ -28,6 +27,7 @@ import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.MetaDataService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/optimize/TransportOptimizeAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/optimize/TransportOptimizeAction.java index bb2ae9579fe..5bc2771ff4a 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/optimize/TransportOptimizeAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/optimize/TransportOptimizeAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.admin.indices.optimize; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.ShardOperationFailedException; import org.elasticsearch.action.TransportActions; @@ -35,6 +34,7 @@ import org.elasticsearch.index.shard.service.IndexShard; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.List; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java index 0cc49b5bc78..87b7cfccc12 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.admin.indices.refresh; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.ShardOperationFailedException; import org.elasticsearch.action.TransportActions; @@ -35,6 +34,7 @@ import org.elasticsearch.index.shard.service.IndexShard; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.List; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/IndexShardStatus.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/IndexShardStatus.java index d1f5950cd1a..6bf493a59ac 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/IndexShardStatus.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/IndexShardStatus.java @@ -19,9 +19,9 @@ package org.elasticsearch.action.admin.indices.status; -import org.elasticsearch.util.gcommon.collect.Iterators; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.util.SizeValue; +import org.elasticsearch.util.gcommon.collect.Iterators; import java.util.Iterator; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/IndexStatus.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/IndexStatus.java index dbe2b55e7fb..7ddb5059d0f 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/IndexStatus.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/IndexStatus.java @@ -19,8 +19,8 @@ package org.elasticsearch.action.admin.indices.status; -import org.elasticsearch.util.gcommon.collect.Maps; import org.elasticsearch.util.SizeValue; +import org.elasticsearch.util.gcommon.collect.Maps; import org.elasticsearch.util.settings.Settings; import java.util.Iterator; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/IndicesStatusResponse.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/IndicesStatusResponse.java index a5f52d29459..992fdb1954d 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/IndicesStatusResponse.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/IndicesStatusResponse.java @@ -19,10 +19,10 @@ package org.elasticsearch.action.admin.indices.status; -import org.elasticsearch.util.gcommon.collect.ImmutableMap; import org.elasticsearch.action.ShardOperationFailedException; import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse; import org.elasticsearch.cluster.ClusterState; +import org.elasticsearch.util.gcommon.collect.ImmutableMap; import org.elasticsearch.util.io.stream.StreamInput; import org.elasticsearch.util.io.stream.StreamOutput; import org.elasticsearch.util.settings.Settings; @@ -31,9 +31,9 @@ import java.io.IOException; import java.util.List; import java.util.Map; +import static org.elasticsearch.action.admin.indices.status.ShardStatus.*; import static org.elasticsearch.util.gcommon.collect.Lists.*; import static org.elasticsearch.util.gcommon.collect.Maps.*; -import static org.elasticsearch.action.admin.indices.status.ShardStatus.*; import static org.elasticsearch.util.settings.ImmutableSettings.*; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/TransportIndicesStatusAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/TransportIndicesStatusAction.java index 463922f2ade..a3120ceb2f5 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/TransportIndicesStatusAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/TransportIndicesStatusAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.admin.indices.status; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.ShardOperationFailedException; import org.elasticsearch.action.TransportActions; @@ -36,6 +35,7 @@ import org.elasticsearch.index.shard.service.InternalIndexShard; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.io.IOException; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/count/TransportCountAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/count/TransportCountAction.java index a894c93b3d7..32ff090cca3 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/count/TransportCountAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/count/TransportCountAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.count; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.ShardOperationFailedException; import org.elasticsearch.action.TransportActions; @@ -34,6 +33,7 @@ import org.elasticsearch.index.shard.service.IndexShard; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.List; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java index 52b62296f50..73c7e1a85ed 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.delete; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.TransportActions; @@ -35,6 +34,7 @@ import org.elasticsearch.indices.IndexAlreadyExistsException; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/TransportDeleteByQueryAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/TransportDeleteByQueryAction.java index 3609317ce54..31c9ae95724 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/TransportDeleteByQueryAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/TransportDeleteByQueryAction.java @@ -19,12 +19,12 @@ package org.elasticsearch.action.deletebyquery; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.support.replication.TransportIndicesReplicationOperationAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.concurrent.atomic.AtomicReferenceArray; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/TransportIndexDeleteByQueryAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/TransportIndexDeleteByQueryAction.java index f9b1b4e81cf..8c4f6ddf910 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/TransportIndexDeleteByQueryAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/TransportIndexDeleteByQueryAction.java @@ -19,13 +19,13 @@ package org.elasticsearch.action.deletebyquery; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.support.replication.TransportIndexReplicationOperationAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.routing.GroupShardsIterator; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.concurrent.atomic.AtomicReferenceArray; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/TransportShardDeleteByQueryAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/TransportShardDeleteByQueryAction.java index fad172bfcc3..ab9e7150ee1 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/TransportShardDeleteByQueryAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/TransportShardDeleteByQueryAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.deletebyquery; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchIllegalStateException; import org.elasticsearch.action.support.replication.TransportShardReplicationOperationAction; import org.elasticsearch.cluster.ClusterService; @@ -30,6 +29,7 @@ import org.elasticsearch.cluster.routing.ShardsIterator; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/get/GetResponse.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/get/GetResponse.java index 678757600f4..59c33424cf6 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/get/GetResponse.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/get/GetResponse.java @@ -19,10 +19,10 @@ package org.elasticsearch.action.get; -import org.elasticsearch.util.gcommon.collect.ImmutableMap; import org.elasticsearch.ElasticSearchParseException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.util.Unicode; +import org.elasticsearch.util.gcommon.collect.ImmutableMap; import org.elasticsearch.util.io.stream.StreamInput; import org.elasticsearch.util.io.stream.StreamOutput; import org.elasticsearch.util.io.stream.Streamable; @@ -31,9 +31,9 @@ import java.io.IOException; import java.util.Iterator; import java.util.Map; +import static org.elasticsearch.action.get.GetField.*; import static org.elasticsearch.util.gcommon.collect.Iterators.*; import static org.elasticsearch.util.gcommon.collect.Maps.*; -import static org.elasticsearch.action.get.GetField.*; import static org.elasticsearch.util.json.Jackson.*; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/get/TransportGetAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/get/TransportGetAction.java index 21d07070885..5589492bd48 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/get/TransportGetAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/get/TransportGetAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.get; -import org.elasticsearch.util.guice.inject.Inject; import org.apache.lucene.document.Document; import org.apache.lucene.document.FieldSelector; import org.apache.lucene.document.Fieldable; @@ -34,6 +33,7 @@ import org.elasticsearch.index.shard.service.IndexShard; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.lucene.Lucene; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java index 554a09a5ff7..69111f1cd36 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.index; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.TransportActions; @@ -39,6 +38,7 @@ import org.elasticsearch.indices.IndicesService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; import org.elasticsearch.util.UUID; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/mlt/TransportMoreLikeThisAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/mlt/TransportMoreLikeThisAction.java index 29a323e3087..db37c00905a 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/mlt/TransportMoreLikeThisAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/mlt/TransportMoreLikeThisAction.java @@ -19,8 +19,6 @@ package org.elasticsearch.action.mlt; -import org.elasticsearch.index.query.xcontent.BoolQueryBuilder; -import org.elasticsearch.util.guice.inject.Inject; import org.apache.lucene.document.Fieldable; import org.apache.lucene.index.Term; import org.elasticsearch.ElasticSearchException; @@ -37,21 +35,23 @@ import org.elasticsearch.action.support.BaseAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.index.mapper.*; +import org.elasticsearch.index.query.xcontent.BoolQueryBuilder; import org.elasticsearch.index.query.xcontent.MoreLikeThisFieldQueryBuilder; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.transport.BaseTransportRequestHandler; import org.elasticsearch.transport.TransportChannel; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.Collections; import java.util.Iterator; import java.util.Set; -import static org.elasticsearch.util.gcommon.collect.Sets.*; import static org.elasticsearch.client.Requests.*; import static org.elasticsearch.index.query.xcontent.QueryBuilders.*; import static org.elasticsearch.search.builder.SearchSourceBuilder.*; +import static org.elasticsearch.util.gcommon.collect.Sets.*; /** * The more like this action. diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/SearchResponse.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/SearchResponse.java index 8755cb16fae..cc54b34c95f 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/SearchResponse.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/SearchResponse.java @@ -25,8 +25,6 @@ import org.elasticsearch.search.facets.Facets; import org.elasticsearch.search.internal.InternalSearchResponse; import org.elasticsearch.util.io.stream.StreamInput; import org.elasticsearch.util.io.stream.StreamOutput; -import org.elasticsearch.util.json.JsonBuilder; -import org.elasticsearch.util.json.ToJson; import org.elasticsearch.util.xcontent.ToXContent; import org.elasticsearch.util.xcontent.builder.XContentBuilder; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java index 7087c9ab758..24399e7bb95 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.search; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.search.type.TransportSearchDfsQueryAndFetchAction; @@ -30,6 +29,7 @@ import org.elasticsearch.action.support.BaseAction; import org.elasticsearch.transport.BaseTransportRequestHandler; import org.elasticsearch.transport.TransportChannel; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import static org.elasticsearch.action.search.SearchType.*; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/TransportSearchScrollAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/TransportSearchScrollAction.java index 3c2f3eb2224..9aa1c9a1df7 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/TransportSearchScrollAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/TransportSearchScrollAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.search; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchIllegalArgumentException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.TransportActions; @@ -30,6 +29,7 @@ import org.elasticsearch.action.support.BaseAction; import org.elasticsearch.transport.BaseTransportRequestHandler; import org.elasticsearch.transport.TransportChannel; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import static org.elasticsearch.action.search.type.ParsedScrollId.*; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryAndFetchAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryAndFetchAction.java index 00fb6759ea6..f13b4bbcb05 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryAndFetchAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryAndFetchAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.search.type; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.search.*; import org.elasticsearch.cluster.ClusterService; @@ -37,6 +36,7 @@ import org.elasticsearch.search.internal.InternalSearchRequest; import org.elasticsearch.search.internal.InternalSearchResponse; import org.elasticsearch.search.query.QuerySearchRequest; import org.elasticsearch.threadpool.ThreadPool; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.Collection; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryThenFetchAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryThenFetchAction.java index 600fbb3c1c2..06fac046490 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryThenFetchAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryThenFetchAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.search.type; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.search.*; import org.elasticsearch.cluster.ClusterService; @@ -40,6 +39,7 @@ import org.elasticsearch.search.query.QuerySearchRequest; import org.elasticsearch.search.query.QuerySearchResult; import org.elasticsearch.search.query.QuerySearchResultProvider; import org.elasticsearch.threadpool.ThreadPool; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.trove.ExtTIntArrayList; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryAndFetchAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryAndFetchAction.java index 50a6844c9c9..8c184f84d04 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryAndFetchAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryAndFetchAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.search.type; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchResponse; @@ -35,6 +34,7 @@ import org.elasticsearch.search.fetch.QueryFetchSearchResult; import org.elasticsearch.search.internal.InternalSearchRequest; import org.elasticsearch.search.internal.InternalSearchResponse; import org.elasticsearch.threadpool.ThreadPool; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.Map; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryThenFetchAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryThenFetchAction.java index ad86f3e555b..55ca0068445 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryThenFetchAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryThenFetchAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.search.type; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.search.*; import org.elasticsearch.cluster.ClusterService; @@ -37,6 +36,7 @@ import org.elasticsearch.search.internal.InternalSearchResponse; import org.elasticsearch.search.query.QuerySearchResult; import org.elasticsearch.search.query.QuerySearchResultProvider; import org.elasticsearch.threadpool.ThreadPool; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.trove.ExtTIntArrayList; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryAndFetchAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryAndFetchAction.java index 4444b7c11cb..2ef7ff8007c 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryAndFetchAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryAndFetchAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.search.type; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.search.*; import org.elasticsearch.cluster.ClusterService; @@ -35,6 +34,7 @@ import org.elasticsearch.search.internal.InternalSearchResponse; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.util.Tuple; import org.elasticsearch.util.component.AbstractComponent; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.Collection; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryThenFetchAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryThenFetchAction.java index 015a2877f00..82f54cba339 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryThenFetchAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryThenFetchAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.search.type; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.search.*; import org.elasticsearch.cluster.ClusterService; @@ -38,6 +37,7 @@ import org.elasticsearch.search.query.QuerySearchResultProvider; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.util.Tuple; import org.elasticsearch.util.component.AbstractComponent; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.trove.ExtTIntArrayList; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationResponse.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationResponse.java index fca58a4e578..8f859c518e2 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationResponse.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationResponse.java @@ -19,9 +19,9 @@ package org.elasticsearch.action.support.broadcast; -import org.elasticsearch.util.gcommon.collect.ImmutableList; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ShardOperationFailedException; +import org.elasticsearch.util.gcommon.collect.ImmutableList; import org.elasticsearch.util.io.stream.StreamInput; import org.elasticsearch.util.io.stream.StreamOutput; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastOperationAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastOperationAction.java index 3d4f427c795..35adcab4891 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastOperationAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastOperationAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.support.broadcast; -import org.elasticsearch.util.gcommon.collect.ImmutableList; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.BaseAction; @@ -34,6 +33,7 @@ import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.*; +import org.elasticsearch.util.gcommon.collect.ImmutableList; import org.elasticsearch.util.io.ThrowableObjectInputStream; import org.elasticsearch.util.io.ThrowableObjectOutputStream; import org.elasticsearch.util.io.stream.StreamInput; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationResponse.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationResponse.java index 215b7cb6b88..6f7cebea327 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationResponse.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationResponse.java @@ -19,9 +19,9 @@ package org.elasticsearch.action.support.nodes; -import org.elasticsearch.util.gcommon.collect.Maps; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.cluster.ClusterName; +import org.elasticsearch.util.gcommon.collect.Maps; import org.elasticsearch.util.io.stream.StreamInput; import org.elasticsearch.util.io.stream.StreamOutput; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesOperationAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesOperationAction.java index 1ed14fb87b0..b7f0dd1ba1c 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesOperationAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesOperationAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.support.nodes; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.FailedNodeException; @@ -31,6 +30,7 @@ import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.*; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.concurrent.atomic.AtomicInteger; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/TransportIndexReplicationOperationAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/TransportIndexReplicationOperationAction.java index 0eb6373f00c..f7b4eee96df 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/TransportIndexReplicationOperationAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/TransportIndexReplicationOperationAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.support.replication; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionResponse; @@ -30,6 +29,7 @@ import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.BaseTransportRequestHandler; import org.elasticsearch.transport.TransportChannel; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.concurrent.atomic.AtomicInteger; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/TransportIndicesReplicationOperationAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/TransportIndicesReplicationOperationAction.java index 770a1d1c1e5..36c4ca1838d 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/TransportIndicesReplicationOperationAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/TransportIndicesReplicationOperationAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.support.replication; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.support.BaseAction; @@ -29,6 +28,7 @@ import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.BaseTransportRequestHandler; import org.elasticsearch.transport.TransportChannel; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.concurrent.atomic.AtomicInteger; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/terms/TermsResponse.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/terms/TermsResponse.java index dfe911a21fd..1cbec1f34e5 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/terms/TermsResponse.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/terms/TermsResponse.java @@ -19,9 +19,9 @@ package org.elasticsearch.action.terms; -import org.elasticsearch.util.gcommon.collect.Iterators; import org.elasticsearch.action.ShardOperationFailedException; import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse; +import org.elasticsearch.util.gcommon.collect.Iterators; import org.elasticsearch.util.io.stream.StreamInput; import org.elasticsearch.util.io.stream.StreamOutput; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/terms/TransportTermsAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/terms/TransportTermsAction.java index 1f22a6d067b..2a6469e6bce 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/terms/TransportTermsAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/terms/TransportTermsAction.java @@ -19,8 +19,6 @@ package org.elasticsearch.action.terms; -import org.elasticsearch.util.gcommon.collect.Maps; -import org.elasticsearch.util.guice.inject.Inject; import org.apache.lucene.index.Term; import org.apache.lucene.index.TermDocs; import org.apache.lucene.index.TermEnum; @@ -44,8 +42,10 @@ import org.elasticsearch.indices.IndicesService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; import org.elasticsearch.util.BoundedTreeSet; +import org.elasticsearch.util.gcommon.collect.Maps; import org.elasticsearch.util.gnu.trove.TObjectIntHashMap; import org.elasticsearch.util.gnu.trove.TObjectIntIterator; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import javax.annotation.Nullable; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/node/NodeAdminClient.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/node/NodeAdminClient.java index 31dc80040ac..06b57020947 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/node/NodeAdminClient.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/node/NodeAdminClient.java @@ -19,11 +19,11 @@ package org.elasticsearch.client.node; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.client.AdminClient; import org.elasticsearch.client.ClusterAdminClient; import org.elasticsearch.client.IndicesAdminClient; import org.elasticsearch.util.component.AbstractComponent; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/node/NodeClient.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/node/NodeClient.java index af5321de6a6..86e79b31750 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/node/NodeClient.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/node/NodeClient.java @@ -19,7 +19,6 @@ package org.elasticsearch.client.node; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.ActionFuture; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.count.CountRequest; @@ -47,6 +46,7 @@ import org.elasticsearch.client.AdminClient; import org.elasticsearch.client.internal.InternalClient; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.util.component.AbstractComponent; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/node/NodeClientModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/node/NodeClientModule.java index 4c123c67229..da3ffadd690 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/node/NodeClientModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/node/NodeClientModule.java @@ -19,11 +19,11 @@ package org.elasticsearch.client.node; -import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.client.AdminClient; import org.elasticsearch.client.Client; import org.elasticsearch.client.ClusterAdminClient; import org.elasticsearch.client.IndicesAdminClient; +import org.elasticsearch.util.guice.inject.AbstractModule; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/node/NodeClusterAdminClient.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/node/NodeClusterAdminClient.java index 7d45d205a15..38abdb34080 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/node/NodeClusterAdminClient.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/node/NodeClusterAdminClient.java @@ -19,7 +19,6 @@ package org.elasticsearch.client.node; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.ActionFuture; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest; @@ -45,6 +44,7 @@ import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; import org.elasticsearch.action.admin.cluster.state.TransportClusterStateAction; import org.elasticsearch.client.ClusterAdminClient; import org.elasticsearch.util.component.AbstractComponent; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/node/NodeIndicesAdminClient.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/node/NodeIndicesAdminClient.java index e1065b1497b..063f3ce9302 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/node/NodeIndicesAdminClient.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/node/NodeIndicesAdminClient.java @@ -19,7 +19,6 @@ package org.elasticsearch.client.node; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.ActionFuture; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest; @@ -54,6 +53,7 @@ import org.elasticsearch.action.admin.indices.status.IndicesStatusResponse; import org.elasticsearch.action.admin.indices.status.TransportIndicesStatusAction; import org.elasticsearch.client.IndicesAdminClient; import org.elasticsearch.util.component.AbstractComponent; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/ClientTransportModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/ClientTransportModule.java index a21922bb7a0..4cd7d48b064 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/ClientTransportModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/ClientTransportModule.java @@ -19,11 +19,11 @@ package org.elasticsearch.client.transport; -import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.client.transport.support.InternalTransportAdminClient; import org.elasticsearch.client.transport.support.InternalTransportClient; import org.elasticsearch.client.transport.support.InternalTransportClusterAdminClient; import org.elasticsearch.client.transport.support.InternalTransportIndicesAdminClient; +import org.elasticsearch.util.guice.inject.AbstractModule; /** * @author kimchy (Shay Banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/TransportClient.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/TransportClient.java index 6dd5e96cf8e..52ffe9fe759 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/TransportClient.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/TransportClient.java @@ -19,10 +19,6 @@ package org.elasticsearch.client.transport; -import org.elasticsearch.util.gcommon.collect.ImmutableList; -import org.elasticsearch.util.guice.inject.Guice; -import org.elasticsearch.util.guice.inject.Injector; -import org.elasticsearch.util.guice.inject.Module; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.ActionFuture; import org.elasticsearch.action.ActionListener; @@ -59,6 +55,10 @@ import org.elasticsearch.transport.TransportModule; import org.elasticsearch.transport.TransportService; import org.elasticsearch.util.ThreadLocals; import org.elasticsearch.util.Tuple; +import org.elasticsearch.util.gcommon.collect.ImmutableList; +import org.elasticsearch.util.guice.inject.Guice; +import org.elasticsearch.util.guice.inject.Injector; +import org.elasticsearch.util.guice.inject.Module; import org.elasticsearch.util.settings.ImmutableSettings; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.settings.SettingsModule; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/TransportClientClusterModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/TransportClientClusterModule.java index b128aa34103..726fb2186cc 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/TransportClientClusterModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/TransportClientClusterModule.java @@ -19,10 +19,10 @@ package org.elasticsearch.client.transport; -import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.service.InternalClusterService; import org.elasticsearch.discovery.DiscoveryModule; +import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.util.logging.Loggers; import org.elasticsearch.util.settings.NoClassSettingsException; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/TransportClientClusterService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/TransportClientClusterService.java index f368d80c681..3b36fae3560 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/TransportClientClusterService.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/TransportClientClusterService.java @@ -19,10 +19,10 @@ package org.elasticsearch.client.transport; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.discovery.DiscoveryService; import org.elasticsearch.util.component.AbstractComponent; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java index 235accf854f..185237e7886 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java @@ -19,8 +19,6 @@ package org.elasticsearch.client.transport; -import org.elasticsearch.util.gcommon.collect.ImmutableList; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse; @@ -37,6 +35,8 @@ import org.elasticsearch.transport.RemoteTransportException; import org.elasticsearch.transport.TransportService; import org.elasticsearch.util.TimeValue; import org.elasticsearch.util.component.AbstractComponent; +import org.elasticsearch.util.gcommon.collect.ImmutableList; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.transport.TransportAddress; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/ClientTransportActionModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/ClientTransportActionModule.java index 995943a20cf..87e3b9624e1 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/ClientTransportActionModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/ClientTransportActionModule.java @@ -19,7 +19,6 @@ package org.elasticsearch.client.transport.action; -import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.client.transport.action.admin.cluster.health.ClientTransportClusterHealthAction; import org.elasticsearch.client.transport.action.admin.cluster.node.info.ClientTransportNodesInfoAction; import org.elasticsearch.client.transport.action.admin.cluster.node.shutdown.ClientTransportNodesShutdownAction; @@ -45,6 +44,7 @@ import org.elasticsearch.client.transport.action.index.ClientTransportIndexActio import org.elasticsearch.client.transport.action.search.ClientTransportSearchAction; import org.elasticsearch.client.transport.action.search.ClientTransportSearchScrollAction; import org.elasticsearch.client.transport.action.terms.ClientTransportTermsAction; +import org.elasticsearch.util.guice.inject.AbstractModule; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/health/ClientTransportClusterHealthAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/health/ClientTransportClusterHealthAction.java index e889f8ac10f..714605ad961 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/health/ClientTransportClusterHealthAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/health/ClientTransportClusterHealthAction.java @@ -19,12 +19,12 @@ package org.elasticsearch.client.transport.action.admin.cluster.health; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.client.transport.action.support.BaseClientTransportAction; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/info/ClientTransportNodesInfoAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/info/ClientTransportNodesInfoAction.java index d1d5d8b5322..1ead4e92d7d 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/info/ClientTransportNodesInfoAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/info/ClientTransportNodesInfoAction.java @@ -19,12 +19,12 @@ package org.elasticsearch.client.transport.action.admin.cluster.node.info; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.admin.cluster.node.info.NodesInfoRequest; import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse; import org.elasticsearch.client.transport.action.support.BaseClientTransportAction; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/shutdown/ClientTransportNodesShutdownAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/shutdown/ClientTransportNodesShutdownAction.java index 56f3dcd724d..57a0f4bb404 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/shutdown/ClientTransportNodesShutdownAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/shutdown/ClientTransportNodesShutdownAction.java @@ -19,12 +19,12 @@ package org.elasticsearch.client.transport.action.admin.cluster.node.shutdown; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.admin.cluster.node.shutdown.NodesShutdownRequest; import org.elasticsearch.action.admin.cluster.node.shutdown.NodesShutdownResponse; import org.elasticsearch.client.transport.action.support.BaseClientTransportAction; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/ping/broadcast/ClientTransportBroadcastPingAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/ping/broadcast/ClientTransportBroadcastPingAction.java index 0472137a47c..27af30f38e8 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/ping/broadcast/ClientTransportBroadcastPingAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/ping/broadcast/ClientTransportBroadcastPingAction.java @@ -19,12 +19,12 @@ package org.elasticsearch.client.transport.action.admin.cluster.ping.broadcast; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.admin.cluster.ping.broadcast.BroadcastPingRequest; import org.elasticsearch.action.admin.cluster.ping.broadcast.BroadcastPingResponse; import org.elasticsearch.client.transport.action.support.BaseClientTransportAction; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/ping/replication/ClientTransportReplicationPingAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/ping/replication/ClientTransportReplicationPingAction.java index aa3a22985fb..c2fce93a0ec 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/ping/replication/ClientTransportReplicationPingAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/ping/replication/ClientTransportReplicationPingAction.java @@ -19,12 +19,12 @@ package org.elasticsearch.client.transport.action.admin.cluster.ping.replication; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.admin.cluster.ping.replication.ReplicationPingRequest; import org.elasticsearch.action.admin.cluster.ping.replication.ReplicationPingResponse; import org.elasticsearch.client.transport.action.support.BaseClientTransportAction; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/ping/single/ClientTransportSinglePingAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/ping/single/ClientTransportSinglePingAction.java index 4198292fd62..cae8bd2c6e8 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/ping/single/ClientTransportSinglePingAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/ping/single/ClientTransportSinglePingAction.java @@ -19,12 +19,12 @@ package org.elasticsearch.client.transport.action.admin.cluster.ping.single; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.admin.cluster.ping.single.SinglePingRequest; import org.elasticsearch.action.admin.cluster.ping.single.SinglePingResponse; import org.elasticsearch.client.transport.action.support.BaseClientTransportAction; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/state/ClientTransportClusterStateAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/state/ClientTransportClusterStateAction.java index 25bda661445..86ec73f3ff8 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/state/ClientTransportClusterStateAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/state/ClientTransportClusterStateAction.java @@ -19,12 +19,12 @@ package org.elasticsearch.client.transport.action.admin.cluster.state; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest; import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; import org.elasticsearch.client.transport.action.support.BaseClientTransportAction; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/alias/ClientTransportIndicesAliasesAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/alias/ClientTransportIndicesAliasesAction.java index 48eaa69d536..aebc2c6e0ec 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/alias/ClientTransportIndicesAliasesAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/alias/ClientTransportIndicesAliasesAction.java @@ -19,12 +19,12 @@ package org.elasticsearch.client.transport.action.admin.indices.alias; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest; import org.elasticsearch.action.admin.indices.alias.IndicesAliasesResponse; import org.elasticsearch.client.transport.action.support.BaseClientTransportAction; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/cache/clear/ClientTransportClearIndicesCacheAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/cache/clear/ClientTransportClearIndicesCacheAction.java index 71eee420bdf..2b081c7f966 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/cache/clear/ClientTransportClearIndicesCacheAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/cache/clear/ClientTransportClearIndicesCacheAction.java @@ -19,12 +19,12 @@ package org.elasticsearch.client.transport.action.admin.indices.cache.clear; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.admin.indices.cache.clear.ClearIndicesCacheRequest; import org.elasticsearch.action.admin.indices.cache.clear.ClearIndicesCacheResponse; import org.elasticsearch.client.transport.action.support.BaseClientTransportAction; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/create/ClientTransportCreateIndexAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/create/ClientTransportCreateIndexAction.java index 20eb899c869..1f3635443b6 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/create/ClientTransportCreateIndexAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/create/ClientTransportCreateIndexAction.java @@ -19,12 +19,12 @@ package org.elasticsearch.client.transport.action.admin.indices.create; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.admin.indices.create.CreateIndexRequest; import org.elasticsearch.action.admin.indices.create.CreateIndexResponse; import org.elasticsearch.client.transport.action.support.BaseClientTransportAction; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/delete/ClientTransportDeleteIndexAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/delete/ClientTransportDeleteIndexAction.java index dc75118697f..6b083a7cad9 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/delete/ClientTransportDeleteIndexAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/delete/ClientTransportDeleteIndexAction.java @@ -19,12 +19,12 @@ package org.elasticsearch.client.transport.action.admin.indices.delete; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest; import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse; import org.elasticsearch.client.transport.action.support.BaseClientTransportAction; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/flush/ClientTransportFlushAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/flush/ClientTransportFlushAction.java index 2182d3eae37..a9f54c2fff8 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/flush/ClientTransportFlushAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/flush/ClientTransportFlushAction.java @@ -19,12 +19,12 @@ package org.elasticsearch.client.transport.action.admin.indices.flush; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.admin.indices.flush.FlushRequest; import org.elasticsearch.action.admin.indices.flush.FlushResponse; import org.elasticsearch.client.transport.action.support.BaseClientTransportAction; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/gateway/snapshot/ClientTransportGatewaySnapshotAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/gateway/snapshot/ClientTransportGatewaySnapshotAction.java index b8781e4d026..373e185e14c 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/gateway/snapshot/ClientTransportGatewaySnapshotAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/gateway/snapshot/ClientTransportGatewaySnapshotAction.java @@ -19,12 +19,12 @@ package org.elasticsearch.client.transport.action.admin.indices.gateway.snapshot; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.admin.indices.gateway.snapshot.GatewaySnapshotRequest; import org.elasticsearch.action.admin.indices.gateway.snapshot.GatewaySnapshotResponse; import org.elasticsearch.client.transport.action.support.BaseClientTransportAction; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/mapping/create/ClientTransportPutMappingAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/mapping/create/ClientTransportPutMappingAction.java index 32823e93774..a7379977704 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/mapping/create/ClientTransportPutMappingAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/mapping/create/ClientTransportPutMappingAction.java @@ -19,12 +19,12 @@ package org.elasticsearch.client.transport.action.admin.indices.mapping.create; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest; import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse; import org.elasticsearch.client.transport.action.support.BaseClientTransportAction; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/optimize/ClientTransportOptimizeAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/optimize/ClientTransportOptimizeAction.java index 23b38e585ff..c7c1e0d705d 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/optimize/ClientTransportOptimizeAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/optimize/ClientTransportOptimizeAction.java @@ -19,12 +19,12 @@ package org.elasticsearch.client.transport.action.admin.indices.optimize; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.admin.indices.optimize.OptimizeRequest; import org.elasticsearch.action.admin.indices.optimize.OptimizeResponse; import org.elasticsearch.client.transport.action.support.BaseClientTransportAction; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/refresh/ClientTransportRefreshAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/refresh/ClientTransportRefreshAction.java index e750db606dc..4bf7054166c 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/refresh/ClientTransportRefreshAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/refresh/ClientTransportRefreshAction.java @@ -19,12 +19,12 @@ package org.elasticsearch.client.transport.action.admin.indices.refresh; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.admin.indices.refresh.RefreshRequest; import org.elasticsearch.action.admin.indices.refresh.RefreshResponse; import org.elasticsearch.client.transport.action.support.BaseClientTransportAction; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/status/ClientTransportIndicesStatusAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/status/ClientTransportIndicesStatusAction.java index 2b9a40946a0..c7dd616475d 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/status/ClientTransportIndicesStatusAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/status/ClientTransportIndicesStatusAction.java @@ -19,12 +19,12 @@ package org.elasticsearch.client.transport.action.admin.indices.status; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.admin.indices.status.IndicesStatusRequest; import org.elasticsearch.action.admin.indices.status.IndicesStatusResponse; import org.elasticsearch.client.transport.action.support.BaseClientTransportAction; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/count/ClientTransportCountAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/count/ClientTransportCountAction.java index dd8f43707e2..ff28b995e45 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/count/ClientTransportCountAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/count/ClientTransportCountAction.java @@ -19,12 +19,12 @@ package org.elasticsearch.client.transport.action.count; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.count.CountRequest; import org.elasticsearch.action.count.CountResponse; import org.elasticsearch.client.transport.action.support.BaseClientTransportAction; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/delete/ClientTransportDeleteAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/delete/ClientTransportDeleteAction.java index 53b813688a6..d38a2ee9da5 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/delete/ClientTransportDeleteAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/delete/ClientTransportDeleteAction.java @@ -19,12 +19,12 @@ package org.elasticsearch.client.transport.action.delete; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.delete.DeleteResponse; import org.elasticsearch.client.transport.action.support.BaseClientTransportAction; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/deletebyquery/ClientTransportDeleteByQueryAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/deletebyquery/ClientTransportDeleteByQueryAction.java index fc15b614f28..89d945beaab 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/deletebyquery/ClientTransportDeleteByQueryAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/deletebyquery/ClientTransportDeleteByQueryAction.java @@ -19,12 +19,12 @@ package org.elasticsearch.client.transport.action.deletebyquery; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.deletebyquery.DeleteByQueryRequest; import org.elasticsearch.action.deletebyquery.DeleteByQueryResponse; import org.elasticsearch.client.transport.action.support.BaseClientTransportAction; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/get/ClientTransportGetAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/get/ClientTransportGetAction.java index 3a7db7b174c..94775bddf5b 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/get/ClientTransportGetAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/get/ClientTransportGetAction.java @@ -19,12 +19,12 @@ package org.elasticsearch.client.transport.action.get; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.get.GetRequest; import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.client.transport.action.support.BaseClientTransportAction; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/index/ClientTransportIndexAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/index/ClientTransportIndexAction.java index c79142d4ef9..30e5ab6d12e 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/index/ClientTransportIndexAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/index/ClientTransportIndexAction.java @@ -19,12 +19,12 @@ package org.elasticsearch.client.transport.action.index; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.client.transport.action.support.BaseClientTransportAction; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/mlt/ClientTransportMoreLikeThisAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/mlt/ClientTransportMoreLikeThisAction.java index 14a785baf43..d842ef35774 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/mlt/ClientTransportMoreLikeThisAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/mlt/ClientTransportMoreLikeThisAction.java @@ -19,12 +19,12 @@ package org.elasticsearch.client.transport.action.mlt; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.mlt.MoreLikeThisRequest; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.transport.action.support.BaseClientTransportAction; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/search/ClientTransportSearchAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/search/ClientTransportSearchAction.java index 5aec226db0a..af30443cd16 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/search/ClientTransportSearchAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/search/ClientTransportSearchAction.java @@ -19,12 +19,12 @@ package org.elasticsearch.client.transport.action.search; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.transport.action.support.BaseClientTransportAction; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/search/ClientTransportSearchScrollAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/search/ClientTransportSearchScrollAction.java index 0997817c3d5..9cc5ffc7747 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/search/ClientTransportSearchScrollAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/search/ClientTransportSearchScrollAction.java @@ -19,12 +19,12 @@ package org.elasticsearch.client.transport.action.search; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchScrollRequest; import org.elasticsearch.client.transport.action.support.BaseClientTransportAction; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/terms/ClientTransportTermsAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/terms/ClientTransportTermsAction.java index 24a88bfdf85..9334a697dbb 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/terms/ClientTransportTermsAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/terms/ClientTransportTermsAction.java @@ -19,12 +19,12 @@ package org.elasticsearch.client.transport.action.terms; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.TransportActions; import org.elasticsearch.action.terms.TermsRequest; import org.elasticsearch.action.terms.TermsResponse; import org.elasticsearch.client.transport.action.support.BaseClientTransportAction; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/support/InternalTransportAdminClient.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/support/InternalTransportAdminClient.java index e0a9b7a08fd..ddffa18705c 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/support/InternalTransportAdminClient.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/support/InternalTransportAdminClient.java @@ -19,12 +19,12 @@ package org.elasticsearch.client.transport.support; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.client.AdminClient; import org.elasticsearch.client.ClusterAdminClient; import org.elasticsearch.client.IndicesAdminClient; import org.elasticsearch.client.transport.TransportClientNodesService; import org.elasticsearch.util.component.AbstractComponent; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/support/InternalTransportClient.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/support/InternalTransportClient.java index e0cdc0b2ab8..4d8f248cb54 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/support/InternalTransportClient.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/support/InternalTransportClient.java @@ -19,7 +19,6 @@ package org.elasticsearch.client.transport.support; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.ActionFuture; import org.elasticsearch.action.ActionListener; @@ -54,6 +53,7 @@ import org.elasticsearch.client.transport.action.terms.ClientTransportTermsActio import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.util.component.AbstractComponent; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/support/InternalTransportClusterAdminClient.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/support/InternalTransportClusterAdminClient.java index 2bf33c1678f..a9ae9d5fea1 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/support/InternalTransportClusterAdminClient.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/support/InternalTransportClusterAdminClient.java @@ -19,7 +19,6 @@ package org.elasticsearch.client.transport.support; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.ActionFuture; import org.elasticsearch.action.ActionListener; @@ -48,6 +47,7 @@ import org.elasticsearch.client.transport.action.admin.cluster.ping.single.Clien import org.elasticsearch.client.transport.action.admin.cluster.state.ClientTransportClusterStateAction; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.util.component.AbstractComponent; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/support/InternalTransportIndicesAdminClient.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/support/InternalTransportIndicesAdminClient.java index 2eba52897be..d8d65905f20 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/support/InternalTransportIndicesAdminClient.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/support/InternalTransportIndicesAdminClient.java @@ -19,7 +19,6 @@ package org.elasticsearch.client.transport.support; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.ActionFuture; import org.elasticsearch.action.ActionListener; @@ -57,6 +56,7 @@ import org.elasticsearch.client.transport.action.admin.indices.refresh.ClientTra import org.elasticsearch.client.transport.action.admin.indices.status.ClientTransportIndicesStatusAction; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.util.component.AbstractComponent; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/ClusterModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/ClusterModule.java index f6b88713274..913aea06c9c 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/ClusterModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/ClusterModule.java @@ -19,7 +19,6 @@ package org.elasticsearch.cluster; -import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.cluster.action.index.MappingUpdatedAction; import org.elasticsearch.cluster.action.index.NodeIndexCreatedAction; import org.elasticsearch.cluster.action.index.NodeIndexDeletedAction; @@ -30,6 +29,7 @@ import org.elasticsearch.cluster.routing.RoutingService; import org.elasticsearch.cluster.routing.strategy.DefaultShardsRoutingStrategy; import org.elasticsearch.cluster.routing.strategy.ShardsRoutingStrategy; import org.elasticsearch.cluster.service.InternalClusterService; +import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/index/MappingUpdatedAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/index/MappingUpdatedAction.java index 166ecbdcb60..36cbd615d38 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/index/MappingUpdatedAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/index/MappingUpdatedAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.cluster.action.index; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; @@ -29,6 +28,7 @@ import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.metadata.MetaDataService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.io.stream.StreamInput; import org.elasticsearch.util.io.stream.StreamOutput; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/index/NodeIndexCreatedAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/index/NodeIndexCreatedAction.java index c8c4118baf7..beb687a45de 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/index/NodeIndexCreatedAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/index/NodeIndexCreatedAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.cluster.action.index; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.node.DiscoveryNodes; @@ -29,6 +28,7 @@ import org.elasticsearch.transport.TransportChannel; import org.elasticsearch.transport.TransportService; import org.elasticsearch.transport.VoidTransportResponseHandler; import org.elasticsearch.util.component.AbstractComponent; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.io.stream.StreamInput; import org.elasticsearch.util.io.stream.StreamOutput; import org.elasticsearch.util.io.stream.Streamable; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/index/NodeIndexDeletedAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/index/NodeIndexDeletedAction.java index 5e75784aded..74263a47658 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/index/NodeIndexDeletedAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/index/NodeIndexDeletedAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.cluster.action.index; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.node.DiscoveryNodes; @@ -29,6 +28,7 @@ import org.elasticsearch.transport.TransportChannel; import org.elasticsearch.transport.TransportService; import org.elasticsearch.transport.VoidTransportResponseHandler; import org.elasticsearch.util.component.AbstractComponent; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.io.stream.StreamInput; import org.elasticsearch.util.io.stream.StreamOutput; import org.elasticsearch.util.io.stream.Streamable; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/index/NodeMappingCreatedAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/index/NodeMappingCreatedAction.java index 52bf739fc1c..a520811953f 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/index/NodeMappingCreatedAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/index/NodeMappingCreatedAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.cluster.action.index; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.node.DiscoveryNodes; @@ -29,6 +28,7 @@ import org.elasticsearch.transport.TransportChannel; import org.elasticsearch.transport.TransportService; import org.elasticsearch.transport.VoidTransportResponseHandler; import org.elasticsearch.util.component.AbstractComponent; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.io.stream.StreamInput; import org.elasticsearch.util.io.stream.StreamOutput; import org.elasticsearch.util.io.stream.Streamable; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java index b668a6a7f89..9700fa297f0 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.cluster.action.shard; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; @@ -36,6 +35,7 @@ import org.elasticsearch.transport.TransportChannel; import org.elasticsearch.transport.TransportService; import org.elasticsearch.transport.VoidTransportResponseHandler; import org.elasticsearch.util.component.AbstractComponent; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.io.stream.StreamInput; import org.elasticsearch.util.io.stream.StreamOutput; import org.elasticsearch.util.io.stream.Streamable; @@ -44,9 +44,9 @@ import org.elasticsearch.util.settings.Settings; import java.io.IOException; -import static org.elasticsearch.util.gcommon.collect.Lists.*; import static org.elasticsearch.cluster.ClusterState.*; import static org.elasticsearch.cluster.routing.ImmutableShardRouting.*; +import static org.elasticsearch.util.gcommon.collect.Lists.*; /** * @author kimchy (Shay Banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java index 042d1edbf98..8927940bc1e 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java @@ -19,13 +19,13 @@ package org.elasticsearch.cluster.metadata; -import org.elasticsearch.util.gcommon.collect.ImmutableMap; -import org.elasticsearch.util.gcommon.collect.ImmutableSet; import org.codehaus.jackson.JsonParser; import org.codehaus.jackson.JsonToken; import org.elasticsearch.util.MapBuilder; import org.elasticsearch.util.Preconditions; import org.elasticsearch.util.concurrent.Immutable; +import org.elasticsearch.util.gcommon.collect.ImmutableMap; +import org.elasticsearch.util.gcommon.collect.ImmutableSet; import org.elasticsearch.util.io.stream.StreamInput; import org.elasticsearch.util.io.stream.StreamOutput; import org.elasticsearch.util.json.JsonBuilder; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java index 9efbc5e290e..6db54db9a11 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java @@ -19,10 +19,6 @@ package org.elasticsearch.cluster.metadata; -import org.elasticsearch.util.gcommon.collect.ImmutableMap; -import org.elasticsearch.util.gcommon.collect.ImmutableSet; -import org.elasticsearch.util.gcommon.collect.Lists; -import org.elasticsearch.util.gcommon.collect.UnmodifiableIterator; import org.codehaus.jackson.JsonParser; import org.codehaus.jackson.JsonToken; import org.elasticsearch.ElasticSearchIllegalArgumentException; @@ -30,6 +26,10 @@ import org.elasticsearch.index.Index; import org.elasticsearch.indices.IndexMissingException; import org.elasticsearch.util.MapBuilder; import org.elasticsearch.util.concurrent.Immutable; +import org.elasticsearch.util.gcommon.collect.ImmutableMap; +import org.elasticsearch.util.gcommon.collect.ImmutableSet; +import org.elasticsearch.util.gcommon.collect.Lists; +import org.elasticsearch.util.gcommon.collect.UnmodifiableIterator; import org.elasticsearch.util.io.stream.StreamInput; import org.elasticsearch.util.io.stream.StreamOutput; import org.elasticsearch.util.json.JsonBuilder; @@ -41,9 +41,9 @@ import javax.annotation.Nullable; import java.io.IOException; import java.util.*; +import static org.elasticsearch.util.MapBuilder.*; import static org.elasticsearch.util.gcommon.collect.Lists.*; import static org.elasticsearch.util.gcommon.collect.Sets.*; -import static org.elasticsearch.util.MapBuilder.*; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MetaDataService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MetaDataService.java index e011d85923b..42221615a4e 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MetaDataService.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MetaDataService.java @@ -19,8 +19,6 @@ package org.elasticsearch.cluster.metadata; -import org.elasticsearch.util.gcommon.collect.Maps; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; @@ -46,6 +44,8 @@ import org.elasticsearch.util.Strings; import org.elasticsearch.util.TimeValue; import org.elasticsearch.util.Tuple; import org.elasticsearch.util.component.AbstractComponent; +import org.elasticsearch.util.gcommon.collect.Maps; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.io.Streams; import org.elasticsearch.util.settings.ImmutableSettings; import org.elasticsearch.util.settings.Settings; @@ -59,12 +59,12 @@ import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import static org.elasticsearch.util.gcommon.collect.Maps.*; -import static org.elasticsearch.util.gcommon.collect.Sets.*; import static org.elasticsearch.cluster.ClusterState.*; import static org.elasticsearch.cluster.metadata.IndexMetaData.*; import static org.elasticsearch.cluster.metadata.MetaData.*; import static org.elasticsearch.index.mapper.DocumentMapper.MergeFlags.*; +import static org.elasticsearch.util.gcommon.collect.Maps.*; +import static org.elasticsearch.util.gcommon.collect.Sets.*; import static org.elasticsearch.util.settings.ImmutableSettings.*; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java index f28d1d50de9..d097ddddbf3 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java @@ -19,10 +19,10 @@ package org.elasticsearch.cluster.node; +import org.apache.lucene.util.StringHelper; import org.elasticsearch.util.gcommon.collect.ImmutableList; import org.elasticsearch.util.gcommon.collect.ImmutableMap; import org.elasticsearch.util.gcommon.collect.Maps; -import org.apache.lucene.util.StringHelper; import org.elasticsearch.util.io.stream.StreamInput; import org.elasticsearch.util.io.stream.StreamOutput; import org.elasticsearch.util.io.stream.Streamable; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/ImmutableShardRouting.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/ImmutableShardRouting.java index 6b674873aab..a5be0481861 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/ImmutableShardRouting.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/ImmutableShardRouting.java @@ -19,8 +19,8 @@ package org.elasticsearch.cluster.routing; -import org.elasticsearch.util.gcommon.collect.ImmutableList; import org.elasticsearch.index.shard.ShardId; +import org.elasticsearch.util.gcommon.collect.ImmutableList; import org.elasticsearch.util.io.stream.StreamInput; import org.elasticsearch.util.io.stream.StreamOutput; import org.elasticsearch.util.io.stream.Streamable; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java index 777c4969e1d..31f04edb096 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java @@ -19,13 +19,13 @@ package org.elasticsearch.cluster.routing; -import org.elasticsearch.util.gcommon.collect.ImmutableMap; -import org.elasticsearch.util.gcommon.collect.Sets; -import org.elasticsearch.util.gcommon.collect.UnmodifiableIterator; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.util.IdentityHashSet; import org.elasticsearch.util.concurrent.Immutable; +import org.elasticsearch.util.gcommon.collect.ImmutableMap; +import org.elasticsearch.util.gcommon.collect.Sets; +import org.elasticsearch.util.gcommon.collect.UnmodifiableIterator; import org.elasticsearch.util.io.stream.StreamInput; import org.elasticsearch.util.io.stream.StreamOutput; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java index a7229074479..807b7d10774 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java @@ -19,10 +19,10 @@ package org.elasticsearch.cluster.routing; -import org.elasticsearch.util.gcommon.collect.ImmutableList; -import org.elasticsearch.util.gcommon.collect.UnmodifiableIterator; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.util.concurrent.jsr166y.ThreadLocalRandom; +import org.elasticsearch.util.gcommon.collect.ImmutableList; +import org.elasticsearch.util.gcommon.collect.UnmodifiableIterator; import org.elasticsearch.util.io.stream.StreamInput; import org.elasticsearch.util.io.stream.StreamOutput; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java index 59e6b96eac3..00fd2c386c6 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java @@ -19,13 +19,13 @@ package org.elasticsearch.cluster.routing; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.cluster.*; import org.elasticsearch.cluster.routing.strategy.ShardsRoutingStrategy; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.util.TimeValue; import org.elasticsearch.util.component.AbstractLifecycleComponent; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.concurrent.Future; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java index b0708d68beb..94efcbd57ce 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java @@ -19,14 +19,14 @@ package org.elasticsearch.cluster.routing; -import org.elasticsearch.util.gcommon.collect.ImmutableMap; -import org.elasticsearch.util.gcommon.collect.Lists; -import org.elasticsearch.util.gcommon.collect.UnmodifiableIterator; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.index.Index; import org.elasticsearch.indices.IndexMissingException; import org.elasticsearch.util.concurrent.Immutable; +import org.elasticsearch.util.gcommon.collect.ImmutableMap; +import org.elasticsearch.util.gcommon.collect.Lists; +import org.elasticsearch.util.gcommon.collect.UnmodifiableIterator; import org.elasticsearch.util.io.stream.StreamInput; import org.elasticsearch.util.io.stream.StreamOutput; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/strategy/DefaultShardsRoutingStrategy.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/strategy/DefaultShardsRoutingStrategy.java index ee1be9af054..ef624b60561 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/strategy/DefaultShardsRoutingStrategy.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/strategy/DefaultShardsRoutingStrategy.java @@ -27,8 +27,8 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import static org.elasticsearch.util.gcommon.collect.Sets.*; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; +import static org.elasticsearch.util.gcommon.collect.Sets.*; /** * @author kimchy (Shay Banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java index dc0d6980d6e..775b8e8f6c8 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java @@ -19,7 +19,6 @@ package org.elasticsearch.cluster.service; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.cluster.*; import org.elasticsearch.cluster.node.DiscoveryNode; @@ -29,6 +28,7 @@ import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; import org.elasticsearch.util.TimeValue; import org.elasticsearch.util.component.AbstractLifecycleComponent; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.List; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/IndexModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/IndexModule.java index 198e2725591..c198932b559 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/IndexModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/IndexModule.java @@ -19,9 +19,9 @@ package org.elasticsearch.index; -import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.index.service.IndexService; import org.elasticsearch.index.service.InternalIndexService; +import org.elasticsearch.util.guice.inject.AbstractModule; /** * @author kimchy (Shay Banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/IndexServiceManagement.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/IndexServiceManagement.java index 7e15cd48a89..61000b76fae 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/IndexServiceManagement.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/IndexServiceManagement.java @@ -19,13 +19,13 @@ package org.elasticsearch.index; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.index.service.IndexService; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.jmx.JmxService; import org.elasticsearch.jmx.MBean; import org.elasticsearch.jmx.ManagedAttribute; import org.elasticsearch.util.component.CloseableComponent; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ASCIIFoldingTokenFilterFactory.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ASCIIFoldingTokenFilterFactory.java index 1f06b31111f..b8b84e1d0cf 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ASCIIFoldingTokenFilterFactory.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ASCIIFoldingTokenFilterFactory.java @@ -19,12 +19,12 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.ASCIIFoldingFilter; import org.apache.lucene.analysis.TokenStream; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AnalysisService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AnalysisService.java index f630ec77b19..ce2dce26015 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AnalysisService.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AnalysisService.java @@ -19,13 +19,13 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.gcommon.collect.ImmutableMap; -import org.elasticsearch.util.guice.inject.Inject; import org.apache.lucene.analysis.Analyzer; import org.elasticsearch.index.AbstractIndexComponent; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.component.CloseableComponent; +import org.elasticsearch.util.gcommon.collect.ImmutableMap; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.ImmutableSettings; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AnalyzerProvider.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AnalyzerProvider.java index 519aac8e64a..232d91b3981 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AnalyzerProvider.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AnalyzerProvider.java @@ -19,9 +19,9 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.guice.inject.Provider; import org.apache.lucene.analysis.Analyzer; import org.elasticsearch.index.IndexComponent; +import org.elasticsearch.util.guice.inject.Provider; /** * @author kimchy (Shay Banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ArabicAnalyzerProvider.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ArabicAnalyzerProvider.java index 23151a8ea44..e77ce168520 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ArabicAnalyzerProvider.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ArabicAnalyzerProvider.java @@ -19,14 +19,14 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.gcommon.collect.ImmutableSet; -import org.elasticsearch.util.gcommon.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.ar.ArabicAnalyzer; import org.apache.lucene.util.Version; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.gcommon.collect.ImmutableSet; +import org.elasticsearch.util.gcommon.collect.Iterators; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; import java.util.Set; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ArabicStemTokenFilterFactory.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ArabicStemTokenFilterFactory.java index 764529c091b..df9170d3a5c 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ArabicStemTokenFilterFactory.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ArabicStemTokenFilterFactory.java @@ -19,12 +19,12 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.ar.ArabicStemFilter; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/BrazilianAnalyzerProvider.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/BrazilianAnalyzerProvider.java index d59075ae7ee..60f6a03310d 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/BrazilianAnalyzerProvider.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/BrazilianAnalyzerProvider.java @@ -19,14 +19,14 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.gcommon.collect.ImmutableSet; -import org.elasticsearch.util.gcommon.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.br.BrazilianAnalyzer; import org.apache.lucene.util.Version; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.gcommon.collect.ImmutableSet; +import org.elasticsearch.util.gcommon.collect.Iterators; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; import java.util.Set; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/BrazilianStemTokenFilterFactory.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/BrazilianStemTokenFilterFactory.java index ac2a0b5c94f..8a8f67e72c9 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/BrazilianStemTokenFilterFactory.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/BrazilianStemTokenFilterFactory.java @@ -19,14 +19,14 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.gcommon.collect.ImmutableSet; -import org.elasticsearch.util.gcommon.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.br.BrazilianStemFilter; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.gcommon.collect.ImmutableSet; +import org.elasticsearch.util.gcommon.collect.Iterators; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; import java.util.Set; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ChineseAnalyzerProvider.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ChineseAnalyzerProvider.java index 8bd6a3cf0e7..febc55ac498 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ChineseAnalyzerProvider.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ChineseAnalyzerProvider.java @@ -19,11 +19,11 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.cn.ChineseAnalyzer; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/CjkAnalyzerProvider.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/CjkAnalyzerProvider.java index 34ebe367c78..f92bc1f0c2d 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/CjkAnalyzerProvider.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/CjkAnalyzerProvider.java @@ -19,14 +19,14 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.gcommon.collect.ImmutableSet; -import org.elasticsearch.util.gcommon.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.cjk.CJKAnalyzer; import org.apache.lucene.util.Version; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.gcommon.collect.ImmutableSet; +import org.elasticsearch.util.gcommon.collect.Iterators; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; import java.util.Set; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzerProvider.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzerProvider.java index 3611e05f1c1..cfd16c351b7 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzerProvider.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzerProvider.java @@ -19,10 +19,10 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.ImmutableSettings; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/CzechAnalyzerProvider.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/CzechAnalyzerProvider.java index 6d10a5aa167..c114904b81b 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/CzechAnalyzerProvider.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/CzechAnalyzerProvider.java @@ -19,14 +19,14 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.gcommon.collect.ImmutableSet; -import org.elasticsearch.util.gcommon.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.cz.CzechAnalyzer; import org.apache.lucene.util.Version; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.gcommon.collect.ImmutableSet; +import org.elasticsearch.util.gcommon.collect.Iterators; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; import java.util.Set; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/DutchAnalyzerProvider.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/DutchAnalyzerProvider.java index 99b9190279a..dcffb167ba2 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/DutchAnalyzerProvider.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/DutchAnalyzerProvider.java @@ -19,14 +19,14 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.gcommon.collect.ImmutableSet; -import org.elasticsearch.util.gcommon.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.nl.DutchAnalyzer; import org.apache.lucene.util.Version; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.gcommon.collect.ImmutableSet; +import org.elasticsearch.util.gcommon.collect.Iterators; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; import java.util.Set; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/DutchStemTokenFilterFactory.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/DutchStemTokenFilterFactory.java index 09c886dbbf5..b4623778bff 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/DutchStemTokenFilterFactory.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/DutchStemTokenFilterFactory.java @@ -19,14 +19,14 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.gcommon.collect.ImmutableSet; -import org.elasticsearch.util.gcommon.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.nl.DutchStemFilter; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.gcommon.collect.ImmutableSet; +import org.elasticsearch.util.gcommon.collect.Iterators; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; import java.util.Set; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenFilterFactory.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenFilterFactory.java index da41caa1068..dd7ed6f30e5 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenFilterFactory.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenFilterFactory.java @@ -19,14 +19,14 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.ngram.EdgeNGramTokenFilter; import org.apache.lucene.analysis.ngram.EdgeNGramTokenizer; import org.apache.lucene.analysis.ngram.NGramTokenFilter; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenizerFactory.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenizerFactory.java index e81db3e0acf..92941ff109e 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenizerFactory.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenizerFactory.java @@ -19,13 +19,13 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.ngram.EdgeNGramTokenizer; import org.apache.lucene.analysis.ngram.NGramTokenizer; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; import java.io.Reader; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/FieldNameAnalyzer.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/FieldNameAnalyzer.java index 7022b988096..a070e87ac0c 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/FieldNameAnalyzer.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/FieldNameAnalyzer.java @@ -19,9 +19,9 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.gcommon.collect.ImmutableMap; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.TokenStream; +import org.elasticsearch.util.gcommon.collect.ImmutableMap; import java.io.IOException; import java.io.Reader; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/FrenchAnalyzerProvider.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/FrenchAnalyzerProvider.java index 070c4090f4e..f89fe89696d 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/FrenchAnalyzerProvider.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/FrenchAnalyzerProvider.java @@ -19,14 +19,14 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.gcommon.collect.ImmutableSet; -import org.elasticsearch.util.gcommon.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.fr.FrenchAnalyzer; import org.apache.lucene.util.Version; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.gcommon.collect.ImmutableSet; +import org.elasticsearch.util.gcommon.collect.Iterators; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; import java.util.Set; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/FrenchStemTokenFilterFactory.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/FrenchStemTokenFilterFactory.java index 054d3ce3c2c..ca40e4d3e5c 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/FrenchStemTokenFilterFactory.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/FrenchStemTokenFilterFactory.java @@ -19,14 +19,14 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.gcommon.collect.ImmutableSet; -import org.elasticsearch.util.gcommon.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.fr.FrenchStemFilter; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.gcommon.collect.ImmutableSet; +import org.elasticsearch.util.gcommon.collect.Iterators; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; import java.util.Set; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/GermanAnalyzerProvider.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/GermanAnalyzerProvider.java index 6f496af11c8..eea4c1cd8ca 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/GermanAnalyzerProvider.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/GermanAnalyzerProvider.java @@ -19,14 +19,14 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.gcommon.collect.ImmutableSet; -import org.elasticsearch.util.gcommon.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.de.GermanAnalyzer; import org.apache.lucene.util.Version; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.gcommon.collect.ImmutableSet; +import org.elasticsearch.util.gcommon.collect.Iterators; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; import java.util.Set; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/GermanStemTokenFilterFactory.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/GermanStemTokenFilterFactory.java index ad2e0d3e372..d9c1adf5a7e 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/GermanStemTokenFilterFactory.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/GermanStemTokenFilterFactory.java @@ -19,14 +19,14 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.gcommon.collect.ImmutableSet; -import org.elasticsearch.util.gcommon.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.de.GermanStemFilter; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.gcommon.collect.ImmutableSet; +import org.elasticsearch.util.gcommon.collect.Iterators; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; import java.util.Set; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/GreekAnalyzerProvider.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/GreekAnalyzerProvider.java index 36e4d14eec1..68483facc43 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/GreekAnalyzerProvider.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/GreekAnalyzerProvider.java @@ -19,14 +19,14 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.gcommon.collect.ImmutableSet; -import org.elasticsearch.util.gcommon.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.el.GreekAnalyzer; import org.apache.lucene.util.Version; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.gcommon.collect.ImmutableSet; +import org.elasticsearch.util.gcommon.collect.Iterators; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; import java.util.Set; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/KeywordAnalyzerProvider.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/KeywordAnalyzerProvider.java index 6ce7a53df1f..3c75092ab22 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/KeywordAnalyzerProvider.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/KeywordAnalyzerProvider.java @@ -19,11 +19,11 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.KeywordAnalyzer; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/KeywordTokenizerFactory.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/KeywordTokenizerFactory.java index 7dbacfa3c60..827d045436f 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/KeywordTokenizerFactory.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/KeywordTokenizerFactory.java @@ -19,12 +19,12 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.KeywordTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; import java.io.Reader; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/LengthTokenFilterFactory.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/LengthTokenFilterFactory.java index aa3acc317a8..fa71625ad82 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/LengthTokenFilterFactory.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/LengthTokenFilterFactory.java @@ -19,12 +19,12 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.LengthFilter; import org.apache.lucene.analysis.TokenStream; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/LetterTokenizerFactory.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/LetterTokenizerFactory.java index c013c018a59..31a283be168 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/LetterTokenizerFactory.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/LetterTokenizerFactory.java @@ -19,12 +19,12 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.LetterTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; import java.io.Reader; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenFilterFactory.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenFilterFactory.java index e43fd04563a..f7f32ae60d8 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenFilterFactory.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenFilterFactory.java @@ -19,12 +19,12 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.LowerCaseFilter; import org.apache.lucene.analysis.TokenStream; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenizerFactory.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenizerFactory.java index 79c7523a06c..bb626e1b1fb 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenizerFactory.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenizerFactory.java @@ -19,12 +19,12 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.LowerCaseTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; import java.io.Reader; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NGramTokenFilterFactory.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NGramTokenFilterFactory.java index fcad67258ea..8dfcb68e417 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NGramTokenFilterFactory.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NGramTokenFilterFactory.java @@ -19,12 +19,12 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.ngram.NGramTokenFilter; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NGramTokenizerFactory.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NGramTokenizerFactory.java index 434564bf2a0..5fae0b71e23 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NGramTokenizerFactory.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NGramTokenizerFactory.java @@ -19,12 +19,12 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.ngram.NGramTokenizer; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; import java.io.Reader; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PersianAnalyzerProvider.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PersianAnalyzerProvider.java index 2e0e14874cd..0e7dca3b8c6 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PersianAnalyzerProvider.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PersianAnalyzerProvider.java @@ -19,14 +19,14 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.gcommon.collect.ImmutableSet; -import org.elasticsearch.util.gcommon.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.fa.PersianAnalyzer; import org.apache.lucene.util.Version; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.gcommon.collect.ImmutableSet; +import org.elasticsearch.util.gcommon.collect.Iterators; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; import java.util.Set; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PorterStemTokenFilterFactory.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PorterStemTokenFilterFactory.java index 5b19c1a36d8..f6f838a0fef 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PorterStemTokenFilterFactory.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PorterStemTokenFilterFactory.java @@ -19,12 +19,12 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.PorterStemFilter; import org.apache.lucene.analysis.TokenStream; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/RussianAnalyzerProvider.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/RussianAnalyzerProvider.java index 84b786fb05f..3c7b447b916 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/RussianAnalyzerProvider.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/RussianAnalyzerProvider.java @@ -19,14 +19,14 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.gcommon.collect.ImmutableSet; -import org.elasticsearch.util.gcommon.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.ru.RussianAnalyzer; import org.apache.lucene.util.Version; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.gcommon.collect.ImmutableSet; +import org.elasticsearch.util.gcommon.collect.Iterators; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/RussianStemTokenFilterFactory.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/RussianStemTokenFilterFactory.java index a7214950357..ebd7fbd6f13 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/RussianStemTokenFilterFactory.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/RussianStemTokenFilterFactory.java @@ -19,12 +19,12 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.ru.RussianStemFilter; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactory.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactory.java index 4b2f7b55a20..d6b5a5321d1 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactory.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactory.java @@ -19,12 +19,12 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.shingle.ShingleFilter; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/SimpleAnalyzerProvider.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/SimpleAnalyzerProvider.java index 41ea33982e6..3e04dc5c82a 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/SimpleAnalyzerProvider.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/SimpleAnalyzerProvider.java @@ -19,11 +19,11 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.SimpleAnalyzer; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StandardAnalyzerProvider.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StandardAnalyzerProvider.java index e837655bc95..8a1e0dbfee0 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StandardAnalyzerProvider.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StandardAnalyzerProvider.java @@ -19,15 +19,15 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.gcommon.collect.ImmutableSet; -import org.elasticsearch.util.gcommon.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.StopAnalyzer; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.util.Version; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.gcommon.collect.ImmutableSet; +import org.elasticsearch.util.gcommon.collect.Iterators; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; import java.util.Set; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StandardTokenFilterFactory.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StandardTokenFilterFactory.java index a500e2a2859..2cc56b4d78a 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StandardTokenFilterFactory.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StandardTokenFilterFactory.java @@ -19,12 +19,12 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.standard.StandardFilter; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StandardTokenizerFactory.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StandardTokenizerFactory.java index facdea4cdce..f6e17032511 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StandardTokenizerFactory.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StandardTokenizerFactory.java @@ -19,14 +19,14 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.analysis.standard.StandardTokenizer; import org.apache.lucene.util.Version; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; import java.io.Reader; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StopAnalyzerProvider.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StopAnalyzerProvider.java index 7477a2526cd..8bf58080e0e 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StopAnalyzerProvider.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StopAnalyzerProvider.java @@ -19,14 +19,14 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.gcommon.collect.ImmutableSet; -import org.elasticsearch.util.gcommon.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.StopAnalyzer; import org.apache.lucene.util.Version; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.gcommon.collect.ImmutableSet; +import org.elasticsearch.util.gcommon.collect.Iterators; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; import java.util.Set; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StopTokenFilterFactory.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StopTokenFilterFactory.java index 396eca973dc..5707cf217b0 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StopTokenFilterFactory.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StopTokenFilterFactory.java @@ -19,15 +19,15 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.gcommon.collect.ImmutableSet; -import org.elasticsearch.util.gcommon.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.StopAnalyzer; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.TokenStream; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.gcommon.collect.ImmutableSet; +import org.elasticsearch.util.gcommon.collect.Iterators; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; import java.util.Set; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ThaiAnalyzerProvider.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ThaiAnalyzerProvider.java index 9791da7927a..4038be3d21c 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ThaiAnalyzerProvider.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ThaiAnalyzerProvider.java @@ -19,12 +19,12 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.th.ThaiAnalyzer; import org.apache.lucene.util.Version; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/WhitespaceAnalyzerProvider.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/WhitespaceAnalyzerProvider.java index e4d194b7881..3b89024806e 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/WhitespaceAnalyzerProvider.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/WhitespaceAnalyzerProvider.java @@ -19,11 +19,11 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.WhitespaceAnalyzer; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactory.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactory.java index 7a0790196a4..978785325e4 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactory.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactory.java @@ -19,12 +19,12 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.WhitespaceTokenizer; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; import java.io.Reader; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/IndexCache.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/IndexCache.java index 4b0b79991da..13aa933c917 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/IndexCache.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/IndexCache.java @@ -19,12 +19,12 @@ package org.elasticsearch.index.cache; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.index.AbstractIndexComponent; import org.elasticsearch.index.Index; import org.elasticsearch.index.cache.filter.FilterCache; import org.elasticsearch.index.cache.filter.none.NoneFilterCache; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import static org.elasticsearch.util.settings.ImmutableSettings.Builder.*; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/IndexCacheModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/IndexCacheModule.java index c80828218cb..e3f76fe89d3 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/IndexCacheModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/IndexCacheModule.java @@ -19,8 +19,8 @@ package org.elasticsearch.index.cache; -import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.index.cache.filter.FilterCacheModule; +import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/FilterCacheModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/FilterCacheModule.java index 4e277ba9cff..efa75e48895 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/FilterCacheModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/FilterCacheModule.java @@ -19,9 +19,9 @@ package org.elasticsearch.index.cache.filter; +import org.elasticsearch.index.cache.filter.soft.SoftFilterCache; import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.util.guice.inject.Scopes; -import org.elasticsearch.index.cache.filter.soft.SoftFilterCache; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/none/NoneFilterCache.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/none/NoneFilterCache.java index 72c710c37a1..9e9f7c5f968 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/none/NoneFilterCache.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/none/NoneFilterCache.java @@ -19,12 +19,12 @@ package org.elasticsearch.index.cache.filter.none; -import org.elasticsearch.util.guice.inject.Inject; import org.apache.lucene.search.Filter; import org.elasticsearch.index.AbstractIndexComponent; import org.elasticsearch.index.Index; import org.elasticsearch.index.cache.filter.FilterCache; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/soft/SoftFilterCache.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/soft/SoftFilterCache.java index 33e8060189a..94af64a6b2e 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/soft/SoftFilterCache.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/soft/SoftFilterCache.java @@ -19,14 +19,14 @@ package org.elasticsearch.index.cache.filter.soft; -import org.elasticsearch.util.gcommon.collect.MapMaker; -import org.elasticsearch.util.guice.inject.Inject; import org.apache.lucene.search.DocIdSet; import org.apache.lucene.search.Filter; import org.elasticsearch.index.Index; import org.elasticsearch.index.cache.filter.support.AbstractConcurrentMapFilterCache; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.threadpool.ThreadPool; +import org.elasticsearch.util.gcommon.collect.MapMaker; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.concurrent.ConcurrentMap; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/weak/WeakFilterCache.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/weak/WeakFilterCache.java index b29b9f45e5e..149e1487105 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/weak/WeakFilterCache.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/weak/WeakFilterCache.java @@ -19,14 +19,14 @@ package org.elasticsearch.index.cache.filter.weak; -import org.elasticsearch.util.gcommon.collect.MapMaker; -import org.elasticsearch.util.guice.inject.Inject; import org.apache.lucene.search.DocIdSet; import org.apache.lucene.search.Filter; import org.elasticsearch.index.Index; import org.elasticsearch.index.cache.filter.support.AbstractConcurrentMapFilterCache; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.threadpool.ThreadPool; +import org.elasticsearch.util.gcommon.collect.MapMaker; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.concurrent.ConcurrentMap; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/deletionpolicy/DeletionPolicyModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/deletionpolicy/DeletionPolicyModule.java index fc88ad4a414..cc56f4bdabc 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/deletionpolicy/DeletionPolicyModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/deletionpolicy/DeletionPolicyModule.java @@ -19,9 +19,9 @@ package org.elasticsearch.index.deletionpolicy; +import org.apache.lucene.index.IndexDeletionPolicy; import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.util.guice.inject.name.Names; -import org.apache.lucene.index.IndexDeletionPolicy; import org.elasticsearch.util.settings.Settings; import static org.elasticsearch.index.deletionpolicy.DeletionPolicyModule.DeletionPolicySettings.*; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/deletionpolicy/KeepLastNDeletionPolicy.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/deletionpolicy/KeepLastNDeletionPolicy.java index 9a2a5814178..746fc2b66b1 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/deletionpolicy/KeepLastNDeletionPolicy.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/deletionpolicy/KeepLastNDeletionPolicy.java @@ -19,12 +19,12 @@ package org.elasticsearch.index.deletionpolicy; -import org.elasticsearch.util.guice.inject.Inject; import org.apache.lucene.index.IndexCommit; import org.apache.lucene.index.IndexDeletionPolicy; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.index.shard.AbstractIndexShardComponent; import org.elasticsearch.index.shard.ShardId; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.io.IOException; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/deletionpolicy/KeepOnlyLastDeletionPolicy.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/deletionpolicy/KeepOnlyLastDeletionPolicy.java index ac5a57a19ca..9d44330126f 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/deletionpolicy/KeepOnlyLastDeletionPolicy.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/deletionpolicy/KeepOnlyLastDeletionPolicy.java @@ -19,12 +19,12 @@ package org.elasticsearch.index.deletionpolicy; -import org.elasticsearch.util.guice.inject.Inject; import org.apache.lucene.index.IndexCommit; import org.apache.lucene.index.IndexDeletionPolicy; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.index.shard.AbstractIndexShardComponent; import org.elasticsearch.index.shard.ShardId; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.List; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicy.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicy.java index 990b4f795c0..ddf48f2b2f6 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicy.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicy.java @@ -19,12 +19,12 @@ package org.elasticsearch.index.deletionpolicy; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.name.Named; import org.apache.lucene.index.IndexCommit; import org.apache.lucene.index.IndexDeletionPolicy; import org.elasticsearch.index.shard.AbstractIndexShardComponent; import org.elasticsearch.index.shard.IndexShardComponent; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.name.Named; import java.io.IOException; import java.util.ArrayList; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/EngineModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/EngineModule.java index 72d4e53ee33..dc6d162e6a2 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/EngineModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/EngineModule.java @@ -19,9 +19,9 @@ package org.elasticsearch.index.engine; -import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.index.engine.robin.RobinEngineModule; import org.elasticsearch.util.guice.ModulesFactory; +import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/robin/RobinEngine.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/robin/RobinEngine.java index 16f3709b4e9..52eca356a45 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/robin/RobinEngine.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/robin/RobinEngine.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.engine.robin; -import org.elasticsearch.util.guice.inject.Inject; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.LogMergePolicy; @@ -42,6 +41,7 @@ import org.elasticsearch.util.SizeUnit; import org.elasticsearch.util.SizeValue; import org.elasticsearch.util.TimeValue; import org.elasticsearch.util.concurrent.resource.AcquirableResource; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.lucene.IndexWriters; import org.elasticsearch.util.lucene.ReaderSearcherHolder; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/robin/RobinEngineModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/robin/RobinEngineModule.java index d6817d1d1f6..57715ef063e 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/robin/RobinEngineModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/robin/RobinEngineModule.java @@ -19,8 +19,8 @@ package org.elasticsearch.index.engine.robin; -import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.index.engine.Engine; +import org.elasticsearch.util.guice.inject.AbstractModule; /** * @author kimchy (Shay Banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/IndexGatewayModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/IndexGatewayModule.java index 8b70c6e0457..a35850c426a 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/IndexGatewayModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/IndexGatewayModule.java @@ -19,9 +19,9 @@ package org.elasticsearch.index.gateway; -import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.gateway.Gateway; import org.elasticsearch.util.guice.ModulesFactory; +import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayService.java index b76eaa20bb3..4eb180c1edd 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayService.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayService.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.gateway; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchIllegalStateException; import org.elasticsearch.index.deletionpolicy.SnapshotIndexCommit; import org.elasticsearch.index.engine.Engine; @@ -37,6 +36,7 @@ import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.util.StopWatch; import org.elasticsearch.util.TimeValue; import org.elasticsearch.util.component.CloseableIndexComponent; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.io.IOException; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/fs/FsIndexGateway.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/fs/FsIndexGateway.java index 44b09b71d88..5ca6dbdfb19 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/fs/FsIndexGateway.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/fs/FsIndexGateway.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.gateway.fs; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.env.Environment; import org.elasticsearch.gateway.Gateway; import org.elasticsearch.gateway.fs.FsGateway; @@ -30,6 +29,7 @@ import org.elasticsearch.index.gateway.IndexGateway; import org.elasticsearch.index.gateway.IndexShardGateway; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.Strings; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.io.File; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/fs/FsIndexGatewayModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/fs/FsIndexGatewayModule.java index fbc7bb3258d..93ecc79ce1f 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/fs/FsIndexGatewayModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/fs/FsIndexGatewayModule.java @@ -19,8 +19,8 @@ package org.elasticsearch.index.gateway.fs; -import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.index.gateway.IndexGateway; +import org.elasticsearch.util.guice.inject.AbstractModule; /** * @author kimchy (Shay Banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/fs/FsIndexShardGateway.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/fs/FsIndexShardGateway.java index 533a88d706d..f32e56b7d1d 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/fs/FsIndexShardGateway.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/fs/FsIndexShardGateway.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.gateway.fs; -import org.elasticsearch.util.guice.inject.Inject; import org.apache.lucene.index.IndexReader; import org.apache.lucene.store.IndexInput; import org.elasticsearch.index.deletionpolicy.SnapshotIndexCommit; @@ -37,6 +36,7 @@ import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.util.SizeUnit; import org.elasticsearch.util.SizeValue; import org.elasticsearch.util.TimeValue; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.io.stream.DataInputStreamInput; import org.elasticsearch.util.io.stream.DataOutputStreamOutput; import org.elasticsearch.util.io.stream.StreamOutput; @@ -50,8 +50,8 @@ import java.util.ArrayList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicReference; -import static org.elasticsearch.util.gcommon.collect.Lists.*; import static org.elasticsearch.index.translog.TranslogStreams.*; +import static org.elasticsearch.util.gcommon.collect.Lists.*; import static org.elasticsearch.util.io.FileSystemUtils.*; import static org.elasticsearch.util.lucene.Directories.*; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/none/NoneIndexGateway.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/none/NoneIndexGateway.java index f226f8d36d1..0ee97ca45fb 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/none/NoneIndexGateway.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/none/NoneIndexGateway.java @@ -19,12 +19,12 @@ package org.elasticsearch.index.gateway.none; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.index.AbstractIndexComponent; import org.elasticsearch.index.Index; import org.elasticsearch.index.gateway.IndexGateway; import org.elasticsearch.index.gateway.IndexShardGateway; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/none/NoneIndexGatewayModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/none/NoneIndexGatewayModule.java index b9689d2f92b..f02ab6f1587 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/none/NoneIndexGatewayModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/none/NoneIndexGatewayModule.java @@ -19,8 +19,8 @@ package org.elasticsearch.index.gateway.none; -import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.index.gateway.IndexGateway; +import org.elasticsearch.util.guice.inject.AbstractModule; /** * @author kimchy (Shay Banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/none/NoneIndexShardGateway.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/none/NoneIndexShardGateway.java index 0536f784547..8d0561023e8 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/none/NoneIndexShardGateway.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/none/NoneIndexShardGateway.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.gateway.none; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.index.gateway.IndexShardGateway; import org.elasticsearch.index.gateway.IndexShardGatewayRecoveryException; import org.elasticsearch.index.settings.IndexSettings; @@ -29,6 +28,7 @@ import org.elasticsearch.index.shard.service.IndexShard; import org.elasticsearch.index.shard.service.InternalIndexShard; import org.elasticsearch.util.SizeUnit; import org.elasticsearch.util.SizeValue; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java index b925b24707b..f8b61e0e6d6 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java @@ -19,13 +19,13 @@ package org.elasticsearch.index.mapper; +import org.apache.lucene.analysis.Analyzer; +import org.elasticsearch.index.analysis.FieldNameAnalyzer; +import org.elasticsearch.util.concurrent.Immutable; import org.elasticsearch.util.gcommon.collect.ImmutableList; import org.elasticsearch.util.gcommon.collect.ImmutableMap; import org.elasticsearch.util.gcommon.collect.Iterables; import org.elasticsearch.util.gcommon.collect.UnmodifiableIterator; -import org.apache.lucene.analysis.Analyzer; -import org.elasticsearch.index.analysis.FieldNameAnalyzer; -import org.elasticsearch.util.concurrent.Immutable; import java.util.Map; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/FieldMappers.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/FieldMappers.java index e5db03e7e6c..3eb821e2ab4 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/FieldMappers.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/FieldMappers.java @@ -19,10 +19,10 @@ package org.elasticsearch.index.mapper; +import org.elasticsearch.util.concurrent.Immutable; import org.elasticsearch.util.gcommon.collect.ImmutableList; import org.elasticsearch.util.gcommon.collect.Iterators; import org.elasticsearch.util.gcommon.collect.UnmodifiableIterator; -import org.elasticsearch.util.concurrent.Immutable; /** * A holder for several {@link FieldMapper}. diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperService.java index 5e080d39705..aab95314033 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperService.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperService.java @@ -19,9 +19,6 @@ package org.elasticsearch.index.mapper; -import org.elasticsearch.util.gcommon.collect.ImmutableMap; -import org.elasticsearch.util.gcommon.collect.UnmodifiableIterator; -import org.elasticsearch.util.guice.inject.Inject; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.TokenStream; import org.elasticsearch.env.Environment; @@ -32,6 +29,9 @@ import org.elasticsearch.index.analysis.AnalysisService; import org.elasticsearch.index.mapper.xcontent.XContentDocumentMapperParser; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.concurrent.ThreadSafe; +import org.elasticsearch.util.gcommon.collect.ImmutableMap; +import org.elasticsearch.util.gcommon.collect.UnmodifiableIterator; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.io.Streams; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/MergeContext.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/MergeContext.java index d04daa9cb2d..d14723b3b83 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/MergeContext.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/MergeContext.java @@ -19,8 +19,8 @@ package org.elasticsearch.index.mapper.xcontent; -import org.elasticsearch.util.gcommon.collect.Lists; import org.elasticsearch.index.mapper.DocumentMapper; +import org.elasticsearch.util.gcommon.collect.Lists; import java.util.List; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentDocumentMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentDocumentMapper.java index 8d185657554..55b922c4a35 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentDocumentMapper.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentDocumentMapper.java @@ -166,14 +166,14 @@ public class XContentDocumentMapper implements DocumentMapper, ToXContent { private final Object mutex = new Object(); public XContentDocumentMapper(XContentObjectMapper rootObjectMapper, - XContentUidFieldMapper uidFieldMapper, - XContentIdFieldMapper idFieldMapper, - XContentTypeFieldMapper typeFieldMapper, - XContentSourceFieldMapper sourceFieldMapper, - XContentAllFieldMapper allFieldMapper, - Analyzer indexAnalyzer, Analyzer searchAnalyzer, - @Nullable XContentBoostFieldMapper boostFieldMapper, - @Nullable String mappingSource) { + XContentUidFieldMapper uidFieldMapper, + XContentIdFieldMapper idFieldMapper, + XContentTypeFieldMapper typeFieldMapper, + XContentSourceFieldMapper sourceFieldMapper, + XContentAllFieldMapper allFieldMapper, + Analyzer indexAnalyzer, Analyzer searchAnalyzer, + @Nullable XContentBoostFieldMapper boostFieldMapper, + @Nullable String mappingSource) { this.type = rootObjectMapper.name(); this.mappingSource = mappingSource; this.rootObjectMapper = rootObjectMapper; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentFloatFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentFloatFieldMapper.java index 3640d968661..b91363774f8 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentFloatFieldMapper.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentFloatFieldMapper.java @@ -91,8 +91,8 @@ public class XContentFloatFieldMapper extends XContentNumberFieldMapper { private final String nullValueAsString; protected XContentFloatFieldMapper(Names names, int precisionStep, Field.Index index, Field.Store store, - float boost, boolean omitNorms, boolean omitTermFreqAndPositions, - Float nullValue) { + float boost, boolean omitNorms, boolean omitTermFreqAndPositions, + Float nullValue) { super(names, precisionStep, index, store, boost, omitNorms, omitTermFreqAndPositions, new NamedAnalyzer("_float/" + precisionStep, new NumericFloatAnalyzer(precisionStep)), new NamedAnalyzer("_float/max", new NumericFloatAnalyzer(Integer.MAX_VALUE))); diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentIntegerFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentIntegerFieldMapper.java index de78edbf839..b7ec8c961dd 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentIntegerFieldMapper.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentIntegerFieldMapper.java @@ -91,8 +91,8 @@ public class XContentIntegerFieldMapper extends XContentNumberFieldMapper mappers) { + FormatDateTimeFormatter[] dateTimeFormatters, Map mappers) { this.name = name; this.enabled = enabled; this.dynamic = dynamic; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentShortFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentShortFieldMapper.java index 9da1d90e792..a198f3eb7cb 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentShortFieldMapper.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentShortFieldMapper.java @@ -91,8 +91,8 @@ public class XContentShortFieldMapper extends XContentNumberFieldMapper { private final String nullValueAsString; protected XContentShortFieldMapper(Names names, int precisionStep, Field.Index index, Field.Store store, - float boost, boolean omitNorms, boolean omitTermFreqAndPositions, - Short nullValue) { + float boost, boolean omitNorms, boolean omitTermFreqAndPositions, + Short nullValue) { super(names, precisionStep, index, store, boost, omitNorms, omitTermFreqAndPositions, new NamedAnalyzer("_short/" + precisionStep, new NumericIntegerAnalyzer(precisionStep)), new NamedAnalyzer("_short/max", new NumericIntegerAnalyzer(Integer.MAX_VALUE))); diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentTypeFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentTypeFieldMapper.java index 5a6030f1974..fc5eaea39fe 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentTypeFieldMapper.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentTypeFieldMapper.java @@ -72,7 +72,7 @@ public class XContentTypeFieldMapper extends XContentFieldMapper impleme } public XContentTypeFieldMapper(String name, String indexName, Field.Store store, Field.TermVector termVector, - float boost, boolean omitNorms, boolean omitTermFreqAndPositions) { + float boost, boolean omitNorms, boolean omitTermFreqAndPositions) { super(new Names(name, indexName, indexName, name), Defaults.INDEX, store, termVector, boost, omitNorms, omitTermFreqAndPositions, Lucene.KEYWORD_ANALYZER, Lucene.KEYWORD_ANALYZER); } diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentTypeParser.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentTypeParser.java index 7893aa29959..e724f084ea6 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentTypeParser.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentTypeParser.java @@ -19,10 +19,10 @@ package org.elasticsearch.index.mapper.xcontent; -import org.elasticsearch.util.gcommon.collect.ImmutableMap; import org.elasticsearch.index.analysis.AnalysisService; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.util.Strings; +import org.elasticsearch.util.gcommon.collect.ImmutableMap; import java.util.Map; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/policy/BalancedSegmentMergePolicyProvider.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/policy/BalancedSegmentMergePolicyProvider.java index 2d9ff31d266..a338ccc065e 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/policy/BalancedSegmentMergePolicyProvider.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/policy/BalancedSegmentMergePolicyProvider.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.merge.policy; -import org.elasticsearch.util.guice.inject.Inject; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.LogByteSizeMergePolicy; import org.apache.lucene.index.LogMergePolicy; @@ -28,6 +27,7 @@ import org.elasticsearch.index.store.Store; import org.elasticsearch.util.Preconditions; import org.elasticsearch.util.SizeUnit; import org.elasticsearch.util.SizeValue; +import org.elasticsearch.util.guice.inject.Inject; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/policy/LogByteSizeMergePolicyProvider.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/policy/LogByteSizeMergePolicyProvider.java index 042c746f15a..b400714b5d3 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/policy/LogByteSizeMergePolicyProvider.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/policy/LogByteSizeMergePolicyProvider.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.merge.policy; -import org.elasticsearch.util.guice.inject.Inject; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.LogByteSizeMergePolicy; import org.elasticsearch.index.shard.AbstractIndexShardComponent; @@ -27,6 +26,7 @@ import org.elasticsearch.index.store.Store; import org.elasticsearch.util.Preconditions; import org.elasticsearch.util.SizeUnit; import org.elasticsearch.util.SizeValue; +import org.elasticsearch.util.guice.inject.Inject; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/policy/LogDocMergePolicyProvider.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/policy/LogDocMergePolicyProvider.java index 4fac3f84a6b..09d2bb93bf9 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/policy/LogDocMergePolicyProvider.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/policy/LogDocMergePolicyProvider.java @@ -19,12 +19,12 @@ package org.elasticsearch.index.merge.policy; -import org.elasticsearch.util.guice.inject.Inject; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.LogDocMergePolicy; import org.elasticsearch.index.shard.AbstractIndexShardComponent; import org.elasticsearch.index.store.Store; import org.elasticsearch.util.Preconditions; +import org.elasticsearch.util.guice.inject.Inject; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/policy/MergePolicyModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/policy/MergePolicyModule.java index bdc359f9a03..7920d7a7e38 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/policy/MergePolicyModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/policy/MergePolicyModule.java @@ -19,8 +19,8 @@ package org.elasticsearch.index.merge.policy; -import org.elasticsearch.util.guice.inject.AbstractModule; import org.apache.lucene.index.LogMergePolicy; +import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/scheduler/ConcurrentMergeSchedulerProvider.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/scheduler/ConcurrentMergeSchedulerProvider.java index 9f5b3008c67..1881c3bb130 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/scheduler/ConcurrentMergeSchedulerProvider.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/scheduler/ConcurrentMergeSchedulerProvider.java @@ -19,12 +19,12 @@ package org.elasticsearch.index.merge.scheduler; -import org.elasticsearch.util.guice.inject.Inject; import org.apache.lucene.index.ConcurrentMergeScheduler; import org.apache.lucene.index.MergeScheduler; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.index.shard.AbstractIndexShardComponent; import org.elasticsearch.index.shard.ShardId; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/scheduler/SerialMergeSchedulerProvider.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/scheduler/SerialMergeSchedulerProvider.java index 8119d82ebce..8cc95cb2110 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/scheduler/SerialMergeSchedulerProvider.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/scheduler/SerialMergeSchedulerProvider.java @@ -19,12 +19,12 @@ package org.elasticsearch.index.merge.scheduler; -import org.elasticsearch.util.guice.inject.Inject; import org.apache.lucene.index.MergeScheduler; import org.apache.lucene.index.SerialMergeScheduler; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.index.shard.AbstractIndexShardComponent; import org.elasticsearch.index.shard.ShardId; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/IndexQueryParserService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/IndexQueryParserService.java index 607b5ce57d8..8175fe9b1d7 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/IndexQueryParserService.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/IndexQueryParserService.java @@ -19,16 +19,16 @@ package org.elasticsearch.index.query; -import org.elasticsearch.index.query.xcontent.XContentIndexQueryParser; -import org.elasticsearch.util.gcommon.collect.ImmutableMap; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.index.AbstractIndexComponent; import org.elasticsearch.index.Index; import org.elasticsearch.index.analysis.AnalysisService; import org.elasticsearch.index.cache.IndexCache; import org.elasticsearch.index.mapper.MapperService; +import org.elasticsearch.index.query.xcontent.XContentIndexQueryParser; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.index.similarity.SimilarityService; +import org.elasticsearch.util.gcommon.collect.ImmutableMap; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.ImmutableSettings; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/XContentQueryParserRegistry.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/XContentQueryParserRegistry.java index e6146cfd1b4..fe93271814a 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/XContentQueryParserRegistry.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/XContentQueryParserRegistry.java @@ -19,11 +19,11 @@ package org.elasticsearch.index.query.xcontent; -import org.elasticsearch.util.gcommon.collect.ImmutableMap; import org.apache.lucene.util.StringHelper; import org.elasticsearch.index.Index; import org.elasticsearch.index.analysis.AnalysisService; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.gcommon.collect.ImmutableMap; import org.elasticsearch.util.settings.Settings; import javax.annotation.Nullable; @@ -41,10 +41,10 @@ public class XContentQueryParserRegistry { private final Map filterParsers; public XContentQueryParserRegistry(Index index, - @IndexSettings Settings indexSettings, - AnalysisService analysisService, - @Nullable Iterable queryParsers, - @Nullable Iterable filterParsers) { + @IndexSettings Settings indexSettings, + AnalysisService analysisService, + @Nullable Iterable queryParsers, + @Nullable Iterable filterParsers) { Map queryParsersMap = newHashMap(); // add defaults diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/routing/OperationRoutingModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/routing/OperationRoutingModule.java index a3031806e84..b7845cc5d2c 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/routing/OperationRoutingModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/routing/OperationRoutingModule.java @@ -19,10 +19,10 @@ package org.elasticsearch.index.routing; -import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.index.routing.hash.HashFunction; import org.elasticsearch.index.routing.hash.djb.DjbHashFunction; import org.elasticsearch.index.routing.plain.PlainOperationRoutingModule; +import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.util.settings.Settings; import static org.elasticsearch.util.guice.ModulesFactory.*; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/routing/plain/PlainOperationRouting.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/routing/plain/PlainOperationRouting.java index 09c8cca2aad..509f996375e 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/routing/plain/PlainOperationRouting.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/routing/plain/PlainOperationRouting.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.routing.plain; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.routing.GroupShardsIterator; @@ -35,6 +34,7 @@ import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.indices.IndexMissingException; import org.elasticsearch.util.IdentityHashSet; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import javax.annotation.Nullable; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/routing/plain/PlainOperationRoutingModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/routing/plain/PlainOperationRoutingModule.java index e7a26254093..59ded672691 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/routing/plain/PlainOperationRoutingModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/routing/plain/PlainOperationRoutingModule.java @@ -19,8 +19,8 @@ package org.elasticsearch.index.routing.plain; -import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.index.routing.OperationRouting; +import org.elasticsearch.util.guice.inject.AbstractModule; /** * @author kimchy (Shay Banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/service/IndexService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/service/IndexService.java index 1d671b726c8..2f67af68815 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/service/IndexService.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/service/IndexService.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.service; -import org.elasticsearch.util.guice.inject.Injector; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.index.IndexComponent; import org.elasticsearch.index.IndexShardMissingException; @@ -30,6 +29,7 @@ import org.elasticsearch.index.routing.OperationRouting; import org.elasticsearch.index.shard.service.IndexShard; import org.elasticsearch.index.similarity.SimilarityService; import org.elasticsearch.util.component.CloseableIndexComponent; +import org.elasticsearch.util.guice.inject.Injector; import java.util.Set; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/service/InternalIndexService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/service/InternalIndexService.java index 1e7689a1414..e06892e8350 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/service/InternalIndexService.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/service/InternalIndexService.java @@ -19,11 +19,6 @@ package org.elasticsearch.index.service; -import org.elasticsearch.util.gcommon.collect.ImmutableMap; -import org.elasticsearch.util.gcommon.collect.Lists; -import org.elasticsearch.util.gcommon.collect.UnmodifiableIterator; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.Injector; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.index.AbstractIndexComponent; import org.elasticsearch.index.Index; @@ -56,7 +51,12 @@ import org.elasticsearch.indices.InternalIndicesLifecycle; import org.elasticsearch.plugins.PluginsService; import org.elasticsearch.plugins.ShardsPluginsModule; import org.elasticsearch.util.component.CloseableIndexComponent; +import org.elasticsearch.util.gcommon.collect.ImmutableMap; +import org.elasticsearch.util.gcommon.collect.Lists; +import org.elasticsearch.util.gcommon.collect.UnmodifiableIterator; import org.elasticsearch.util.guice.Injectors; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.Injector; import org.elasticsearch.util.guice.inject.Module; import org.elasticsearch.util.settings.Settings; @@ -65,9 +65,9 @@ import java.util.List; import java.util.Map; import java.util.Set; +import static org.elasticsearch.util.MapBuilder.*; import static org.elasticsearch.util.gcommon.collect.Maps.*; import static org.elasticsearch.util.gcommon.collect.Sets.*; -import static org.elasticsearch.util.MapBuilder.*; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IndexShardManagement.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IndexShardManagement.java index 492f0f6ef53..3b8299887bf 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IndexShardManagement.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IndexShardManagement.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.shard; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.index.engine.Engine; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.index.shard.service.IndexShard; @@ -29,6 +28,7 @@ import org.elasticsearch.jmx.JmxService; import org.elasticsearch.jmx.MBean; import org.elasticsearch.jmx.ManagedAttribute; import org.elasticsearch.util.component.CloseableComponent; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.io.IOException; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IndexShardModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IndexShardModule.java index aca581c3ca1..564fb17b87a 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IndexShardModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IndexShardModule.java @@ -19,10 +19,10 @@ package org.elasticsearch.index.shard; -import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.index.shard.recovery.RecoveryAction; import org.elasticsearch.index.shard.service.IndexShard; import org.elasticsearch.index.shard.service.InternalIndexShard; +import org.elasticsearch.util.guice.inject.AbstractModule; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/recovery/RecoveryAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/recovery/RecoveryAction.java index 918d217543b..b5fa09be960 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/recovery/RecoveryAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/recovery/RecoveryAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.shard.recovery; -import org.elasticsearch.util.guice.inject.Inject; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; import org.elasticsearch.ElasticSearchException; @@ -43,6 +42,7 @@ import org.elasticsearch.util.SizeValue; import org.elasticsearch.util.StopWatch; import org.elasticsearch.util.TimeValue; import org.elasticsearch.util.component.CloseableComponent; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.io.stream.StreamInput; import org.elasticsearch.util.io.stream.StreamOutput; import org.elasticsearch.util.io.stream.Streamable; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/service/InternalIndexShard.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/service/InternalIndexShard.java index 96cf1a46584..69ccfd48b77 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/service/InternalIndexShard.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/service/InternalIndexShard.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.shard.service; -import org.elasticsearch.util.guice.inject.Inject; import org.apache.lucene.document.Document; import org.apache.lucene.index.Term; import org.apache.lucene.search.*; @@ -50,6 +49,7 @@ import org.elasticsearch.util.SizeValue; import org.elasticsearch.util.Strings; import org.elasticsearch.util.TimeValue; import org.elasticsearch.util.concurrent.ThreadSafe; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.lucene.Lucene; import org.elasticsearch.util.lucene.search.TermFilter; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/similarity/DefaultSimilarityProvider.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/similarity/DefaultSimilarityProvider.java index 886ea1d7340..2c20863e375 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/similarity/DefaultSimilarityProvider.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/similarity/DefaultSimilarityProvider.java @@ -19,11 +19,11 @@ package org.elasticsearch.index.similarity; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.apache.lucene.search.DefaultSimilarity; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.guice.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/similarity/SimilarityProvider.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/similarity/SimilarityProvider.java index deaf66ec4be..0ce08a7b1ef 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/similarity/SimilarityProvider.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/similarity/SimilarityProvider.java @@ -19,9 +19,9 @@ package org.elasticsearch.index.similarity; -import org.elasticsearch.util.guice.inject.Provider; import org.apache.lucene.search.Similarity; import org.elasticsearch.index.IndexComponent; +import org.elasticsearch.util.guice.inject.Provider; /** * @author kimchy (Shay Banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java index 6044e82788b..365db7e85cd 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java @@ -19,12 +19,12 @@ package org.elasticsearch.index.similarity; -import org.elasticsearch.util.gcommon.collect.ImmutableMap; -import org.elasticsearch.util.guice.inject.Inject; import org.apache.lucene.search.Similarity; import org.elasticsearch.index.AbstractIndexComponent; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.util.gcommon.collect.ImmutableMap; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.ImmutableSettings; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/StoreManagement.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/StoreManagement.java index 41ccb3f2c6a..3e74040a3d6 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/StoreManagement.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/StoreManagement.java @@ -19,10 +19,10 @@ package org.elasticsearch.index.store; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.index.shard.AbstractIndexShardComponent; import org.elasticsearch.jmx.MBean; import org.elasticsearch.jmx.ManagedAttribute; +import org.elasticsearch.util.guice.inject.Inject; import java.io.IOException; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/StoreModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/StoreModule.java index 47e332940d8..9f37092fc7e 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/StoreModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/StoreModule.java @@ -19,8 +19,6 @@ package org.elasticsearch.index.store; -import org.elasticsearch.util.guice.inject.AbstractModule; -import org.elasticsearch.util.guice.inject.Module; import org.elasticsearch.index.store.fs.MmapFsStoreModule; import org.elasticsearch.index.store.fs.NioFsStoreModule; import org.elasticsearch.index.store.fs.SimpleFsStoreModule; @@ -28,6 +26,8 @@ import org.elasticsearch.index.store.memory.MemoryStoreModule; import org.elasticsearch.index.store.ram.RamStoreModule; import org.elasticsearch.util.OsUtils; import org.elasticsearch.util.guice.ModulesFactory; +import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.guice.inject.Module; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/AbstractFsStore.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/AbstractFsStore.java index 2135418efe4..6e338891a94 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/AbstractFsStore.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/AbstractFsStore.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.store.fs; -import org.elasticsearch.util.gcommon.collect.ImmutableSet; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; import org.elasticsearch.index.settings.IndexSettings; @@ -29,6 +28,7 @@ import org.elasticsearch.index.store.memory.HeapDirectory; import org.elasticsearch.index.store.support.AbstractStore; import org.elasticsearch.util.SizeUnit; import org.elasticsearch.util.SizeValue; +import org.elasticsearch.util.gcommon.collect.ImmutableSet; import org.elasticsearch.util.io.FileSystemUtils; import org.elasticsearch.util.lucene.store.SwitchDirectory; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/MmapFsStore.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/MmapFsStore.java index 52ca927592b..3635a79c687 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/MmapFsStore.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/MmapFsStore.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.store.fs; -import org.elasticsearch.util.guice.inject.Inject; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; import org.apache.lucene.store.MMapDirectory; @@ -28,6 +27,7 @@ import org.elasticsearch.index.LocalNodeId; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.store.support.ForceSyncDirectory; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.lucene.store.SwitchDirectory; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/MmapFsStoreModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/MmapFsStoreModule.java index ce178694bc6..dc7244cb2ce 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/MmapFsStoreModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/MmapFsStoreModule.java @@ -19,8 +19,8 @@ package org.elasticsearch.index.store.fs; -import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.index.store.Store; +import org.elasticsearch.util.guice.inject.AbstractModule; /** * @author kimchy (Shay Banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/NioFsStore.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/NioFsStore.java index 240ca13daf4..833c4120a72 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/NioFsStore.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/NioFsStore.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.store.fs; -import org.elasticsearch.util.guice.inject.Inject; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; import org.apache.lucene.store.NIOFSDirectory; @@ -28,6 +27,7 @@ import org.elasticsearch.index.LocalNodeId; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.store.support.ForceSyncDirectory; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.lucene.store.SwitchDirectory; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/NioFsStoreModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/NioFsStoreModule.java index c945d1d1576..f740f108d70 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/NioFsStoreModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/NioFsStoreModule.java @@ -19,8 +19,8 @@ package org.elasticsearch.index.store.fs; -import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.index.store.Store; +import org.elasticsearch.util.guice.inject.AbstractModule; /** * @author kimchy (Shay Banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/SimpleFsStore.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/SimpleFsStore.java index 9fb9b212b62..30435c3a335 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/SimpleFsStore.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/SimpleFsStore.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.store.fs; -import org.elasticsearch.util.guice.inject.Inject; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; import org.apache.lucene.store.SimpleFSDirectory; @@ -28,6 +27,7 @@ import org.elasticsearch.index.LocalNodeId; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.store.support.ForceSyncDirectory; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.lucene.store.SwitchDirectory; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/SimpleFsStoreModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/SimpleFsStoreModule.java index 5093585c85f..ed4e9e1dc1e 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/SimpleFsStoreModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/SimpleFsStoreModule.java @@ -19,8 +19,8 @@ package org.elasticsearch.index.store.fs; -import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.index.store.Store; +import org.elasticsearch.util.guice.inject.AbstractModule; /** * @author kimchy (Shay Banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/memory/ByteBufferStore.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/memory/ByteBufferStore.java index 0705ea541d2..698521fc7f6 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/memory/ByteBufferStore.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/memory/ByteBufferStore.java @@ -19,12 +19,12 @@ package org.elasticsearch.index.store.memory; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.store.support.AbstractStore; import org.elasticsearch.util.SizeUnit; import org.elasticsearch.util.SizeValue; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/memory/HeapStore.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/memory/HeapStore.java index bb781454938..5bb7147c841 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/memory/HeapStore.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/memory/HeapStore.java @@ -19,12 +19,12 @@ package org.elasticsearch.index.store.memory; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.store.support.AbstractStore; import org.elasticsearch.util.SizeUnit; import org.elasticsearch.util.SizeValue; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/memory/MemoryStoreModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/memory/MemoryStoreModule.java index 087f69ac119..23343c3e8de 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/memory/MemoryStoreModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/memory/MemoryStoreModule.java @@ -19,9 +19,9 @@ package org.elasticsearch.index.store.memory; -import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.ElasticSearchIllegalArgumentException; import org.elasticsearch.index.store.Store; +import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/ram/RamStore.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/ram/RamStore.java index 116ed758ace..0d42ea3afd9 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/ram/RamStore.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/ram/RamStore.java @@ -19,13 +19,13 @@ package org.elasticsearch.index.store.ram; -import org.elasticsearch.util.guice.inject.Inject; import org.apache.lucene.store.RAMDirectory; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.store.support.AbstractStore; import org.elasticsearch.util.SizeUnit; import org.elasticsearch.util.SizeValue; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.io.IOException; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/ram/RamStoreModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/ram/RamStoreModule.java index 6180cd5ba89..8113668be69 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/ram/RamStoreModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/ram/RamStoreModule.java @@ -19,8 +19,8 @@ package org.elasticsearch.index.store.ram; -import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.index.store.Store; +import org.elasticsearch.util.guice.inject.AbstractModule; /** * @author kimchy (Shay Banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/TranslogModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/TranslogModule.java index 6f99105e4db..e93c5ca3296 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/TranslogModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/TranslogModule.java @@ -19,9 +19,9 @@ package org.elasticsearch.index.translog; +import org.elasticsearch.index.translog.memory.MemoryTranslog; import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.util.guice.inject.Scopes; -import org.elasticsearch.index.translog.memory.MemoryTranslog; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/memory/MemorySnapshot.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/memory/MemorySnapshot.java index 094c091604a..d0eb1e32eb6 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/memory/MemorySnapshot.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/memory/MemorySnapshot.java @@ -19,10 +19,10 @@ package org.elasticsearch.index.translog.memory; -import org.elasticsearch.util.gcommon.collect.Iterables; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.ElasticSearchIllegalArgumentException; import org.elasticsearch.index.translog.Translog; +import org.elasticsearch.util.gcommon.collect.Iterables; import org.elasticsearch.util.io.stream.StreamInput; import org.elasticsearch.util.io.stream.StreamOutput; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/memory/MemoryTranslog.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/memory/MemoryTranslog.java index f75e8541b51..4ca747d2395 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/memory/MemoryTranslog.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/memory/MemoryTranslog.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.translog.memory; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.index.shard.AbstractIndexShardComponent; import org.elasticsearch.index.shard.ShardId; @@ -29,6 +28,7 @@ import org.elasticsearch.util.SizeUnit; import org.elasticsearch.util.SizeValue; import org.elasticsearch.util.concurrent.ThreadSafe; import org.elasticsearch.util.concurrent.jsr166y.LinkedTransferQueue; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.ArrayList; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/RestController.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/RestController.java index 5fdf958ef4f..e5ecf80e112 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/RestController.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/RestController.java @@ -19,10 +19,10 @@ package org.elasticsearch.rest; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.ElasticSearchIllegalArgumentException; import org.elasticsearch.util.component.AbstractLifecycleComponent; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.path.PathTrie; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/RestModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/RestModule.java index 73148c50942..38536f6c987 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/RestModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/RestModule.java @@ -19,8 +19,8 @@ package org.elasticsearch.rest; -import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.rest.action.RestActionModule; +import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/RestActionModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/RestActionModule.java index aadde28f221..821e92efbe2 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/RestActionModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/RestActionModule.java @@ -19,7 +19,6 @@ package org.elasticsearch.rest.action; -import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.rest.action.admin.cluster.health.RestClusterHealthAction; import org.elasticsearch.rest.action.admin.cluster.node.info.RestNodesInfoAction; import org.elasticsearch.rest.action.admin.cluster.node.shutdown.RestNodesShutdownAction; @@ -47,6 +46,7 @@ import org.elasticsearch.rest.action.mlt.RestMoreLikeThisAction; import org.elasticsearch.rest.action.search.RestSearchAction; import org.elasticsearch.rest.action.search.RestSearchScrollAction; import org.elasticsearch.rest.action.terms.RestTermsAction; +import org.elasticsearch.util.guice.inject.AbstractModule; /** * @author kimchy (Shay Banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/health/RestClusterHealthAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/health/RestClusterHealthAction.java index be123dc3877..567ebab33a3 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/health/RestClusterHealthAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/health/RestClusterHealthAction.java @@ -19,14 +19,13 @@ package org.elasticsearch.rest.action.admin.cluster.health; -import org.elasticsearch.rest.action.support.RestXContentBuilder; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.cluster.health.*; import org.elasticsearch.client.Client; import org.elasticsearch.rest.*; import org.elasticsearch.rest.action.support.RestActions; -import org.elasticsearch.util.json.JsonBuilder; +import org.elasticsearch.rest.action.support.RestXContentBuilder; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.builder.XContentBuilder; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/info/RestNodesInfoAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/info/RestNodesInfoAction.java index 0de9fa121b2..1a5741e5835 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/info/RestNodesInfoAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/info/RestNodesInfoAction.java @@ -19,8 +19,6 @@ package org.elasticsearch.rest.action.admin.cluster.node.info; -import org.elasticsearch.rest.action.support.RestXContentBuilder; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.cluster.node.info.NodeInfo; import org.elasticsearch.action.admin.cluster.node.info.NodesInfoRequest; @@ -28,7 +26,8 @@ import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse; import org.elasticsearch.client.Client; import org.elasticsearch.rest.*; import org.elasticsearch.rest.action.support.RestActions; -import org.elasticsearch.util.json.JsonBuilder; +import org.elasticsearch.rest.action.support.RestXContentBuilder; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.builder.XContentBuilder; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/shutdown/RestNodesShutdownAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/shutdown/RestNodesShutdownAction.java index bf5be89bb66..e032fcbf4c2 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/shutdown/RestNodesShutdownAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/shutdown/RestNodesShutdownAction.java @@ -19,21 +19,19 @@ package org.elasticsearch.rest.action.admin.cluster.node.shutdown; -import org.elasticsearch.rest.action.support.RestXContentBuilder; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.cluster.node.shutdown.NodesShutdownRequest; import org.elasticsearch.action.admin.cluster.node.shutdown.NodesShutdownResponse; import org.elasticsearch.client.Client; import org.elasticsearch.rest.*; import org.elasticsearch.rest.action.support.RestActions; -import org.elasticsearch.util.json.JsonBuilder; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.builder.XContentBuilder; import java.io.IOException; -import static org.elasticsearch.rest.action.support.RestXContentBuilder.restContentBuilder; +import static org.elasticsearch.rest.action.support.RestXContentBuilder.*; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/ping/broadcast/RestBroadcastPingAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/ping/broadcast/RestBroadcastPingAction.java index 1a5ed9eb45e..68ab35e1c6d 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/ping/broadcast/RestBroadcastPingAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/ping/broadcast/RestBroadcastPingAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.rest.action.admin.cluster.ping.broadcast; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.cluster.ping.broadcast.BroadcastPingRequest; import org.elasticsearch.action.admin.cluster.ping.broadcast.BroadcastPingResponse; @@ -28,7 +27,7 @@ import org.elasticsearch.client.Client; import org.elasticsearch.rest.*; import org.elasticsearch.rest.action.support.RestActions; import org.elasticsearch.rest.action.support.RestXContentBuilder; -import org.elasticsearch.util.json.JsonBuilder; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.builder.XContentBuilder; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/ping/replication/RestReplicationPingAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/ping/replication/RestReplicationPingAction.java index 1261299eff8..fd1be42a39d 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/ping/replication/RestReplicationPingAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/ping/replication/RestReplicationPingAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.rest.action.admin.cluster.ping.replication; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.cluster.ping.replication.IndexReplicationPingResponse; import org.elasticsearch.action.admin.cluster.ping.replication.ReplicationPingRequest; @@ -29,7 +28,7 @@ import org.elasticsearch.client.Client; import org.elasticsearch.rest.*; import org.elasticsearch.rest.action.support.RestActions; import org.elasticsearch.rest.action.support.RestXContentBuilder; -import org.elasticsearch.util.json.JsonBuilder; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.builder.XContentBuilder; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/ping/single/RestSinglePingAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/ping/single/RestSinglePingAction.java index cda6103a2fc..42bdb78f5be 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/ping/single/RestSinglePingAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/ping/single/RestSinglePingAction.java @@ -19,14 +19,13 @@ package org.elasticsearch.rest.action.admin.cluster.ping.single; -import org.elasticsearch.rest.action.support.RestXContentBuilder; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.cluster.ping.single.SinglePingRequest; import org.elasticsearch.action.admin.cluster.ping.single.SinglePingResponse; import org.elasticsearch.client.Client; import org.elasticsearch.rest.*; -import org.elasticsearch.util.json.JsonBuilder; +import org.elasticsearch.rest.action.support.RestXContentBuilder; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.builder.XContentBuilder; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/cache/clear/RestClearIndicesCacheAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/cache/clear/RestClearIndicesCacheAction.java index c6441cc147e..ad6932143b0 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/cache/clear/RestClearIndicesCacheAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/cache/clear/RestClearIndicesCacheAction.java @@ -19,8 +19,6 @@ package org.elasticsearch.rest.action.admin.indices.cache.clear; -import org.elasticsearch.rest.action.support.RestXContentBuilder; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.indices.cache.clear.ClearIndicesCacheRequest; import org.elasticsearch.action.admin.indices.cache.clear.ClearIndicesCacheResponse; @@ -28,6 +26,8 @@ import org.elasticsearch.action.support.broadcast.BroadcastOperationThreading; import org.elasticsearch.client.Client; import org.elasticsearch.rest.*; import org.elasticsearch.rest.action.support.RestActions; +import org.elasticsearch.rest.action.support.RestXContentBuilder; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.builder.XContentBuilder; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/delete/RestDeleteIndexAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/delete/RestDeleteIndexAction.java index c7b9f4ae42b..1be0ac39cf8 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/delete/RestDeleteIndexAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/delete/RestDeleteIndexAction.java @@ -19,15 +19,14 @@ package org.elasticsearch.rest.action.admin.indices.delete; -import org.elasticsearch.rest.action.support.RestXContentBuilder; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest; import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse; import org.elasticsearch.client.Client; import org.elasticsearch.indices.IndexMissingException; import org.elasticsearch.rest.*; -import org.elasticsearch.util.json.JsonBuilder; +import org.elasticsearch.rest.action.support.RestXContentBuilder; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.builder.XContentBuilder; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/flush/RestFlushAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/flush/RestFlushAction.java index 50ecad79343..0722beedaa9 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/flush/RestFlushAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/flush/RestFlushAction.java @@ -19,8 +19,6 @@ package org.elasticsearch.rest.action.admin.indices.flush; -import org.elasticsearch.rest.action.support.RestXContentBuilder; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.indices.flush.FlushRequest; import org.elasticsearch.action.admin.indices.flush.FlushResponse; @@ -28,7 +26,8 @@ import org.elasticsearch.action.support.broadcast.BroadcastOperationThreading; import org.elasticsearch.client.Client; import org.elasticsearch.rest.*; import org.elasticsearch.rest.action.support.RestActions; -import org.elasticsearch.util.json.JsonBuilder; +import org.elasticsearch.rest.action.support.RestXContentBuilder; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.builder.XContentBuilder; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/gateway/snapshot/RestGatewaySnapshotAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/gateway/snapshot/RestGatewaySnapshotAction.java index dc623941fed..1114d119d89 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/gateway/snapshot/RestGatewaySnapshotAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/gateway/snapshot/RestGatewaySnapshotAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.rest.action.admin.indices.gateway.snapshot; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.indices.gateway.snapshot.GatewaySnapshotRequest; import org.elasticsearch.action.admin.indices.gateway.snapshot.GatewaySnapshotResponse; @@ -28,7 +27,7 @@ import org.elasticsearch.client.Client; import org.elasticsearch.rest.*; import org.elasticsearch.rest.action.support.RestActions; import org.elasticsearch.rest.action.support.RestXContentBuilder; -import org.elasticsearch.util.json.JsonBuilder; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.builder.XContentBuilder; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/put/RestPutMappingAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/put/RestPutMappingAction.java index ec01b636dff..c1a332d971a 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/put/RestPutMappingAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/put/RestPutMappingAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.rest.action.admin.indices.mapping.put; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest; import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse; @@ -29,7 +28,7 @@ import org.elasticsearch.index.mapper.MergeMappingException; import org.elasticsearch.indices.IndexMissingException; import org.elasticsearch.rest.*; import org.elasticsearch.rest.action.support.RestXContentBuilder; -import org.elasticsearch.util.json.JsonBuilder; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.builder.XContentBuilder; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/optimize/RestOptimizeAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/optimize/RestOptimizeAction.java index fea78d1fe03..1a3c3e7ac20 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/optimize/RestOptimizeAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/optimize/RestOptimizeAction.java @@ -19,8 +19,6 @@ package org.elasticsearch.rest.action.admin.indices.optimize; -import org.elasticsearch.rest.action.support.RestXContentBuilder; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.indices.optimize.OptimizeRequest; import org.elasticsearch.action.admin.indices.optimize.OptimizeResponse; @@ -28,6 +26,8 @@ import org.elasticsearch.action.support.broadcast.BroadcastOperationThreading; import org.elasticsearch.client.Client; import org.elasticsearch.rest.*; import org.elasticsearch.rest.action.support.RestActions; +import org.elasticsearch.rest.action.support.RestXContentBuilder; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.builder.XContentBuilder; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/refresh/RestRefreshAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/refresh/RestRefreshAction.java index 03ad4b211d3..ff8d091892a 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/refresh/RestRefreshAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/refresh/RestRefreshAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.rest.action.admin.indices.refresh; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.indices.refresh.RefreshRequest; import org.elasticsearch.action.admin.indices.refresh.RefreshResponse; @@ -28,7 +27,7 @@ import org.elasticsearch.client.Client; import org.elasticsearch.rest.*; import org.elasticsearch.rest.action.support.RestActions; import org.elasticsearch.rest.action.support.RestXContentBuilder; -import org.elasticsearch.util.json.JsonBuilder; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.builder.XContentBuilder; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/status/RestIndicesStatusAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/status/RestIndicesStatusAction.java index 1e035878f5d..b9cd64c30cd 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/status/RestIndicesStatusAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/status/RestIndicesStatusAction.java @@ -19,14 +19,13 @@ package org.elasticsearch.rest.action.admin.indices.status; -import org.elasticsearch.rest.action.support.RestXContentBuilder; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.indices.status.*; import org.elasticsearch.action.support.broadcast.BroadcastOperationThreading; import org.elasticsearch.client.Client; import org.elasticsearch.rest.*; -import org.elasticsearch.util.json.JsonBuilder; +import org.elasticsearch.rest.action.support.RestXContentBuilder; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.builder.XContentBuilder; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/delete/RestDeleteAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/delete/RestDeleteAction.java index 35b9377fe6f..bfafbce69cf 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/delete/RestDeleteAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/delete/RestDeleteAction.java @@ -19,14 +19,13 @@ package org.elasticsearch.rest.action.delete; -import org.elasticsearch.rest.action.support.RestXContentBuilder; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.delete.DeleteResponse; import org.elasticsearch.client.Client; import org.elasticsearch.rest.*; -import org.elasticsearch.util.json.JsonBuilder; +import org.elasticsearch.rest.action.support.RestXContentBuilder; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.builder.XContentBuilder; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/deletebyquery/RestDeleteByQueryAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/deletebyquery/RestDeleteByQueryAction.java index 3e5ad586b94..aa78d9c23ae 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/deletebyquery/RestDeleteByQueryAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/deletebyquery/RestDeleteByQueryAction.java @@ -19,8 +19,6 @@ package org.elasticsearch.rest.action.deletebyquery; -import org.elasticsearch.rest.action.support.RestXContentBuilder; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.deletebyquery.DeleteByQueryRequest; import org.elasticsearch.action.deletebyquery.DeleteByQueryResponse; @@ -29,7 +27,8 @@ import org.elasticsearch.action.deletebyquery.ShardDeleteByQueryRequest; import org.elasticsearch.client.Client; import org.elasticsearch.rest.*; import org.elasticsearch.rest.action.support.RestActions; -import org.elasticsearch.util.json.JsonBuilder; +import org.elasticsearch.rest.action.support.RestXContentBuilder; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.builder.XContentBuilder; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/get/RestGetAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/get/RestGetAction.java index ce9ee31d89d..b2a57bf8e08 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/get/RestGetAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/get/RestGetAction.java @@ -19,14 +19,13 @@ package org.elasticsearch.rest.action.get; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.get.GetField; import org.elasticsearch.action.get.GetRequest; import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.client.Client; import org.elasticsearch.rest.*; -import org.elasticsearch.util.json.JsonBuilder; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.builder.XContentBuilder; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java index 6007cba4b36..d90c841878b 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java @@ -19,14 +19,13 @@ package org.elasticsearch.rest.action.index; -import org.elasticsearch.rest.action.support.RestXContentBuilder; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.client.Client; import org.elasticsearch.rest.*; -import org.elasticsearch.util.json.JsonBuilder; +import org.elasticsearch.rest.action.support.RestXContentBuilder; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.builder.XContentBuilder; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/mlt/RestMoreLikeThisAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/mlt/RestMoreLikeThisAction.java index 770770ca71c..7b04766a701 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/mlt/RestMoreLikeThisAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/mlt/RestMoreLikeThisAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.rest.action.mlt; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.mlt.MoreLikeThisRequest; import org.elasticsearch.action.search.SearchResponse; @@ -28,7 +27,7 @@ import org.elasticsearch.client.Client; import org.elasticsearch.rest.*; import org.elasticsearch.search.Scroll; import org.elasticsearch.util.Unicode; -import org.elasticsearch.util.json.JsonBuilder; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.builder.XContentBuilder; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java index 6785464a5ab..9c3e8c974fe 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.rest.action.search; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.search.SearchOperationThreading; import org.elasticsearch.action.search.SearchResponse; @@ -27,7 +26,7 @@ import org.elasticsearch.action.search.SearchScrollRequest; import org.elasticsearch.client.Client; import org.elasticsearch.rest.*; import org.elasticsearch.search.Scroll; -import org.elasticsearch.util.json.JsonBuilder; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.builder.XContentBuilder; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/terms/RestTermsAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/terms/RestTermsAction.java index f9b477cac1f..7eecb53e661 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/terms/RestTermsAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/terms/RestTermsAction.java @@ -19,8 +19,6 @@ package org.elasticsearch.rest.action.terms; -import org.elasticsearch.rest.action.support.RestXContentBuilder; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.broadcast.BroadcastOperationThreading; import org.elasticsearch.action.terms.FieldTermsFreq; @@ -29,7 +27,8 @@ import org.elasticsearch.action.terms.TermsRequest; import org.elasticsearch.action.terms.TermsResponse; import org.elasticsearch.client.Client; import org.elasticsearch.rest.*; -import org.elasticsearch.util.json.JsonBuilder; +import org.elasticsearch.rest.action.support.RestXContentBuilder; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.builder.XContentBuilder; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchHit.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchHit.java index 1b60033a2be..0b653ea0fbf 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchHit.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchHit.java @@ -23,7 +23,6 @@ import org.apache.lucene.search.Explanation; import org.elasticsearch.ElasticSearchParseException; import org.elasticsearch.search.highlight.HighlightField; import org.elasticsearch.util.io.stream.Streamable; -import org.elasticsearch.util.json.ToJson; import org.elasticsearch.util.xcontent.ToXContent; import java.util.Map; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchHits.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchHits.java index 46be9d9822b..8a8e895596c 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchHits.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchHits.java @@ -20,7 +20,6 @@ package org.elasticsearch.search; import org.elasticsearch.util.io.stream.Streamable; -import org.elasticsearch.util.json.ToJson; import org.elasticsearch.util.xcontent.ToXContent; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchModule.java index 7d8eb0651f3..cba3109ec04 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchModule.java @@ -19,7 +19,6 @@ package org.elasticsearch.search; -import org.elasticsearch.util.guice.inject.AbstractModule; import org.elasticsearch.search.action.SearchServiceTransportAction; import org.elasticsearch.search.controller.SearchPhaseController; import org.elasticsearch.search.dfs.DfsPhase; @@ -27,6 +26,7 @@ import org.elasticsearch.search.facets.FacetsPhase; import org.elasticsearch.search.fetch.FetchPhase; import org.elasticsearch.search.highlight.HighlightPhase; import org.elasticsearch.search.query.QueryPhase; +import org.elasticsearch.util.guice.inject.AbstractModule; /** * @author kimchy (Shay Banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchParseElement.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchParseElement.java index 8d68eb2626f..6a620bd73b9 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchParseElement.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchParseElement.java @@ -19,7 +19,6 @@ package org.elasticsearch.search; -import org.codehaus.jackson.JsonParser; import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.util.xcontent.XContentParser; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/action/SearchServiceTransportAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/action/SearchServiceTransportAction.java index f16a42f1953..ba7d284a8b0 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/search/action/SearchServiceTransportAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/search/action/SearchServiceTransportAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.action; -import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.search.SearchService; @@ -32,6 +31,7 @@ import org.elasticsearch.search.internal.InternalSearchRequest; import org.elasticsearch.search.query.QuerySearchRequest; import org.elasticsearch.search.query.QuerySearchResult; import org.elasticsearch.transport.*; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.io.stream.LongStreamable; import org.elasticsearch.util.io.stream.VoidStreamable; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/controller/SearchPhaseController.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/controller/SearchPhaseController.java index 6ff16b291e2..c0d2b1414a7 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/search/controller/SearchPhaseController.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/search/controller/SearchPhaseController.java @@ -19,9 +19,6 @@ package org.elasticsearch.search.controller; -import org.elasticsearch.util.gcommon.collect.Iterables; -import org.elasticsearch.util.gcommon.collect.Lists; -import org.elasticsearch.util.gcommon.collect.Maps; import org.apache.lucene.index.Term; import org.apache.lucene.search.FieldDoc; import org.apache.lucene.search.ScoreDoc; @@ -42,6 +39,9 @@ import org.elasticsearch.search.internal.InternalSearchHits; import org.elasticsearch.search.internal.InternalSearchResponse; import org.elasticsearch.search.query.QuerySearchResult; import org.elasticsearch.search.query.QuerySearchResultProvider; +import org.elasticsearch.util.gcommon.collect.Iterables; +import org.elasticsearch.util.gcommon.collect.Lists; +import org.elasticsearch.util.gcommon.collect.Maps; import org.elasticsearch.util.trove.ExtTIntArrayList; import org.elasticsearch.util.trove.ExtTObjectIntHasMap; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java index 79dc70611eb..58f470a4797 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java @@ -19,11 +19,11 @@ package org.elasticsearch.search.dfs; -import org.elasticsearch.util.gcommon.collect.ImmutableMap; import org.apache.lucene.index.Term; import org.elasticsearch.search.SearchParseElement; import org.elasticsearch.search.SearchPhase; import org.elasticsearch.search.internal.SearchContext; +import org.elasticsearch.util.gcommon.collect.ImmutableMap; import org.elasticsearch.util.gnu.trove.THashSet; import java.util.Map; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/Facet.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/Facet.java index 608cd77e457..558c374a2f3 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/Facet.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/Facet.java @@ -21,7 +21,6 @@ package org.elasticsearch.search.facets; import org.elasticsearch.ElasticSearchIllegalArgumentException; import org.elasticsearch.util.io.stream.Streamable; -import org.elasticsearch.util.json.ToJson; import org.elasticsearch.util.xcontent.ToXContent; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/FacetsPhase.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/FacetsPhase.java index 725f61e2050..d089e70592f 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/FacetsPhase.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/FacetsPhase.java @@ -19,8 +19,6 @@ package org.elasticsearch.search.facets; -import org.elasticsearch.util.gcommon.collect.ImmutableMap; -import org.elasticsearch.util.gcommon.collect.Lists; import org.apache.lucene.search.*; import org.apache.lucene.util.OpenBitSet; import org.elasticsearch.ElasticSearchException; @@ -28,6 +26,8 @@ import org.elasticsearch.ElasticSearchIllegalStateException; import org.elasticsearch.search.SearchParseElement; import org.elasticsearch.search.SearchPhase; import org.elasticsearch.search.internal.SearchContext; +import org.elasticsearch.util.gcommon.collect.ImmutableMap; +import org.elasticsearch.util.gcommon.collect.Lists; import org.elasticsearch.util.lucene.Lucene; import java.io.IOException; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java index 82ca4e1ffb8..657b5e39892 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java @@ -19,8 +19,6 @@ package org.elasticsearch.search.fetch; -import org.elasticsearch.util.gcommon.collect.ImmutableMap; -import org.elasticsearch.util.guice.inject.Inject; import org.apache.lucene.document.Document; import org.apache.lucene.document.FieldSelector; import org.apache.lucene.document.Fieldable; @@ -33,6 +31,8 @@ import org.elasticsearch.search.internal.InternalSearchHit; import org.elasticsearch.search.internal.InternalSearchHitField; import org.elasticsearch.search.internal.InternalSearchHits; import org.elasticsearch.search.internal.SearchContext; +import org.elasticsearch.util.gcommon.collect.ImmutableMap; +import org.elasticsearch.util.guice.inject.Inject; import java.io.IOException; import java.util.ArrayList; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java index a754e58d6f4..1afad7c1230 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.highlight; -import org.elasticsearch.util.gcommon.collect.ImmutableMap; import org.apache.lucene.search.vectorhighlight.*; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.index.mapper.DocumentMapper; @@ -30,6 +29,7 @@ import org.elasticsearch.search.SearchPhase; import org.elasticsearch.search.fetch.FetchPhaseExecutionException; import org.elasticsearch.search.internal.InternalSearchHit; import org.elasticsearch.search.internal.SearchContext; +import org.elasticsearch.util.gcommon.collect.ImmutableMap; import java.io.IOException; import java.util.HashMap; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/InternalSearchHits.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/InternalSearchHits.java index 027b31cf99c..89c44442a1e 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/InternalSearchHits.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/InternalSearchHits.java @@ -19,14 +19,13 @@ package org.elasticsearch.search.internal; -import org.elasticsearch.util.gcommon.collect.Iterators; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchHits; import org.elasticsearch.search.SearchShardTarget; +import org.elasticsearch.util.gcommon.collect.Iterators; import org.elasticsearch.util.gnu.trove.TIntObjectHashMap; import org.elasticsearch.util.io.stream.StreamInput; import org.elasticsearch.util.io.stream.StreamOutput; -import org.elasticsearch.util.json.JsonBuilder; import org.elasticsearch.util.xcontent.builder.XContentBuilder; import java.io.IOException; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/InternalSearchResponse.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/InternalSearchResponse.java index abbe92e410f..a5e4bfbbda7 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/InternalSearchResponse.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/InternalSearchResponse.java @@ -24,8 +24,6 @@ import org.elasticsearch.search.facets.Facets; import org.elasticsearch.util.io.stream.StreamInput; import org.elasticsearch.util.io.stream.StreamOutput; import org.elasticsearch.util.io.stream.Streamable; -import org.elasticsearch.util.json.JsonBuilder; -import org.elasticsearch.util.json.ToJson; import org.elasticsearch.util.xcontent.ToXContent; import org.elasticsearch.util.xcontent.builder.XContentBuilder; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/query/FromParseElement.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/query/FromParseElement.java index 063f5b91677..d47aa19b581 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/search/query/FromParseElement.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/search/query/FromParseElement.java @@ -19,8 +19,6 @@ package org.elasticsearch.search.query; -import org.codehaus.jackson.JsonParser; -import org.codehaus.jackson.JsonToken; import org.elasticsearch.search.SearchParseElement; import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.util.xcontent.XContentParser; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/query/QueryParseElement.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/query/QueryParseElement.java index 335b48f1746..75af6efbacf 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/search/query/QueryParseElement.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/search/query/QueryParseElement.java @@ -20,7 +20,6 @@ package org.elasticsearch.search.query; import org.apache.lucene.search.Query; -import org.codehaus.jackson.JsonParser; import org.elasticsearch.index.query.xcontent.XContentIndexQueryParser; import org.elasticsearch.search.SearchParseElement; import org.elasticsearch.search.internal.SearchContext; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/query/QueryParserNameParseElement.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/query/QueryParserNameParseElement.java index 56317f212b0..f30e9aa9e7a 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/search/query/QueryParserNameParseElement.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/search/query/QueryParserNameParseElement.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.query; -import org.codehaus.jackson.JsonParser; import org.elasticsearch.search.SearchParseElement; import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.util.xcontent.XContentParser; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/query/QueryPhase.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/query/QueryPhase.java index ed138642433..adff14adf36 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/search/query/QueryPhase.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/search/query/QueryPhase.java @@ -19,8 +19,6 @@ package org.elasticsearch.search.query; -import org.elasticsearch.util.gcommon.collect.ImmutableMap; -import org.elasticsearch.util.guice.inject.Inject; import org.apache.lucene.search.*; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.search.SearchParseElement; @@ -28,6 +26,8 @@ import org.elasticsearch.search.SearchParseException; import org.elasticsearch.search.SearchPhase; import org.elasticsearch.search.facets.FacetsPhase; import org.elasticsearch.search.internal.SearchContext; +import org.elasticsearch.util.gcommon.collect.ImmutableMap; +import org.elasticsearch.util.guice.inject.Inject; import org.elasticsearch.util.lucene.search.CustomBoostFactorQuery; import org.elasticsearch.util.lucene.search.TermFilter;