From 040030dac8594a13f912f21fbe12c801a2400c68 Mon Sep 17 00:00:00 2001 From: kimchy Date: Mon, 10 May 2010 01:34:22 +0300 Subject: [PATCH] reafctor inject to util from util.guice --- .../action/TransportActionModule.java | 2 +- .../health/TransportClusterHealthAction.java | 2 +- .../cluster/node/info/TransportNodesInfo.java | 2 +- .../restart/TransportNodesRestartAction.java | 2 +- .../TransportNodesShutdownAction.java | 2 +- .../node/stats/TransportNodesStats.java | 2 +- .../TransportBroadcastPingAction.java | 2 +- .../TransportIndexReplicationPingAction.java | 2 +- .../TransportReplicationPingAction.java | 2 +- .../TransportShardReplicationPingAction.java | 2 +- .../single/TransportSinglePingAction.java | 2 +- .../state/TransportClusterStateAction.java | 2 +- .../alias/TransportIndicesAliasesAction.java | 2 +- .../TransportClearIndicesCacheAction.java | 2 +- .../create/TransportCreateIndexAction.java | 2 +- .../delete/TransportDeleteIndexAction.java | 2 +- .../indices/flush/TransportFlushAction.java | 2 +- .../TransportGatewaySnapshotAction.java | 2 +- .../TransportIndexGatewaySnapshotAction.java | 2 +- .../TransportShardGatewaySnapshotAction.java | 2 +- .../put/TransportPutMappingAction.java | 2 +- .../optimize/TransportOptimizeAction.java | 2 +- .../refresh/TransportRefreshAction.java | 2 +- .../status/TransportIndicesStatusAction.java | 2 +- .../action/count/TransportCountAction.java | 2 +- .../action/delete/TransportDeleteAction.java | 2 +- .../TransportDeleteByQueryAction.java | 2 +- .../TransportIndexDeleteByQueryAction.java | 2 +- .../TransportShardDeleteByQueryAction.java | 2 +- .../action/get/TransportGetAction.java | 2 +- .../action/index/TransportIndexAction.java | 2 +- .../mlt/TransportMoreLikeThisAction.java | 2 +- .../action/search/TransportSearchAction.java | 2 +- .../search/TransportSearchScrollAction.java | 2 +- ...TransportSearchDfsQueryAndFetchAction.java | 2 +- ...ransportSearchDfsQueryThenFetchAction.java | 2 +- .../TransportSearchQueryAndFetchAction.java | 2 +- .../TransportSearchQueryThenFetchAction.java | 2 +- ...nsportSearchScrollQueryAndFetchAction.java | 2 +- ...sportSearchScrollQueryThenFetchAction.java | 2 +- .../nodes/TransportNodesOperationAction.java | 2 +- ...nsportIndexReplicationOperationAction.java | 2 +- ...portIndicesReplicationOperationAction.java | 2 +- .../action/terms/TransportTermsAction.java | 2 +- .../elasticsearch/bootstrap/Bootstrap.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 +- .../transport/ClientTransportModule.java | 2 +- .../client/transport/TransportClient.java | 6 ++-- .../TransportClientClusterModule.java | 2 +- .../TransportClientClusterService.java | 2 +- .../TransportClientNodesService.java | 2 +- .../action/ClientTransportActionModule.java | 2 +- .../ClientTransportClusterHealthAction.java | 2 +- .../info/ClientTransportNodesInfoAction.java | 2 +- .../ClientTransportNodesRestartAction.java | 2 +- .../ClientTransportNodesShutdownAction.java | 2 +- .../ClientTransportNodesStatsAction.java | 2 +- .../ClientTransportBroadcastPingAction.java | 2 +- .../ClientTransportReplicationPingAction.java | 2 +- .../ClientTransportSinglePingAction.java | 2 +- .../ClientTransportClusterStateAction.java | 2 +- .../ClientTransportIndicesAliasesAction.java | 2 +- ...lientTransportClearIndicesCacheAction.java | 2 +- .../ClientTransportCreateIndexAction.java | 2 +- .../ClientTransportDeleteIndexAction.java | 2 +- .../flush/ClientTransportFlushAction.java | 2 +- .../ClientTransportGatewaySnapshotAction.java | 2 +- .../ClientTransportPutMappingAction.java | 2 +- .../ClientTransportOptimizeAction.java | 2 +- .../refresh/ClientTransportRefreshAction.java | 2 +- .../ClientTransportIndicesStatusAction.java | 2 +- .../count/ClientTransportCountAction.java | 2 +- .../delete/ClientTransportDeleteAction.java | 2 +- .../ClientTransportDeleteByQueryAction.java | 2 +- .../action/get/ClientTransportGetAction.java | 2 +- .../index/ClientTransportIndexAction.java | 2 +- .../ClientTransportMoreLikeThisAction.java | 2 +- .../search/ClientTransportSearchAction.java | 2 +- .../ClientTransportSearchScrollAction.java | 2 +- .../terms/ClientTransportTermsAction.java | 2 +- .../support/InternalTransportAdminClient.java | 2 +- .../support/InternalTransportClient.java | 2 +- .../InternalTransportClusterAdminClient.java | 2 +- .../InternalTransportIndicesAdminClient.java | 2 +- .../elasticsearch/cluster/ClusterModule.java | 2 +- .../cluster/ClusterNameModule.java | 2 +- .../action/index/MappingUpdatedAction.java | 2 +- .../action/index/NodeIndexCreatedAction.java | 2 +- .../action/index/NodeIndexDeletedAction.java | 2 +- .../index/NodeMappingCreatedAction.java | 2 +- .../action/shard/ShardStateAction.java | 2 +- .../cluster/metadata/MetaDataService.java | 2 +- .../cluster/routing/RoutingService.java | 2 +- .../service/InternalClusterService.java | 2 +- .../discovery/DiscoveryModule.java | 4 +-- .../discovery/DiscoveryService.java | 2 +- .../discovery/local/LocalDiscovery.java | 2 +- .../discovery/local/LocalDiscoveryModule.java | 2 +- .../discovery/zen/ZenDiscovery.java | 2 +- .../discovery/zen/ZenDiscoveryModule.java | 2 +- .../discovery/zen/ping/ZenPingService.java | 2 +- .../elasticsearch/env/EnvironmentModule.java | 2 +- .../org/elasticsearch/gateway/Gateway.java | 2 +- .../elasticsearch/gateway/GatewayModule.java | 2 +- .../elasticsearch/gateway/GatewayService.java | 2 +- .../elasticsearch/gateway/fs/FsGateway.java | 4 +-- .../gateway/fs/FsGatewayModule.java | 2 +- .../gateway/none/NoneGateway.java | 4 +-- .../gateway/none/NoneGatewayModule.java | 2 +- .../org/elasticsearch/http/HttpServer.java | 2 +- .../elasticsearch/http/HttpServerModule.java | 4 +-- .../http/netty/NettyHttpServerTransport.java | 2 +- .../netty/NettyHttpServerTransportModule.java | 2 +- .../org/elasticsearch/index/IndexModule.java | 2 +- .../elasticsearch/index/IndexNameModule.java | 2 +- .../index/IndexServiceManagement.java | 2 +- .../org/elasticsearch/index/LocalNodeId.java | 2 +- .../index/LocalNodeIdModule.java | 2 +- .../ASCIIFoldingTokenFilterFactory.java | 4 +-- .../index/analysis/AnalysisModule.java | 8 ++--- .../index/analysis/AnalysisService.java | 2 +- .../index/analysis/AnalyzerProvider.java | 2 +- .../analysis/ArabicAnalyzerProvider.java | 4 +-- .../ArabicStemTokenFilterFactory.java | 4 +-- .../analysis/BrazilianAnalyzerProvider.java | 4 +-- .../BrazilianStemTokenFilterFactory.java | 4 +-- .../analysis/ChineseAnalyzerProvider.java | 4 +-- .../index/analysis/CjkAnalyzerProvider.java | 4 +-- .../analysis/CustomAnalyzerProvider.java | 4 +-- .../index/analysis/CzechAnalyzerProvider.java | 4 +-- .../index/analysis/DutchAnalyzerProvider.java | 4 +-- .../analysis/DutchStemTokenFilterFactory.java | 4 +-- .../analysis/EdgeNGramTokenFilterFactory.java | 4 +-- .../analysis/EdgeNGramTokenizerFactory.java | 4 +-- .../analysis/FrenchAnalyzerProvider.java | 4 +-- .../FrenchStemTokenFilterFactory.java | 4 +-- .../analysis/GermanAnalyzerProvider.java | 4 +-- .../GermanStemTokenFilterFactory.java | 4 +-- .../index/analysis/GreekAnalyzerProvider.java | 4 +-- .../analysis/KeywordAnalyzerProvider.java | 4 +-- .../analysis/KeywordTokenizerFactory.java | 4 +-- .../analysis/LengthTokenFilterFactory.java | 4 +-- .../analysis/LetterTokenizerFactory.java | 4 +-- .../analysis/LowerCaseTokenFilterFactory.java | 4 +-- .../analysis/LowerCaseTokenizerFactory.java | 4 +-- .../analysis/NGramTokenFilterFactory.java | 4 +-- .../index/analysis/NGramTokenizerFactory.java | 4 +-- .../analysis/PersianAnalyzerProvider.java | 4 +-- .../PorterStemTokenFilterFactory.java | 4 +-- .../analysis/RussianAnalyzerProvider.java | 4 +-- .../RussianStemTokenFilterFactory.java | 4 +-- .../analysis/ShingleTokenFilterFactory.java | 4 +-- .../analysis/SimpleAnalyzerProvider.java | 4 +-- .../analysis/StandardAnalyzerProvider.java | 4 +-- .../analysis/StandardTokenFilterFactory.java | 4 +-- .../analysis/StandardTokenizerFactory.java | 4 +-- .../index/analysis/StopAnalyzerProvider.java | 4 +-- .../analysis/StopTokenFilterFactory.java | 4 +-- .../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 | 4 +-- .../cache/filter/none/NoneFilterCache.java | 2 +- .../cache/filter/soft/SoftFilterCache.java | 2 +- .../cache/filter/weak/WeakFilterCache.java | 2 +- .../deletionpolicy/DeletionPolicyModule.java | 4 +-- .../KeepLastNDeletionPolicy.java | 2 +- .../KeepOnlyLastDeletionPolicy.java | 2 +- .../SnapshotDeletionPolicy.java | 4 +-- .../index/engine/EngineModule.java | 2 +- .../index/engine/robin/RobinEngine.java | 2 +- .../index/engine/robin/RobinEngineModule.java | 2 +- .../index/gateway/IndexGatewayModule.java | 2 +- .../gateway/IndexShardGatewayModule.java | 2 +- .../gateway/IndexShardGatewayService.java | 2 +- .../index/gateway/fs/FsIndexGateway.java | 2 +- .../gateway/fs/FsIndexGatewayModule.java | 2 +- .../index/gateway/fs/FsIndexShardGateway.java | 2 +- .../index/gateway/none/NoneIndexGateway.java | 2 +- .../gateway/none/NoneIndexGatewayModule.java | 2 +- .../gateway/none/NoneIndexShardGateway.java | 2 +- .../index/mapper/MapperService.java | 2 +- .../index/mapper/MapperServiceModule.java | 2 +- .../BalancedSegmentMergePolicyProvider.java | 2 +- .../LogByteSizeMergePolicyProvider.java | 2 +- .../policy/LogDocMergePolicyProvider.java | 2 +- .../index/merge/policy/MergeFactor.java | 2 +- .../index/merge/policy/MergePolicyModule.java | 2 +- .../ConcurrentMergeSchedulerProvider.java | 2 +- .../merge/scheduler/MergeSchedulerModule.java | 2 +- .../SerialMergeSchedulerProvider.java | 2 +- .../index/query/IndexQueryParserModule.java | 8 ++--- .../index/query/IndexQueryParserService.java | 2 +- .../query/xcontent/BoolFilterParser.java | 2 +- .../index/query/xcontent/BoolQueryParser.java | 2 +- .../xcontent/ConstantScoreQueryParser.java | 2 +- .../CustomBoostFactorQueryParser.java | 2 +- .../query/xcontent/DisMaxQueryParser.java | 2 +- .../query/xcontent/FieldQueryParser.java | 2 +- .../query/xcontent/FilteredQueryParser.java | 2 +- .../query/xcontent/MatchAllQueryParser.java | 2 +- .../query/xcontent/PrefixFilterParser.java | 2 +- .../query/xcontent/PrefixQueryParser.java | 2 +- .../query/xcontent/QueryFilterParser.java | 2 +- .../xcontent/QueryStringQueryParser.java | 2 +- .../query/xcontent/RangeFilterParser.java | 2 +- .../query/xcontent/RangeQueryParser.java | 2 +- .../query/xcontent/SpanFirstQueryParser.java | 2 +- .../query/xcontent/SpanNearQueryParser.java | 2 +- .../query/xcontent/SpanNotQueryParser.java | 2 +- .../query/xcontent/SpanOrQueryParser.java | 2 +- .../query/xcontent/SpanTermQueryParser.java | 2 +- .../query/xcontent/TermFilterParser.java | 2 +- .../index/query/xcontent/TermQueryParser.java | 2 +- .../query/xcontent/TermsFilterParser.java | 2 +- .../query/xcontent/WildcardQueryParser.java | 2 +- .../xcontent/XContentIndexQueryParser.java | 4 +-- .../index/routing/OperationRoutingModule.java | 2 +- .../routing/plain/PlainOperationRouting.java | 2 +- .../plain/PlainOperationRoutingModule.java | 2 +- .../index/service/IndexService.java | 2 +- .../index/service/InternalIndexService.java | 6 ++-- .../index/settings/IndexSettings.java | 2 +- .../index/settings/IndexSettingsModule.java | 2 +- .../index/shard/IndexShardManagement.java | 2 +- .../index/shard/IndexShardModule.java | 2 +- .../index/shard/recovery/RecoveryAction.java | 2 +- .../shard/service/InternalIndexShard.java | 2 +- .../similarity/DefaultSimilarityProvider.java | 4 +-- .../index/similarity/SimilarityModule.java | 8 ++--- .../index/similarity/SimilarityProvider.java | 2 +- .../index/similarity/SimilarityService.java | 2 +- .../index/store/StoreManagement.java | 2 +- .../index/store/StoreModule.java | 4 +-- .../index/store/fs/MmapFsStore.java | 2 +- .../index/store/fs/MmapFsStoreModule.java | 2 +- .../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 +- .../index/store/ram/RamStore.java | 2 +- .../index/store/ram/RamStoreModule.java | 2 +- .../index/translog/TranslogModule.java | 4 +-- .../index/translog/memory/MemoryTranslog.java | 2 +- .../indices/IndicesMemoryCleaner.java | 2 +- .../elasticsearch/indices/IndicesModule.java | 2 +- .../indices/InternalIndicesLifecycle.java | 2 +- .../indices/InternalIndicesService.java | 6 ++-- .../cluster/IndicesClusterStateService.java | 2 +- .../java/org/elasticsearch/jmx/JmxModule.java | 12 ++++---- .../jmx/action/GetJmxServiceUrlAction.java | 2 +- .../elasticsearch/monitor/MonitorModule.java | 8 ++--- .../elasticsearch/monitor/MonitorService.java | 2 +- .../monitor/dump/DumpMonitorService.java | 2 +- .../dump/cluster/ClusterDumpContributor.java | 4 +-- .../dump/heap/HeapDumpContributor.java | 4 +-- .../dump/summary/SummaryDumpContributor.java | 4 +-- .../dump/thread/ThreadDumpContributor.java | 4 +-- .../monitor/jvm/JvmMonitorService.java | 2 +- .../elasticsearch/monitor/jvm/JvmService.java | 2 +- .../monitor/memory/MemoryMonitorService.java | 2 +- .../memory/alpha/AlphaMemoryMonitor.java | 2 +- .../monitor/network/JmxNetworkProbe.java | 2 +- .../monitor/network/NetworkService.java | 2 +- .../monitor/network/SigarNetworkProbe.java | 2 +- .../elasticsearch/monitor/os/JmxOsProbe.java | 2 +- .../elasticsearch/monitor/os/OsService.java | 2 +- .../monitor/os/SigarOsProbe.java | 2 +- .../monitor/process/JmxProcessProbe.java | Bin 1579 -> 1577 bytes .../monitor/process/ProcessService.java | 2 +- .../monitor/process/SigarProcessProbe.java | 2 +- .../monitor/sigar/SigarService.java | 2 +- .../node/internal/InternalNode.java | 6 ++-- .../node/internal/NodeModule.java | 2 +- .../elasticsearch/plugins/AbstractPlugin.java | 2 +- .../plugins/IndicesPluginsModule.java | 4 +-- .../org/elasticsearch/plugins/Plugin.java | 2 +- .../elasticsearch/plugins/PluginsModule.java | 4 +-- .../elasticsearch/plugins/PluginsService.java | 4 +-- .../plugins/ShardsPluginsModule.java | 4 +-- .../elasticsearch/rest/RestController.java | 2 +- .../org/elasticsearch/rest/RestModule.java | 2 +- .../rest/action/RestActionModule.java | 2 +- .../health/RestClusterHealthAction.java | 2 +- .../node/info/RestNodesInfoAction.java | 2 +- .../node/restart/RestNodesRestartAction.java | 2 +- .../shutdown/RestNodesShutdownAction.java | 2 +- .../node/stats/RestNodesStatsAction.java | 2 +- .../broadcast/RestBroadcastPingAction.java | 2 +- .../RestReplicationPingAction.java | 2 +- .../ping/single/RestSinglePingAction.java | 2 +- .../cluster/state/RestClusterStateAction.java | 2 +- .../alias/RestIndicesAliasesAction.java | 2 +- .../clear/RestClearIndicesCacheAction.java | 2 +- .../indices/create/RestCreateIndexAction.java | 2 +- .../indices/delete/RestDeleteIndexAction.java | 2 +- .../admin/indices/flush/RestFlushAction.java | 2 +- .../snapshot/RestGatewaySnapshotAction.java | 2 +- .../mapping/put/RestPutMappingAction.java | 2 +- .../indices/optimize/RestOptimizeAction.java | 2 +- .../indices/refresh/RestRefreshAction.java | 2 +- .../status/RestIndicesStatusAction.java | 2 +- .../rest/action/count/RestCountAction.java | 2 +- .../rest/action/delete/RestDeleteAction.java | 2 +- .../RestDeleteByQueryAction.java | 2 +- .../rest/action/get/RestGetAction.java | 2 +- .../rest/action/index/RestIndexAction.java | 2 +- .../rest/action/main/RestMainAction.java | 2 +- .../action/mlt/RestMoreLikeThisAction.java | 2 +- .../rest/action/search/RestSearchAction.java | 2 +- .../action/search/RestSearchScrollAction.java | 2 +- .../rest/action/terms/RestTermsAction.java | 2 +- .../elasticsearch/search/SearchModule.java | 2 +- .../elasticsearch/search/SearchService.java | 2 +- .../action/SearchServiceTransportAction.java | 2 +- .../search/fetch/FetchPhase.java | 2 +- .../search/query/QueryPhase.java | 2 +- .../threadpool/ThreadPoolModule.java | 4 +-- .../blocking/BlockingThreadPool.java | 2 +- .../BlockingThreadPoolManagement.java | 2 +- .../blocking/BlockingThreadPoolModule.java | 2 +- .../threadpool/cached/CachedThreadPool.java | 2 +- .../cached/CachedThreadPoolManagement.java | 2 +- .../cached/CachedThreadPoolModule.java | 2 +- .../threadpool/scaling/ScalingThreadPool.java | 2 +- .../scaling/ScalingThreadPoolManagement.java | 2 +- .../scaling/ScalingThreadPoolModule.java | 2 +- .../org/elasticsearch/timer/TimerModule.java | 2 +- .../org/elasticsearch/timer/TimerService.java | 2 +- .../transport/TransportModule.java | 4 +-- .../transport/TransportService.java | 2 +- .../transport/TransportServiceManagement.java | 2 +- .../transport/local/LocalTransport.java | 2 +- .../local/LocalTransportManagement.java | 2 +- .../transport/local/LocalTransportModule.java | 2 +- .../transport/netty/NettyTransport.java | 2 +- .../netty/NettyTransportManagement.java | 2 +- .../transport/netty/NettyTransportModule.java | 2 +- .../elasticsearch/util/guice/Injectors.java | 8 ++--- .../util/guice/ModulesFactory.java | 2 +- .../{guice => }/inject/AbstractModule.java | 24 +++++++-------- .../{guice => }/inject/AbstractProcessor.java | 26 ++++++++-------- .../util/{guice => }/inject/Binder.java | 18 +++++------ .../util/{guice => }/inject/Binding.java | 10 +++---- .../{guice => }/inject/BindingAnnotation.java | 2 +- .../{guice => }/inject/BindingProcessor.java | 6 ++-- .../inject/BoundProviderFactory.java | 14 ++++----- .../inject/ConfigurationException.java | 8 ++--- .../{guice => }/inject/ConstantFactory.java | 14 ++++----- .../{guice => }/inject/ConstructionProxy.java | 4 +-- .../inject/ConstructionProxyFactory.java | 2 +- .../inject/ConstructorBindingImpl.java | 14 ++++----- .../inject/ConstructorInjector.java | 12 ++++---- .../inject/ConstructorInjectorStore.java | 12 ++++---- .../inject/ContextualCallable.java | 6 ++-- .../{guice => }/inject/CreationException.java | 8 ++--- .../DefaultConstructionProxyFactory.java | 4 +-- .../{guice => }/inject/DeferredLookups.java | 10 +++---- .../{guice => }/inject/EncounterImpl.java | 12 ++++---- .../util/{guice => }/inject/Exposed.java | 4 +-- .../{guice => }/inject/ExposedKeyFactory.java | 16 +++++----- .../util/{guice => }/inject/FactoryProxy.java | 14 ++++----- .../util/{guice => }/inject/Guice.java | 2 +- .../{guice => }/inject/ImplementedBy.java | 2 +- .../{guice => }/inject/InheritingState.java | 12 ++++---- .../{guice => }/inject/Initializable.java | 6 ++-- .../{guice => }/inject/Initializables.java | 6 ++-- .../util/{guice => }/inject/Initializer.java | 10 +++---- .../util/{guice => }/inject/Inject.java | 6 ++-- .../inject/InjectionRequestProcessor.java | 14 ++++----- .../util/{guice => }/inject/Injector.java | 2 +- .../{guice => }/inject/InjectorBuilder.java | 6 ++-- .../util/{guice => }/inject/InjectorImpl.java | 14 ++++----- .../{guice => }/inject/InjectorShell.java | 10 +++---- .../InternalFactoryToProviderAdapter.java | 16 +++++----- .../util/{guice => }/inject/Key.java | 12 ++++---- .../{guice => }/inject/LookupProcessor.java | 10 +++---- .../util/{guice => }/inject/Lookups.java | 2 +- .../{guice => }/inject/MembersInjector.java | 2 +- .../inject/MembersInjectorImpl.java | 12 ++++---- .../inject/MembersInjectorStore.java | 12 ++++---- .../{guice => }/inject/MessageProcessor.java | 6 ++-- .../util/{guice => }/inject/Module.java | 2 +- .../inject/OutOfScopeException.java | 2 +- .../{guice => }/inject/PrivateBinder.java | 8 ++--- .../inject/PrivateElementProcessor.java | 6 ++-- .../{guice => }/inject/PrivateModule.java | 26 ++++++++-------- .../util/{guice => }/inject/ProvidedBy.java | 2 +- .../util/{guice => }/inject/Provider.java | 2 +- .../ProviderToInternalFactoryAdapter.java | 12 ++++---- .../util/{guice => }/inject/Provides.java | 2 +- .../inject/ProvisionException.java | 8 ++--- .../util/{guice => }/inject/Reflection.java | 2 +- .../util/{guice => }/inject/Scope.java | 2 +- .../{guice => }/inject/ScopeAnnotation.java | 2 +- .../inject/ScopeBindingProcessor.java | 10 +++---- .../util/{guice => }/inject/Scopes.java | 8 ++--- .../inject/SingleFieldInjector.java | 14 ++++----- .../inject/SingleMemberInjector.java | 8 ++--- .../inject/SingleMethodInjector.java | 12 ++++---- .../inject/SingleParameterInjector.java | 12 ++++---- .../util/{guice => }/inject/Singleton.java | 2 +- .../util/{guice => }/inject/Stage.java | 2 +- .../util/{guice => }/inject/State.java | 10 +++---- .../inject/TypeConverterBindingProcessor.java | 20 ++++++------- .../inject/TypeListenerBindingProcessor.java | 6 ++-- .../util/{guice => }/inject/TypeLiteral.java | 10 +++---- .../util/{guice => }/inject/WeakKeySet.java | 2 +- .../inject/assistedinject/Assisted.java | 4 +-- .../assistedinject/AssistedConstructor.java | 6 ++-- .../inject/assistedinject/AssistedInject.java | 2 +- .../assistedinject/FactoryProvider.java | 14 ++++----- .../assistedinject/FactoryProvider2.java | 16 +++++----- .../inject/assistedinject/Parameter.java | 14 ++++----- .../assistedinject/ParameterListKey.java | 4 +-- .../inject/assistedinject/package-info.java | 2 +- .../binder/AnnotatedBindingBuilder.java | 8 ++--- .../AnnotatedConstantBindingBuilder.java | 8 ++--- .../binder/AnnotatedElementBuilder.java | 8 ++--- .../inject/binder/ConstantBindingBuilder.java | 2 +- .../inject/binder/LinkedBindingBuilder.java | 28 +++++++++--------- .../inject/binder/ScopedBindingBuilder.java | 14 ++++----- .../inject/binder/package-info.java | 4 +-- .../internal/AbstractBindingBuilder.java | 14 ++++----- .../inject/internal/Annotations.java | 10 +++---- .../AsynchronousComputationException.java | 2 +- .../inject/internal/BindingBuilder.java | 14 ++++----- .../inject/internal/BindingImpl.java | 16 +++++----- .../inject/internal/BytecodeGen.java | 4 +-- .../inject/internal/Collections2.java | 2 +- .../inject/internal/ComputationException.java | 2 +- .../internal/ConstantBindingBuilderImpl.java | 14 ++++----- .../inject/internal/ConstructionContext.java | 2 +- .../inject/internal/ErrorHandler.java | 4 +-- .../{guice => }/inject/internal/Errors.java | 6 ++-- .../inject/internal/ErrorsException.java | 2 +- .../inject/internal/ExpirationTimer.java | 2 +- .../inject/internal/ExposedBindingImpl.java | 16 +++++----- .../inject/internal/ExposureBuilder.java | 12 ++++---- .../inject/internal/FailableCache.java | 2 +- .../inject/internal/InstanceBindingImpl.java | 14 ++++----- .../inject/internal/InternalContext.java | 4 +-- .../inject/internal/InternalFactory.java | 6 ++-- .../{guice => }/inject/internal/Join.java | 4 +-- .../inject/internal/LinkedBindingImpl.java | 12 ++++---- .../internal/LinkedProviderBindingImpl.java | 14 ++++----- .../inject/internal/MatcherAndConverter.java | 10 +++---- .../inject/internal/MoreTypes.java | 10 +++---- .../inject/internal/NullOutputException.java | 2 +- .../inject/internal/Nullability.java | 2 +- .../{guice => }/inject/internal/Nullable.java | 2 +- .../inject/internal/Preconditions.java | 2 +- .../inject/internal/PrivateElementsImpl.java | 18 +++++------ .../internal/ProviderInstanceBindingImpl.java | 12 ++++---- .../inject/internal/ProviderMethod.java | 8 ++--- .../internal/ProviderMethodsModule.java | 12 ++++---- .../{guice => }/inject/internal/Scoping.java | 14 ++++----- .../inject/internal/SourceProvider.java | 2 +- .../inject/internal/StackTraceElements.java | 2 +- .../inject/internal/Stopwatch.java | 2 +- .../{guice => }/inject/internal/Strings.java | 2 +- .../inject/internal/ToStringBuilder.java | 2 +- .../inject/internal/UniqueAnnotations.java | 6 ++-- .../inject/internal/UnmodifiableIterator.java | 2 +- .../internal/UntargettedBindingImpl.java | 14 ++++----- .../inject/internal/package-info.java | 2 +- .../inject/matcher/AbstractMatcher.java | 2 +- .../{guice => }/inject/matcher/Matcher.java | 2 +- .../{guice => }/inject/matcher/Matchers.java | 6 ++-- .../inject/matcher/package-info.java | 2 +- .../inject/multibindings/Element.java | 4 +-- .../inject/multibindings/MapBinder.java | 16 +++++----- .../inject/multibindings/Multibinder.java | 16 +++++----- .../inject/multibindings/RealElement.java | 2 +- .../inject/multibindings/package-info.java | 2 +- .../util/{guice => }/inject/name/Named.java | 4 +-- .../{guice => }/inject/name/NamedImpl.java | 4 +-- .../util/{guice => }/inject/name/Names.java | 6 ++-- .../{guice => }/inject/name/package-info.java | 2 +- .../util/{guice => }/inject/package-info.java | 12 ++++---- .../inject/spi/BindingScopingVisitor.java | 6 ++-- .../inject/spi/BindingTargetVisitor.java | 4 +-- .../inject/spi/ConstructorBinding.java | 4 +-- .../inject/spi/ConvertedConstantBinding.java | 8 ++--- .../spi/DefaultBindingScopingVisitor.java | 4 +-- .../spi/DefaultBindingTargetVisitor.java | 4 +-- .../inject/spi/DefaultElementVisitor.java | 4 +-- .../{guice => }/inject/spi/Dependency.java | 4 +-- .../util/{guice => }/inject/spi/Element.java | 8 ++--- .../inject/spi/ElementVisitor.java | 6 ++-- .../util/{guice => }/inject/spi/Elements.java | 16 +++++----- .../inject/spi/ExposedBinding.java | 6 ++-- .../inject/spi/HasDependencies.java | 6 ++-- .../inject/spi/InjectionListener.java | 2 +- .../inject/spi/InjectionPoint.java | 16 +++++----- .../inject/spi/InjectionRequest.java | 12 ++++---- .../inject/spi/InstanceBinding.java | 4 +-- .../inject/spi/LinkedKeyBinding.java | 8 ++--- .../inject/spi/MembersInjectorLookup.java | 14 ++++----- .../util/{guice => }/inject/spi/Message.java | 12 ++++---- .../inject/spi/PrivateElements.java | 8 ++--- .../inject/spi/ProviderBinding.java | 10 +++---- .../inject/spi/ProviderInstanceBinding.java | 6 ++-- .../inject/spi/ProviderKeyBinding.java | 10 +++---- .../inject/spi/ProviderLookup.java | 14 ++++----- .../inject/spi/ProviderWithDependencies.java | 4 +-- .../{guice => }/inject/spi/ScopeBinding.java | 10 +++---- .../inject/spi/StaticInjectionRequest.java | 10 +++---- .../{guice => }/inject/spi/TypeConverter.java | 4 +-- .../inject/spi/TypeConverterBinding.java | 12 ++++---- .../{guice => }/inject/spi/TypeEncounter.java | 10 +++---- .../{guice => }/inject/spi/TypeListener.java | 6 ++-- .../inject/spi/TypeListenerBinding.java | 10 +++---- .../inject/spi/UntargettedBinding.java | 4 +-- .../{guice => }/inject/spi/package-info.java | 2 +- .../util/{guice => }/inject/util/Modules.java | 6 ++-- .../{guice => }/inject/util/Providers.java | 4 +-- .../util/{guice => }/inject/util/Types.java | 12 ++++---- .../{guice => }/inject/util/package-info.java | 2 +- .../util/network/NetworkModule.java | 2 +- .../util/network/NetworkService.java | 2 +- .../util/settings/SettingsFilter.java | 2 +- .../util/settings/SettingsModule.java | 2 +- .../index/analysis/AnalysisModuleTests.java | 4 +-- .../guice/IndexQueryParserModuleTests.java | 4 +-- .../xcontent/guice/MyJsonFilterParser.java | 4 +-- .../xcontent/guice/MyJsonQueryParser.java | 4 +-- .../elasticsearch/util/SizeValueTests.java | 2 +- .../util/guice/InjectorsTests.java | 10 +++---- ...ceUnbalancedShardsEmbeddedSearchTests.java | 4 +-- .../analysis/IcuAnalysisBinderProcessor.java | 6 ++-- .../IcuCollationTokenFilterFactory.java | 4 +-- .../IcuFoldingTokenFilterFactory.java | 4 +-- .../IcuNormalizerTokenFilterFactory.java | 4 +-- .../analysis/icu/AnalysisICUPlugin.java | 2 +- .../analysis/SimpleIcuAnalysisTests.java | 4 +-- .../org/elasticsearch/cloud/CloudModule.java | 2 +- .../blobstore/CloudBlobStoreService.java | 2 +- .../cloud/compute/CloudComputeService.java | 2 +- .../discovery/cloud/CloudDiscovery.java | 2 +- .../discovery/cloud/CloudDiscoveryModule.java | 2 +- .../gateway/cloud/CloudGateway.java | 4 +-- .../gateway/cloud/CloudGatewayModule.java | 2 +- .../gateway/cloud/CloudIndexGateway.java | 2 +- .../cloud/CloudIndexGatewayModule.java | 2 +- .../gateway/cloud/CloudIndexShardGateway.java | 2 +- .../plugin/cloud/CloudPlugin.java | 2 +- .../discovery/jgroups/JgroupsDiscovery.java | 2 +- .../jgroups/JgroupsDiscoveryModule.java | 2 +- .../XContentAttachmentMapperService.java | 2 +- .../MapperAttachmentsIndexModule.java | 2 +- .../attachments/MapperAttachmentsPlugin.java | 2 +- .../memcached/MemcachedServer.java | 2 +- .../memcached/MemcachedServerModule.java | 4 +-- .../netty/NettyMemcachedServerTransport.java | 2 +- .../NettyMemcachedServerTransportModule.java | 2 +- .../memcached/MemcachedTransportPlugin.java | 2 +- 566 files changed, 1194 insertions(+), 1196 deletions(-) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/AbstractModule.java (87%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/AbstractProcessor.java (77%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/Binder.java (96%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/Binding.java (91%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/BindingAnnotation.java (96%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/BindingProcessor.java (98%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/BoundProviderFactory.java (81%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/ConfigurationException.java (91%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/ConstantFactory.java (72%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/ConstructionProxy.java (92%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/ConstructionProxyFactory.java (94%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/ConstructorBindingImpl.java (88%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/ConstructorInjector.java (90%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/ConstructorInjectorStore.java (87%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/ContextualCallable.java (80%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/CreationException.java (87%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/DefaultConstructionProxyFactory.java (95%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/DeferredLookups.java (85%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/EncounterImpl.java (90%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/Exposed.java (86%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/ExposedKeyFactory.java (79%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/FactoryProxy.java (80%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/Guice.java (98%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/ImplementedBy.java (95%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/InheritingState.java (91%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/Initializable.java (83%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/Initializables.java (85%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/Initializer.java (94%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/Inject.java (91%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/InjectionRequestProcessor.java (88%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/Injector.java (99%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/InjectorBuilder.java (98%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/InjectorImpl.java (98%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/InjectorShell.java (96%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/InternalFactoryToProviderAdapter.java (75%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/Key.java (97%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/LookupProcessor.java (84%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/Lookups.java (95%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/MembersInjector.java (96%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/MembersInjectorImpl.java (91%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/MembersInjectorStore.java (91%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/MessageProcessor.java (90%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/Module.java (97%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/OutOfScopeException.java (96%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/PrivateBinder.java (81%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/PrivateElementProcessor.java (89%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/PrivateModule.java (88%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/ProvidedBy.java (95%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/Provider.java (98%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/ProviderToInternalFactoryAdapter.java (81%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/Provides.java (96%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/ProvisionException.java (88%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/Reflection.java (96%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/Scope.java (98%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/ScopeAnnotation.java (96%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/ScopeBindingProcessor.java (85%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/Scopes.java (94%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/SingleFieldInjector.java (81%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/SingleMemberInjector.java (76%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/SingleMethodInjector.java (87%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/SingleParameterInjector.java (85%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/Singleton.java (96%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/Stage.java (96%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/State.java (93%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/TypeConverterBindingProcessor.java (89%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/TypeListenerBindingProcessor.java (84%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/TypeLiteral.java (97%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/WeakKeySet.java (96%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/assistedinject/Assisted.java (92%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/assistedinject/AssistedConstructor.java (94%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/assistedinject/AssistedInject.java (96%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/assistedinject/FactoryProvider.java (96%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/assistedinject/FactoryProvider2.java (94%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/assistedinject/Parameter.java (91%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/assistedinject/ParameterListKey.java (93%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/assistedinject/package-info.java (92%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/binder/AnnotatedBindingBuilder.java (76%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/binder/AnnotatedConstantBindingBuilder.java (75%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/binder/AnnotatedElementBuilder.java (75%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/binder/ConstantBindingBuilder.java (96%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/binder/LinkedBindingBuilder.java (56%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/binder/ScopedBindingBuilder.java (66%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/binder/package-info.java (82%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/AbstractBindingBuilder.java (91%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/Annotations.java (93%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/AsynchronousComputationException.java (94%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/BindingBuilder.java (90%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/BindingImpl.java (86%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/BytecodeGen.java (98%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/Collections2.java (96%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/ComputationException.java (93%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/ConstantBindingBuilderImpl.java (88%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/ConstructionContext.java (98%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/ErrorHandler.java (88%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/Errors.java (99%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/ErrorsException.java (95%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/ExpirationTimer.java (93%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/ExposedBindingImpl.java (83%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/ExposureBuilder.java (78%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/FailableCache.java (97%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/InstanceBindingImpl.java (88%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/InternalContext.java (93%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/InternalFactory.java (81%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/Join.java (98%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/LinkedBindingImpl.java (85%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/LinkedProviderBindingImpl.java (84%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/MatcherAndConverter.java (82%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/MoreTypes.java (98%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/NullOutputException.java (94%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/Nullability.java (94%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/Nullable.java (95%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/Preconditions.java (99%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/PrivateElementsImpl.java (88%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/ProviderInstanceBindingImpl.java (90%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/ProviderMethod.java (93%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/ProviderMethodsModule.java (92%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/Scoping.java (93%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/SourceProvider.java (97%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/StackTraceElements.java (96%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/Stopwatch.java (95%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/Strings.java (97%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/ToStringBuilder.java (96%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/UniqueAnnotations.java (92%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/UnmodifiableIterator.java (94%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/UntargettedBindingImpl.java (81%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/internal/package-info.java (92%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/matcher/AbstractMatcher.java (97%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/matcher/Matcher.java (95%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/matcher/Matchers.java (98%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/matcher/package-info.java (93%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/multibindings/Element.java (89%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/multibindings/MapBinder.java (96%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/multibindings/Multibinder.java (96%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/multibindings/RealElement.java (96%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/multibindings/package-info.java (92%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/name/Named.java (90%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/name/NamedImpl.java (91%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/name/Names.java (93%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/name/package-info.java (92%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/package-info.java (83%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/BindingScopingVisitor.java (92%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/BindingTargetVisitor.java (94%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/ConstructorBinding.java (93%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/ConvertedConstantBinding.java (83%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/DefaultBindingScopingVisitor.java (93%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/DefaultBindingTargetVisitor.java (95%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/DefaultElementVisitor.java (95%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/Dependency.java (97%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/Element.java (86%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/ElementVisitor.java (92%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/Elements.java (95%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/ExposedBinding.java (87%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/HasDependencies.java (82%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/InjectionListener.java (95%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/InjectionPoint.java (96%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/InjectionRequest.java (86%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/InstanceBinding.java (91%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/LinkedKeyBinding.java (78%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/MembersInjectorLookup.java (85%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/Message.java (89%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/PrivateElements.java (87%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/ProviderBinding.java (82%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/ProviderInstanceBinding.java (88%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/ProviderKeyBinding.java (78%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/ProviderLookup.java (85%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/ProviderWithDependencies.java (89%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/ScopeBinding.java (83%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/StaticInjectionRequest.java (86%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/TypeConverter.java (89%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/TypeConverterBinding.java (81%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/TypeEncounter.java (93%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/TypeListener.java (88%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/TypeListenerBinding.java (84%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/UntargettedBinding.java (89%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/spi/package-info.java (93%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/util/Modules.java (98%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/util/Providers.java (93%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/util/Types.java (91%) rename modules/elasticsearch/src/main/java/org/elasticsearch/util/{guice => }/inject/util/package-info.java (92%) 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 ab8554f8001..f99ee6327e9 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/TransportActionModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/TransportActionModule.java @@ -54,7 +54,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; +import org.elasticsearch.util.inject.AbstractModule; /** * @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 bd93c6969e3..ae4a1d045d6 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 @@ -33,7 +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.inject.Inject; import org.elasticsearch.util.settings.Settings; /** 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 0ca2bab6544..a8c02d2f146 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 @@ -30,7 +30,7 @@ import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; import org.elasticsearch.util.MapBuilder; import org.elasticsearch.util.collect.ImmutableMap; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.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/restart/TransportNodesRestartAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/restart/TransportNodesRestartAction.java index 63f5c16ef51..e10d869bcd7 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/restart/TransportNodesRestartAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/restart/TransportNodesRestartAction.java @@ -30,7 +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.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/action/admin/cluster/node/shutdown/TransportNodesShutdownAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/TransportNodesShutdownAction.java index 7f11f28ef85..16ad20f02b9 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/TransportNodesShutdownAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/TransportNodesShutdownAction.java @@ -30,7 +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.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/action/admin/cluster/node/stats/TransportNodesStats.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStats.java index fe4ec010475..46909061cba 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStats.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStats.java @@ -29,7 +29,7 @@ import org.elasticsearch.monitor.MonitorService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; import org.elasticsearch.util.collect.Lists; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.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/broadcast/TransportBroadcastPingAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/TransportBroadcastPingAction.java index ce5f722a759..1dff6118ff3 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 @@ -32,7 +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.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 090251e8a6d..3e0f5749f97 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 @@ -27,7 +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.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 1878a77631d..8cabaaf9d21 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 @@ -24,7 +24,7 @@ import org.elasticsearch.action.support.replication.TransportIndicesReplicationO 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.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 b1a608bc768..cb5940951a7 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 @@ -27,7 +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.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 e20375f4e5a..81a620a4615 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 @@ -26,7 +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.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 4c5af8400da..8e034c146c8 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 @@ -25,7 +25,7 @@ import org.elasticsearch.action.support.master.TransportMasterNodeOperationActio 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.inject.Inject; import org.elasticsearch.util.settings.Settings; /** 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 4801ad4985e..259fd5655aa 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 @@ -26,7 +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.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 35ff7884cc4..ba5a9f1bce1 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 @@ -33,7 +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.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/TransportCreateIndexAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java index fabea81a18f..b155739daad 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 @@ -26,7 +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.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 aa8b2d02b12..e7ff281034c 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 @@ -26,7 +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.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 c9610ee1c5e..1416acf3665 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 @@ -34,7 +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.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 a884359060e..8977f6105c9 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 @@ -24,7 +24,7 @@ import org.elasticsearch.action.support.replication.TransportIndicesReplicationO 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.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 84ad12d9243..d1304b555e3 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 @@ -27,7 +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.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 f29c493fc10..990dd1247d7 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 @@ -28,7 +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.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 3ae5488aa67..ec41b4a1017 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 @@ -27,7 +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.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 59e22d09add..d0716c000e8 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 @@ -34,7 +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.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 f2a87162d02..61d80cedf6e 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 @@ -34,7 +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.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/TransportIndicesStatusAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/TransportIndicesStatusAction.java index 281c3be49ef..9df9794efd8 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 @@ -35,7 +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.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 011a9457bf0..f767009f418 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 @@ -33,7 +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.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 73c7e1a85ed..d2d7992e797 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 @@ -34,7 +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.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 31c9ae95724..44a5ba6329e 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 @@ -24,7 +24,7 @@ import org.elasticsearch.action.support.replication.TransportIndicesReplicationO 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.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 8c4f6ddf910..d69e60c85cb 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 @@ -25,7 +25,7 @@ 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.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 ab9e7150ee1..85529d44f10 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 @@ -29,7 +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.inject.Inject; import org.elasticsearch.util.settings.Settings; /** 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 b0a93507cd5..608d253b3cf 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 @@ -33,7 +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.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 69111f1cd36..fb73c5104ae 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 @@ -38,7 +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.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 926766da269..84161ace755 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 @@ -41,7 +41,7 @@ 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.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.Collections; 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 24399e7bb95..3ada696d196 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 @@ -29,7 +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.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 9aa1c9a1df7..9b4ab61be53 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 @@ -29,7 +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.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 c4fe539ad65..3afa8e9e11b 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 @@ -36,7 +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.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 ed17bce506e..b286bdee8c0 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 @@ -39,7 +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.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 2d7c6a1b2e7..c3ab0539944 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 @@ -34,7 +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.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 8d498555980..6944ebc4e37 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 @@ -36,7 +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.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 2ef7ff8007c..7198b0684fb 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 @@ -34,7 +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.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 0b7025890b1..056be121c04 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 @@ -37,7 +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.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/nodes/TransportNodesOperationAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesOperationAction.java index b7f0dd1ba1c..804a5412de5 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 @@ -30,7 +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.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 f7b4eee96df..c3fa57415ff 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 @@ -29,7 +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.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 36c4ca1838d..5095d6c4e24 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 @@ -28,7 +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.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/TransportTermsAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/terms/TransportTermsAction.java index 33d162e3c2b..f8887aa8892 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 @@ -45,7 +45,7 @@ import org.elasticsearch.util.BoundedTreeSet; import org.elasticsearch.util.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.inject.Inject; import org.elasticsearch.util.settings.Settings; import javax.annotation.Nullable; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java b/modules/elasticsearch/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java index 2a634ce1e07..a27b9753f91 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java @@ -28,8 +28,8 @@ import org.elasticsearch.node.NodeBuilder; import org.elasticsearch.node.internal.InternalSettingsPerparer; import org.elasticsearch.util.Classes; import org.elasticsearch.util.Tuple; -import org.elasticsearch.util.guice.inject.CreationException; -import org.elasticsearch.util.guice.inject.spi.Message; +import org.elasticsearch.util.inject.CreationException; +import org.elasticsearch.util.inject.spi.Message; import org.elasticsearch.util.jline.ANSI; import org.elasticsearch.util.logging.ESLogger; import org.elasticsearch.util.logging.Loggers; 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 06b57020947..49aeca56720 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 @@ -23,7 +23,7 @@ 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.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 86e79b31750..e4fc10e7868 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 @@ -46,7 +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.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 da3ffadd690..d0be5e31a65 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 @@ -23,7 +23,7 @@ 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; +import org.elasticsearch.util.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 20f1ddb50ee..40cadfb00f6 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 @@ -50,7 +50,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.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 063f3ce9302..15493687ac0 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 @@ -53,7 +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.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 4cd7d48b064..4b096e453ae 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 @@ -23,7 +23,7 @@ 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; +import org.elasticsearch.util.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 fc7558933b0..cd3b9bc7353 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 @@ -56,9 +56,9 @@ import org.elasticsearch.transport.TransportService; import org.elasticsearch.util.ThreadLocals; import org.elasticsearch.util.Tuple; import org.elasticsearch.util.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.inject.Guice; +import org.elasticsearch.util.inject.Injector; +import org.elasticsearch.util.inject.Module; import org.elasticsearch.util.network.NetworkModule; import org.elasticsearch.util.settings.ImmutableSettings; import org.elasticsearch.util.settings.Settings; 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 726fb2186cc..c978cd6b0b3 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 @@ -22,7 +22,7 @@ package org.elasticsearch.client.transport; 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.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 3b36fae3560..383330aab00 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 @@ -22,7 +22,7 @@ package org.elasticsearch.client.transport; 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.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 7230453a4e9..32294f6ec09 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 @@ -36,7 +36,7 @@ import org.elasticsearch.transport.TransportService; import org.elasticsearch.util.TimeValue; import org.elasticsearch.util.collect.ImmutableList; import org.elasticsearch.util.component.AbstractComponent; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.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 3bdf1d7cc97..1addf16d34f 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 @@ -46,7 +46,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; +import org.elasticsearch.util.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 714605ad961..6466ba27a8c 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 @@ -24,7 +24,7 @@ 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.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 1ead4e92d7d..ae62cf8ea3a 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 @@ -24,7 +24,7 @@ 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.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/restart/ClientTransportNodesRestartAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/restart/ClientTransportNodesRestartAction.java index a9942038e9b..4c38c60a6aa 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/restart/ClientTransportNodesRestartAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/restart/ClientTransportNodesRestartAction.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.admin.cluster.node.restart.NodesRestartRequest; import org.elasticsearch.action.admin.cluster.node.restart.NodesRestartResponse; import org.elasticsearch.client.transport.action.support.BaseClientTransportAction; import org.elasticsearch.transport.TransportService; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.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 57a0f4bb404..8df2294fa25 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 @@ -24,7 +24,7 @@ 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.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/stats/ClientTransportNodesStatsAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/stats/ClientTransportNodesStatsAction.java index c03c0deb0cc..46a138b49de 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/stats/ClientTransportNodesStatsAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/stats/ClientTransportNodesStatsAction.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsRequest; import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsResponse; import org.elasticsearch.client.transport.action.support.BaseClientTransportAction; import org.elasticsearch.transport.TransportService; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.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 27af30f38e8..d4e5e0987f8 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 @@ -24,7 +24,7 @@ import org.elasticsearch.action.admin.cluster.ping.broadcast.BroadcastPingReques 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.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 c2fce93a0ec..49e5f8b5f51 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 @@ -24,7 +24,7 @@ import org.elasticsearch.action.admin.cluster.ping.replication.ReplicationPingRe 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.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 cae8bd2c6e8..05420734133 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 @@ -24,7 +24,7 @@ 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.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 86ec73f3ff8..9af320d4f26 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 @@ -24,7 +24,7 @@ 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.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 aebc2c6e0ec..5815ba5e40e 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 @@ -24,7 +24,7 @@ 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.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 2b081c7f966..9f826390ed1 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 @@ -24,7 +24,7 @@ import org.elasticsearch.action.admin.indices.cache.clear.ClearIndicesCacheReque 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.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 1f3635443b6..aa27c12045d 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 @@ -24,7 +24,7 @@ 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.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 6b083a7cad9..47192f97abe 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 @@ -24,7 +24,7 @@ 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.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 a9f54c2fff8..e5b3a027e91 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 @@ -24,7 +24,7 @@ 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.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 373e185e14c..dcbb4ce4fd4 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 @@ -24,7 +24,7 @@ import org.elasticsearch.action.admin.indices.gateway.snapshot.GatewaySnapshotRe 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.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 a7379977704..c7fe9162482 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 @@ -24,7 +24,7 @@ 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.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 c7c1e0d705d..bc767b8ff62 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 @@ -24,7 +24,7 @@ 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.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 4bf7054166c..abd95326047 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 @@ -24,7 +24,7 @@ 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.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 c7dd616475d..203fed67eaa 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 @@ -24,7 +24,7 @@ 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.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 ff28b995e45..0524a5dc142 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 @@ -24,7 +24,7 @@ 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.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 d38a2ee9da5..4a19ceb1a17 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 @@ -24,7 +24,7 @@ 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.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 89d945beaab..a1df72e7473 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 @@ -24,7 +24,7 @@ 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.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 94775bddf5b..84e56181169 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 @@ -24,7 +24,7 @@ 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.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 30e5ab6d12e..d854b4947c2 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 @@ -24,7 +24,7 @@ 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.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 d842ef35774..f2ddb238e8d 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 @@ -24,7 +24,7 @@ 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.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 af30443cd16..007d73c4aeb 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 @@ -24,7 +24,7 @@ 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.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 9cc5ffc7747..b8f802b4a9b 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 @@ -24,7 +24,7 @@ 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.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 9334a697dbb..46474b68795 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 @@ -24,7 +24,7 @@ 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.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 ddffa18705c..5cdca80f8ed 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 @@ -24,7 +24,7 @@ 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.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 4d8f248cb54..61c2458055e 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 @@ -53,7 +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.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 fe558053797..cc8ad4ff37a 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 @@ -53,7 +53,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.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 d8d65905f20..ee740727f35 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 @@ -56,7 +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.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 913aea06c9c..e18d129a45d 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/ClusterModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/ClusterModule.java @@ -29,7 +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.inject.AbstractModule; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/ClusterNameModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/ClusterNameModule.java index aad67fe9d02..8b707ea6c54 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/ClusterNameModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/ClusterNameModule.java @@ -19,7 +19,7 @@ package org.elasticsearch.cluster; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.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 36cbd615d38..456475b2b36 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 @@ -28,7 +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.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 beb687a45de..c25632fb9fb 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 @@ -28,7 +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.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 74263a47658..10849c2b167 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 @@ -28,7 +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.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 a520811953f..8544da5be25 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 @@ -28,7 +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.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 4f1d65fe27e..865b06bc456 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 @@ -35,7 +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.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/metadata/MetaDataService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MetaDataService.java index 32dcef71a67..c44cb123da5 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 @@ -45,7 +45,7 @@ import org.elasticsearch.util.TimeValue; import org.elasticsearch.util.Tuple; import org.elasticsearch.util.collect.Maps; import org.elasticsearch.util.component.AbstractComponent; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.io.Streams; import org.elasticsearch.util.settings.ImmutableSettings; import org.elasticsearch.util.settings.Settings; 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 00fd2c386c6..38926c62bab 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 @@ -25,7 +25,7 @@ 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.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.concurrent.Future; 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 775b8e8f6c8..eae3e52272e 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 @@ -28,7 +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.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.List; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/DiscoveryModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/DiscoveryModule.java index be8ef07262c..cd5a1b37495 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/DiscoveryModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/DiscoveryModule.java @@ -21,8 +21,8 @@ package org.elasticsearch.discovery; import org.elasticsearch.discovery.local.LocalDiscoveryModule; import org.elasticsearch.discovery.zen.ZenDiscoveryModule; -import org.elasticsearch.util.guice.inject.AbstractModule; -import org.elasticsearch.util.guice.inject.Module; +import org.elasticsearch.util.inject.AbstractModule; +import org.elasticsearch.util.inject.Module; import org.elasticsearch.util.settings.Settings; import static org.elasticsearch.util.guice.ModulesFactory.*; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/DiscoveryService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/DiscoveryService.java index 8c38774fbb6..696610b4433 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/DiscoveryService.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/DiscoveryService.java @@ -19,7 +19,7 @@ package org.elasticsearch.discovery; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.util.TimeValue; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/local/LocalDiscovery.java b/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/local/LocalDiscovery.java index 2c3f389490c..81cabb3c56d 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/local/LocalDiscovery.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/local/LocalDiscovery.java @@ -29,7 +29,7 @@ import org.elasticsearch.discovery.InitialStateDiscoveryListener; import org.elasticsearch.transport.TransportService; import org.elasticsearch.util.component.AbstractLifecycleComponent; import org.elasticsearch.util.concurrent.jsr166y.LinkedTransferQueue; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.Queue; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/local/LocalDiscoveryModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/local/LocalDiscoveryModule.java index e857ba83cdf..d62278b2d16 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/local/LocalDiscoveryModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/local/LocalDiscoveryModule.java @@ -19,7 +19,7 @@ package org.elasticsearch.discovery.local; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.inject.AbstractModule; import org.elasticsearch.discovery.Discovery; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java b/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java index f02b3b85809..3bf4ca89d57 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java @@ -38,7 +38,7 @@ import org.elasticsearch.transport.TransportService; import org.elasticsearch.util.TimeValue; import org.elasticsearch.util.UUID; import org.elasticsearch.util.component.AbstractLifecycleComponent; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.List; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ZenDiscoveryModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ZenDiscoveryModule.java index c76bdbb8721..d2e202da9ce 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ZenDiscoveryModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ZenDiscoveryModule.java @@ -19,7 +19,7 @@ package org.elasticsearch.discovery.zen; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.inject.AbstractModule; import org.elasticsearch.discovery.Discovery; import org.elasticsearch.discovery.zen.ping.ZenPingService; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ping/ZenPingService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ping/ZenPingService.java index 97b4374b89d..d9e5d285381 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ping/ZenPingService.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ping/ZenPingService.java @@ -31,7 +31,7 @@ import org.elasticsearch.transport.TransportService; import org.elasticsearch.util.TimeValue; import org.elasticsearch.util.collect.ImmutableList; import org.elasticsearch.util.component.AbstractLifecycleComponent; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.network.NetworkService; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/env/EnvironmentModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/env/EnvironmentModule.java index fe6f9c5ad1b..6b53ded287d 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/env/EnvironmentModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/env/EnvironmentModule.java @@ -19,7 +19,7 @@ package org.elasticsearch.env; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.inject.AbstractModule; /** * @author kimchy (Shay Banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/Gateway.java b/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/Gateway.java index df75017d11c..305b7e9e2b5 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/Gateway.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/Gateway.java @@ -19,7 +19,7 @@ package org.elasticsearch.gateway; -import org.elasticsearch.util.guice.inject.Module; +import org.elasticsearch.util.inject.Module; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.util.component.LifecycleComponent; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/GatewayModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/GatewayModule.java index ab0912d458a..17cb44d40ba 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/GatewayModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/GatewayModule.java @@ -19,7 +19,7 @@ package org.elasticsearch.gateway; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.inject.AbstractModule; import org.elasticsearch.gateway.none.NoneGatewayModule; import org.elasticsearch.util.guice.ModulesFactory; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/GatewayService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/GatewayService.java index 4324b509b6f..9a59c4be0f7 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/GatewayService.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/GatewayService.java @@ -19,7 +19,7 @@ package org.elasticsearch.gateway; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.cluster.*; import org.elasticsearch.cluster.metadata.IndexMetaData; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/fs/FsGateway.java b/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/fs/FsGateway.java index fffdc096cff..87134f8d693 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/fs/FsGateway.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/fs/FsGateway.java @@ -27,8 +27,8 @@ import org.elasticsearch.gateway.Gateway; import org.elasticsearch.gateway.GatewayException; import org.elasticsearch.index.gateway.fs.FsIndexGatewayModule; import org.elasticsearch.util.component.AbstractLifecycleComponent; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.Module; +import org.elasticsearch.util.inject.Inject; +import org.elasticsearch.util.inject.Module; import org.elasticsearch.util.io.FileSystemUtils; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.ToXContent; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/fs/FsGatewayModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/fs/FsGatewayModule.java index 6170fc5b40c..ac5d0de6e2a 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/fs/FsGatewayModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/fs/FsGatewayModule.java @@ -19,7 +19,7 @@ package org.elasticsearch.gateway.fs; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.inject.AbstractModule; import org.elasticsearch.gateway.Gateway; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/none/NoneGateway.java b/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/none/NoneGateway.java index 3f12f4987fd..11f0f7726ec 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/none/NoneGateway.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/none/NoneGateway.java @@ -19,8 +19,8 @@ package org.elasticsearch.gateway.none; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.Module; +import org.elasticsearch.util.inject.Inject; +import org.elasticsearch.util.inject.Module; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.gateway.Gateway; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/none/NoneGatewayModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/none/NoneGatewayModule.java index f23b9232e10..ebc61b72b39 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/none/NoneGatewayModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/none/NoneGatewayModule.java @@ -19,7 +19,7 @@ package org.elasticsearch.gateway.none; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.inject.AbstractModule; import org.elasticsearch.gateway.Gateway; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/http/HttpServer.java b/modules/elasticsearch/src/main/java/org/elasticsearch/http/HttpServer.java index 8c66ac812dc..e0285a6a195 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/http/HttpServer.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/http/HttpServer.java @@ -25,7 +25,7 @@ import org.elasticsearch.rest.RestController; import org.elasticsearch.rest.XContentThrowableRestResponse; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.util.component.AbstractLifecycleComponent; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.path.PathTrie; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/http/HttpServerModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/http/HttpServerModule.java index 73651063a69..b77ecf5d2b4 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/http/HttpServerModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/http/HttpServerModule.java @@ -19,8 +19,8 @@ package org.elasticsearch.http; -import org.elasticsearch.util.guice.inject.AbstractModule; -import org.elasticsearch.util.guice.inject.Module; +import org.elasticsearch.util.inject.AbstractModule; +import org.elasticsearch.util.inject.Module; import org.elasticsearch.util.Classes; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransport.java b/modules/elasticsearch/src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransport.java index 3ed857e4f62..0e9157c8662 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransport.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransport.java @@ -26,7 +26,7 @@ import org.elasticsearch.transport.netty.NettyInternalESLoggerFactory; import org.elasticsearch.util.SizeUnit; import org.elasticsearch.util.SizeValue; import org.elasticsearch.util.component.AbstractLifecycleComponent; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.network.NetworkService; import org.elasticsearch.util.network.NetworkUtils; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransportModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransportModule.java index 2b1128626a7..11854be4dfd 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransportModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransportModule.java @@ -19,7 +19,7 @@ package org.elasticsearch.http.netty; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.inject.AbstractModule; import org.elasticsearch.http.HttpServerTransport; /** 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 c198932b559..e077d4f0343 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/IndexModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/IndexModule.java @@ -21,7 +21,7 @@ package org.elasticsearch.index; import org.elasticsearch.index.service.IndexService; import org.elasticsearch.index.service.InternalIndexService; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.inject.AbstractModule; /** * @author kimchy (Shay Banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/IndexNameModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/IndexNameModule.java index 8eacfa021fb..dbc79c37303 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/IndexNameModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/IndexNameModule.java @@ -19,7 +19,7 @@ package org.elasticsearch.index; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.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 61000b76fae..81eaa55aeb2 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/IndexServiceManagement.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/IndexServiceManagement.java @@ -25,7 +25,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.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/LocalNodeId.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/LocalNodeId.java index 8603828ba5f..7ed96d9efee 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/LocalNodeId.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/LocalNodeId.java @@ -19,7 +19,7 @@ package org.elasticsearch.index; -import org.elasticsearch.util.guice.inject.BindingAnnotation; +import org.elasticsearch.util.inject.BindingAnnotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/LocalNodeIdModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/LocalNodeIdModule.java index f82870ff47b..053ffb8e67a 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/LocalNodeIdModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/LocalNodeIdModule.java @@ -19,7 +19,7 @@ package org.elasticsearch.index; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.inject.AbstractModule; /** * @author kimchy (Shay Banon) 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 b8b84e1d0cf..f5ae553fa0c 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 @@ -23,8 +23,8 @@ 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.inject.Inject; +import org.elasticsearch.util.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AnalysisModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AnalysisModule.java index f3e7033f83b..96caf77cd1b 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AnalysisModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AnalysisModule.java @@ -20,10 +20,10 @@ package org.elasticsearch.index.analysis; import org.elasticsearch.util.collect.Lists; -import org.elasticsearch.util.guice.inject.AbstractModule; -import org.elasticsearch.util.guice.inject.Scopes; -import org.elasticsearch.util.guice.inject.assistedinject.FactoryProvider; -import org.elasticsearch.util.guice.inject.multibindings.MapBinder; +import org.elasticsearch.util.inject.AbstractModule; +import org.elasticsearch.util.inject.Scopes; +import org.elasticsearch.util.inject.assistedinject.FactoryProvider; +import org.elasticsearch.util.inject.multibindings.MapBinder; import org.elasticsearch.util.settings.Settings; import java.util.List; 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 0322f32b68d..090436d3133 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 @@ -25,7 +25,7 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.collect.ImmutableMap; import org.elasticsearch.util.component.CloseableComponent; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.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 232d91b3981..00107a8de3a 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 @@ -21,7 +21,7 @@ package org.elasticsearch.index.analysis; import org.apache.lucene.analysis.Analyzer; import org.elasticsearch.index.IndexComponent; -import org.elasticsearch.util.guice.inject.Provider; +import org.elasticsearch.util.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 be8d14dc717..7e6e88cc2f4 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 @@ -25,8 +25,8 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.collect.ImmutableSet; import org.elasticsearch.util.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; +import org.elasticsearch.util.inject.Inject; +import org.elasticsearch.util.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 df9170d3a5c..ea76c849935 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 @@ -23,8 +23,8 @@ 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.inject.Inject; +import org.elasticsearch.util.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 6140bbb8165..f06790268a7 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 @@ -25,8 +25,8 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.collect.ImmutableSet; import org.elasticsearch.util.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; +import org.elasticsearch.util.inject.Inject; +import org.elasticsearch.util.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 88a68b54611..f71e8c82330 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 @@ -25,8 +25,8 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.collect.ImmutableSet; import org.elasticsearch.util.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; +import org.elasticsearch.util.inject.Inject; +import org.elasticsearch.util.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 febc55ac498..870fb6d4741 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 @@ -22,8 +22,8 @@ package org.elasticsearch.index.analysis; 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.inject.Inject; +import org.elasticsearch.util.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 321a74740ff..8f16b910880 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 @@ -25,8 +25,8 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.collect.ImmutableSet; import org.elasticsearch.util.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; +import org.elasticsearch.util.inject.Inject; +import org.elasticsearch.util.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 1bc67307d20..a96fe2cfb04 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 @@ -21,8 +21,8 @@ package org.elasticsearch.index.analysis; 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.inject.Inject; +import org.elasticsearch.util.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 19c8f1e2474..6efb36d47a4 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 @@ -25,8 +25,8 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.collect.ImmutableSet; import org.elasticsearch.util.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; +import org.elasticsearch.util.inject.Inject; +import org.elasticsearch.util.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 e5767aaa725..8170b410153 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 @@ -25,8 +25,8 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.collect.ImmutableSet; import org.elasticsearch.util.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; +import org.elasticsearch.util.inject.Inject; +import org.elasticsearch.util.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 27c0ee33978..2f407a5040e 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 @@ -25,8 +25,8 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.collect.ImmutableSet; import org.elasticsearch.util.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; +import org.elasticsearch.util.inject.Inject; +import org.elasticsearch.util.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 dd7ed6f30e5..847f246f3ae 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 @@ -25,8 +25,8 @@ 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.inject.Inject; +import org.elasticsearch.util.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 92941ff109e..d99a3629c19 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 @@ -24,8 +24,8 @@ 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.inject.Inject; +import org.elasticsearch.util.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/FrenchAnalyzerProvider.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/FrenchAnalyzerProvider.java index f367f2501f3..1b662702602 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 @@ -25,8 +25,8 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.collect.ImmutableSet; import org.elasticsearch.util.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; +import org.elasticsearch.util.inject.Inject; +import org.elasticsearch.util.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 627511ddf08..79043efdca2 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 @@ -25,8 +25,8 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.collect.ImmutableSet; import org.elasticsearch.util.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; +import org.elasticsearch.util.inject.Inject; +import org.elasticsearch.util.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 5c8e2aac8f9..bb52494c10a 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 @@ -25,8 +25,8 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.collect.ImmutableSet; import org.elasticsearch.util.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; +import org.elasticsearch.util.inject.Inject; +import org.elasticsearch.util.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 c4685b630b8..9653625f5ce 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 @@ -25,8 +25,8 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.collect.ImmutableSet; import org.elasticsearch.util.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; +import org.elasticsearch.util.inject.Inject; +import org.elasticsearch.util.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 cded3d98581..3f45cd667fb 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 @@ -25,8 +25,8 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.collect.ImmutableSet; import org.elasticsearch.util.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; +import org.elasticsearch.util.inject.Inject; +import org.elasticsearch.util.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 3c75092ab22..c4dab4a054d 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 @@ -22,8 +22,8 @@ package org.elasticsearch.index.analysis; 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.inject.Inject; +import org.elasticsearch.util.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 827d045436f..5088ded2f73 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 @@ -23,8 +23,8 @@ 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.inject.Inject; +import org.elasticsearch.util.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 fa71625ad82..590037a2a88 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 @@ -23,8 +23,8 @@ 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.inject.Inject; +import org.elasticsearch.util.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 31a283be168..d4a31fea8d1 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 @@ -23,8 +23,8 @@ 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.inject.Inject; +import org.elasticsearch.util.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 f7f32ae60d8..e2ce9bb233b 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 @@ -23,8 +23,8 @@ 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.inject.Inject; +import org.elasticsearch.util.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 bb626e1b1fb..88e70826b60 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 @@ -23,8 +23,8 @@ 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.inject.Inject; +import org.elasticsearch.util.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 8dfcb68e417..764f3f2150d 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 @@ -23,8 +23,8 @@ 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.inject.Inject; +import org.elasticsearch.util.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 5fae0b71e23..e7758863b89 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 @@ -23,8 +23,8 @@ 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.inject.Inject; +import org.elasticsearch.util.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 e656b2e47eb..a0e9285a9b4 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 @@ -25,8 +25,8 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.collect.ImmutableSet; import org.elasticsearch.util.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; +import org.elasticsearch.util.inject.Inject; +import org.elasticsearch.util.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 f6f838a0fef..4e84981ea5f 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 @@ -23,8 +23,8 @@ 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.inject.Inject; +import org.elasticsearch.util.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 5b94f50228c..9c37d2c3818 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 @@ -25,8 +25,8 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.collect.ImmutableSet; import org.elasticsearch.util.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; +import org.elasticsearch.util.inject.Inject; +import org.elasticsearch.util.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 ebd7fbd6f13..ba5ab97dfaa 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 @@ -23,8 +23,8 @@ 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.inject.Inject; +import org.elasticsearch.util.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 d6b5a5321d1..c6872129632 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 @@ -23,8 +23,8 @@ 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.inject.Inject; +import org.elasticsearch.util.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 3e04dc5c82a..19912ac6aa2 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 @@ -22,8 +22,8 @@ package org.elasticsearch.index.analysis; 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.inject.Inject; +import org.elasticsearch.util.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 45c3934a0bb..52ccd9c0ed1 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 @@ -26,8 +26,8 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.collect.ImmutableSet; import org.elasticsearch.util.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; +import org.elasticsearch.util.inject.Inject; +import org.elasticsearch.util.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 2cc56b4d78a..e2a562d7549 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 @@ -23,8 +23,8 @@ 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.inject.Inject; +import org.elasticsearch.util.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 f6e17032511..938afe5099a 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 @@ -25,8 +25,8 @@ 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.inject.Inject; +import org.elasticsearch.util.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 d2d0b17a535..29924b00c28 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 @@ -25,8 +25,8 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.collect.ImmutableSet; import org.elasticsearch.util.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; +import org.elasticsearch.util.inject.Inject; +import org.elasticsearch.util.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 72107cc8cb8..76976d8e114 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 @@ -26,8 +26,8 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.collect.ImmutableSet; import org.elasticsearch.util.collect.Iterators; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; +import org.elasticsearch.util.inject.Inject; +import org.elasticsearch.util.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 4038be3d21c..7ad1ce4efb9 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 @@ -23,8 +23,8 @@ 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.inject.Inject; +import org.elasticsearch.util.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 3b89024806e..fcf1fd3863d 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 @@ -22,8 +22,8 @@ package org.elasticsearch.index.analysis; 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.inject.Inject; +import org.elasticsearch.util.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 978785325e4..e5f2bd5b768 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 @@ -23,8 +23,8 @@ 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.inject.Inject; +import org.elasticsearch.util.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 13aa933c917..e4c18343560 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 @@ -24,7 +24,7 @@ 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.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 e3f76fe89d3..203d5770bc6 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 @@ -20,7 +20,7 @@ package org.elasticsearch.index.cache; import org.elasticsearch.index.cache.filter.FilterCacheModule; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.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 efa75e48895..403a45cf044 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 @@ -20,8 +20,8 @@ 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.util.inject.AbstractModule; +import org.elasticsearch.util.inject.Scopes; 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 9e9f7c5f968..2bdab929c98 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 @@ -24,7 +24,7 @@ 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.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 b7ee6778f32..68867d375c8 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 @@ -26,7 +26,7 @@ import org.elasticsearch.index.cache.filter.support.AbstractConcurrentMapFilterC import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.util.collect.MapMaker; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.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 e4193a90705..5ba16b859bc 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 @@ -26,7 +26,7 @@ import org.elasticsearch.index.cache.filter.support.AbstractConcurrentMapFilterC import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.util.collect.MapMaker; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.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 cc56f4bdabc..01d7ce2209f 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 @@ -20,8 +20,8 @@ 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.elasticsearch.util.inject.AbstractModule; +import org.elasticsearch.util.inject.name.Names; 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 746fc2b66b1..6cf2226291a 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 @@ -24,7 +24,7 @@ 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.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 9d44330126f..fc69116215a 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 @@ -24,7 +24,7 @@ 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.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 ddf48f2b2f6..90d2db03e48 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 @@ -23,8 +23,8 @@ 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 org.elasticsearch.util.inject.Inject; +import org.elasticsearch.util.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 dc6d162e6a2..a8957d49885 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 @@ -21,7 +21,7 @@ package org.elasticsearch.index.engine; import org.elasticsearch.index.engine.robin.RobinEngineModule; import org.elasticsearch.util.guice.ModulesFactory; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.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 52eca356a45..2c5be0abece 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 @@ -41,7 +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.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 57715ef063e..61b88ee3a23 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 @@ -20,7 +20,7 @@ package org.elasticsearch.index.engine.robin; import org.elasticsearch.index.engine.Engine; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.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 a35850c426a..b9fc0aa3848 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 @@ -21,7 +21,7 @@ package org.elasticsearch.index.gateway; import org.elasticsearch.gateway.Gateway; import org.elasticsearch.util.guice.ModulesFactory; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.inject.AbstractModule; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayModule.java index b467624496d..08e58178e23 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayModule.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.gateway; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.inject.AbstractModule; /** * @author kimchy (Shay Banon) 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 4eb180c1edd..a617467f8cb 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 @@ -36,7 +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.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 20254fb1efb..471862020bc 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 @@ -29,7 +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.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 93ecc79ce1f..992de38c277 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 @@ -20,7 +20,7 @@ package org.elasticsearch.index.gateway.fs; import org.elasticsearch.index.gateway.IndexGateway; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.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 8c643d99357..489aad935be 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 @@ -36,7 +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.inject.Inject; import org.elasticsearch.util.io.stream.DataInputStreamInput; import org.elasticsearch.util.io.stream.DataOutputStreamOutput; import org.elasticsearch.util.io.stream.StreamOutput; 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 0ee97ca45fb..5a94dd72e03 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 @@ -24,7 +24,7 @@ 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.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 f02ab6f1587..8bf4d8afd03 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 @@ -20,7 +20,7 @@ package org.elasticsearch.index.gateway.none; import org.elasticsearch.index.gateway.IndexGateway; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.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 8d0561023e8..bb70fcad2cc 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 @@ -28,7 +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.inject.Inject; import org.elasticsearch.util.settings.Settings; /** 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 60143748e13..cd191cda323 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 @@ -31,7 +31,7 @@ import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.collect.ImmutableMap; import org.elasticsearch.util.collect.UnmodifiableIterator; import org.elasticsearch.util.concurrent.ThreadSafe; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.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/MapperServiceModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperServiceModule.java index be66a33c27e..a5280bd7a9c 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperServiceModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperServiceModule.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.mapper; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.inject.AbstractModule; /** * @author kimchy (Shay Banon) 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 a338ccc065e..df113761f80 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 @@ -27,7 +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; +import org.elasticsearch.util.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 b400714b5d3..c2cbab1d2d2 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 @@ -26,7 +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; +import org.elasticsearch.util.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 09d2bb93bf9..f8587a25cf5 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 @@ -24,7 +24,7 @@ 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; +import org.elasticsearch.util.inject.Inject; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/policy/MergeFactor.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/policy/MergeFactor.java index fef7923b486..966804504b1 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/policy/MergeFactor.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/policy/MergeFactor.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.merge.policy; -import org.elasticsearch.util.guice.inject.BindingAnnotation; +import org.elasticsearch.util.inject.BindingAnnotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; 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 7920d7a7e38..700fa2d9b9a 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 @@ -20,7 +20,7 @@ package org.elasticsearch.index.merge.policy; import org.apache.lucene.index.LogMergePolicy; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.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 1881c3bb130..2c79e5fd3bf 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 @@ -24,7 +24,7 @@ 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.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/scheduler/MergeSchedulerModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/scheduler/MergeSchedulerModule.java index 10862b8e6e9..4d681a2d924 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/scheduler/MergeSchedulerModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/scheduler/MergeSchedulerModule.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.merge.scheduler; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.inject.AbstractModule; import org.elasticsearch.util.settings.Settings; import static org.elasticsearch.index.merge.scheduler.MergeSchedulerModule.MergeSchedulerSettings.*; 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 8cc95cb2110..82434c681c5 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 @@ -24,7 +24,7 @@ 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.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/IndexQueryParserModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/IndexQueryParserModule.java index 334b7cbdbfe..e36382329a0 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/IndexQueryParserModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/IndexQueryParserModule.java @@ -20,10 +20,10 @@ package org.elasticsearch.index.query; import org.elasticsearch.index.query.xcontent.*; -import org.elasticsearch.util.guice.inject.AbstractModule; -import org.elasticsearch.util.guice.inject.Scopes; -import org.elasticsearch.util.guice.inject.assistedinject.FactoryProvider; -import org.elasticsearch.util.guice.inject.multibindings.MapBinder; +import org.elasticsearch.util.inject.AbstractModule; +import org.elasticsearch.util.inject.Scopes; +import org.elasticsearch.util.inject.assistedinject.FactoryProvider; +import org.elasticsearch.util.inject.multibindings.MapBinder; import org.elasticsearch.util.settings.Settings; import java.util.Map; 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 b17ade96da4..7d70f11b1b1 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 @@ -28,7 +28,7 @@ import org.elasticsearch.index.query.xcontent.XContentIndexQueryParser; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.index.similarity.SimilarityService; import org.elasticsearch.util.collect.ImmutableMap; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.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/BoolFilterParser.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/BoolFilterParser.java index 8497540701a..1df0f27e4cf 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/BoolFilterParser.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/BoolFilterParser.java @@ -24,7 +24,7 @@ import org.elasticsearch.index.AbstractIndexComponent; import org.elasticsearch.index.Index; import org.elasticsearch.index.query.QueryParsingException; import org.elasticsearch.index.settings.IndexSettings; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.XContentParser; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/BoolQueryParser.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/BoolQueryParser.java index d5337ad29d1..96681460cfb 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/BoolQueryParser.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/BoolQueryParser.java @@ -26,7 +26,7 @@ import org.elasticsearch.index.AbstractIndexComponent; import org.elasticsearch.index.Index; import org.elasticsearch.index.query.QueryParsingException; import org.elasticsearch.index.settings.IndexSettings; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.XContentParser; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/ConstantScoreQueryParser.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/ConstantScoreQueryParser.java index 34db2d4a897..d95aae04a4a 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/ConstantScoreQueryParser.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/ConstantScoreQueryParser.java @@ -27,7 +27,7 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.query.QueryParsingException; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.Strings; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.XContentParser; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/CustomBoostFactorQueryParser.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/CustomBoostFactorQueryParser.java index 773b61d36ed..af16e56a155 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/CustomBoostFactorQueryParser.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/CustomBoostFactorQueryParser.java @@ -25,7 +25,7 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.query.QueryParsingException; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.Strings; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.lucene.search.CustomBoostFactorQuery; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.XContentParser; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/DisMaxQueryParser.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/DisMaxQueryParser.java index f9deb10fce4..4b7ca68ff3e 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/DisMaxQueryParser.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/DisMaxQueryParser.java @@ -26,7 +26,7 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.query.QueryParsingException; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.Strings; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.XContentParser; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/FieldQueryParser.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/FieldQueryParser.java index 091588be730..9a851cfb5de 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/FieldQueryParser.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/FieldQueryParser.java @@ -30,7 +30,7 @@ import org.elasticsearch.index.analysis.AnalysisService; import org.elasticsearch.index.query.QueryParsingException; import org.elasticsearch.index.query.support.MapperQueryParser; import org.elasticsearch.index.settings.IndexSettings; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.XContentParser; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/FilteredQueryParser.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/FilteredQueryParser.java index ade4d320e95..e2d2d43e1c7 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/FilteredQueryParser.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/FilteredQueryParser.java @@ -26,7 +26,7 @@ import org.elasticsearch.index.AbstractIndexComponent; import org.elasticsearch.index.Index; import org.elasticsearch.index.query.QueryParsingException; import org.elasticsearch.index.settings.IndexSettings; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.XContentParser; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/MatchAllQueryParser.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/MatchAllQueryParser.java index 6c460ef5444..8c9af218f27 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/MatchAllQueryParser.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/MatchAllQueryParser.java @@ -26,7 +26,7 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.query.QueryParsingException; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.Strings; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.XContentParser; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/PrefixFilterParser.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/PrefixFilterParser.java index a6a80b72fc7..4d0b3d2cea4 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/PrefixFilterParser.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/PrefixFilterParser.java @@ -27,7 +27,7 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.query.QueryParsingException; import org.elasticsearch.index.settings.IndexSettings; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.XContentParser; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/PrefixQueryParser.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/PrefixQueryParser.java index 4325daab879..6f78ee8660a 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/PrefixQueryParser.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/PrefixQueryParser.java @@ -28,7 +28,7 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.query.QueryParsingException; import org.elasticsearch.index.settings.IndexSettings; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.XContentParser; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/QueryFilterParser.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/QueryFilterParser.java index 1915f60aaf2..55d86a0a459 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/QueryFilterParser.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/QueryFilterParser.java @@ -26,7 +26,7 @@ import org.elasticsearch.index.AbstractIndexComponent; import org.elasticsearch.index.Index; import org.elasticsearch.index.query.QueryParsingException; import org.elasticsearch.index.settings.IndexSettings; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.XContentParser; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/QueryStringQueryParser.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/QueryStringQueryParser.java index 61162974721..babb7ef2958 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/QueryStringQueryParser.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/QueryStringQueryParser.java @@ -34,7 +34,7 @@ import org.elasticsearch.index.query.support.MultiFieldMapperQueryParser; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.Strings; import org.elasticsearch.util.collect.Lists; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.trove.ExtTObjectFloatHashMap; import org.elasticsearch.util.xcontent.XContentParser; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/RangeFilterParser.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/RangeFilterParser.java index 1483be1aa03..24901333502 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/RangeFilterParser.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/RangeFilterParser.java @@ -26,7 +26,7 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.query.QueryParsingException; import org.elasticsearch.index.settings.IndexSettings; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.XContentParser; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/RangeQueryParser.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/RangeQueryParser.java index 4f104c3f585..be4957240ba 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/RangeQueryParser.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/RangeQueryParser.java @@ -26,7 +26,7 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.query.QueryParsingException; import org.elasticsearch.index.settings.IndexSettings; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.XContentParser; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/SpanFirstQueryParser.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/SpanFirstQueryParser.java index 9fcc86429d3..0ba88065e36 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/SpanFirstQueryParser.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/SpanFirstQueryParser.java @@ -27,7 +27,7 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.query.QueryParsingException; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.Strings; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.XContentParser; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/SpanNearQueryParser.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/SpanNearQueryParser.java index 58ba4fb0713..03d7e0d49ee 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/SpanNearQueryParser.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/SpanNearQueryParser.java @@ -27,7 +27,7 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.query.QueryParsingException; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.Strings; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.XContentParser; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/SpanNotQueryParser.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/SpanNotQueryParser.java index 0308a6170d0..494a74269ab 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/SpanNotQueryParser.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/SpanNotQueryParser.java @@ -27,7 +27,7 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.query.QueryParsingException; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.Strings; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.XContentParser; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/SpanOrQueryParser.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/SpanOrQueryParser.java index 975c64a09f3..32c2fcbcd33 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/SpanOrQueryParser.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/SpanOrQueryParser.java @@ -27,7 +27,7 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.query.QueryParsingException; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.Strings; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.XContentParser; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/SpanTermQueryParser.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/SpanTermQueryParser.java index 5fadecfb6c9..c7d2ac80f4e 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/SpanTermQueryParser.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/SpanTermQueryParser.java @@ -28,7 +28,7 @@ import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.query.QueryParsingException; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.Strings; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.XContentParser; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/TermFilterParser.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/TermFilterParser.java index 9d3e914a897..2c3b2a21970 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/TermFilterParser.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/TermFilterParser.java @@ -26,7 +26,7 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.query.QueryParsingException; import org.elasticsearch.index.settings.IndexSettings; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.lucene.search.TermFilter; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.XContentParser; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/TermQueryParser.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/TermQueryParser.java index df54c7e0c98..a3b6986078e 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/TermQueryParser.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/TermQueryParser.java @@ -27,7 +27,7 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.query.QueryParsingException; import org.elasticsearch.index.settings.IndexSettings; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.XContentParser; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/TermsFilterParser.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/TermsFilterParser.java index 672a8311a3e..dc5f0bd83a4 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/TermsFilterParser.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/TermsFilterParser.java @@ -29,7 +29,7 @@ import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.query.QueryParsingException; import org.elasticsearch.index.settings.IndexSettings; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.XContentParser; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/WildcardQueryParser.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/WildcardQueryParser.java index ed5732bc1a2..d4a6ff0712d 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/WildcardQueryParser.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/WildcardQueryParser.java @@ -28,7 +28,7 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.query.QueryParsingException; import org.elasticsearch.index.settings.IndexSettings; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.XContentParser; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/XContentIndexQueryParser.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/XContentIndexQueryParser.java index 36261eda872..a4751d617f6 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/XContentIndexQueryParser.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/XContentIndexQueryParser.java @@ -32,8 +32,8 @@ import org.elasticsearch.index.query.QueryParsingException; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.index.similarity.SimilarityService; import org.elasticsearch.util.ThreadLocals; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; +import org.elasticsearch.util.inject.Inject; +import org.elasticsearch.util.inject.assistedinject.Assisted; import org.elasticsearch.util.io.FastByteArrayOutputStream; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.XContentFactory; 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 b7845cc5d2c..319ce32199b 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 @@ -22,7 +22,7 @@ package org.elasticsearch.index.routing; 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.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 509f996375e..acbe585cc8e 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 @@ -34,7 +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.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 59ded672691..8627fc93622 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 @@ -20,7 +20,7 @@ package org.elasticsearch.index.routing.plain; import org.elasticsearch.index.routing.OperationRouting; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.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 2f67af68815..464519dcc4a 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 @@ -29,7 +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 org.elasticsearch.util.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 92111087405..0ec474dedc2 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 @@ -55,9 +55,9 @@ import org.elasticsearch.util.collect.Lists; import org.elasticsearch.util.collect.UnmodifiableIterator; import org.elasticsearch.util.component.CloseableIndexComponent; 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.inject.Inject; +import org.elasticsearch.util.inject.Injector; +import org.elasticsearch.util.inject.Module; import org.elasticsearch.util.settings.Settings; import java.io.IOException; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/settings/IndexSettings.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/settings/IndexSettings.java index 091a5e70d56..12357fd6c39 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/settings/IndexSettings.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/settings/IndexSettings.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.settings; -import org.elasticsearch.util.guice.inject.BindingAnnotation; +import org.elasticsearch.util.inject.BindingAnnotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/settings/IndexSettingsModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/settings/IndexSettingsModule.java index 58a92e93efb..d428af243d5 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/settings/IndexSettingsModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/settings/IndexSettingsModule.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.settings; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.inject.AbstractModule; import org.elasticsearch.util.settings.Settings; /** 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 3b8299887bf..433d23f71dc 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 @@ -28,7 +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.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 564fb17b87a..5c279115d42 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 @@ -22,7 +22,7 @@ package org.elasticsearch.index.shard; 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; +import org.elasticsearch.util.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 b5fa09be960..6de58b151ca 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 @@ -42,7 +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.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 69ccfd48b77..9d93efd5ffb 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 @@ -49,7 +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.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 2c20863e375..5ef2a0c2221 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 @@ -22,8 +22,8 @@ package org.elasticsearch.index.similarity; 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.inject.Inject; +import org.elasticsearch.util.inject.assistedinject.Assisted; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/similarity/SimilarityModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/similarity/SimilarityModule.java index e966c999f61..6eaf5750a71 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/similarity/SimilarityModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/similarity/SimilarityModule.java @@ -19,10 +19,10 @@ package org.elasticsearch.index.similarity; -import org.elasticsearch.util.guice.inject.AbstractModule; -import org.elasticsearch.util.guice.inject.Scopes; -import org.elasticsearch.util.guice.inject.assistedinject.FactoryProvider; -import org.elasticsearch.util.guice.inject.multibindings.MapBinder; +import org.elasticsearch.util.inject.AbstractModule; +import org.elasticsearch.util.inject.Scopes; +import org.elasticsearch.util.inject.assistedinject.FactoryProvider; +import org.elasticsearch.util.inject.multibindings.MapBinder; import org.elasticsearch.util.settings.Settings; import java.util.Map; 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 0ce08a7b1ef..e8125f2784b 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 @@ -21,7 +21,7 @@ package org.elasticsearch.index.similarity; import org.apache.lucene.search.Similarity; import org.elasticsearch.index.IndexComponent; -import org.elasticsearch.util.guice.inject.Provider; +import org.elasticsearch.util.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 a98cd9ddc23..aa87bb75bd5 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 @@ -24,7 +24,7 @@ import org.elasticsearch.index.AbstractIndexComponent; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.util.collect.ImmutableMap; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.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 3e74040a3d6..3c4605865ad 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 @@ -22,7 +22,7 @@ package org.elasticsearch.index.store; import org.elasticsearch.index.shard.AbstractIndexShardComponent; import org.elasticsearch.jmx.MBean; import org.elasticsearch.jmx.ManagedAttribute; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.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 9f37092fc7e..b79486ac873 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 @@ -26,8 +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.inject.AbstractModule; +import org.elasticsearch.util.inject.Module; 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 3635a79c687..5a3c3f27198 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 @@ -27,7 +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.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 dc7244cb2ce..2bac85153fd 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 @@ -20,7 +20,7 @@ package org.elasticsearch.index.store.fs; import org.elasticsearch.index.store.Store; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.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 833c4120a72..2ecba6f080c 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 @@ -27,7 +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.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 f740f108d70..a9ca1329ccd 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 @@ -20,7 +20,7 @@ package org.elasticsearch.index.store.fs; import org.elasticsearch.index.store.Store; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.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 30435c3a335..2f0a5e3d346 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 @@ -27,7 +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.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 ed4e9e1dc1e..9a658c2a2bc 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 @@ -20,7 +20,7 @@ package org.elasticsearch.index.store.fs; import org.elasticsearch.index.store.Store; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.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 698521fc7f6..4df3dd97919 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 @@ -24,7 +24,7 @@ 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.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 5bb7147c841..5bad9507903 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 @@ -24,7 +24,7 @@ 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.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 23343c3e8de..f0cd3a53d22 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 @@ -21,7 +21,7 @@ package org.elasticsearch.index.store.memory; import org.elasticsearch.ElasticSearchIllegalArgumentException; import org.elasticsearch.index.store.Store; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.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 0d42ea3afd9..9483b8371d1 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 @@ -25,7 +25,7 @@ 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.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 8113668be69..de46cf5763f 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 @@ -20,7 +20,7 @@ package org.elasticsearch.index.store.ram; import org.elasticsearch.index.store.Store; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.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 e93c5ca3296..52167d21f96 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 @@ -20,8 +20,8 @@ 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.util.inject.AbstractModule; +import org.elasticsearch.util.inject.Scopes; import org.elasticsearch.util.settings.Settings; /** 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 872eeaaf721..fec167459ed 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 @@ -27,7 +27,7 @@ import org.elasticsearch.index.translog.TranslogException; import org.elasticsearch.util.SizeUnit; import org.elasticsearch.util.SizeValue; import org.elasticsearch.util.concurrent.ThreadSafe; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.ArrayList; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/IndicesMemoryCleaner.java b/modules/elasticsearch/src/main/java/org/elasticsearch/indices/IndicesMemoryCleaner.java index 106ee4c373e..a28768a7bbf 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/IndicesMemoryCleaner.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/indices/IndicesMemoryCleaner.java @@ -19,7 +19,7 @@ package org.elasticsearch.indices; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.index.engine.Engine; import org.elasticsearch.index.engine.FlushNotAllowedEngineException; import org.elasticsearch.index.service.IndexService; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/IndicesModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/indices/IndicesModule.java index 0ee5caf561b..32b8fa62232 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/IndicesModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/indices/IndicesModule.java @@ -19,7 +19,7 @@ package org.elasticsearch.indices; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.inject.AbstractModule; import org.elasticsearch.indices.cluster.IndicesClusterStateService; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/InternalIndicesLifecycle.java b/modules/elasticsearch/src/main/java/org/elasticsearch/indices/InternalIndicesLifecycle.java index f5adc9b1ee0..5e88723cc4f 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/InternalIndicesLifecycle.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/indices/InternalIndicesLifecycle.java @@ -19,7 +19,7 @@ package org.elasticsearch.indices; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.index.Index; import org.elasticsearch.index.service.IndexService; import org.elasticsearch.index.shard.ShardId; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/InternalIndicesService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/indices/InternalIndicesService.java index b175566a473..a19c52b3ec9 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/InternalIndicesService.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/indices/InternalIndicesService.java @@ -45,9 +45,9 @@ import org.elasticsearch.util.component.AbstractLifecycleComponent; import org.elasticsearch.util.component.CloseableIndexComponent; import org.elasticsearch.util.concurrent.ThreadSafe; 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.inject.Inject; +import org.elasticsearch.util.inject.Injector; +import org.elasticsearch.util.inject.Module; import org.elasticsearch.util.settings.Settings; import java.util.ArrayList; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java index cd26be8a64e..f227c00be00 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java @@ -50,7 +50,7 @@ import org.elasticsearch.indices.IndicesService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.util.collect.ImmutableMap; import org.elasticsearch.util.component.AbstractLifecycleComponent; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.Map; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/jmx/JmxModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/jmx/JmxModule.java index 86bbce74af3..0e10f1b4a71 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/jmx/JmxModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/jmx/JmxModule.java @@ -19,12 +19,12 @@ package org.elasticsearch.jmx; -import org.elasticsearch.util.guice.inject.AbstractModule; -import org.elasticsearch.util.guice.inject.TypeLiteral; -import org.elasticsearch.util.guice.inject.matcher.Matchers; -import org.elasticsearch.util.guice.inject.spi.InjectionListener; -import org.elasticsearch.util.guice.inject.spi.TypeEncounter; -import org.elasticsearch.util.guice.inject.spi.TypeListener; +import org.elasticsearch.util.inject.AbstractModule; +import org.elasticsearch.util.inject.TypeLiteral; +import org.elasticsearch.util.inject.matcher.Matchers; +import org.elasticsearch.util.inject.spi.InjectionListener; +import org.elasticsearch.util.inject.spi.TypeEncounter; +import org.elasticsearch.util.inject.spi.TypeListener; import org.elasticsearch.jmx.action.GetJmxServiceUrlAction; import org.elasticsearch.util.logging.Loggers; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/jmx/action/GetJmxServiceUrlAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/jmx/action/GetJmxServiceUrlAction.java index bd1c6566068..0c1d84d5a7c 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/jmx/action/GetJmxServiceUrlAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/jmx/action/GetJmxServiceUrlAction.java @@ -19,7 +19,7 @@ package org.elasticsearch.jmx.action; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.node.DiscoveryNode; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/MonitorModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/MonitorModule.java index 1038172e35c..d62a7fe8bc4 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/MonitorModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/MonitorModule.java @@ -43,10 +43,10 @@ import org.elasticsearch.monitor.process.ProcessProbe; import org.elasticsearch.monitor.process.ProcessService; import org.elasticsearch.monitor.process.SigarProcessProbe; import org.elasticsearch.monitor.sigar.SigarService; -import org.elasticsearch.util.guice.inject.AbstractModule; -import org.elasticsearch.util.guice.inject.Scopes; -import org.elasticsearch.util.guice.inject.assistedinject.FactoryProvider; -import org.elasticsearch.util.guice.inject.multibindings.MapBinder; +import org.elasticsearch.util.inject.AbstractModule; +import org.elasticsearch.util.inject.Scopes; +import org.elasticsearch.util.inject.assistedinject.FactoryProvider; +import org.elasticsearch.util.inject.multibindings.MapBinder; import org.elasticsearch.util.settings.Settings; import java.util.Map; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/MonitorService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/MonitorService.java index 7e63200c0d5..552da6cc197 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/MonitorService.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/MonitorService.java @@ -27,7 +27,7 @@ import org.elasticsearch.monitor.network.NetworkService; import org.elasticsearch.monitor.os.OsService; import org.elasticsearch.monitor.process.ProcessService; import org.elasticsearch.util.component.AbstractLifecycleComponent; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/DumpMonitorService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/DumpMonitorService.java index ca4979a9997..022be528d17 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/DumpMonitorService.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/DumpMonitorService.java @@ -25,7 +25,7 @@ import org.elasticsearch.monitor.dump.heap.HeapDumpContributor; import org.elasticsearch.monitor.dump.summary.SummaryDumpContributor; import org.elasticsearch.monitor.dump.thread.ThreadDumpContributor; import org.elasticsearch.util.component.AbstractComponent; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import javax.annotation.Nullable; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/cluster/ClusterDumpContributor.java b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/cluster/ClusterDumpContributor.java index 7944f8caa5a..6ef478ddd6c 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/cluster/ClusterDumpContributor.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/cluster/ClusterDumpContributor.java @@ -19,8 +19,8 @@ package org.elasticsearch.monitor.dump.cluster; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; +import org.elasticsearch.util.inject.Inject; +import org.elasticsearch.util.inject.assistedinject.Assisted; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.node.DiscoveryNodes; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/heap/HeapDumpContributor.java b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/heap/HeapDumpContributor.java index 56c2d91bdca..b6b4bfb51da 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/heap/HeapDumpContributor.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/heap/HeapDumpContributor.java @@ -19,8 +19,8 @@ package org.elasticsearch.monitor.dump.heap; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; +import org.elasticsearch.util.inject.Inject; +import org.elasticsearch.util.inject.assistedinject.Assisted; import org.elasticsearch.monitor.dump.Dump; import org.elasticsearch.monitor.dump.DumpContributionFailedException; import org.elasticsearch.monitor.dump.DumpContributor; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/summary/SummaryDumpContributor.java b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/summary/SummaryDumpContributor.java index fdae3874ec9..b46dce7cf84 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/summary/SummaryDumpContributor.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/summary/SummaryDumpContributor.java @@ -19,8 +19,8 @@ package org.elasticsearch.monitor.dump.summary; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; +import org.elasticsearch.util.inject.Inject; +import org.elasticsearch.util.inject.assistedinject.Assisted; import org.elasticsearch.monitor.dump.Dump; import org.elasticsearch.monitor.dump.DumpContributionFailedException; import org.elasticsearch.monitor.dump.DumpContributor; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/thread/ThreadDumpContributor.java b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/thread/ThreadDumpContributor.java index f37c4949ed9..28c23df5d26 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/thread/ThreadDumpContributor.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/thread/ThreadDumpContributor.java @@ -19,8 +19,8 @@ package org.elasticsearch.monitor.dump.thread; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.assistedinject.Assisted; +import org.elasticsearch.util.inject.Inject; +import org.elasticsearch.util.inject.assistedinject.Assisted; import org.elasticsearch.monitor.dump.Dump; import org.elasticsearch.monitor.dump.DumpContributionFailedException; import org.elasticsearch.monitor.dump.DumpContributor; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/jvm/JvmMonitorService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/jvm/JvmMonitorService.java index 803acff2261..385243a8759 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/jvm/JvmMonitorService.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/jvm/JvmMonitorService.java @@ -26,7 +26,7 @@ import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.util.TimeValue; import org.elasticsearch.util.collect.ImmutableSet; import org.elasticsearch.util.component.AbstractLifecycleComponent; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.HashSet; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/jvm/JvmService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/jvm/JvmService.java index 2abc0423fb4..192e040a8e3 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/jvm/JvmService.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/jvm/JvmService.java @@ -20,7 +20,7 @@ package org.elasticsearch.monitor.jvm; import org.elasticsearch.util.component.AbstractComponent; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/memory/MemoryMonitorService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/memory/MemoryMonitorService.java index 615daa8982f..9dfe5899d16 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/memory/MemoryMonitorService.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/memory/MemoryMonitorService.java @@ -19,7 +19,7 @@ package org.elasticsearch.monitor.memory; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.util.component.AbstractLifecycleComponent; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/memory/alpha/AlphaMemoryMonitor.java b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/memory/alpha/AlphaMemoryMonitor.java index f28a8672f1b..4a4b7e0e784 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/memory/alpha/AlphaMemoryMonitor.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/memory/alpha/AlphaMemoryMonitor.java @@ -28,7 +28,7 @@ import org.elasticsearch.util.SizeValue; import org.elasticsearch.util.StopWatch; import org.elasticsearch.util.TimeValue; import org.elasticsearch.util.component.AbstractLifecycleComponent; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.concurrent.ScheduledFuture; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/JmxNetworkProbe.java b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/JmxNetworkProbe.java index 76e242b83af..7ea41de4027 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/JmxNetworkProbe.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/JmxNetworkProbe.java @@ -20,7 +20,7 @@ package org.elasticsearch.monitor.network; import org.elasticsearch.util.component.AbstractComponent; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/NetworkService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/NetworkService.java index ea567193916..29ed500b770 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/NetworkService.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/NetworkService.java @@ -20,7 +20,7 @@ package org.elasticsearch.monitor.network; import org.elasticsearch.util.component.AbstractComponent; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/SigarNetworkProbe.java b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/SigarNetworkProbe.java index 329215bd165..76a31079181 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/SigarNetworkProbe.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/SigarNetworkProbe.java @@ -21,7 +21,7 @@ package org.elasticsearch.monitor.network; import org.elasticsearch.monitor.sigar.SigarService; import org.elasticsearch.util.component.AbstractComponent; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.hyperic.sigar.NetInterfaceConfig; import org.hyperic.sigar.Sigar; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/JmxOsProbe.java b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/JmxOsProbe.java index d6c66fa91bd..5dda17c193a 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/JmxOsProbe.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/JmxOsProbe.java @@ -20,7 +20,7 @@ package org.elasticsearch.monitor.os; import org.elasticsearch.util.component.AbstractComponent; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/OsService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/OsService.java index 179fd8626d2..c1e9268408c 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/OsService.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/OsService.java @@ -20,7 +20,7 @@ package org.elasticsearch.monitor.os; import org.elasticsearch.util.component.AbstractComponent; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/SigarOsProbe.java b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/SigarOsProbe.java index 314b2a9b78a..6b086f61a32 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/SigarOsProbe.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/SigarOsProbe.java @@ -21,7 +21,7 @@ package org.elasticsearch.monitor.os; import org.elasticsearch.monitor.sigar.SigarService; import org.elasticsearch.util.component.AbstractComponent; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.hyperic.sigar.*; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/process/JmxProcessProbe.java b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/process/JmxProcessProbe.java index 88b035287e1e3d00cea2118569b386df8190f716..10c3c44aa5e21fbb95f437577f2a33819e21ea19 100644 GIT binary patch delta 30 lcmZ3@vyx{+4{d<9^QepE9Ml~kZ^wP}a)XjUDbC>||HVudX diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/process/ProcessService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/process/ProcessService.java index 017e908e240..92dfd88dc26 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/process/ProcessService.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/process/ProcessService.java @@ -20,7 +20,7 @@ package org.elasticsearch.monitor.process; import org.elasticsearch.util.component.AbstractComponent; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/process/SigarProcessProbe.java b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/process/SigarProcessProbe.java index 0e1e7453fd7..11eeba531aa 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/process/SigarProcessProbe.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/process/SigarProcessProbe.java @@ -21,7 +21,7 @@ package org.elasticsearch.monitor.process; import org.elasticsearch.monitor.sigar.SigarService; import org.elasticsearch.util.component.AbstractComponent; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.hyperic.sigar.*; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/sigar/SigarService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/sigar/SigarService.java index 601d78f64e4..348b39cbf42 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/sigar/SigarService.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/sigar/SigarService.java @@ -20,7 +20,7 @@ package org.elasticsearch.monitor.sigar; import org.elasticsearch.util.component.AbstractComponent; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.hyperic.sigar.Sigar; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/node/internal/InternalNode.java b/modules/elasticsearch/src/main/java/org/elasticsearch/node/internal/InternalNode.java index 95fe0648ba4..f100fb8e079 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/node/internal/InternalNode.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/node/internal/InternalNode.java @@ -62,9 +62,9 @@ import org.elasticsearch.util.Tuple; import org.elasticsearch.util.component.Lifecycle; import org.elasticsearch.util.component.LifecycleComponent; import org.elasticsearch.util.guice.Injectors; -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.inject.Guice; +import org.elasticsearch.util.inject.Injector; +import org.elasticsearch.util.inject.Module; import org.elasticsearch.util.io.FileSystemUtils; import org.elasticsearch.util.logging.ESLogger; import org.elasticsearch.util.logging.Loggers; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/node/internal/NodeModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/node/internal/NodeModule.java index ea95f950a20..354342aba6a 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/node/internal/NodeModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/node/internal/NodeModule.java @@ -19,7 +19,7 @@ package org.elasticsearch.node.internal; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.inject.AbstractModule; import org.elasticsearch.node.Node; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/plugins/AbstractPlugin.java b/modules/elasticsearch/src/main/java/org/elasticsearch/plugins/AbstractPlugin.java index 5cd3f70e9c2..789def5becf 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/plugins/AbstractPlugin.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/plugins/AbstractPlugin.java @@ -22,7 +22,7 @@ package org.elasticsearch.plugins; import org.elasticsearch.util.collect.ImmutableList; import org.elasticsearch.util.component.CloseableIndexComponent; import org.elasticsearch.util.component.LifecycleComponent; -import org.elasticsearch.util.guice.inject.Module; +import org.elasticsearch.util.inject.Module; import java.util.Collection; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/plugins/IndicesPluginsModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/plugins/IndicesPluginsModule.java index f3edb386ab8..3f6d11ec8d3 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/plugins/IndicesPluginsModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/plugins/IndicesPluginsModule.java @@ -19,8 +19,8 @@ package org.elasticsearch.plugins; -import org.elasticsearch.util.guice.inject.AbstractModule; -import org.elasticsearch.util.guice.inject.Module; +import org.elasticsearch.util.inject.AbstractModule; +import org.elasticsearch.util.inject.Module; import org.elasticsearch.util.settings.Settings; import java.util.Collection; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/plugins/Plugin.java b/modules/elasticsearch/src/main/java/org/elasticsearch/plugins/Plugin.java index c0dbf0812b8..7150003e61c 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/plugins/Plugin.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/plugins/Plugin.java @@ -19,7 +19,7 @@ package org.elasticsearch.plugins; -import org.elasticsearch.util.guice.inject.Module; +import org.elasticsearch.util.inject.Module; import org.elasticsearch.util.component.CloseableIndexComponent; import org.elasticsearch.util.component.LifecycleComponent; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/plugins/PluginsModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/plugins/PluginsModule.java index bb9b7d23fcf..7a33b3ee3e6 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/plugins/PluginsModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/plugins/PluginsModule.java @@ -19,8 +19,8 @@ package org.elasticsearch.plugins; -import org.elasticsearch.util.guice.inject.AbstractModule; -import org.elasticsearch.util.guice.inject.Module; +import org.elasticsearch.util.inject.AbstractModule; +import org.elasticsearch.util.inject.Module; import org.elasticsearch.util.settings.Settings; import java.util.Collection; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/plugins/PluginsService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/plugins/PluginsService.java index e6e1e3aec67..72099f95321 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/plugins/PluginsService.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/plugins/PluginsService.java @@ -27,8 +27,8 @@ import org.elasticsearch.util.collect.Maps; import org.elasticsearch.util.component.AbstractComponent; import org.elasticsearch.util.component.CloseableIndexComponent; import org.elasticsearch.util.component.LifecycleComponent; -import org.elasticsearch.util.guice.inject.Inject; -import org.elasticsearch.util.guice.inject.Module; +import org.elasticsearch.util.inject.Inject; +import org.elasticsearch.util.inject.Module; import org.elasticsearch.util.io.Streams; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/plugins/ShardsPluginsModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/plugins/ShardsPluginsModule.java index 091df06a4c0..a7b2fa70fae 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/plugins/ShardsPluginsModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/plugins/ShardsPluginsModule.java @@ -19,8 +19,8 @@ package org.elasticsearch.plugins; -import org.elasticsearch.util.guice.inject.AbstractModule; -import org.elasticsearch.util.guice.inject.Module; +import org.elasticsearch.util.inject.AbstractModule; +import org.elasticsearch.util.inject.Module; import org.elasticsearch.util.settings.Settings; import java.util.Collection; 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 222dd8dd64c..37d22f0e6e1 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/RestController.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/RestController.java @@ -22,7 +22,7 @@ package org.elasticsearch.rest; 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.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 38536f6c987..8863d605113 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/RestModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/RestModule.java @@ -20,7 +20,7 @@ package org.elasticsearch.rest; import org.elasticsearch.rest.action.RestActionModule; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.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 57b3f41b69d..169848a3d93 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 @@ -48,7 +48,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; +import org.elasticsearch.util.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 e39f45e56d7..4b79e84feea 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 @@ -25,7 +25,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.guice.inject.Inject; +import org.elasticsearch.util.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 eded703c5fd..8cc34529f5b 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 @@ -27,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.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.settings.SettingsFilter; import org.elasticsearch.util.xcontent.builder.XContentBuilder; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/restart/RestNodesRestartAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/restart/RestNodesRestartAction.java index ec18d2714ae..a0976d46c1c 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/restart/RestNodesRestartAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/restart/RestNodesRestartAction.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.admin.cluster.node.restart.NodesRestartResponse; import org.elasticsearch.client.Client; import org.elasticsearch.rest.*; import org.elasticsearch.rest.action.support.RestActions; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.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 5acc009454a..71ed761f203 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 @@ -25,7 +25,7 @@ import org.elasticsearch.action.admin.cluster.node.shutdown.NodesShutdownRespons import org.elasticsearch.client.Client; import org.elasticsearch.rest.*; import org.elasticsearch.rest.action.support.RestActions; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.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/stats/RestNodesStatsAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/stats/RestNodesStatsAction.java index ead7a1434f5..6bef620a1f7 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/stats/RestNodesStatsAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/stats/RestNodesStatsAction.java @@ -27,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.guice.inject.Inject; +import org.elasticsearch.util.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/broadcast/RestBroadcastPingAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/ping/broadcast/RestBroadcastPingAction.java index 77f489404c4..6694a342790 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 @@ -27,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.guice.inject.Inject; +import org.elasticsearch.util.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 c1048177043..1089d40e744 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 @@ -28,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.guice.inject.Inject; +import org.elasticsearch.util.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 a5492f1cbed..6cb2c92ccef 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 @@ -25,7 +25,7 @@ import org.elasticsearch.action.admin.cluster.ping.single.SinglePingResponse; import org.elasticsearch.client.Client; import org.elasticsearch.rest.*; import org.elasticsearch.rest.action.support.RestXContentBuilder; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.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/state/RestClusterStateAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/state/RestClusterStateAction.java index dc8d0303c6b..3221095069f 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/state/RestClusterStateAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/state/RestClusterStateAction.java @@ -31,7 +31,7 @@ import org.elasticsearch.cluster.routing.RoutingNode; import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.rest.*; import org.elasticsearch.rest.action.support.RestXContentBuilder; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.settings.SettingsFilter; import org.elasticsearch.util.xcontent.builder.XContentBuilder; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/RestIndicesAliasesAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/RestIndicesAliasesAction.java index c13f98a7e68..f8879d9e77d 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/RestIndicesAliasesAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/RestIndicesAliasesAction.java @@ -26,7 +26,7 @@ import org.elasticsearch.action.admin.indices.alias.IndicesAliasesResponse; import org.elasticsearch.client.Client; import org.elasticsearch.cluster.metadata.AliasAction; import org.elasticsearch.rest.*; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.XContentFactory; import org.elasticsearch.util.xcontent.XContentParser; 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 4a8334be702..8d85e59ca68 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 @@ -27,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.guice.inject.Inject; +import org.elasticsearch.util.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/create/RestCreateIndexAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/create/RestCreateIndexAction.java index 6b0ca5e22b2..1414f9d6967 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/create/RestCreateIndexAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/create/RestCreateIndexAction.java @@ -28,7 +28,7 @@ import org.elasticsearch.indices.InvalidIndexNameException; import org.elasticsearch.rest.*; import org.elasticsearch.rest.action.support.RestXContentBuilder; import org.elasticsearch.util.Strings; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.ImmutableSettings; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.settings.SettingsException; 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 81d9308e824..9ab1acb6213 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 @@ -26,7 +26,7 @@ import org.elasticsearch.client.Client; import org.elasticsearch.indices.IndexMissingException; import org.elasticsearch.rest.*; import org.elasticsearch.rest.action.support.RestXContentBuilder; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.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 551b28e177b..6cd5697bdca 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 @@ -27,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.guice.inject.Inject; +import org.elasticsearch.util.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 261689970d2..4304000fc3d 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 @@ -27,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.guice.inject.Inject; +import org.elasticsearch.util.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 8b487b3b2e2..4a144f8881f 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 @@ -28,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.guice.inject.Inject; +import org.elasticsearch.util.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 c2909310742..a711af7500a 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 @@ -27,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.guice.inject.Inject; +import org.elasticsearch.util.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 7c312d67357..85745808d37 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 @@ -27,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.guice.inject.Inject; +import org.elasticsearch.util.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 1536a673640..2616706de80 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 @@ -25,7 +25,7 @@ import org.elasticsearch.action.support.broadcast.BroadcastOperationThreading; import org.elasticsearch.client.Client; import org.elasticsearch.rest.*; import org.elasticsearch.rest.action.support.RestXContentBuilder; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.settings.SettingsFilter; import org.elasticsearch.util.xcontent.builder.XContentBuilder; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/count/RestCountAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/count/RestCountAction.java index ffcf17bc362..6f1e0605366 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/count/RestCountAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/count/RestCountAction.java @@ -27,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.guice.inject.Inject; +import org.elasticsearch.util.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 1ef4822661b..7f40f4c0386 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 @@ -25,7 +25,7 @@ import org.elasticsearch.action.delete.DeleteResponse; import org.elasticsearch.client.Client; import org.elasticsearch.rest.*; import org.elasticsearch.rest.action.support.RestXContentBuilder; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.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 2dd8be08702..97ae40e67b5 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 @@ -28,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.guice.inject.Inject; +import org.elasticsearch.util.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 8b96a1a18b9..9845980fca1 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 @@ -25,7 +25,7 @@ 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.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.XContentFactory; 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 ecd728b843f..42b9618afa7 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 @@ -25,7 +25,7 @@ import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.client.Client; import org.elasticsearch.rest.*; import org.elasticsearch.rest.action.support.RestXContentBuilder; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.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/main/RestMainAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/main/RestMainAction.java index 0e803d70a69..5838af85acc 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/main/RestMainAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/main/RestMainAction.java @@ -25,7 +25,7 @@ import org.elasticsearch.rest.*; import org.elasticsearch.rest.action.support.RestXContentBuilder; import org.elasticsearch.util.Classes; import org.elasticsearch.util.concurrent.jsr166y.ThreadLocalRandom; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.xcontent.XContentFactory; import org.elasticsearch.util.xcontent.XContentParser; 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 64bdb13591b..5b0642152b5 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 @@ -27,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.guice.inject.Inject; +import org.elasticsearch.util.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/RestSearchAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java index 78fb70d83b4..f4bee9b96a9 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java @@ -32,7 +32,7 @@ import org.elasticsearch.rest.action.support.RestActions; import org.elasticsearch.search.Scroll; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.util.Unicode; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.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 71fe01b3b3e..0998d3439bb 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 @@ -26,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.guice.inject.Inject; +import org.elasticsearch.util.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 de1609e844f..f77a47f516f 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 @@ -28,7 +28,7 @@ import org.elasticsearch.action.terms.TermsResponse; import org.elasticsearch.client.Client; import org.elasticsearch.rest.*; import org.elasticsearch.rest.action.support.RestXContentBuilder; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.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/SearchModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchModule.java index cba3109ec04..45652e1b8ce 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchModule.java @@ -26,7 +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; +import org.elasticsearch.util.inject.AbstractModule; /** * @author kimchy (Shay Banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchService.java index 80024080fd1..24f30d55843 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchService.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchService.java @@ -50,7 +50,7 @@ import org.elasticsearch.util.collect.ImmutableMap; import org.elasticsearch.util.component.AbstractLifecycleComponent; import org.elasticsearch.util.concurrent.ConcurrentMapLong; import org.elasticsearch.util.concurrent.ConcurrentMaps; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.timer.Timeout; import org.elasticsearch.util.timer.TimerTask; 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 f0ec2f0add0..467a063ba1a 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 @@ -32,7 +32,7 @@ import org.elasticsearch.search.query.QuerySearchRequest; import org.elasticsearch.search.query.QuerySearchResult; import org.elasticsearch.transport.*; import org.elasticsearch.util.component.AbstractComponent; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.io.stream.LongStreamable; import org.elasticsearch.util.io.stream.VoidStreamable; import org.elasticsearch.util.logging.ESLogger; 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 f9f4355559a..58f57f1a39f 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 @@ -32,7 +32,7 @@ import org.elasticsearch.search.internal.InternalSearchHitField; import org.elasticsearch.search.internal.InternalSearchHits; import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.util.collect.ImmutableMap; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import java.io.IOException; import java.util.ArrayList; 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 8c9229eccad..200c6bf751d 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 @@ -27,7 +27,7 @@ import org.elasticsearch.search.SearchPhase; import org.elasticsearch.search.facets.FacetsPhase; import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.util.collect.ImmutableMap; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.lucene.search.CustomBoostFactorQuery; import org.elasticsearch.util.lucene.search.TermFilter; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/ThreadPoolModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/ThreadPoolModule.java index cbc5e606d77..7368bb5a74d 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/ThreadPoolModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/ThreadPoolModule.java @@ -20,8 +20,8 @@ package org.elasticsearch.threadpool; import org.elasticsearch.threadpool.cached.CachedThreadPoolModule; -import org.elasticsearch.util.guice.inject.AbstractModule; -import org.elasticsearch.util.guice.inject.Module; +import org.elasticsearch.util.inject.AbstractModule; +import org.elasticsearch.util.inject.Module; import org.elasticsearch.util.settings.Settings; import static org.elasticsearch.util.guice.ModulesFactory.*; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/blocking/BlockingThreadPool.java b/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/blocking/BlockingThreadPool.java index 32254d29d0f..50240f14ca7 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/blocking/BlockingThreadPool.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/blocking/BlockingThreadPool.java @@ -24,7 +24,7 @@ import org.elasticsearch.util.SizeUnit; import org.elasticsearch.util.SizeValue; import org.elasticsearch.util.TimeValue; import org.elasticsearch.util.concurrent.DynamicExecutors; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.concurrent.Executors; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/blocking/BlockingThreadPoolManagement.java b/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/blocking/BlockingThreadPoolManagement.java index 722322d4139..49e4f84847c 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/blocking/BlockingThreadPoolManagement.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/blocking/BlockingThreadPoolManagement.java @@ -22,7 +22,7 @@ package org.elasticsearch.threadpool.blocking; import org.elasticsearch.jmx.MBean; import org.elasticsearch.jmx.ManagedAttribute; import org.elasticsearch.threadpool.ThreadPool; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/blocking/BlockingThreadPoolModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/blocking/BlockingThreadPoolModule.java index d0fce692860..5c83cec0cde 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/blocking/BlockingThreadPoolModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/blocking/BlockingThreadPoolModule.java @@ -20,7 +20,7 @@ package org.elasticsearch.threadpool.blocking; import org.elasticsearch.threadpool.ThreadPool; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.inject.AbstractModule; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/cached/CachedThreadPool.java b/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/cached/CachedThreadPool.java index 326524d98c1..692f703b91f 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/cached/CachedThreadPool.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/cached/CachedThreadPool.java @@ -22,7 +22,7 @@ package org.elasticsearch.threadpool.cached; import org.elasticsearch.threadpool.support.AbstractThreadPool; import org.elasticsearch.util.TimeValue; import org.elasticsearch.util.concurrent.DynamicExecutors; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.concurrent.Executors; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/cached/CachedThreadPoolManagement.java b/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/cached/CachedThreadPoolManagement.java index 36f58f3c585..9ceae8b4b4b 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/cached/CachedThreadPoolManagement.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/cached/CachedThreadPoolManagement.java @@ -22,7 +22,7 @@ package org.elasticsearch.threadpool.cached; import org.elasticsearch.jmx.MBean; import org.elasticsearch.jmx.ManagedAttribute; import org.elasticsearch.threadpool.ThreadPool; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/cached/CachedThreadPoolModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/cached/CachedThreadPoolModule.java index 666c037c765..6f7c094a0f0 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/cached/CachedThreadPoolModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/cached/CachedThreadPoolModule.java @@ -20,7 +20,7 @@ package org.elasticsearch.threadpool.cached; import org.elasticsearch.threadpool.ThreadPool; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.inject.AbstractModule; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/scaling/ScalingThreadPool.java b/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/scaling/ScalingThreadPool.java index 69533da7fea..01d858f46d7 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/scaling/ScalingThreadPool.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/scaling/ScalingThreadPool.java @@ -23,7 +23,7 @@ import org.elasticsearch.threadpool.support.AbstractThreadPool; import org.elasticsearch.util.TimeValue; import org.elasticsearch.util.concurrent.DynamicExecutors; import org.elasticsearch.util.concurrent.ScalingThreadPoolExecutor; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.settings.Settings; import java.util.concurrent.Executors; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/scaling/ScalingThreadPoolManagement.java b/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/scaling/ScalingThreadPoolManagement.java index afe0f0035a5..4b88245a0e0 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/scaling/ScalingThreadPoolManagement.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/scaling/ScalingThreadPoolManagement.java @@ -22,7 +22,7 @@ package org.elasticsearch.threadpool.scaling; import org.elasticsearch.jmx.MBean; import org.elasticsearch.jmx.ManagedAttribute; import org.elasticsearch.threadpool.ThreadPool; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/scaling/ScalingThreadPoolModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/scaling/ScalingThreadPoolModule.java index 7092b426643..3610ebb6799 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/scaling/ScalingThreadPoolModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/scaling/ScalingThreadPoolModule.java @@ -20,7 +20,7 @@ package org.elasticsearch.threadpool.scaling; import org.elasticsearch.threadpool.ThreadPool; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.inject.AbstractModule; /** * @author kimchy (shay.banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/timer/TimerModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/timer/TimerModule.java index c4e0dd4ea44..84c44ed6397 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/timer/TimerModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/timer/TimerModule.java @@ -19,7 +19,7 @@ package org.elasticsearch.timer; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.inject.AbstractModule; /** * @author kimchy (Shay Banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/timer/TimerService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/timer/TimerService.java index 4a3d416fc18..b98de11a60b 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/timer/TimerService.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/timer/TimerService.java @@ -19,7 +19,7 @@ package org.elasticsearch.timer; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.util.TimeValue; import org.elasticsearch.util.component.AbstractComponent; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportModule.java index 54457fc4f51..84cbd0df7d8 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportModule.java @@ -19,8 +19,8 @@ package org.elasticsearch.transport; -import org.elasticsearch.util.guice.inject.AbstractModule; -import org.elasticsearch.util.guice.inject.Module; +import org.elasticsearch.util.inject.AbstractModule; +import org.elasticsearch.util.inject.Module; import org.elasticsearch.transport.local.LocalTransportModule; import org.elasticsearch.util.Classes; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportService.java index 8d1190dfd2e..43812931546 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportService.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportService.java @@ -27,7 +27,7 @@ import org.elasticsearch.util.TimeValue; import org.elasticsearch.util.component.AbstractLifecycleComponent; import org.elasticsearch.util.concurrent.ConcurrentMapLong; import org.elasticsearch.util.concurrent.ConcurrentMaps; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.io.stream.Streamable; import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.timer.Timeout; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportServiceManagement.java b/modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportServiceManagement.java index 18bf5635f3a..bdfe2ad9ad7 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportServiceManagement.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportServiceManagement.java @@ -19,7 +19,7 @@ package org.elasticsearch.transport; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.jmx.MBean; import org.elasticsearch.jmx.ManagedAttribute; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/local/LocalTransport.java b/modules/elasticsearch/src/main/java/org/elasticsearch/transport/local/LocalTransport.java index 002d74e6775..5223d00f27b 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/local/LocalTransport.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/transport/local/LocalTransport.java @@ -19,7 +19,7 @@ package org.elasticsearch.transport.local; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.threadpool.ThreadPool; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/local/LocalTransportManagement.java b/modules/elasticsearch/src/main/java/org/elasticsearch/transport/local/LocalTransportManagement.java index 1202567a291..789ff8dd9f8 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/local/LocalTransportManagement.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/transport/local/LocalTransportManagement.java @@ -21,7 +21,7 @@ package org.elasticsearch.transport.local; import org.elasticsearch.jmx.MBean; import org.elasticsearch.transport.Transport; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; /** * @author kimchy (Shay Banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/local/LocalTransportModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/transport/local/LocalTransportModule.java index ff07aae0c51..b3a172ef2a5 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/local/LocalTransportModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/transport/local/LocalTransportModule.java @@ -19,7 +19,7 @@ package org.elasticsearch.transport.local; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.inject.AbstractModule; import org.elasticsearch.transport.Transport; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java b/modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java index 420e24d3843..30df4e45111 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java @@ -29,7 +29,7 @@ import org.elasticsearch.util.Strings; import org.elasticsearch.util.TimeValue; import org.elasticsearch.util.collect.Lists; import org.elasticsearch.util.component.AbstractLifecycleComponent; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; import org.elasticsearch.util.io.stream.BytesStreamOutput; import org.elasticsearch.util.io.stream.HandlesStreamOutput; import org.elasticsearch.util.io.stream.Streamable; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/NettyTransportManagement.java b/modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/NettyTransportManagement.java index 4091e17d16b..7aeae3de98a 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/NettyTransportManagement.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/NettyTransportManagement.java @@ -22,7 +22,7 @@ package org.elasticsearch.transport.netty; import org.elasticsearch.jmx.MBean; import org.elasticsearch.jmx.ManagedAttribute; import org.elasticsearch.transport.Transport; -import org.elasticsearch.util.guice.inject.Inject; +import org.elasticsearch.util.inject.Inject; /** * @author kimchy (Shay Banon) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/NettyTransportModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/NettyTransportModule.java index f1796a4d1b5..26e3f11e878 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/NettyTransportModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/NettyTransportModule.java @@ -19,7 +19,7 @@ package org.elasticsearch.transport.netty; -import org.elasticsearch.util.guice.inject.AbstractModule; +import org.elasticsearch.util.inject.AbstractModule; import org.elasticsearch.transport.Transport; /** diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/Injectors.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/Injectors.java index 99b0b5db11b..e87b018a6ed 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/Injectors.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/Injectors.java @@ -20,9 +20,9 @@ package org.elasticsearch.util.guice; import org.elasticsearch.util.collect.Sets; -import org.elasticsearch.util.guice.inject.*; -import org.elasticsearch.util.guice.inject.matcher.Matcher; -import org.elasticsearch.util.guice.inject.name.Names; +import org.elasticsearch.util.inject.*; +import org.elasticsearch.util.inject.matcher.Matcher; +import org.elasticsearch.util.inject.name.Names; import java.lang.reflect.Type; import java.util.Map; @@ -35,7 +35,7 @@ import java.util.Set; public class Injectors { /** - * Returns an instance of the given type with the {@link org.elasticsearch.util.guice.inject.name.Named} + * Returns an instance of the given type with the {@link org.elasticsearch.util.inject.name.Named} * annotation value. *

* This method allows you to switch this code diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/ModulesFactory.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/ModulesFactory.java index f3c72275b67..e479ffb90df 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/ModulesFactory.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/ModulesFactory.java @@ -19,7 +19,7 @@ package org.elasticsearch.util.guice; -import org.elasticsearch.util.guice.inject.Module; +import org.elasticsearch.util.inject.Module; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.util.settings.Settings; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/AbstractModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/AbstractModule.java similarity index 87% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/AbstractModule.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/AbstractModule.java index 77bbc909a77..0517695f641 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/AbstractModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/AbstractModule.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; -import org.elasticsearch.util.guice.inject.binder.AnnotatedBindingBuilder; -import org.elasticsearch.util.guice.inject.binder.AnnotatedConstantBindingBuilder; -import org.elasticsearch.util.guice.inject.binder.LinkedBindingBuilder; -import static org.elasticsearch.util.guice.inject.internal.Preconditions.checkNotNull; -import static org.elasticsearch.util.guice.inject.internal.Preconditions.checkState; -import org.elasticsearch.util.guice.inject.matcher.Matcher; -import org.elasticsearch.util.guice.inject.spi.Message; -import org.elasticsearch.util.guice.inject.spi.TypeConverter; -import org.elasticsearch.util.guice.inject.spi.TypeListener; +import org.elasticsearch.util.inject.binder.AnnotatedBindingBuilder; +import org.elasticsearch.util.inject.binder.AnnotatedConstantBindingBuilder; +import org.elasticsearch.util.inject.binder.LinkedBindingBuilder; +import static org.elasticsearch.util.inject.internal.Preconditions.checkNotNull; +import static org.elasticsearch.util.inject.internal.Preconditions.checkState; +import org.elasticsearch.util.inject.matcher.Matcher; +import org.elasticsearch.util.inject.spi.Message; +import org.elasticsearch.util.inject.spi.TypeConverter; +import org.elasticsearch.util.inject.spi.TypeListener; import java.lang.annotation.Annotation; /** @@ -228,8 +228,8 @@ public abstract class AbstractModule implements Module { } /** - * @see Binder#bindListener(org.elasticsearch.util.guice.inject.matcher.Matcher, - * org.elasticsearch.util.guice.inject.spi.TypeListener) + * @see Binder#bindListener(org.elasticsearch.util.inject.matcher.Matcher, + * org.elasticsearch.util.inject.spi.TypeListener) * @since 2.0 */ protected void bindListener(Matcher> typeMatcher, diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/AbstractProcessor.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/AbstractProcessor.java similarity index 77% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/AbstractProcessor.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/AbstractProcessor.java index 32d02fa30f9..6ec020ca4c9 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/AbstractProcessor.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/AbstractProcessor.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; -import org.elasticsearch.util.guice.inject.internal.Errors; -import org.elasticsearch.util.guice.inject.spi.Element; -import org.elasticsearch.util.guice.inject.spi.ElementVisitor; -import org.elasticsearch.util.guice.inject.spi.InjectionRequest; -import org.elasticsearch.util.guice.inject.spi.MembersInjectorLookup; -import org.elasticsearch.util.guice.inject.spi.Message; -import org.elasticsearch.util.guice.inject.spi.PrivateElements; -import org.elasticsearch.util.guice.inject.spi.ProviderLookup; -import org.elasticsearch.util.guice.inject.spi.ScopeBinding; -import org.elasticsearch.util.guice.inject.spi.StaticInjectionRequest; -import org.elasticsearch.util.guice.inject.spi.TypeConverterBinding; -import org.elasticsearch.util.guice.inject.spi.TypeListenerBinding; +import org.elasticsearch.util.inject.internal.Errors; +import org.elasticsearch.util.inject.spi.Element; +import org.elasticsearch.util.inject.spi.ElementVisitor; +import org.elasticsearch.util.inject.spi.InjectionRequest; +import org.elasticsearch.util.inject.spi.MembersInjectorLookup; +import org.elasticsearch.util.inject.spi.Message; +import org.elasticsearch.util.inject.spi.PrivateElements; +import org.elasticsearch.util.inject.spi.ProviderLookup; +import org.elasticsearch.util.inject.spi.ScopeBinding; +import org.elasticsearch.util.inject.spi.StaticInjectionRequest; +import org.elasticsearch.util.inject.spi.TypeConverterBinding; +import org.elasticsearch.util.inject.spi.TypeListenerBinding; import java.util.Iterator; import java.util.List; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Binder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Binder.java similarity index 96% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Binder.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Binder.java index 544c6c77d2e..0d73d55315f 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Binder.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Binder.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; -import org.elasticsearch.util.guice.inject.binder.AnnotatedBindingBuilder; -import org.elasticsearch.util.guice.inject.binder.AnnotatedConstantBindingBuilder; -import org.elasticsearch.util.guice.inject.binder.LinkedBindingBuilder; -import org.elasticsearch.util.guice.inject.matcher.Matcher; -import org.elasticsearch.util.guice.inject.spi.Message; -import org.elasticsearch.util.guice.inject.spi.TypeConverter; -import org.elasticsearch.util.guice.inject.spi.TypeListener; +import org.elasticsearch.util.inject.binder.AnnotatedBindingBuilder; +import org.elasticsearch.util.inject.binder.AnnotatedConstantBindingBuilder; +import org.elasticsearch.util.inject.binder.LinkedBindingBuilder; +import org.elasticsearch.util.inject.matcher.Matcher; +import org.elasticsearch.util.inject.spi.Message; +import org.elasticsearch.util.inject.spi.TypeConverter; +import org.elasticsearch.util.inject.spi.TypeListener; import java.lang.annotation.Annotation; /** @@ -163,7 +163,7 @@ import java.lang.annotation.Annotation; * .to(BlueService.class); * * Differentiating by names is a common enough use case that we provided a - * standard annotation, {@link org.elasticsearch.util.guice.inject.name.Named @Named}. Because of + * standard annotation, {@link org.elasticsearch.util.inject.name.Named @Named}. Because of * Guice's library support, binding by name is quite easier than in the * arbitrary binding annotation case we just saw. However, remember that these * names will live in a single flat namespace with all the other names used in diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Binding.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Binding.java similarity index 91% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Binding.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Binding.java index 3019b7f13cf..6382fa12a7f 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Binding.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Binding.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; -import org.elasticsearch.util.guice.inject.spi.BindingScopingVisitor; -import org.elasticsearch.util.guice.inject.spi.BindingTargetVisitor; -import org.elasticsearch.util.guice.inject.spi.Element; +import org.elasticsearch.util.inject.spi.BindingScopingVisitor; +import org.elasticsearch.util.inject.spi.BindingTargetVisitor; +import org.elasticsearch.util.inject.spi.Element; /** * A mapping from a key (type and optional annotation) to the strategy for getting instances of the @@ -69,7 +69,7 @@ public interface Binding extends Element { * binding. * * @throws UnsupportedOperationException when invoked on a {@link Binding} - * created via {@link org.elasticsearch.util.guice.inject.spi.Elements#getElements}. This + * created via {@link org.elasticsearch.util.inject.spi.Elements#getElements}. This * method is only supported on {@link Binding}s returned from an injector. */ Provider getProvider(); diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/BindingAnnotation.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/BindingAnnotation.java similarity index 96% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/BindingAnnotation.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/BindingAnnotation.java index 2e74033db77..e7859e0e9d4 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/BindingAnnotation.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/BindingAnnotation.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import java.lang.annotation.Retention; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/BindingProcessor.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/BindingProcessor.java similarity index 98% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/BindingProcessor.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/BindingProcessor.java index 8dd79f30cfa..ce5787d294e 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/BindingProcessor.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/BindingProcessor.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; import org.elasticsearch.util.collect.ImmutableSet; import org.elasticsearch.util.collect.Lists; -import org.elasticsearch.util.guice.inject.internal.*; -import org.elasticsearch.util.guice.inject.spi.*; +import org.elasticsearch.util.inject.internal.*; +import org.elasticsearch.util.inject.spi.*; import java.util.List; import java.util.Set; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/BoundProviderFactory.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/BoundProviderFactory.java similarity index 81% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/BoundProviderFactory.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/BoundProviderFactory.java index 828a8ef880c..eab8faf0166 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/BoundProviderFactory.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/BoundProviderFactory.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; -import org.elasticsearch.util.guice.inject.BindingProcessor.CreationListener; -import org.elasticsearch.util.guice.inject.internal.Errors; -import org.elasticsearch.util.guice.inject.internal.ErrorsException; -import org.elasticsearch.util.guice.inject.internal.InternalContext; -import org.elasticsearch.util.guice.inject.internal.InternalFactory; -import org.elasticsearch.util.guice.inject.spi.Dependency; +import org.elasticsearch.util.inject.BindingProcessor.CreationListener; +import org.elasticsearch.util.inject.internal.Errors; +import org.elasticsearch.util.inject.internal.ErrorsException; +import org.elasticsearch.util.inject.internal.InternalContext; +import org.elasticsearch.util.inject.internal.InternalFactory; +import org.elasticsearch.util.inject.spi.Dependency; /** * Delegates to a custom factory which is also bound in the injector. diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ConfigurationException.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ConfigurationException.java similarity index 91% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ConfigurationException.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ConfigurationException.java index 3be156a94a7..acf28ca8eb9 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ConfigurationException.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ConfigurationException.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; import org.elasticsearch.util.collect.ImmutableSet; -import org.elasticsearch.util.guice.inject.internal.Errors; -import org.elasticsearch.util.guice.inject.spi.Message; +import org.elasticsearch.util.inject.internal.Errors; +import org.elasticsearch.util.inject.spi.Message; import java.util.Collection; -import static org.elasticsearch.util.guice.inject.internal.Preconditions.*; +import static org.elasticsearch.util.inject.internal.Preconditions.*; /** * Thrown when a programming error such as a misplaced annotation, illegal binding, or unsupported diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ConstantFactory.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ConstantFactory.java similarity index 72% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ConstantFactory.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ConstantFactory.java index 7cf9283ee06..40413ea4e60 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ConstantFactory.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ConstantFactory.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; -import org.elasticsearch.util.guice.inject.internal.Errors; -import org.elasticsearch.util.guice.inject.internal.ErrorsException; -import org.elasticsearch.util.guice.inject.internal.InternalContext; -import org.elasticsearch.util.guice.inject.internal.InternalFactory; -import org.elasticsearch.util.guice.inject.internal.ToStringBuilder; -import org.elasticsearch.util.guice.inject.spi.Dependency; +import org.elasticsearch.util.inject.internal.Errors; +import org.elasticsearch.util.inject.internal.ErrorsException; +import org.elasticsearch.util.inject.internal.InternalContext; +import org.elasticsearch.util.inject.internal.InternalFactory; +import org.elasticsearch.util.inject.internal.ToStringBuilder; +import org.elasticsearch.util.inject.spi.Dependency; /** * @author crazybob@google.com (Bob Lee) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ConstructionProxy.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ConstructionProxy.java similarity index 92% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ConstructionProxy.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ConstructionProxy.java index b8c12fe9621..5835c2fae34 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ConstructionProxy.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ConstructionProxy.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; -import org.elasticsearch.util.guice.inject.spi.InjectionPoint; +import org.elasticsearch.util.inject.spi.InjectionPoint; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ConstructionProxyFactory.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ConstructionProxyFactory.java similarity index 94% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ConstructionProxyFactory.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ConstructionProxyFactory.java index 987f55a21ac..112ce7a4428 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ConstructionProxyFactory.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ConstructionProxyFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; /** * Creates {@link ConstructionProxy} instances. diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ConstructorBindingImpl.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ConstructorBindingImpl.java similarity index 88% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ConstructorBindingImpl.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ConstructorBindingImpl.java index 12dbf911c6f..08c4024c803 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ConstructorBindingImpl.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ConstructorBindingImpl.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; import org.elasticsearch.util.collect.ImmutableSet; -import org.elasticsearch.util.guice.inject.internal.*; -import org.elasticsearch.util.guice.inject.spi.BindingTargetVisitor; -import org.elasticsearch.util.guice.inject.spi.ConstructorBinding; -import org.elasticsearch.util.guice.inject.spi.Dependency; -import org.elasticsearch.util.guice.inject.spi.InjectionPoint; +import org.elasticsearch.util.inject.internal.*; +import org.elasticsearch.util.inject.spi.BindingTargetVisitor; +import org.elasticsearch.util.inject.spi.ConstructorBinding; +import org.elasticsearch.util.inject.spi.Dependency; +import org.elasticsearch.util.inject.spi.InjectionPoint; import java.util.Set; -import static org.elasticsearch.util.guice.inject.internal.Preconditions.*; +import static org.elasticsearch.util.inject.internal.Preconditions.*; class ConstructorBindingImpl extends BindingImpl implements ConstructorBinding { diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ConstructorInjector.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ConstructorInjector.java similarity index 90% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ConstructorInjector.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ConstructorInjector.java index cf15aa6bd61..0d960414676 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ConstructorInjector.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ConstructorInjector.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; import org.elasticsearch.util.collect.ImmutableSet; -import org.elasticsearch.util.guice.inject.internal.ConstructionContext; -import org.elasticsearch.util.guice.inject.internal.Errors; -import org.elasticsearch.util.guice.inject.internal.ErrorsException; -import org.elasticsearch.util.guice.inject.internal.InternalContext; -import org.elasticsearch.util.guice.inject.spi.InjectionPoint; +import org.elasticsearch.util.inject.internal.ConstructionContext; +import org.elasticsearch.util.inject.internal.Errors; +import org.elasticsearch.util.inject.internal.ErrorsException; +import org.elasticsearch.util.inject.internal.InternalContext; +import org.elasticsearch.util.inject.spi.InjectionPoint; import java.lang.reflect.InvocationTargetException; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ConstructorInjectorStore.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ConstructorInjectorStore.java similarity index 87% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ConstructorInjectorStore.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ConstructorInjectorStore.java index eb08c184e69..c7d28f63205 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ConstructorInjectorStore.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ConstructorInjectorStore.java @@ -14,14 +14,12 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; -import org.elasticsearch.util.guice.inject.internal.Errors; -import org.elasticsearch.util.guice.inject.internal.ErrorsException; -import org.elasticsearch.util.guice.inject.internal.FailableCache; -import org.elasticsearch.util.guice.inject.spi.InjectionPoint; - -import static org.elasticsearch.util.collect.Iterables.*; +import org.elasticsearch.util.inject.internal.Errors; +import org.elasticsearch.util.inject.internal.ErrorsException; +import org.elasticsearch.util.inject.internal.FailableCache; +import org.elasticsearch.util.inject.spi.InjectionPoint; /** * Constructor injectors by type. diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ContextualCallable.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ContextualCallable.java similarity index 80% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ContextualCallable.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ContextualCallable.java index 5955db05195..67d3c45372a 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ContextualCallable.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ContextualCallable.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; -import org.elasticsearch.util.guice.inject.internal.ErrorsException; -import org.elasticsearch.util.guice.inject.internal.InternalContext; +import org.elasticsearch.util.inject.internal.ErrorsException; +import org.elasticsearch.util.inject.internal.InternalContext; /** * @author crazybob@google.com (Bob Lee) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/CreationException.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/CreationException.java similarity index 87% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/CreationException.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/CreationException.java index cbba69e8d6a..490698ba771 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/CreationException.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/CreationException.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; import org.elasticsearch.util.collect.ImmutableSet; -import org.elasticsearch.util.guice.inject.internal.Errors; -import org.elasticsearch.util.guice.inject.spi.Message; +import org.elasticsearch.util.inject.internal.Errors; +import org.elasticsearch.util.inject.spi.Message; import java.util.Collection; -import static org.elasticsearch.util.guice.inject.internal.Preconditions.*; +import static org.elasticsearch.util.inject.internal.Preconditions.*; /** * Thrown when errors occur while creating a {@link Injector}. Includes a list of encountered diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/DefaultConstructionProxyFactory.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/DefaultConstructionProxyFactory.java similarity index 95% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/DefaultConstructionProxyFactory.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/DefaultConstructionProxyFactory.java index 491e0404125..e9d43aac956 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/DefaultConstructionProxyFactory.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/DefaultConstructionProxyFactory.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; -import org.elasticsearch.util.guice.inject.spi.InjectionPoint; +import org.elasticsearch.util.inject.spi.InjectionPoint; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Modifier; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/DeferredLookups.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/DeferredLookups.java similarity index 85% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/DeferredLookups.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/DeferredLookups.java index a1c0fc5d9ef..1af59f2fcbc 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/DeferredLookups.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/DeferredLookups.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; import org.elasticsearch.util.collect.Lists; -import org.elasticsearch.util.guice.inject.internal.Errors; -import org.elasticsearch.util.guice.inject.spi.Element; -import org.elasticsearch.util.guice.inject.spi.MembersInjectorLookup; -import org.elasticsearch.util.guice.inject.spi.ProviderLookup; +import org.elasticsearch.util.inject.internal.Errors; +import org.elasticsearch.util.inject.spi.Element; +import org.elasticsearch.util.inject.spi.MembersInjectorLookup; +import org.elasticsearch.util.inject.spi.ProviderLookup; import java.util.List; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/EncounterImpl.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/EncounterImpl.java similarity index 90% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/EncounterImpl.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/EncounterImpl.java index 161aeed6861..67fe447398c 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/EncounterImpl.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/EncounterImpl.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; import org.elasticsearch.util.collect.ImmutableList; import org.elasticsearch.util.collect.Lists; -import org.elasticsearch.util.guice.inject.internal.Errors; -import org.elasticsearch.util.guice.inject.spi.InjectionListener; -import org.elasticsearch.util.guice.inject.spi.Message; -import org.elasticsearch.util.guice.inject.spi.TypeEncounter; +import org.elasticsearch.util.inject.internal.Errors; +import org.elasticsearch.util.inject.spi.InjectionListener; +import org.elasticsearch.util.inject.spi.Message; +import org.elasticsearch.util.inject.spi.TypeEncounter; import java.util.List; -import static org.elasticsearch.util.guice.inject.internal.Preconditions.*; +import static org.elasticsearch.util.inject.internal.Preconditions.*; /** * @author jessewilson@google.com (Jesse Wilson) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Exposed.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Exposed.java similarity index 86% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Exposed.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Exposed.java index abe0414aaa6..5615f45fbbe 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Exposed.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Exposed.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -23,7 +23,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** - * Acccompanies a {@literal @}{@link org.elasticsearch.util.guice.inject.Provides Provides} method annotation in a + * Acccompanies a {@literal @}{@link org.elasticsearch.util.inject.Provides Provides} method annotation in a * private module to indicate that the provided binding is exposed. * * @author jessewilson@google.com (Jesse Wilson) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ExposedKeyFactory.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ExposedKeyFactory.java similarity index 79% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ExposedKeyFactory.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ExposedKeyFactory.java index 8f3645f6446..4193241c7a4 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ExposedKeyFactory.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ExposedKeyFactory.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; -import org.elasticsearch.util.guice.inject.internal.BindingImpl; -import org.elasticsearch.util.guice.inject.internal.Errors; -import org.elasticsearch.util.guice.inject.internal.ErrorsException; -import org.elasticsearch.util.guice.inject.internal.InternalContext; -import org.elasticsearch.util.guice.inject.internal.InternalFactory; -import org.elasticsearch.util.guice.inject.spi.Dependency; -import org.elasticsearch.util.guice.inject.spi.PrivateElements; +import org.elasticsearch.util.inject.internal.BindingImpl; +import org.elasticsearch.util.inject.internal.Errors; +import org.elasticsearch.util.inject.internal.ErrorsException; +import org.elasticsearch.util.inject.internal.InternalContext; +import org.elasticsearch.util.inject.internal.InternalFactory; +import org.elasticsearch.util.inject.spi.Dependency; +import org.elasticsearch.util.inject.spi.PrivateElements; /** * This factory exists in a parent injector. When invoked, it retrieves its value from a child diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/FactoryProxy.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/FactoryProxy.java similarity index 80% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/FactoryProxy.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/FactoryProxy.java index a7e2afddee3..38ca8a626db 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/FactoryProxy.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/FactoryProxy.java @@ -15,14 +15,14 @@ */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; -import org.elasticsearch.util.guice.inject.internal.Errors; -import org.elasticsearch.util.guice.inject.internal.ErrorsException; -import org.elasticsearch.util.guice.inject.internal.InternalContext; -import org.elasticsearch.util.guice.inject.internal.InternalFactory; -import org.elasticsearch.util.guice.inject.internal.ToStringBuilder; -import org.elasticsearch.util.guice.inject.spi.Dependency; +import org.elasticsearch.util.inject.internal.Errors; +import org.elasticsearch.util.inject.internal.ErrorsException; +import org.elasticsearch.util.inject.internal.InternalContext; +import org.elasticsearch.util.inject.internal.InternalFactory; +import org.elasticsearch.util.inject.internal.ToStringBuilder; +import org.elasticsearch.util.inject.spi.Dependency; /** * A placeholder which enables us to swap in the real factory once the injector is created. diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Guice.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Guice.java similarity index 98% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Guice.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Guice.java index bede4956cec..57919a4b096 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Guice.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Guice.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; import java.util.Arrays; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ImplementedBy.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ImplementedBy.java similarity index 95% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ImplementedBy.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ImplementedBy.java index 9b5277a0aca..b5a9f3c07cd 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ImplementedBy.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ImplementedBy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; import static java.lang.annotation.ElementType.TYPE; import java.lang.annotation.Retention; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/InheritingState.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/InheritingState.java similarity index 91% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/InheritingState.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/InheritingState.java index e1991bf3e8c..d680414919e 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/InheritingState.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/InheritingState.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; import org.elasticsearch.util.collect.Lists; import org.elasticsearch.util.collect.Maps; -import org.elasticsearch.util.guice.inject.internal.BindingImpl; -import org.elasticsearch.util.guice.inject.internal.Errors; -import org.elasticsearch.util.guice.inject.internal.MatcherAndConverter; -import org.elasticsearch.util.guice.inject.spi.TypeListenerBinding; +import org.elasticsearch.util.inject.internal.BindingImpl; +import org.elasticsearch.util.inject.internal.Errors; +import org.elasticsearch.util.inject.internal.MatcherAndConverter; +import org.elasticsearch.util.inject.spi.TypeListenerBinding; import java.lang.annotation.Annotation; import java.util.ArrayList; @@ -29,7 +29,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import static org.elasticsearch.util.guice.inject.internal.Preconditions.*; +import static org.elasticsearch.util.inject.internal.Preconditions.*; /** * @author jessewilson@google.com (Jesse Wilson) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Initializable.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Initializable.java similarity index 83% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Initializable.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Initializable.java index 68a8e06adf2..39ecbd046e2 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Initializable.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Initializable.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; -import org.elasticsearch.util.guice.inject.internal.Errors; -import org.elasticsearch.util.guice.inject.internal.ErrorsException; +import org.elasticsearch.util.inject.internal.Errors; +import org.elasticsearch.util.inject.internal.ErrorsException; /** * Holds a reference that requires initialization to be performed before it can be used. diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Initializables.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Initializables.java similarity index 85% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Initializables.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Initializables.java index 1893a8bfae0..872149e5a2d 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Initializables.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Initializables.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; -import org.elasticsearch.util.guice.inject.internal.Errors; -import org.elasticsearch.util.guice.inject.internal.ErrorsException; +import org.elasticsearch.util.inject.internal.Errors; +import org.elasticsearch.util.inject.internal.ErrorsException; /** * @author jessewilson@google.com (Jesse Wilson) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Initializer.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Initializer.java similarity index 94% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Initializer.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Initializer.java index 34f87197887..c464a329ce2 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Initializer.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Initializer.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; import org.elasticsearch.util.collect.Lists; import org.elasticsearch.util.collect.Maps; -import org.elasticsearch.util.guice.inject.internal.Errors; -import org.elasticsearch.util.guice.inject.internal.ErrorsException; -import org.elasticsearch.util.guice.inject.spi.InjectionPoint; +import org.elasticsearch.util.inject.internal.Errors; +import org.elasticsearch.util.inject.internal.ErrorsException; +import org.elasticsearch.util.inject.spi.InjectionPoint; import java.util.Map; import java.util.Set; import java.util.concurrent.CountDownLatch; -import static org.elasticsearch.util.guice.inject.internal.Preconditions.*; +import static org.elasticsearch.util.inject.internal.Preconditions.*; /** * Manages and injects instances at injector-creation time. This is made more complicated by diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Inject.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Inject.java similarity index 91% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Inject.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Inject.java index 2e173f68c38..776307b9d7a 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Inject.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Inject.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.CONSTRUCTOR; @@ -36,8 +36,8 @@ import java.lang.annotation.Target; * method and field injections. * *

  • Pre-constructed instances passed to {@link Injector#injectMembers}, - * {@link org.elasticsearch.util.guice.inject.binder.LinkedBindingBuilder#toInstance(Object)} and - * {@link org.elasticsearch.util.guice.inject.binder.LinkedBindingBuilder#toProvider(Provider)}. + * {@link org.elasticsearch.util.inject.binder.LinkedBindingBuilder#toInstance(Object)} and + * {@link org.elasticsearch.util.inject.binder.LinkedBindingBuilder#toProvider(Provider)}. * In this case all constructors are, of course, ignored. * *
  • Static fields and methods of classes which any {@link Module} has diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/InjectionRequestProcessor.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/InjectionRequestProcessor.java similarity index 88% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/InjectionRequestProcessor.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/InjectionRequestProcessor.java index 2106e787c8f..5380f9bd604 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/InjectionRequestProcessor.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/InjectionRequestProcessor.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; import org.elasticsearch.util.collect.ImmutableList; import org.elasticsearch.util.collect.Lists; -import org.elasticsearch.util.guice.inject.internal.Errors; -import org.elasticsearch.util.guice.inject.internal.ErrorsException; -import org.elasticsearch.util.guice.inject.internal.InternalContext; -import org.elasticsearch.util.guice.inject.spi.InjectionPoint; -import org.elasticsearch.util.guice.inject.spi.InjectionRequest; -import org.elasticsearch.util.guice.inject.spi.StaticInjectionRequest; +import org.elasticsearch.util.inject.internal.Errors; +import org.elasticsearch.util.inject.internal.ErrorsException; +import org.elasticsearch.util.inject.internal.InternalContext; +import org.elasticsearch.util.inject.spi.InjectionPoint; +import org.elasticsearch.util.inject.spi.InjectionRequest; +import org.elasticsearch.util.inject.spi.StaticInjectionRequest; import java.util.List; import java.util.Set; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Injector.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Injector.java similarity index 99% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Injector.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Injector.java index b2ad32e6545..9f1c54ecfbe 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Injector.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Injector.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; import java.util.List; import java.util.Map; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/InjectorBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/InjectorBuilder.java similarity index 98% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/InjectorBuilder.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/InjectorBuilder.java index 749218a3825..c2883605849 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/InjectorBuilder.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/InjectorBuilder.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; import org.elasticsearch.util.collect.ImmutableSet; import org.elasticsearch.util.collect.Iterables; -import org.elasticsearch.util.guice.inject.internal.*; -import org.elasticsearch.util.guice.inject.spi.Dependency; +import org.elasticsearch.util.inject.internal.*; +import org.elasticsearch.util.inject.spi.Dependency; import java.util.Collection; import java.util.List; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/InjectorImpl.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/InjectorImpl.java similarity index 98% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/InjectorImpl.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/InjectorImpl.java index b4fe0c19931..c6092b6e0aa 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/InjectorImpl.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/InjectorImpl.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; import org.elasticsearch.util.Classes; import org.elasticsearch.util.collect.ImmutableList; import org.elasticsearch.util.collect.ImmutableSet; import org.elasticsearch.util.collect.Lists; import org.elasticsearch.util.collect.Maps; -import org.elasticsearch.util.guice.inject.internal.*; -import org.elasticsearch.util.guice.inject.spi.*; -import org.elasticsearch.util.guice.inject.util.Providers; +import org.elasticsearch.util.inject.internal.*; +import org.elasticsearch.util.inject.spi.*; +import org.elasticsearch.util.inject.util.Providers; import java.lang.annotation.Annotation; import java.lang.reflect.*; @@ -32,7 +32,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static org.elasticsearch.util.guice.inject.internal.Annotations.*; +import static org.elasticsearch.util.inject.internal.Annotations.*; /** * Default {@link Injector} implementation. @@ -249,7 +249,7 @@ class InjectorImpl implements Injector, Lookups { * Converts a constant string binding to the required type. * * @return the binding if it could be resolved, or null if the binding doesn't exist - * @throws org.elasticsearch.util.guice.inject.internal.ErrorsException if there was an error resolving the binding + * @throws org.elasticsearch.util.inject.internal.ErrorsException if there was an error resolving the binding */ private BindingImpl convertConstantStringBinding(Key key, Errors errors) throws ErrorsException { @@ -575,7 +575,7 @@ class InjectorImpl implements Injector, Lookups { *
  • The constructor of the raw type. Only for unannotated keys. * * - * @throws org.elasticsearch.util.guice.inject.internal.ErrorsException if the binding cannot be created. + * @throws org.elasticsearch.util.inject.internal.ErrorsException if the binding cannot be created. */ BindingImpl createJustInTimeBinding(Key key, Errors errors) throws ErrorsException { if (state.isBlacklisted(key)) { diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/InjectorShell.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/InjectorShell.java similarity index 96% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/InjectorShell.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/InjectorShell.java index 2ed8a90630b..177a45cf603 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/InjectorShell.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/InjectorShell.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; import org.elasticsearch.util.collect.ImmutableSet; import org.elasticsearch.util.collect.Lists; -import org.elasticsearch.util.guice.inject.internal.*; -import org.elasticsearch.util.guice.inject.spi.*; +import org.elasticsearch.util.inject.internal.*; +import org.elasticsearch.util.inject.spi.*; import java.util.List; import java.util.logging.Logger; -import static org.elasticsearch.util.guice.inject.Scopes.*; -import static org.elasticsearch.util.guice.inject.internal.Preconditions.*; +import static org.elasticsearch.util.inject.Scopes.*; +import static org.elasticsearch.util.inject.internal.Preconditions.*; /** * A partially-initialized injector. See {@link InjectorBuilder}, which uses this to build a tree diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/InternalFactoryToProviderAdapter.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/InternalFactoryToProviderAdapter.java similarity index 75% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/InternalFactoryToProviderAdapter.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/InternalFactoryToProviderAdapter.java index 73a46c1a739..5c6fef6b685 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/InternalFactoryToProviderAdapter.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/InternalFactoryToProviderAdapter.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; -import org.elasticsearch.util.guice.inject.internal.Errors; -import org.elasticsearch.util.guice.inject.internal.ErrorsException; -import org.elasticsearch.util.guice.inject.internal.InternalContext; -import org.elasticsearch.util.guice.inject.internal.InternalFactory; -import static org.elasticsearch.util.guice.inject.internal.Preconditions.checkNotNull; -import org.elasticsearch.util.guice.inject.internal.SourceProvider; -import org.elasticsearch.util.guice.inject.spi.Dependency; +import org.elasticsearch.util.inject.internal.Errors; +import org.elasticsearch.util.inject.internal.ErrorsException; +import org.elasticsearch.util.inject.internal.InternalContext; +import org.elasticsearch.util.inject.internal.InternalFactory; +import static org.elasticsearch.util.inject.internal.Preconditions.checkNotNull; +import org.elasticsearch.util.inject.internal.SourceProvider; +import org.elasticsearch.util.inject.spi.Dependency; /** * @author crazybob@google.com (Bob Lee) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Key.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Key.java similarity index 97% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Key.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Key.java index 5da902e5eff..d9e8f9a5abb 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Key.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Key.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; -import org.elasticsearch.util.guice.inject.internal.Annotations; -import org.elasticsearch.util.guice.inject.internal.MoreTypes; -import static org.elasticsearch.util.guice.inject.internal.Preconditions.checkArgument; -import static org.elasticsearch.util.guice.inject.internal.Preconditions.checkNotNull; -import org.elasticsearch.util.guice.inject.internal.ToStringBuilder; +import org.elasticsearch.util.inject.internal.Annotations; +import org.elasticsearch.util.inject.internal.MoreTypes; +import static org.elasticsearch.util.inject.internal.Preconditions.checkArgument; +import static org.elasticsearch.util.inject.internal.Preconditions.checkNotNull; +import org.elasticsearch.util.inject.internal.ToStringBuilder; import java.lang.annotation.Annotation; import java.lang.reflect.Type; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/LookupProcessor.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/LookupProcessor.java similarity index 84% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/LookupProcessor.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/LookupProcessor.java index 7cded6fd497..cf3ba337353 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/LookupProcessor.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/LookupProcessor.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; -import org.elasticsearch.util.guice.inject.internal.Errors; -import org.elasticsearch.util.guice.inject.internal.ErrorsException; -import org.elasticsearch.util.guice.inject.spi.MembersInjectorLookup; -import org.elasticsearch.util.guice.inject.spi.ProviderLookup; +import org.elasticsearch.util.inject.internal.Errors; +import org.elasticsearch.util.inject.internal.ErrorsException; +import org.elasticsearch.util.inject.spi.MembersInjectorLookup; +import org.elasticsearch.util.inject.spi.ProviderLookup; /** * Handles {@link Binder#getProvider} and {@link Binder#getMembersInjector(TypeLiteral)} commands. diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Lookups.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Lookups.java similarity index 95% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Lookups.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Lookups.java index 085459753c0..b60bcbd7a25 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Lookups.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Lookups.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; /** * Accessors for providers and members injectors. The returned values will not be functional until diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/MembersInjector.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/MembersInjector.java similarity index 96% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/MembersInjector.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/MembersInjector.java index 65d32f73c9d..ea55b9029dd 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/MembersInjector.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/MembersInjector.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; /** * Injects dependencies into the fields and methods on instances of type {@code T}. Ignores the diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/MembersInjectorImpl.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/MembersInjectorImpl.java similarity index 91% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/MembersInjectorImpl.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/MembersInjectorImpl.java index d7a9c6e508c..5eb43a689dc 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/MembersInjectorImpl.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/MembersInjectorImpl.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; import org.elasticsearch.util.collect.ImmutableList; import org.elasticsearch.util.collect.ImmutableSet; -import org.elasticsearch.util.guice.inject.internal.Errors; -import org.elasticsearch.util.guice.inject.internal.ErrorsException; -import org.elasticsearch.util.guice.inject.internal.InternalContext; -import org.elasticsearch.util.guice.inject.spi.InjectionListener; -import org.elasticsearch.util.guice.inject.spi.InjectionPoint; +import org.elasticsearch.util.inject.internal.Errors; +import org.elasticsearch.util.inject.internal.ErrorsException; +import org.elasticsearch.util.inject.internal.InternalContext; +import org.elasticsearch.util.inject.spi.InjectionListener; +import org.elasticsearch.util.inject.spi.InjectionPoint; /** * Injects members of instances of a given type. diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/MembersInjectorStore.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/MembersInjectorStore.java similarity index 91% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/MembersInjectorStore.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/MembersInjectorStore.java index c9ca2a35e48..a2bebfa8bb9 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/MembersInjectorStore.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/MembersInjectorStore.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; import org.elasticsearch.util.collect.ImmutableList; import org.elasticsearch.util.collect.Lists; -import org.elasticsearch.util.guice.inject.internal.Errors; -import org.elasticsearch.util.guice.inject.internal.ErrorsException; -import org.elasticsearch.util.guice.inject.internal.FailableCache; -import org.elasticsearch.util.guice.inject.spi.InjectionPoint; -import org.elasticsearch.util.guice.inject.spi.TypeListenerBinding; +import org.elasticsearch.util.inject.internal.Errors; +import org.elasticsearch.util.inject.internal.ErrorsException; +import org.elasticsearch.util.inject.internal.FailableCache; +import org.elasticsearch.util.inject.spi.InjectionPoint; +import org.elasticsearch.util.inject.spi.TypeListenerBinding; import java.lang.reflect.Field; import java.util.List; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/MessageProcessor.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/MessageProcessor.java similarity index 90% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/MessageProcessor.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/MessageProcessor.java index 33369861838..6dce552ea89 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/MessageProcessor.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/MessageProcessor.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; -import org.elasticsearch.util.guice.inject.internal.Errors; -import org.elasticsearch.util.guice.inject.spi.Message; +import org.elasticsearch.util.inject.internal.Errors; +import org.elasticsearch.util.inject.spi.Message; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Module.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Module.java similarity index 97% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Module.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Module.java index 228881805fd..a1a092ace6a 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Module.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Module.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; /** * A module contributes configuration information, typically interface diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/OutOfScopeException.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/OutOfScopeException.java similarity index 96% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/OutOfScopeException.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/OutOfScopeException.java index 6994f98c17d..9d85e130053 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/OutOfScopeException.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/OutOfScopeException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; /** * Thrown from {@link Provider#get} when an attempt is made to access a scoped diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/PrivateBinder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/PrivateBinder.java similarity index 81% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/PrivateBinder.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/PrivateBinder.java index 9b51c9ea17c..c6f46da0758 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/PrivateBinder.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/PrivateBinder.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; -import org.elasticsearch.util.guice.inject.binder.AnnotatedElementBuilder; +import org.elasticsearch.util.inject.binder.AnnotatedElementBuilder; /** * Returns a binder whose configuration information is hidden from its environment by default. See - * {@link org.elasticsearch.util.guice.inject.PrivateModule PrivateModule} for details. + * {@link org.elasticsearch.util.inject.PrivateModule PrivateModule} for details. * * @author jessewilson@google.com (Jesse Wilson) * @since 2.0 @@ -32,7 +32,7 @@ public interface PrivateBinder extends Binder { /** * Makes a binding for {@code type} available to the enclosing environment. Use {@link - * org.elasticsearch.util.guice.inject.binder.AnnotatedElementBuilder#annotatedWith(Class) annotatedWith()} to expose {@code type} with a + * org.elasticsearch.util.inject.binder.AnnotatedElementBuilder#annotatedWith(Class) annotatedWith()} to expose {@code type} with a * binding annotation. */ AnnotatedElementBuilder expose(Class type); diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/PrivateElementProcessor.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/PrivateElementProcessor.java similarity index 89% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/PrivateElementProcessor.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/PrivateElementProcessor.java index 1baf73b4364..911f8410248 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/PrivateElementProcessor.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/PrivateElementProcessor.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; import org.elasticsearch.util.collect.Lists; -import org.elasticsearch.util.guice.inject.internal.Errors; -import org.elasticsearch.util.guice.inject.spi.PrivateElements; +import org.elasticsearch.util.inject.internal.Errors; +import org.elasticsearch.util.inject.spi.PrivateElements; import java.util.List; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/PrivateModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/PrivateModule.java similarity index 88% rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/PrivateModule.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/PrivateModule.java index 420ccba75b1..3a0f3f57bc7 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/PrivateModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/PrivateModule.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.elasticsearch.util.guice.inject; +package org.elasticsearch.util.inject; -import org.elasticsearch.util.guice.inject.binder.AnnotatedBindingBuilder; -import org.elasticsearch.util.guice.inject.binder.AnnotatedConstantBindingBuilder; -import org.elasticsearch.util.guice.inject.binder.AnnotatedElementBuilder; -import org.elasticsearch.util.guice.inject.binder.LinkedBindingBuilder; -import static org.elasticsearch.util.guice.inject.internal.Preconditions.checkState; -import org.elasticsearch.util.guice.inject.matcher.Matcher; -import org.elasticsearch.util.guice.inject.spi.Message; -import org.elasticsearch.util.guice.inject.spi.TypeConverter; -import org.elasticsearch.util.guice.inject.spi.TypeListener; +import org.elasticsearch.util.inject.binder.AnnotatedBindingBuilder; +import org.elasticsearch.util.inject.binder.AnnotatedConstantBindingBuilder; +import org.elasticsearch.util.inject.binder.AnnotatedElementBuilder; +import org.elasticsearch.util.inject.binder.LinkedBindingBuilder; +import static org.elasticsearch.util.inject.internal.Preconditions.checkState; +import org.elasticsearch.util.inject.matcher.Matcher; +import org.elasticsearch.util.inject.spi.Message; +import org.elasticsearch.util.inject.spi.TypeConverter; +import org.elasticsearch.util.inject.spi.TypeListener; import java.lang.annotation.Annotation; /** @@ -39,7 +39,7 @@ import java.lang.annotation.Annotation; * environment is the root. * *

    Guice EDSL bindings can be exposed with {@link #expose(Class) expose()}. {@literal @}{@link - * org.elasticsearch.util.guice.inject.Provides Provides} bindings can be exposed with the {@literal @}{@link + * org.elasticsearch.util.inject.Provides Provides} bindings can be exposed with the {@literal @}{@link * Exposed} annotation: * * 

    @@ -243,7 +243,7 @@ public abstract class PrivateModule implements Module {
   }
 
   /**
-   * @see Binder#convertToTypes(org.elasticsearch.util.guice.inject.matcher.Matcher, org.elasticsearch.util.guice.inject.spi.TypeConverter)
+   * @see Binder#convertToTypes(org.elasticsearch.util.inject.matcher.Matcher, org.elasticsearch.util.inject.spi.TypeConverter)
    */
   protected final void convertToTypes(Matcher> typeMatcher,
       TypeConverter converter) {
@@ -272,7 +272,7 @@ public abstract class PrivateModule implements Module {
   }
 
   /**
-   * @see Binder#bindListener(org.elasticsearch.util.guice.inject.matcher.Matcher, org.elasticsearch.util.guice.inject.spi.TypeListener)
+   * @see Binder#bindListener(org.elasticsearch.util.inject.matcher.Matcher, org.elasticsearch.util.inject.spi.TypeListener)
    */
   protected void bindListener(Matcher> typeMatcher,
       TypeListener listener) {
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ProvidedBy.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ProvidedBy.java
similarity index 95%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ProvidedBy.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ProvidedBy.java
index a07944bcb14..06c7151d933 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ProvidedBy.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ProvidedBy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject;
+package org.elasticsearch.util.inject;
 
 import static java.lang.annotation.ElementType.TYPE;
 import java.lang.annotation.Retention;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Provider.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Provider.java
similarity index 98%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Provider.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Provider.java
index 26f943f309c..82bc456783f 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Provider.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Provider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject;
+package org.elasticsearch.util.inject;
 
 /**
  * An object capable of providing instances of type {@code T}. Providers are used in numerous ways
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ProviderToInternalFactoryAdapter.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ProviderToInternalFactoryAdapter.java
similarity index 81%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ProviderToInternalFactoryAdapter.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ProviderToInternalFactoryAdapter.java
index e239e1f030f..3df9d5755ff 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ProviderToInternalFactoryAdapter.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ProviderToInternalFactoryAdapter.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject;
+package org.elasticsearch.util.inject;
 
-import org.elasticsearch.util.guice.inject.internal.Errors;
-import org.elasticsearch.util.guice.inject.internal.ErrorsException;
-import org.elasticsearch.util.guice.inject.internal.InternalContext;
-import org.elasticsearch.util.guice.inject.internal.InternalFactory;
-import org.elasticsearch.util.guice.inject.spi.Dependency;
+import org.elasticsearch.util.inject.internal.Errors;
+import org.elasticsearch.util.inject.internal.ErrorsException;
+import org.elasticsearch.util.inject.internal.InternalContext;
+import org.elasticsearch.util.inject.internal.InternalFactory;
+import org.elasticsearch.util.inject.spi.Dependency;
 
 /**
  * @author crazybob@google.com (Bob Lee)
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Provides.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Provides.java
similarity index 96%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Provides.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Provides.java
index 1033d58420b..34adecb9f64 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Provides.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Provides.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject;
+package org.elasticsearch.util.inject;
 
 import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.METHOD;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ProvisionException.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ProvisionException.java
similarity index 88%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ProvisionException.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ProvisionException.java
index 59a81d33def..f98003ab07d 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ProvisionException.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ProvisionException.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject;
+package org.elasticsearch.util.inject;
 
 import org.elasticsearch.util.collect.ImmutableList;
 import org.elasticsearch.util.collect.ImmutableSet;
-import org.elasticsearch.util.guice.inject.internal.Errors;
-import org.elasticsearch.util.guice.inject.spi.Message;
+import org.elasticsearch.util.inject.internal.Errors;
+import org.elasticsearch.util.inject.spi.Message;
 
 import java.util.Collection;
 
-import static org.elasticsearch.util.guice.inject.internal.Preconditions.*;
+import static org.elasticsearch.util.inject.internal.Preconditions.*;
 
 /**
  * Indicates that there was a runtime failure while providing an instance.
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Reflection.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Reflection.java
similarity index 96%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Reflection.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Reflection.java
index 96c51243361..2fcf995d651 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Reflection.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Reflection.java
@@ -15,7 +15,7 @@
  */
 
 
-package org.elasticsearch.util.guice.inject;
+package org.elasticsearch.util.inject;
 
 import java.lang.reflect.Constructor;
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Scope.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Scope.java
similarity index 98%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Scope.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Scope.java
index 1662edd5590..abbe5cc34e4 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Scope.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Scope.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject;
+package org.elasticsearch.util.inject;
 
 /**
  * A scope is a level of visibility that instances provided by Guice may have.
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ScopeAnnotation.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ScopeAnnotation.java
similarity index 96%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ScopeAnnotation.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ScopeAnnotation.java
index 2f284440845..8cba1ca1e5b 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ScopeAnnotation.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ScopeAnnotation.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject;
+package org.elasticsearch.util.inject;
 
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import java.lang.annotation.Retention;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ScopeBindingProcessor.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ScopeBindingProcessor.java
similarity index 85%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ScopeBindingProcessor.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ScopeBindingProcessor.java
index 43483eeac25..33668ebb789 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/ScopeBindingProcessor.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/ScopeBindingProcessor.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject;
+package org.elasticsearch.util.inject;
 
-import org.elasticsearch.util.guice.inject.internal.Annotations;
-import org.elasticsearch.util.guice.inject.internal.Errors;
-import static org.elasticsearch.util.guice.inject.internal.Preconditions.checkNotNull;
-import org.elasticsearch.util.guice.inject.spi.ScopeBinding;
+import org.elasticsearch.util.inject.internal.Annotations;
+import org.elasticsearch.util.inject.internal.Errors;
+import static org.elasticsearch.util.inject.internal.Preconditions.checkNotNull;
+import org.elasticsearch.util.inject.spi.ScopeBinding;
 import java.lang.annotation.Annotation;
 
 /**
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Scopes.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Scopes.java
similarity index 94%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Scopes.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Scopes.java
index 9dbceb9f528..7357c7546ae 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Scopes.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Scopes.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject;
+package org.elasticsearch.util.inject;
 
-import org.elasticsearch.util.guice.inject.internal.Errors;
-import org.elasticsearch.util.guice.inject.internal.InternalFactory;
-import org.elasticsearch.util.guice.inject.internal.Scoping;
+import org.elasticsearch.util.inject.internal.Errors;
+import org.elasticsearch.util.inject.internal.InternalFactory;
+import org.elasticsearch.util.inject.internal.Scoping;
 import java.lang.annotation.Annotation;
 
 /**
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/SingleFieldInjector.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/SingleFieldInjector.java
similarity index 81%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/SingleFieldInjector.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/SingleFieldInjector.java
index de6fb3f111c..3135f44fbc8 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/SingleFieldInjector.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/SingleFieldInjector.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject;
+package org.elasticsearch.util.inject;
 
-import org.elasticsearch.util.guice.inject.internal.Errors;
-import org.elasticsearch.util.guice.inject.internal.ErrorsException;
-import org.elasticsearch.util.guice.inject.internal.InternalContext;
-import org.elasticsearch.util.guice.inject.internal.InternalFactory;
-import org.elasticsearch.util.guice.inject.spi.Dependency;
-import org.elasticsearch.util.guice.inject.spi.InjectionPoint;
+import org.elasticsearch.util.inject.internal.Errors;
+import org.elasticsearch.util.inject.internal.ErrorsException;
+import org.elasticsearch.util.inject.internal.InternalContext;
+import org.elasticsearch.util.inject.internal.InternalFactory;
+import org.elasticsearch.util.inject.spi.Dependency;
+import org.elasticsearch.util.inject.spi.InjectionPoint;
 import java.lang.reflect.Field;
 
 /**
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/SingleMemberInjector.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/SingleMemberInjector.java
similarity index 76%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/SingleMemberInjector.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/SingleMemberInjector.java
index 3edd2447b10..ea4325d6e35 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/SingleMemberInjector.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/SingleMemberInjector.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject;
+package org.elasticsearch.util.inject;
 
-import org.elasticsearch.util.guice.inject.internal.Errors;
-import org.elasticsearch.util.guice.inject.internal.InternalContext;
-import org.elasticsearch.util.guice.inject.spi.InjectionPoint;
+import org.elasticsearch.util.inject.internal.Errors;
+import org.elasticsearch.util.inject.internal.InternalContext;
+import org.elasticsearch.util.inject.spi.InjectionPoint;
 
 /**
  * Injects a field or method of a given object.
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/SingleMethodInjector.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/SingleMethodInjector.java
similarity index 87%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/SingleMethodInjector.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/SingleMethodInjector.java
index a0a2590c1a4..016698c43c0 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/SingleMethodInjector.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/SingleMethodInjector.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject;
+package org.elasticsearch.util.inject;
 
-import org.elasticsearch.util.guice.inject.InjectorImpl.MethodInvoker;
-import org.elasticsearch.util.guice.inject.internal.Errors;
-import org.elasticsearch.util.guice.inject.internal.ErrorsException;
-import org.elasticsearch.util.guice.inject.internal.InternalContext;
-import org.elasticsearch.util.guice.inject.spi.InjectionPoint;
+import org.elasticsearch.util.inject.InjectorImpl.MethodInvoker;
+import org.elasticsearch.util.inject.internal.Errors;
+import org.elasticsearch.util.inject.internal.ErrorsException;
+import org.elasticsearch.util.inject.internal.InternalContext;
+import org.elasticsearch.util.inject.spi.InjectionPoint;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/SingleParameterInjector.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/SingleParameterInjector.java
similarity index 85%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/SingleParameterInjector.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/SingleParameterInjector.java
index 0328e1bec2b..a78854faaaa 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/SingleParameterInjector.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/SingleParameterInjector.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject;
+package org.elasticsearch.util.inject;
 
-import org.elasticsearch.util.guice.inject.internal.Errors;
-import org.elasticsearch.util.guice.inject.internal.ErrorsException;
-import org.elasticsearch.util.guice.inject.internal.InternalContext;
-import org.elasticsearch.util.guice.inject.internal.InternalFactory;
-import org.elasticsearch.util.guice.inject.spi.Dependency;
+import org.elasticsearch.util.inject.internal.Errors;
+import org.elasticsearch.util.inject.internal.ErrorsException;
+import org.elasticsearch.util.inject.internal.InternalContext;
+import org.elasticsearch.util.inject.internal.InternalFactory;
+import org.elasticsearch.util.inject.spi.Dependency;
 
 /**
  * Resolves a single parameter, to be used in a constructor or method invocation.
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Singleton.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Singleton.java
similarity index 96%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Singleton.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Singleton.java
index 57851a95eaf..a877faad105 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Singleton.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Singleton.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject;
+package org.elasticsearch.util.inject;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Stage.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Stage.java
similarity index 96%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Stage.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Stage.java
index 0ed4566c61c..d6638b9761e 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/Stage.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/Stage.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject;
+package org.elasticsearch.util.inject;
 
 /**
  * The stage we're running in.
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/State.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/State.java
similarity index 93%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/State.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/State.java
index c2182f1b4dd..2c0b6d5b36d 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/State.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/State.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject;
+package org.elasticsearch.util.inject;
 
 import org.elasticsearch.util.collect.ImmutableList;
 import org.elasticsearch.util.collect.ImmutableSet;
-import org.elasticsearch.util.guice.inject.internal.BindingImpl;
-import org.elasticsearch.util.guice.inject.internal.Errors;
-import org.elasticsearch.util.guice.inject.internal.MatcherAndConverter;
-import org.elasticsearch.util.guice.inject.spi.TypeListenerBinding;
+import org.elasticsearch.util.inject.internal.BindingImpl;
+import org.elasticsearch.util.inject.internal.Errors;
+import org.elasticsearch.util.inject.internal.MatcherAndConverter;
+import org.elasticsearch.util.inject.spi.TypeListenerBinding;
 
 import java.lang.annotation.Annotation;
 import java.util.List;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/TypeConverterBindingProcessor.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/TypeConverterBindingProcessor.java
similarity index 89%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/TypeConverterBindingProcessor.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/TypeConverterBindingProcessor.java
index 5684139d1fa..75bfa5f2b92 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/TypeConverterBindingProcessor.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/TypeConverterBindingProcessor.java
@@ -15,17 +15,17 @@
  */
 
 
-package org.elasticsearch.util.guice.inject;
+package org.elasticsearch.util.inject;
 
-import org.elasticsearch.util.guice.inject.internal.Errors;
-import org.elasticsearch.util.guice.inject.internal.MatcherAndConverter;
-import org.elasticsearch.util.guice.inject.internal.SourceProvider;
-import org.elasticsearch.util.guice.inject.internal.Strings;
-import org.elasticsearch.util.guice.inject.matcher.AbstractMatcher;
-import org.elasticsearch.util.guice.inject.matcher.Matcher;
-import org.elasticsearch.util.guice.inject.matcher.Matchers;
-import org.elasticsearch.util.guice.inject.spi.TypeConverter;
-import org.elasticsearch.util.guice.inject.spi.TypeConverterBinding;
+import org.elasticsearch.util.inject.internal.Errors;
+import org.elasticsearch.util.inject.internal.MatcherAndConverter;
+import org.elasticsearch.util.inject.internal.SourceProvider;
+import org.elasticsearch.util.inject.internal.Strings;
+import org.elasticsearch.util.inject.matcher.AbstractMatcher;
+import org.elasticsearch.util.inject.matcher.Matcher;
+import org.elasticsearch.util.inject.matcher.Matchers;
+import org.elasticsearch.util.inject.spi.TypeConverter;
+import org.elasticsearch.util.inject.spi.TypeConverterBinding;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/TypeListenerBindingProcessor.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/TypeListenerBindingProcessor.java
similarity index 84%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/TypeListenerBindingProcessor.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/TypeListenerBindingProcessor.java
index 633d208baca..c57c15fbc13 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/TypeListenerBindingProcessor.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/TypeListenerBindingProcessor.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject;
+package org.elasticsearch.util.inject;
 
-import org.elasticsearch.util.guice.inject.internal.Errors;
-import org.elasticsearch.util.guice.inject.spi.TypeListenerBinding;
+import org.elasticsearch.util.inject.internal.Errors;
+import org.elasticsearch.util.inject.spi.TypeListenerBinding;
 
 /**
  * Handles {@link Binder#bindListener} commands.
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/TypeLiteral.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/TypeLiteral.java
similarity index 97%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/TypeLiteral.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/TypeLiteral.java
index cae0241fac6..318e511b1c3 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/TypeLiteral.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/TypeLiteral.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject;
+package org.elasticsearch.util.inject;
 
 import org.elasticsearch.util.collect.ImmutableList;
-import org.elasticsearch.util.guice.inject.internal.MoreTypes;
-import org.elasticsearch.util.guice.inject.util.Types;
+import org.elasticsearch.util.inject.internal.MoreTypes;
+import org.elasticsearch.util.inject.util.Types;
 
 import java.lang.reflect.*;
 import java.util.List;
 
-import static org.elasticsearch.util.guice.inject.internal.MoreTypes.*;
-import static org.elasticsearch.util.guice.inject.internal.Preconditions.*;
+import static org.elasticsearch.util.inject.internal.MoreTypes.*;
+import static org.elasticsearch.util.inject.internal.Preconditions.*;
 
 /**
  * Represents a generic type {@code T}. Java doesn't yet provide a way to
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/WeakKeySet.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/WeakKeySet.java
similarity index 96%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/WeakKeySet.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/WeakKeySet.java
index 21009b34d82..cfcfa4f4a28 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/WeakKeySet.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/WeakKeySet.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject;
+package org.elasticsearch.util.inject;
 
 import org.elasticsearch.util.collect.Sets;
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/assistedinject/Assisted.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/assistedinject/Assisted.java
similarity index 92%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/assistedinject/Assisted.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/assistedinject/Assisted.java
index 6a0e365aaf8..d3e981bdf24 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/assistedinject/Assisted.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/assistedinject/Assisted.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.assistedinject;
+package org.elasticsearch.util.inject.assistedinject;
 
-import org.elasticsearch.util.guice.inject.BindingAnnotation;
+import org.elasticsearch.util.inject.BindingAnnotation;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/assistedinject/AssistedConstructor.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/assistedinject/AssistedConstructor.java
similarity index 94%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/assistedinject/AssistedConstructor.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/assistedinject/AssistedConstructor.java
index 610f63f22c1..0bbd011286f 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/assistedinject/AssistedConstructor.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/assistedinject/AssistedConstructor.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.assistedinject;
+package org.elasticsearch.util.inject.assistedinject;
 
 import org.elasticsearch.util.collect.Lists;
-import org.elasticsearch.util.guice.inject.Inject;
-import org.elasticsearch.util.guice.inject.TypeLiteral;
+import org.elasticsearch.util.inject.Inject;
+import org.elasticsearch.util.inject.TypeLiteral;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/assistedinject/AssistedInject.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/assistedinject/AssistedInject.java
similarity index 96%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/assistedinject/AssistedInject.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/assistedinject/AssistedInject.java
index d9e7876052c..f48b1395858 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/assistedinject/AssistedInject.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/assistedinject/AssistedInject.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.assistedinject;
+package org.elasticsearch.util.inject.assistedinject;
 
 import static java.lang.annotation.ElementType.CONSTRUCTOR;
 import java.lang.annotation.Retention;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/assistedinject/FactoryProvider.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/assistedinject/FactoryProvider.java
similarity index 96%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/assistedinject/FactoryProvider.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/assistedinject/FactoryProvider.java
index 2cb65014eae..2d6de8f8370 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/assistedinject/FactoryProvider.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/assistedinject/FactoryProvider.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.assistedinject;
+package org.elasticsearch.util.inject.assistedinject;
 
 import org.elasticsearch.util.collect.ImmutableMap;
 import org.elasticsearch.util.collect.ImmutableSet;
 import org.elasticsearch.util.collect.Lists;
 import org.elasticsearch.util.collect.Maps;
-import org.elasticsearch.util.guice.inject.*;
-import org.elasticsearch.util.guice.inject.internal.Errors;
-import org.elasticsearch.util.guice.inject.spi.Dependency;
-import org.elasticsearch.util.guice.inject.spi.HasDependencies;
-import org.elasticsearch.util.guice.inject.spi.Message;
+import org.elasticsearch.util.inject.*;
+import org.elasticsearch.util.inject.internal.Errors;
+import org.elasticsearch.util.inject.spi.Dependency;
+import org.elasticsearch.util.inject.spi.HasDependencies;
+import org.elasticsearch.util.inject.spi.Message;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.*;
@@ -64,7 +64,7 @@ import java.util.Set;
  * Any parameter that permits a null value should also be annotated {@code @Nullable}.
  *
  * 
    Configuring factories
    
- * In your {@link org.elasticsearch.util.guice.inject.Module module}, bind the factory interface to the returned
+ * In your {@link org.elasticsearch.util.inject.Module module}, bind the factory interface to the returned
  * factory:
  * 
    bind(PaymentFactory.class).toProvider(
  *     FactoryProvider.newFactory(PaymentFactory.class, RealPayment.class));
    
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/assistedinject/FactoryProvider2.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/assistedinject/FactoryProvider2.java
similarity index 94%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/assistedinject/FactoryProvider2.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/assistedinject/FactoryProvider2.java
index 38262833bf4..66e1b27e0d0 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/assistedinject/FactoryProvider2.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/assistedinject/FactoryProvider2.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.assistedinject;
+package org.elasticsearch.util.inject.assistedinject;
 
 import org.elasticsearch.util.collect.ImmutableList;
 import org.elasticsearch.util.collect.ImmutableMap;
 import org.elasticsearch.util.collect.Lists;
-import org.elasticsearch.util.guice.inject.*;
-import org.elasticsearch.util.guice.inject.internal.Errors;
-import org.elasticsearch.util.guice.inject.internal.ErrorsException;
-import org.elasticsearch.util.guice.inject.spi.Message;
-import org.elasticsearch.util.guice.inject.util.Providers;
+import org.elasticsearch.util.inject.*;
+import org.elasticsearch.util.inject.internal.Errors;
+import org.elasticsearch.util.inject.internal.ErrorsException;
+import org.elasticsearch.util.inject.spi.Message;
+import org.elasticsearch.util.inject.util.Providers;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationHandler;
@@ -33,8 +33,8 @@ import java.util.Arrays;
 import java.util.List;
 
 import static org.elasticsearch.util.collect.Iterables.*;
-import static org.elasticsearch.util.guice.inject.internal.Annotations.*;
-import static org.elasticsearch.util.guice.inject.internal.Preconditions.*;
+import static org.elasticsearch.util.inject.internal.Annotations.*;
+import static org.elasticsearch.util.inject.internal.Preconditions.*;
 
 /**
  * The newer implementation of factory provider. This implementation uses a child injector to
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/assistedinject/Parameter.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/assistedinject/Parameter.java
similarity index 91%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/assistedinject/Parameter.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/assistedinject/Parameter.java
index a68bbfd269e..d7afa731266 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/assistedinject/Parameter.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/assistedinject/Parameter.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.assistedinject;
+package org.elasticsearch.util.inject.assistedinject;
 
-import org.elasticsearch.util.guice.inject.BindingAnnotation;
-import org.elasticsearch.util.guice.inject.ConfigurationException;
-import org.elasticsearch.util.guice.inject.Injector;
-import org.elasticsearch.util.guice.inject.Key;
-import org.elasticsearch.util.guice.inject.Provider;
-import static org.elasticsearch.util.guice.inject.internal.Preconditions.checkArgument;
+import org.elasticsearch.util.inject.BindingAnnotation;
+import org.elasticsearch.util.inject.ConfigurationException;
+import org.elasticsearch.util.inject.Injector;
+import org.elasticsearch.util.inject.Key;
+import org.elasticsearch.util.inject.Provider;
+import static org.elasticsearch.util.inject.internal.Preconditions.checkArgument;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/assistedinject/ParameterListKey.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/assistedinject/ParameterListKey.java
similarity index 93%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/assistedinject/ParameterListKey.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/assistedinject/ParameterListKey.java
index fa8f8c02500..5c7e3ee2f0a 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/assistedinject/ParameterListKey.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/assistedinject/ParameterListKey.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.assistedinject;
+package org.elasticsearch.util.inject.assistedinject;
 
-import org.elasticsearch.util.guice.inject.TypeLiteral;
+import org.elasticsearch.util.inject.TypeLiteral;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/assistedinject/package-info.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/assistedinject/package-info.java
similarity index 92%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/assistedinject/package-info.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/assistedinject/package-info.java
index 83dc89cec86..dbd4481d400 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/assistedinject/package-info.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/assistedinject/package-info.java
@@ -18,4 +18,4 @@
  * Extension for combining factory interfaces with injection; this extension requires {@code
  * guice-jndi-2.0.jar}.
  */
-package org.elasticsearch.util.guice.inject.assistedinject;
\ No newline at end of file
+package org.elasticsearch.util.inject.assistedinject;
\ No newline at end of file
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/binder/AnnotatedBindingBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/binder/AnnotatedBindingBuilder.java
similarity index 76%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/binder/AnnotatedBindingBuilder.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/binder/AnnotatedBindingBuilder.java
index 2b6253a43f3..462df0dc9ba 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/binder/AnnotatedBindingBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/binder/AnnotatedBindingBuilder.java
@@ -14,25 +14,25 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.binder;
+package org.elasticsearch.util.inject.binder;
 
 import java.lang.annotation.Annotation;
 
 /**
- * See the EDSL examples at {@link org.elasticsearch.util.guice.inject.Binder}.
+ * See the EDSL examples at {@link org.elasticsearch.util.inject.Binder}.
  *
  * @author crazybob@google.com (Bob Lee)
  */
 public interface AnnotatedBindingBuilder extends LinkedBindingBuilder {
 
   /**
-   * See the EDSL examples at {@link org.elasticsearch.util.guice.inject.Binder}.
+   * See the EDSL examples at {@link org.elasticsearch.util.inject.Binder}.
    */
   LinkedBindingBuilder annotatedWith(
       Class annotationType);
 
   /**
-   * See the EDSL examples at {@link org.elasticsearch.util.guice.inject.Binder}.
+   * See the EDSL examples at {@link org.elasticsearch.util.inject.Binder}.
    */
   LinkedBindingBuilder annotatedWith(Annotation annotation);
 }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/binder/AnnotatedConstantBindingBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/binder/AnnotatedConstantBindingBuilder.java
similarity index 75%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/binder/AnnotatedConstantBindingBuilder.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/binder/AnnotatedConstantBindingBuilder.java
index c88d5bb23b7..ef0ab827a25 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/binder/AnnotatedConstantBindingBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/binder/AnnotatedConstantBindingBuilder.java
@@ -14,25 +14,25 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.binder;
+package org.elasticsearch.util.inject.binder;
 
 import java.lang.annotation.Annotation;
 
 /**
- * See the EDSL examples at {@link org.elasticsearch.util.guice.inject.Binder}.
+ * See the EDSL examples at {@link org.elasticsearch.util.inject.Binder}.
  *
  * @author crazybob@google.com (Bob Lee)
  */
 public interface AnnotatedConstantBindingBuilder {
 
   /**
-   * See the EDSL examples at {@link org.elasticsearch.util.guice.inject.Binder}.
+   * See the EDSL examples at {@link org.elasticsearch.util.inject.Binder}.
    */
   ConstantBindingBuilder annotatedWith(
       Class annotationType);
 
   /**
-   * See the EDSL examples at {@link org.elasticsearch.util.guice.inject.Binder}.
+   * See the EDSL examples at {@link org.elasticsearch.util.inject.Binder}.
    */
   ConstantBindingBuilder annotatedWith(Annotation annotation);
 }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/binder/AnnotatedElementBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/binder/AnnotatedElementBuilder.java
similarity index 75%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/binder/AnnotatedElementBuilder.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/binder/AnnotatedElementBuilder.java
index 1cfa34a202f..0a3b5e35acc 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/binder/AnnotatedElementBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/binder/AnnotatedElementBuilder.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.binder;
+package org.elasticsearch.util.inject.binder;
 
 import java.lang.annotation.Annotation;
 
 /**
- * See the EDSL examples at {@link org.elasticsearch.util.guice.inject.Binder}.
+ * See the EDSL examples at {@link org.elasticsearch.util.inject.Binder}.
  *
  * @author jessewilson@google.com (Jesse Wilson)
  * @since 2.0
@@ -27,12 +27,12 @@ import java.lang.annotation.Annotation;
 public interface AnnotatedElementBuilder {
 
   /**
-   * See the EDSL examples at {@link org.elasticsearch.util.guice.inject.Binder}.
+   * See the EDSL examples at {@link org.elasticsearch.util.inject.Binder}.
    */
   void annotatedWith(Class annotationType);
 
   /**
-   * See the EDSL examples at {@link org.elasticsearch.util.guice.inject.Binder}.
+   * See the EDSL examples at {@link org.elasticsearch.util.inject.Binder}.
    */
   void annotatedWith(Annotation annotation);
 }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/binder/ConstantBindingBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/binder/ConstantBindingBuilder.java
similarity index 96%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/binder/ConstantBindingBuilder.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/binder/ConstantBindingBuilder.java
index aa953ba0e15..25a7735bebb 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/binder/ConstantBindingBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/binder/ConstantBindingBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.binder;
+package org.elasticsearch.util.inject.binder;
 
 /**
  * Binds to a constant value.
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/binder/LinkedBindingBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/binder/LinkedBindingBuilder.java
similarity index 56%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/binder/LinkedBindingBuilder.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/binder/LinkedBindingBuilder.java
index d3951a05d19..504ac26c558 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/binder/LinkedBindingBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/binder/LinkedBindingBuilder.java
@@ -14,56 +14,56 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.binder;
+package org.elasticsearch.util.inject.binder;
 
-import org.elasticsearch.util.guice.inject.Key;
-import org.elasticsearch.util.guice.inject.Provider;
-import org.elasticsearch.util.guice.inject.TypeLiteral;
+import org.elasticsearch.util.inject.Key;
+import org.elasticsearch.util.inject.Provider;
+import org.elasticsearch.util.inject.TypeLiteral;
 
 /**
- * See the EDSL examples at {@link org.elasticsearch.util.guice.inject.Binder}.
+ * See the EDSL examples at {@link org.elasticsearch.util.inject.Binder}.
  *
  * @author crazybob@google.com (Bob Lee)
  */
 public interface LinkedBindingBuilder extends ScopedBindingBuilder {
 
   /**
-   * See the EDSL examples at {@link org.elasticsearch.util.guice.inject.Binder}.
+   * See the EDSL examples at {@link org.elasticsearch.util.inject.Binder}.
    */
   ScopedBindingBuilder to(Class implementation);
 
   /**
-   * See the EDSL examples at {@link org.elasticsearch.util.guice.inject.Binder}.
+   * See the EDSL examples at {@link org.elasticsearch.util.inject.Binder}.
    */
   ScopedBindingBuilder to(TypeLiteral implementation);
 
   /**
-   * See the EDSL examples at {@link org.elasticsearch.util.guice.inject.Binder}.
+   * See the EDSL examples at {@link org.elasticsearch.util.inject.Binder}.
    */
   ScopedBindingBuilder to(Key targetKey);
 
   /**
-   * See the EDSL examples at {@link org.elasticsearch.util.guice.inject.Binder}.
+   * See the EDSL examples at {@link org.elasticsearch.util.inject.Binder}.
    *
-   * @see org.elasticsearch.util.guice.inject.Injector#injectMembers
+   * @see org.elasticsearch.util.inject.Injector#injectMembers
    */
   void toInstance(T instance);
 
   /**
-   * See the EDSL examples at {@link org.elasticsearch.util.guice.inject.Binder}.
+   * See the EDSL examples at {@link org.elasticsearch.util.inject.Binder}.
    *
-   * @see org.elasticsearch.util.guice.inject.Injector#injectMembers
+   * @see org.elasticsearch.util.inject.Injector#injectMembers
    */
   ScopedBindingBuilder toProvider(Provider provider);
 
   /**
-   * See the EDSL examples at {@link org.elasticsearch.util.guice.inject.Binder}.
+   * See the EDSL examples at {@link org.elasticsearch.util.inject.Binder}.
    */
   ScopedBindingBuilder toProvider(
       Class> providerType);
 
   /**
-   * See the EDSL examples at {@link org.elasticsearch.util.guice.inject.Binder}.
+   * See the EDSL examples at {@link org.elasticsearch.util.inject.Binder}.
    */
   ScopedBindingBuilder toProvider(
       Key> providerKey);
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/binder/ScopedBindingBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/binder/ScopedBindingBuilder.java
similarity index 66%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/binder/ScopedBindingBuilder.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/binder/ScopedBindingBuilder.java
index eb66f61b507..f4e738481f3 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/binder/ScopedBindingBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/binder/ScopedBindingBuilder.java
@@ -14,33 +14,33 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.binder;
+package org.elasticsearch.util.inject.binder;
 
-import org.elasticsearch.util.guice.inject.Scope;
+import org.elasticsearch.util.inject.Scope;
 import java.lang.annotation.Annotation;
 
 /**
- * See the EDSL examples at {@link org.elasticsearch.util.guice.inject.Binder}.
+ * See the EDSL examples at {@link org.elasticsearch.util.inject.Binder}.
  *
  * @author crazybob@google.com (Bob Lee)
  */
 public interface ScopedBindingBuilder {
 
   /**
-   * See the EDSL examples at {@link org.elasticsearch.util.guice.inject.Binder}.
+   * See the EDSL examples at {@link org.elasticsearch.util.inject.Binder}.
    */
   void in(Class scopeAnnotation);
 
   /**
-   * See the EDSL examples at {@link org.elasticsearch.util.guice.inject.Binder}.
+   * See the EDSL examples at {@link org.elasticsearch.util.inject.Binder}.
    */
   void in(Scope scope);
 
   /**
-   * Instructs the {@link org.elasticsearch.util.guice.inject.Injector} to eagerly initialize this
+   * Instructs the {@link org.elasticsearch.util.inject.Injector} to eagerly initialize this
    * singleton-scoped binding upon creation. Useful for application
    * initialization logic.  See the EDSL examples at
-   * {@link org.elasticsearch.util.guice.inject.Binder}.
+   * {@link org.elasticsearch.util.inject.Binder}.
    */
   void asEagerSingleton();
 }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/binder/package-info.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/binder/package-info.java
similarity index 82%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/binder/package-info.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/binder/package-info.java
index 4842be7ee58..539c86e3cec 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/binder/package-info.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/binder/package-info.java
@@ -15,7 +15,7 @@
  */
 
 /**
- * Interfaces which make up {@link org.elasticsearch.util.guice.inject.Binder}'s
+ * Interfaces which make up {@link org.elasticsearch.util.inject.Binder}'s
  * expression language.
  */
-package org.elasticsearch.util.guice.inject.binder;
\ No newline at end of file
+package org.elasticsearch.util.inject.binder;
\ No newline at end of file
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/AbstractBindingBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/AbstractBindingBuilder.java
similarity index 91%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/AbstractBindingBuilder.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/AbstractBindingBuilder.java
index fa6a34f58c3..f975fc8629c 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/AbstractBindingBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/AbstractBindingBuilder.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
-import org.elasticsearch.util.guice.inject.Binder;
-import org.elasticsearch.util.guice.inject.Key;
-import org.elasticsearch.util.guice.inject.Scope;
-import static org.elasticsearch.util.guice.inject.internal.Preconditions.checkNotNull;
-import org.elasticsearch.util.guice.inject.spi.Element;
-import org.elasticsearch.util.guice.inject.spi.InstanceBinding;
+import org.elasticsearch.util.inject.Binder;
+import org.elasticsearch.util.inject.Key;
+import org.elasticsearch.util.inject.Scope;
+import static org.elasticsearch.util.inject.internal.Preconditions.checkNotNull;
+import org.elasticsearch.util.inject.spi.Element;
+import org.elasticsearch.util.inject.spi.InstanceBinding;
 import java.lang.annotation.Annotation;
 import java.util.List;
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/Annotations.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/Annotations.java
similarity index 93%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/Annotations.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/Annotations.java
index 8ba3f15e2eb..985a65fc8d7 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/Annotations.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/Annotations.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
-import org.elasticsearch.util.guice.inject.BindingAnnotation;
-import org.elasticsearch.util.guice.inject.Key;
-import org.elasticsearch.util.guice.inject.ScopeAnnotation;
-import org.elasticsearch.util.guice.inject.TypeLiteral;
+import org.elasticsearch.util.inject.BindingAnnotation;
+import org.elasticsearch.util.inject.Key;
+import org.elasticsearch.util.inject.ScopeAnnotation;
+import org.elasticsearch.util.inject.TypeLiteral;
 import org.elasticsearch.util.Classes;
 
 import java.lang.annotation.Annotation;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/AsynchronousComputationException.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/AsynchronousComputationException.java
similarity index 94%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/AsynchronousComputationException.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/AsynchronousComputationException.java
index 674acca4624..9e8576bbe9e 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/AsynchronousComputationException.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/AsynchronousComputationException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
 /**
  * Wraps an exception that occured during a computation in a different thread.
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/BindingBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/BindingBuilder.java
similarity index 90%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/BindingBuilder.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/BindingBuilder.java
index e3c9f82f43e..e1ca5fca1db 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/BindingBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/BindingBuilder.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
 import org.elasticsearch.util.collect.ImmutableSet;
-import org.elasticsearch.util.guice.inject.*;
-import org.elasticsearch.util.guice.inject.binder.AnnotatedBindingBuilder;
-import org.elasticsearch.util.guice.inject.spi.Element;
-import org.elasticsearch.util.guice.inject.spi.InjectionPoint;
-import org.elasticsearch.util.guice.inject.spi.Message;
+import org.elasticsearch.util.inject.*;
+import org.elasticsearch.util.inject.binder.AnnotatedBindingBuilder;
+import org.elasticsearch.util.inject.spi.Element;
+import org.elasticsearch.util.inject.spi.InjectionPoint;
+import org.elasticsearch.util.inject.spi.Message;
 
 import java.lang.annotation.Annotation;
 import java.util.List;
 import java.util.Set;
 
-import static org.elasticsearch.util.guice.inject.internal.Preconditions.*;
+import static org.elasticsearch.util.inject.internal.Preconditions.*;
 
 /**
  * Bind a non-constant key.
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/BindingImpl.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/BindingImpl.java
similarity index 86%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/BindingImpl.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/BindingImpl.java
index 0a2b3f39943..9e09a5630f5 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/BindingImpl.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/BindingImpl.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
-import org.elasticsearch.util.guice.inject.Binding;
-import org.elasticsearch.util.guice.inject.Injector;
-import org.elasticsearch.util.guice.inject.Key;
-import org.elasticsearch.util.guice.inject.Provider;
-import org.elasticsearch.util.guice.inject.spi.BindingScopingVisitor;
-import org.elasticsearch.util.guice.inject.spi.ElementVisitor;
-import org.elasticsearch.util.guice.inject.spi.InstanceBinding;
+import org.elasticsearch.util.inject.Binding;
+import org.elasticsearch.util.inject.Injector;
+import org.elasticsearch.util.inject.Key;
+import org.elasticsearch.util.inject.Provider;
+import org.elasticsearch.util.inject.spi.BindingScopingVisitor;
+import org.elasticsearch.util.inject.spi.ElementVisitor;
+import org.elasticsearch.util.inject.spi.InstanceBinding;
 
 /**
  * @author crazybob@google.com (Bob Lee)
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/BytecodeGen.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/BytecodeGen.java
similarity index 98%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/BytecodeGen.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/BytecodeGen.java
index 14995ff354f..233325f8ee0 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/BytecodeGen.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/BytecodeGen.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
 import org.elasticsearch.util.base.Function;
 import org.elasticsearch.util.collect.MapMaker;
@@ -28,7 +28,7 @@ import java.security.PrivilegedAction;
 import java.util.Map;
 import java.util.logging.Logger;
 
-import static org.elasticsearch.util.guice.inject.internal.Preconditions.*;
+import static org.elasticsearch.util.inject.internal.Preconditions.*;
 
 /**
  * Utility methods for runtime code generation and class loading. We use this stuff for {@link
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/Collections2.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/Collections2.java
similarity index 96%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/Collections2.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/Collections2.java
index 129bd5bea55..e734ed65467 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/Collections2.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/Collections2.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
 import org.elasticsearch.util.collect.Lists;
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ComputationException.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ComputationException.java
similarity index 93%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ComputationException.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ComputationException.java
index 962ca3ad483..dbf2f72f84a 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ComputationException.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ComputationException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
 /**
  * Wraps an exception that occured during a computation.
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ConstantBindingBuilderImpl.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ConstantBindingBuilderImpl.java
similarity index 88%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ConstantBindingBuilderImpl.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ConstantBindingBuilderImpl.java
index 3c320c6ad7b..b21c3a81665 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ConstantBindingBuilderImpl.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ConstantBindingBuilderImpl.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
 import org.elasticsearch.util.collect.ImmutableSet;
-import org.elasticsearch.util.guice.inject.Binder;
-import org.elasticsearch.util.guice.inject.Key;
-import org.elasticsearch.util.guice.inject.binder.AnnotatedConstantBindingBuilder;
-import org.elasticsearch.util.guice.inject.binder.ConstantBindingBuilder;
-import org.elasticsearch.util.guice.inject.spi.Element;
-import org.elasticsearch.util.guice.inject.spi.InjectionPoint;
+import org.elasticsearch.util.inject.Binder;
+import org.elasticsearch.util.inject.Key;
+import org.elasticsearch.util.inject.binder.AnnotatedConstantBindingBuilder;
+import org.elasticsearch.util.inject.binder.ConstantBindingBuilder;
+import org.elasticsearch.util.inject.spi.Element;
+import org.elasticsearch.util.inject.spi.InjectionPoint;
 
 import java.lang.annotation.Annotation;
 import java.util.List;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ConstructionContext.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ConstructionContext.java
similarity index 98%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ConstructionContext.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ConstructionContext.java
index 14ace7a9059..df0d0f3351c 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ConstructionContext.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ConstructionContext.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ErrorHandler.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ErrorHandler.java
similarity index 88%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ErrorHandler.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ErrorHandler.java
index 987f32b9960..7601e8de7b0 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ErrorHandler.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ErrorHandler.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
-import org.elasticsearch.util.guice.inject.spi.Message;
+import org.elasticsearch.util.inject.spi.Message;
 
 /**
  * Handles errors in the Injector.
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/Errors.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/Errors.java
similarity index 99%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/Errors.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/Errors.java
index 9ab89d081c2..26db0368c76 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/Errors.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/Errors.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
 import org.elasticsearch.util.collect.ImmutableList;
 import org.elasticsearch.util.collect.ImmutableSet;
 import org.elasticsearch.util.collect.Lists;
-import org.elasticsearch.util.guice.inject.*;
-import org.elasticsearch.util.guice.inject.spi.*;
+import org.elasticsearch.util.inject.*;
+import org.elasticsearch.util.inject.spi.*;
 
 import java.io.PrintWriter;
 import java.io.Serializable;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ErrorsException.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ErrorsException.java
similarity index 95%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ErrorsException.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ErrorsException.java
index 3094071ec21..3efe8e0e378 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ErrorsException.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ErrorsException.java
@@ -15,7 +15,7 @@
  */
 
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
 /**
  * Indicates that a result could not be returned while preparing or resolving a binding. The caller
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ExpirationTimer.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ExpirationTimer.java
similarity index 93%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ExpirationTimer.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ExpirationTimer.java
index 2c8ea1a7562..437bcca56f8 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ExpirationTimer.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ExpirationTimer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
 import java.util.Timer;
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ExposedBindingImpl.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ExposedBindingImpl.java
similarity index 83%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ExposedBindingImpl.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ExposedBindingImpl.java
index d8b83a72c48..2c74bfba03e 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ExposedBindingImpl.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ExposedBindingImpl.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
 import org.elasticsearch.util.collect.ImmutableSet;
-import org.elasticsearch.util.guice.inject.Binder;
-import org.elasticsearch.util.guice.inject.Injector;
-import org.elasticsearch.util.guice.inject.Key;
-import org.elasticsearch.util.guice.inject.spi.BindingTargetVisitor;
-import org.elasticsearch.util.guice.inject.spi.Dependency;
-import org.elasticsearch.util.guice.inject.spi.ExposedBinding;
-import org.elasticsearch.util.guice.inject.spi.PrivateElements;
+import org.elasticsearch.util.inject.Binder;
+import org.elasticsearch.util.inject.Injector;
+import org.elasticsearch.util.inject.Key;
+import org.elasticsearch.util.inject.spi.BindingTargetVisitor;
+import org.elasticsearch.util.inject.spi.Dependency;
+import org.elasticsearch.util.inject.spi.ExposedBinding;
+import org.elasticsearch.util.inject.spi.PrivateElements;
 
 import java.util.Set;
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ExposureBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ExposureBuilder.java
similarity index 78%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ExposureBuilder.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ExposureBuilder.java
index 7b69894c062..4090a3c377b 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ExposureBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ExposureBuilder.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
-import org.elasticsearch.util.guice.inject.binder.AnnotatedElementBuilder;
-import org.elasticsearch.util.guice.inject.Binder;
-import org.elasticsearch.util.guice.inject.Key;
+import org.elasticsearch.util.inject.binder.AnnotatedElementBuilder;
+import org.elasticsearch.util.inject.Binder;
+import org.elasticsearch.util.inject.Key;
 import java.lang.annotation.Annotation;
 
 /**
@@ -42,13 +42,13 @@ public class ExposureBuilder implements AnnotatedElementBuilder {
   }
 
   public void annotatedWith(Class annotationType) {
-    org.elasticsearch.util.guice.inject.internal.Preconditions.checkNotNull(annotationType, "annotationType");
+    org.elasticsearch.util.inject.internal.Preconditions.checkNotNull(annotationType, "annotationType");
     checkNotAnnotated();
     key = Key.get(key.getTypeLiteral(), annotationType);
   }
 
   public void annotatedWith(Annotation annotation) {
-    org.elasticsearch.util.guice.inject.internal.Preconditions.checkNotNull(annotation, "annotation");
+    org.elasticsearch.util.inject.internal.Preconditions.checkNotNull(annotation, "annotation");
     checkNotAnnotated();
     key = Key.get(key.getTypeLiteral(), annotation);
   }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/FailableCache.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/FailableCache.java
similarity index 97%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/FailableCache.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/FailableCache.java
index aa00d1d6424..691213c635c 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/FailableCache.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/FailableCache.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
 import org.elasticsearch.util.base.Function;
 import org.elasticsearch.util.collect.MapMaker;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/InstanceBindingImpl.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/InstanceBindingImpl.java
similarity index 88%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/InstanceBindingImpl.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/InstanceBindingImpl.java
index 889e02c9d59..d05b76f8ab5 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/InstanceBindingImpl.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/InstanceBindingImpl.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
 import org.elasticsearch.util.collect.ImmutableSet;
-import org.elasticsearch.util.guice.inject.Binder;
-import org.elasticsearch.util.guice.inject.Injector;
-import org.elasticsearch.util.guice.inject.Key;
-import org.elasticsearch.util.guice.inject.Provider;
-import org.elasticsearch.util.guice.inject.spi.*;
-import org.elasticsearch.util.guice.inject.util.Providers;
+import org.elasticsearch.util.inject.Binder;
+import org.elasticsearch.util.inject.Injector;
+import org.elasticsearch.util.inject.Key;
+import org.elasticsearch.util.inject.Provider;
+import org.elasticsearch.util.inject.spi.*;
+import org.elasticsearch.util.inject.util.Providers;
 
 import java.util.Set;
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/InternalContext.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/InternalContext.java
similarity index 93%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/InternalContext.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/InternalContext.java
index fa853d6b13c..f8356804870 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/InternalContext.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/InternalContext.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
 import org.elasticsearch.util.collect.Maps;
-import org.elasticsearch.util.guice.inject.spi.Dependency;
+import org.elasticsearch.util.inject.spi.Dependency;
 
 import java.util.Map;
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/InternalFactory.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/InternalFactory.java
similarity index 81%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/InternalFactory.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/InternalFactory.java
index 3bef227af32..261d6d11e78 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/InternalFactory.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/InternalFactory.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
-import org.elasticsearch.util.guice.inject.spi.Dependency;
+import org.elasticsearch.util.inject.spi.Dependency;
 
 /**
  * Creates objects which will be injected.
@@ -29,7 +29,7 @@ public interface InternalFactory {
    * Creates an object to be injected.
    *
    * @param context of this injection
-   * @throws org.elasticsearch.util.guice.inject.internal.ErrorsException if a value cannot be provided
+   * @throws org.elasticsearch.util.inject.internal.ErrorsException if a value cannot be provided
    * @return instance to be injected
    */
   T get(Errors errors, InternalContext context, Dependency dependency)
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/Join.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/Join.java
similarity index 98%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/Join.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/Join.java
index d44464527fc..b77c7761e56 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/Join.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/Join.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
 import org.elasticsearch.util.collect.Lists;
 
@@ -23,7 +23,7 @@ import java.util.Arrays;
 import java.util.Iterator;
 import java.util.Map;
 
-import static org.elasticsearch.util.guice.inject.internal.Preconditions.*;
+import static org.elasticsearch.util.inject.internal.Preconditions.*;
 
 /**
  * Utility for joining pieces of text separated by a delimiter. It can handle
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/LinkedBindingImpl.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/LinkedBindingImpl.java
similarity index 85%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/LinkedBindingImpl.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/LinkedBindingImpl.java
index 3dab3fa659b..eb1da56e5aa 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/LinkedBindingImpl.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/LinkedBindingImpl.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
-import org.elasticsearch.util.guice.inject.Injector;
-import org.elasticsearch.util.guice.inject.Key;
-import org.elasticsearch.util.guice.inject.Binder;
-import org.elasticsearch.util.guice.inject.spi.BindingTargetVisitor;
-import org.elasticsearch.util.guice.inject.spi.LinkedKeyBinding;
+import org.elasticsearch.util.inject.Injector;
+import org.elasticsearch.util.inject.Key;
+import org.elasticsearch.util.inject.Binder;
+import org.elasticsearch.util.inject.spi.BindingTargetVisitor;
+import org.elasticsearch.util.inject.spi.LinkedKeyBinding;
 
 public final class LinkedBindingImpl extends BindingImpl implements LinkedKeyBinding {
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/LinkedProviderBindingImpl.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/LinkedProviderBindingImpl.java
similarity index 84%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/LinkedProviderBindingImpl.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/LinkedProviderBindingImpl.java
index 19fb43db876..ac6849f7010 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/LinkedProviderBindingImpl.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/LinkedProviderBindingImpl.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
-import org.elasticsearch.util.guice.inject.Injector;
-import org.elasticsearch.util.guice.inject.Key;
-import org.elasticsearch.util.guice.inject.Provider;
-import org.elasticsearch.util.guice.inject.Binder;
-import org.elasticsearch.util.guice.inject.spi.BindingTargetVisitor;
-import org.elasticsearch.util.guice.inject.spi.ProviderKeyBinding;
+import org.elasticsearch.util.inject.Injector;
+import org.elasticsearch.util.inject.Key;
+import org.elasticsearch.util.inject.Provider;
+import org.elasticsearch.util.inject.Binder;
+import org.elasticsearch.util.inject.spi.BindingTargetVisitor;
+import org.elasticsearch.util.inject.spi.ProviderKeyBinding;
 
 public final class LinkedProviderBindingImpl
     extends BindingImpl implements ProviderKeyBinding {
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/MatcherAndConverter.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/MatcherAndConverter.java
similarity index 82%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/MatcherAndConverter.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/MatcherAndConverter.java
index 354f9d2615e..58600cefb2a 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/MatcherAndConverter.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/MatcherAndConverter.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
-import org.elasticsearch.util.guice.inject.TypeLiteral;
-import static org.elasticsearch.util.guice.inject.internal.Preconditions.checkNotNull;
-import org.elasticsearch.util.guice.inject.matcher.Matcher;
-import org.elasticsearch.util.guice.inject.spi.TypeConverter;
+import org.elasticsearch.util.inject.TypeLiteral;
+import static org.elasticsearch.util.inject.internal.Preconditions.checkNotNull;
+import org.elasticsearch.util.inject.matcher.Matcher;
+import org.elasticsearch.util.inject.spi.TypeConverter;
 
 /**
  * @author crazybob@google.com (Bob Lee)
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/MoreTypes.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/MoreTypes.java
similarity index 98%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/MoreTypes.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/MoreTypes.java
index 699be056d92..f4bedaac544 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/MoreTypes.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/MoreTypes.java
@@ -15,14 +15,14 @@
  */
 
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
 import org.elasticsearch.util.base.Objects;
 import org.elasticsearch.util.collect.ImmutableMap;
 import org.elasticsearch.util.collect.ImmutableSet;
-import org.elasticsearch.util.guice.inject.ConfigurationException;
-import org.elasticsearch.util.guice.inject.TypeLiteral;
-import org.elasticsearch.util.guice.inject.spi.Message;
+import org.elasticsearch.util.inject.ConfigurationException;
+import org.elasticsearch.util.inject.TypeLiteral;
+import org.elasticsearch.util.inject.spi.Message;
 
 import java.io.Serializable;
 import java.lang.reflect.*;
@@ -30,7 +30,7 @@ import java.util.Arrays;
 import java.util.Map;
 import java.util.NoSuchElementException;
 
-import static org.elasticsearch.util.guice.inject.internal.Preconditions.*;
+import static org.elasticsearch.util.inject.internal.Preconditions.*;
 
 /**
  * Static methods for working with types that we aren't publishing in the
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/NullOutputException.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/NullOutputException.java
similarity index 94%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/NullOutputException.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/NullOutputException.java
index 146508849ab..5ef9ea50ef7 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/NullOutputException.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/NullOutputException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
 /**
  * Thrown when a computer function returns null. This subclass exists so
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/Nullability.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/Nullability.java
similarity index 94%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/Nullability.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/Nullability.java
index 109fb5631ca..2115d5eb7c2 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/Nullability.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/Nullability.java
@@ -1,4 +1,4 @@
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
 import java.lang.annotation.Annotation;
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/Nullable.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/Nullable.java
similarity index 95%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/Nullable.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/Nullable.java
index 3bd56ab46d2..71c5a6e630c 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/Nullable.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/Nullable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/Preconditions.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/Preconditions.java
similarity index 99%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/Preconditions.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/Preconditions.java
index 1c179555c93..214676d1d09 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/Preconditions.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/Preconditions.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
 import java.util.Collection;
 import java.util.NoSuchElementException;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/PrivateElementsImpl.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/PrivateElementsImpl.java
similarity index 88%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/PrivateElementsImpl.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/PrivateElementsImpl.java
index 7e75bf8c753..bf2a40ea7fe 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/PrivateElementsImpl.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/PrivateElementsImpl.java
@@ -14,25 +14,25 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
 import org.elasticsearch.util.collect.ImmutableList;
 import org.elasticsearch.util.collect.ImmutableMap;
 import org.elasticsearch.util.collect.Lists;
 import org.elasticsearch.util.collect.Maps;
-import org.elasticsearch.util.guice.inject.Binder;
-import org.elasticsearch.util.guice.inject.Injector;
-import org.elasticsearch.util.guice.inject.Key;
-import org.elasticsearch.util.guice.inject.PrivateBinder;
-import org.elasticsearch.util.guice.inject.spi.Element;
-import org.elasticsearch.util.guice.inject.spi.ElementVisitor;
-import org.elasticsearch.util.guice.inject.spi.PrivateElements;
+import org.elasticsearch.util.inject.Binder;
+import org.elasticsearch.util.inject.Injector;
+import org.elasticsearch.util.inject.Key;
+import org.elasticsearch.util.inject.PrivateBinder;
+import org.elasticsearch.util.inject.spi.Element;
+import org.elasticsearch.util.inject.spi.ElementVisitor;
+import org.elasticsearch.util.inject.spi.PrivateElements;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import static org.elasticsearch.util.guice.inject.internal.Preconditions.*;
+import static org.elasticsearch.util.inject.internal.Preconditions.*;
 
 /**
  * @author jessewilson@google.com (Jesse Wilson)
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ProviderInstanceBindingImpl.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ProviderInstanceBindingImpl.java
similarity index 90%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ProviderInstanceBindingImpl.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ProviderInstanceBindingImpl.java
index 9bf788d8033..8f8732baee5 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ProviderInstanceBindingImpl.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ProviderInstanceBindingImpl.java
@@ -14,14 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
 import org.elasticsearch.util.collect.ImmutableSet;
-import org.elasticsearch.util.guice.inject.Binder;
-import org.elasticsearch.util.guice.inject.Injector;
-import org.elasticsearch.util.guice.inject.Key;
-import org.elasticsearch.util.guice.inject.Provider;
-import org.elasticsearch.util.guice.inject.spi.*;
+import org.elasticsearch.util.inject.Binder;
+import org.elasticsearch.util.inject.Injector;
+import org.elasticsearch.util.inject.Key;
+import org.elasticsearch.util.inject.Provider;
+import org.elasticsearch.util.inject.spi.*;
 
 import java.util.Set;
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ProviderMethod.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ProviderMethod.java
similarity index 93%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ProviderMethod.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ProviderMethod.java
index 4848fc69912..7e7df86aec1 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ProviderMethod.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ProviderMethod.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
 import org.elasticsearch.util.collect.ImmutableSet;
-import org.elasticsearch.util.guice.inject.*;
-import org.elasticsearch.util.guice.inject.spi.Dependency;
-import org.elasticsearch.util.guice.inject.spi.ProviderWithDependencies;
+import org.elasticsearch.util.inject.*;
+import org.elasticsearch.util.inject.spi.Dependency;
+import org.elasticsearch.util.inject.spi.ProviderWithDependencies;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationTargetException;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ProviderMethodsModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ProviderMethodsModule.java
similarity index 92%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ProviderMethodsModule.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ProviderMethodsModule.java
index 6ce1019ab54..1ea75dc1a88 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ProviderMethodsModule.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ProviderMethodsModule.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
 import org.elasticsearch.util.collect.ImmutableSet;
 import org.elasticsearch.util.collect.Lists;
-import org.elasticsearch.util.guice.inject.*;
-import org.elasticsearch.util.guice.inject.spi.Dependency;
-import org.elasticsearch.util.guice.inject.spi.Message;
-import org.elasticsearch.util.guice.inject.util.Modules;
+import org.elasticsearch.util.inject.*;
+import org.elasticsearch.util.inject.spi.Dependency;
+import org.elasticsearch.util.inject.spi.Message;
+import org.elasticsearch.util.inject.util.Modules;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
 import java.util.List;
 
-import static org.elasticsearch.util.guice.inject.internal.Preconditions.*;
+import static org.elasticsearch.util.inject.internal.Preconditions.*;
 
 /**
  * Creates bindings to methods annotated with {@literal @}{@link Provides}. Use the scope and
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/Scoping.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/Scoping.java
similarity index 93%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/Scoping.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/Scoping.java
index 51e17aae1c7..3c5b11c2bc4 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/Scoping.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/Scoping.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
-import org.elasticsearch.util.guice.inject.Scope;
-import org.elasticsearch.util.guice.inject.Scopes;
-import org.elasticsearch.util.guice.inject.Singleton;
-import org.elasticsearch.util.guice.inject.Stage;
-import org.elasticsearch.util.guice.inject.binder.ScopedBindingBuilder;
-import org.elasticsearch.util.guice.inject.spi.BindingScopingVisitor;
+import org.elasticsearch.util.inject.Scope;
+import org.elasticsearch.util.inject.Scopes;
+import org.elasticsearch.util.inject.Singleton;
+import org.elasticsearch.util.inject.Stage;
+import org.elasticsearch.util.inject.binder.ScopedBindingBuilder;
+import org.elasticsearch.util.inject.spi.BindingScopingVisitor;
 import java.lang.annotation.Annotation;
 
 /**
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/SourceProvider.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/SourceProvider.java
similarity index 97%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/SourceProvider.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/SourceProvider.java
index b23ad6a8c65..b5275e38578 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/SourceProvider.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/SourceProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
 import org.elasticsearch.util.collect.ImmutableSet;
 import org.elasticsearch.util.collect.Lists;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/StackTraceElements.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/StackTraceElements.java
similarity index 96%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/StackTraceElements.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/StackTraceElements.java
index 20cd2935451..3096d17b6d7 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/StackTraceElements.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/StackTraceElements.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Member;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/Stopwatch.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/Stopwatch.java
similarity index 95%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/Stopwatch.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/Stopwatch.java
index 94114d321ca..71d63cf76c7 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/Stopwatch.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/Stopwatch.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
 import java.util.logging.Logger;
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/Strings.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/Strings.java
similarity index 97%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/Strings.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/Strings.java
index 937058088d1..92fff198c0b 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/Strings.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/Strings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
 /**
  * String utilities.
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ToStringBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ToStringBuilder.java
similarity index 96%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ToStringBuilder.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ToStringBuilder.java
index e489da378d8..ab701c28c85 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/ToStringBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/ToStringBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/UniqueAnnotations.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/UniqueAnnotations.java
similarity index 92%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/UniqueAnnotations.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/UniqueAnnotations.java
index 3bf17b32f1a..1943402039c 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/UniqueAnnotations.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/UniqueAnnotations.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
-import org.elasticsearch.util.guice.inject.BindingAnnotation;
+import org.elasticsearch.util.inject.BindingAnnotation;
 
 import java.lang.annotation.Annotation;
 import java.lang.annotation.Retention;
@@ -32,7 +32,7 @@ public class UniqueAnnotations {
 
   /**
    * Returns an annotation instance that is not equal to any other annotation
-   * instances, for use in creating distinct {@link org.elasticsearch.util.guice.inject.Key}s.
+   * instances, for use in creating distinct {@link org.elasticsearch.util.inject.Key}s.
    */
   public static Annotation create() {
     return create(nextUniqueValue.getAndIncrement());
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/UnmodifiableIterator.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/UnmodifiableIterator.java
similarity index 94%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/UnmodifiableIterator.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/UnmodifiableIterator.java
index 12d1d15bd56..d79013232fd 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/UnmodifiableIterator.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/UnmodifiableIterator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
 import java.util.Iterator;
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/UntargettedBindingImpl.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/UntargettedBindingImpl.java
similarity index 81%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/UntargettedBindingImpl.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/UntargettedBindingImpl.java
index d83f997670c..73ba352f22e 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/UntargettedBindingImpl.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/UntargettedBindingImpl.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.internal;
+package org.elasticsearch.util.inject.internal;
 
-import org.elasticsearch.util.guice.inject.Injector;
-import org.elasticsearch.util.guice.inject.Key;
-import org.elasticsearch.util.guice.inject.Binder;
-import org.elasticsearch.util.guice.inject.spi.BindingTargetVisitor;
-import org.elasticsearch.util.guice.inject.spi.Dependency;
-import org.elasticsearch.util.guice.inject.spi.UntargettedBinding;
+import org.elasticsearch.util.inject.Injector;
+import org.elasticsearch.util.inject.Key;
+import org.elasticsearch.util.inject.Binder;
+import org.elasticsearch.util.inject.spi.BindingTargetVisitor;
+import org.elasticsearch.util.inject.spi.Dependency;
+import org.elasticsearch.util.inject.spi.UntargettedBinding;
 
 public class UntargettedBindingImpl extends BindingImpl implements UntargettedBinding {
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/package-info.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/package-info.java
similarity index 92%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/package-info.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/package-info.java
index c2082744c12..0a8aba72307 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/internal/package-info.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/internal/package-info.java
@@ -18,4 +18,4 @@
  * Guice (sounds like like "juice")
  */
 
-package org.elasticsearch.util.guice.inject.internal;
\ No newline at end of file
+package org.elasticsearch.util.inject.internal;
\ No newline at end of file
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/matcher/AbstractMatcher.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/matcher/AbstractMatcher.java
similarity index 97%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/matcher/AbstractMatcher.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/matcher/AbstractMatcher.java
index 5dc946deb47..7f3ec4bf595 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/matcher/AbstractMatcher.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/matcher/AbstractMatcher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.matcher;
+package org.elasticsearch.util.inject.matcher;
 
 import java.io.Serializable;
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/matcher/Matcher.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/matcher/Matcher.java
similarity index 95%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/matcher/Matcher.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/matcher/Matcher.java
index 021848eea6a..3d00653dbb9 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/matcher/Matcher.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/matcher/Matcher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.matcher;
+package org.elasticsearch.util.inject.matcher;
 
 /**
  * Returns {@code true} or {@code false} for a given input.
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/matcher/Matchers.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/matcher/Matchers.java
similarity index 98%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/matcher/Matchers.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/matcher/Matchers.java
index 50c23445e65..6aac5f13d93 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/matcher/Matchers.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/matcher/Matchers.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.matcher;
+package org.elasticsearch.util.inject.matcher;
 
-import static org.elasticsearch.util.guice.inject.internal.Preconditions.checkArgument;
-import static org.elasticsearch.util.guice.inject.internal.Preconditions.checkNotNull;
+import static org.elasticsearch.util.inject.internal.Preconditions.checkArgument;
+import static org.elasticsearch.util.inject.internal.Preconditions.checkNotNull;
 import java.io.Serializable;
 import java.lang.annotation.Annotation;
 import java.lang.annotation.Retention;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/matcher/package-info.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/matcher/package-info.java
similarity index 93%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/matcher/package-info.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/matcher/package-info.java
index 5dfd78466a5..677807d92d4 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/matcher/package-info.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/matcher/package-info.java
@@ -18,4 +18,4 @@
  * Used for matching things. Primarily used to pick out methods to which to
  * apply interceptors.
  */
-package org.elasticsearch.util.guice.inject.matcher;
\ No newline at end of file
+package org.elasticsearch.util.inject.matcher;
\ No newline at end of file
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/multibindings/Element.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/multibindings/Element.java
similarity index 89%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/multibindings/Element.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/multibindings/Element.java
index b0ebf9714fb..a315bf2fcce 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/multibindings/Element.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/multibindings/Element.java
@@ -15,9 +15,9 @@
  */
 
 
-package org.elasticsearch.util.guice.inject.multibindings;
+package org.elasticsearch.util.inject.multibindings;
 
-import org.elasticsearch.util.guice.inject.BindingAnnotation;
+import org.elasticsearch.util.inject.BindingAnnotation;
 
 import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/multibindings/MapBinder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/multibindings/MapBinder.java
similarity index 96%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/multibindings/MapBinder.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/multibindings/MapBinder.java
index 055c5d71bdb..738bcc74b63 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/multibindings/MapBinder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/multibindings/MapBinder.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.multibindings;
+package org.elasticsearch.util.inject.multibindings;
 
 import org.elasticsearch.util.collect.ImmutableSet;
-import org.elasticsearch.util.guice.inject.*;
-import org.elasticsearch.util.guice.inject.binder.LinkedBindingBuilder;
-import org.elasticsearch.util.guice.inject.spi.Dependency;
-import org.elasticsearch.util.guice.inject.spi.ProviderWithDependencies;
-import org.elasticsearch.util.guice.inject.util.Types;
+import org.elasticsearch.util.inject.*;
+import org.elasticsearch.util.inject.binder.LinkedBindingBuilder;
+import org.elasticsearch.util.inject.spi.Dependency;
+import org.elasticsearch.util.inject.spi.ProviderWithDependencies;
+import org.elasticsearch.util.inject.util.Types;
 
 import java.lang.annotation.Annotation;
 import java.util.Collections;
@@ -30,8 +30,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import static org.elasticsearch.util.guice.inject.multibindings.Multibinder.*;
-import static org.elasticsearch.util.guice.inject.util.Types.*;
+import static org.elasticsearch.util.inject.multibindings.Multibinder.*;
+import static org.elasticsearch.util.inject.util.Types.*;
 
 /**
  * An API to bind multiple map entries separately, only to later inject them as
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/multibindings/Multibinder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/multibindings/Multibinder.java
similarity index 96%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/multibindings/Multibinder.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/multibindings/Multibinder.java
index 02cfea821f7..06e0ddcbed4 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/multibindings/Multibinder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/multibindings/Multibinder.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.multibindings;
+package org.elasticsearch.util.inject.multibindings;
 
 import org.elasticsearch.util.collect.ImmutableList;
 import org.elasticsearch.util.collect.ImmutableSet;
 import org.elasticsearch.util.collect.Lists;
-import org.elasticsearch.util.guice.inject.*;
-import org.elasticsearch.util.guice.inject.binder.LinkedBindingBuilder;
-import org.elasticsearch.util.guice.inject.internal.Errors;
-import org.elasticsearch.util.guice.inject.spi.Dependency;
-import org.elasticsearch.util.guice.inject.spi.HasDependencies;
-import org.elasticsearch.util.guice.inject.spi.Message;
-import org.elasticsearch.util.guice.inject.util.Types;
+import org.elasticsearch.util.inject.*;
+import org.elasticsearch.util.inject.binder.LinkedBindingBuilder;
+import org.elasticsearch.util.inject.internal.Errors;
+import org.elasticsearch.util.inject.spi.Dependency;
+import org.elasticsearch.util.inject.spi.HasDependencies;
+import org.elasticsearch.util.inject.spi.Message;
+import org.elasticsearch.util.inject.util.Types;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/multibindings/RealElement.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/multibindings/RealElement.java
similarity index 96%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/multibindings/RealElement.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/multibindings/RealElement.java
index 2768ca7dc8d..b07242802f5 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/multibindings/RealElement.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/multibindings/RealElement.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.multibindings;
+package org.elasticsearch.util.inject.multibindings;
 
 import java.lang.annotation.Annotation;
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/multibindings/package-info.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/multibindings/package-info.java
similarity index 92%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/multibindings/package-info.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/multibindings/package-info.java
index 42d6aa3e8a3..cab04e7e4e7 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/multibindings/package-info.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/multibindings/package-info.java
@@ -18,4 +18,4 @@
  * Extension for binding multiple instances in a collection; this extension requires {@code
  * guice-multibindings-2.0.jar}.
  */
-package org.elasticsearch.util.guice.inject.multibindings;
\ No newline at end of file
+package org.elasticsearch.util.inject.multibindings;
\ No newline at end of file
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/name/Named.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/name/Named.java
similarity index 90%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/name/Named.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/name/Named.java
index 4fbf7e71e25..8eb11f1701b 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/name/Named.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/name/Named.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.name;
+package org.elasticsearch.util.inject.name;
 
-import org.elasticsearch.util.guice.inject.BindingAnnotation;
+import org.elasticsearch.util.inject.BindingAnnotation;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/name/NamedImpl.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/name/NamedImpl.java
similarity index 91%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/name/NamedImpl.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/name/NamedImpl.java
index adf4e2127b9..1c7db2ae671 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/name/NamedImpl.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/name/NamedImpl.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.name;
+package org.elasticsearch.util.inject.name;
 
-import static org.elasticsearch.util.guice.inject.internal.Preconditions.checkNotNull;
+import static org.elasticsearch.util.inject.internal.Preconditions.checkNotNull;
 import java.io.Serializable;
 import java.lang.annotation.Annotation;
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/name/Names.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/name/Names.java
similarity index 93%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/name/Names.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/name/Names.java
index 3ec4af25890..339dfff5ffa 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/name/Names.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/name/Names.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.name;
+package org.elasticsearch.util.inject.name;
 
-import org.elasticsearch.util.guice.inject.Binder;
-import org.elasticsearch.util.guice.inject.Key;
+import org.elasticsearch.util.inject.Binder;
+import org.elasticsearch.util.inject.Key;
 import java.util.Enumeration;
 import java.util.Map;
 import java.util.Properties;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/name/package-info.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/name/package-info.java
similarity index 92%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/name/package-info.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/name/package-info.java
index 42e33737bcf..79bdf18c4f3 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/name/package-info.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/name/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Support for binding to string-based names.
  */
-package org.elasticsearch.util.guice.inject.name;
\ No newline at end of file
+package org.elasticsearch.util.inject.name;
\ No newline at end of file
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/package-info.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/package-info.java
similarity index 83%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/package-info.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/package-info.java
index 4b743911944..edd0cf8d503 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/package-info.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/package-info.java
@@ -23,25 +23,25 @@
  * 
    The principal public APIs in this package are:
  *
  * 
    
- * 
    {@link org.elasticsearch.util.guice.inject.Inject}
+ * 
    {@link org.elasticsearch.util.inject.Inject}
  * 
    The annotation you will use in your implementation classes to tell Guice
  *     where and how it should send in ("inject") the objects you depend on
  *     (your "dependencies").
  *
- * 
    {@link org.elasticsearch.util.guice.inject.Module}
+ * 
    {@link org.elasticsearch.util.inject.Module}
  * 
    The interface you will implement in order to specify "bindings" --
  *     instructions for how Guice should handle injection -- for a particular
  *     set of interfaces.
  *
- * 
    {@link org.elasticsearch.util.guice.inject.Binder}
- * 
    The object that Guice passes into your {@link org.elasticsearch.util.guice.inject.Module}
+ * 
    {@link org.elasticsearch.util.inject.Binder}
+ * 
    The object that Guice passes into your {@link org.elasticsearch.util.inject.Module}
  *     to collect these bindings.
  *
- * 
    {@link org.elasticsearch.util.guice.inject.Provider}
+ * 
    {@link org.elasticsearch.util.inject.Provider}
  * 
    The interface you will implement when you need to customize exactly how
  *     Guice creates instances for a particular binding.
  *
  * 
    
  *
  */
-package org.elasticsearch.util.guice.inject;
\ No newline at end of file
+package org.elasticsearch.util.inject;
\ No newline at end of file
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/BindingScopingVisitor.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/BindingScopingVisitor.java
similarity index 92%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/BindingScopingVisitor.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/BindingScopingVisitor.java
index 6f0b51ae70b..f3d5a7f6b78 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/BindingScopingVisitor.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/BindingScopingVisitor.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
-import org.elasticsearch.util.guice.inject.Scope;
+import org.elasticsearch.util.inject.Scope;
 import java.lang.annotation.Annotation;
 
 /**
@@ -41,7 +41,7 @@ public interface BindingScopingVisitor {
 
   /**
    * Visit a scope annotation. This scope strategy is found only on module bindings. The instance
-   * that implements this scope is registered by {@link org.elasticsearch.util.guice.inject.Binder#bindScope(Class,
+   * that implements this scope is registered by {@link org.elasticsearch.util.inject.Binder#bindScope(Class,
    * Scope) Binder.bindScope()}.
    */
   V visitScopeAnnotation(Class scopeAnnotation);
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/BindingTargetVisitor.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/BindingTargetVisitor.java
similarity index 94%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/BindingTargetVisitor.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/BindingTargetVisitor.java
index e1d4ba9dfd6..284d8ca41ce 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/BindingTargetVisitor.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/BindingTargetVisitor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
 /**
  * Visits each of the strategies used to find an instance to satisfy an injection.
@@ -76,7 +76,7 @@ public interface BindingTargetVisitor {
   V visit(ConvertedConstantBinding binding);
 
   /**
-   * Visit a binding to a {@link org.elasticsearch.util.guice.inject.Provider} that delegates to the binding for the
+   * Visit a binding to a {@link org.elasticsearch.util.inject.Provider} that delegates to the binding for the
    * provided type. This target is found only on injector bindings.
    */
   V visit(ProviderBinding binding);
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/ConstructorBinding.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/ConstructorBinding.java
similarity index 93%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/ConstructorBinding.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/ConstructorBinding.java
index 13200bea709..a38f90a3cf1 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/ConstructorBinding.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/ConstructorBinding.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
-import org.elasticsearch.util.guice.inject.Binding;
+import org.elasticsearch.util.inject.Binding;
 
 import java.util.Set;
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/ConvertedConstantBinding.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/ConvertedConstantBinding.java
similarity index 83%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/ConvertedConstantBinding.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/ConvertedConstantBinding.java
index 97e299e9658..9d0534e35cc 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/ConvertedConstantBinding.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/ConvertedConstantBinding.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
-import org.elasticsearch.util.guice.inject.Binding;
-import org.elasticsearch.util.guice.inject.Key;
+import org.elasticsearch.util.inject.Binding;
+import org.elasticsearch.util.inject.Key;
 import java.util.Set;
 
 /**
@@ -36,7 +36,7 @@ public interface ConvertedConstantBinding extends Binding, HasDependencies
 
   /**
    * Returns the key for the source binding. That binding can e retrieved from an injector using
-   * {@link org.elasticsearch.util.guice.inject.Injector#getBinding(Key) Injector.getBinding(key)}.
+   * {@link org.elasticsearch.util.inject.Injector#getBinding(Key) Injector.getBinding(key)}.
    */
   Key getSourceKey();
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/DefaultBindingScopingVisitor.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/DefaultBindingScopingVisitor.java
similarity index 93%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/DefaultBindingScopingVisitor.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/DefaultBindingScopingVisitor.java
index d8cb9e0ed44..1c25252d592 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/DefaultBindingScopingVisitor.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/DefaultBindingScopingVisitor.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
-import org.elasticsearch.util.guice.inject.Scope;
+import org.elasticsearch.util.inject.Scope;
 import java.lang.annotation.Annotation;
 
 /**
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/DefaultBindingTargetVisitor.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/DefaultBindingTargetVisitor.java
similarity index 95%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/DefaultBindingTargetVisitor.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/DefaultBindingTargetVisitor.java
index 8e0bf8edc16..2bced9c808b 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/DefaultBindingTargetVisitor.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/DefaultBindingTargetVisitor.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
-import org.elasticsearch.util.guice.inject.Binding;
+import org.elasticsearch.util.inject.Binding;
 
 /**
  * No-op visitor for subclassing. All interface methods simply delegate to {@link
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/DefaultElementVisitor.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/DefaultElementVisitor.java
similarity index 95%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/DefaultElementVisitor.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/DefaultElementVisitor.java
index 57da9eb7d8a..86d4500237b 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/DefaultElementVisitor.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/DefaultElementVisitor.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
-import org.elasticsearch.util.guice.inject.Binding;
+import org.elasticsearch.util.inject.Binding;
 
 /**
  * No-op visitor for subclassing. All interface methods simply delegate to
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/Dependency.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/Dependency.java
similarity index 97%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/Dependency.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/Dependency.java
index 0aa5fe0f447..0e9e7fe9616 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/Dependency.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/Dependency.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
 import org.elasticsearch.util.base.Objects;
 import org.elasticsearch.util.collect.ImmutableSet;
 import org.elasticsearch.util.collect.Lists;
-import org.elasticsearch.util.guice.inject.Key;
+import org.elasticsearch.util.inject.Key;
 
 import java.util.List;
 import java.util.Set;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/Element.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/Element.java
similarity index 86%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/Element.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/Element.java
index 384e126f1b1..9c972aff019 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/Element.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/Element.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
-import org.elasticsearch.util.guice.inject.Binder;
+import org.elasticsearch.util.inject.Binder;
 
 /**
  * A core component of a module or injector.
  *
  * 
    The elements of a module can be inspected, validated and rewritten. Use {@link
- * Elements#getElements(org.elasticsearch.util.guice.inject.Module[]) Elements.getElements()} to read the elements
+ * Elements#getElements(org.elasticsearch.util.inject.Module[]) Elements.getElements()} to read the elements
  * from a module, and {@link Elements#getModule(Iterable) Elements.getModule()} to rewrite them.
  * This can be used for static analysis and generation of Guice modules.
  *
  * 
    The elements of an injector can be inspected and exercised. Use {@link
- * org.elasticsearch.util.guice.inject.Injector#getBindings Injector.getBindings()} to reflect on Guice injectors.
+ * org.elasticsearch.util.inject.Injector#getBindings Injector.getBindings()} to reflect on Guice injectors.
  *
  * @author jessewilson@google.com (Jesse Wilson)
  * @author crazybob@google.com (Bob Lee)
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/ElementVisitor.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/ElementVisitor.java
similarity index 92%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/ElementVisitor.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/ElementVisitor.java
index 3b16b263df7..92c07cc3e49 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/ElementVisitor.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/ElementVisitor.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
-import org.elasticsearch.util.guice.inject.Binding;
+import org.elasticsearch.util.inject.Binding;
 
 /**
  * Visit elements.
@@ -70,7 +70,7 @@ public interface ElementVisitor {
   V visit(Message message);
 
   /**
-   * Visit a collection of configuration elements for a {@linkplain org.elasticsearch.util.guice.inject.PrivateBinder
+   * Visit a collection of configuration elements for a {@linkplain org.elasticsearch.util.inject.PrivateBinder
    * private binder}.
    */
   V visit(PrivateElements elements);
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/Elements.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/Elements.java
similarity index 95%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/Elements.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/Elements.java
index 9be36ea36de..a887cc66506 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/Elements.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/Elements.java
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
 import org.elasticsearch.util.collect.ImmutableList;
 import org.elasticsearch.util.collect.Lists;
 import org.elasticsearch.util.collect.Sets;
-import org.elasticsearch.util.guice.inject.*;
-import org.elasticsearch.util.guice.inject.binder.AnnotatedBindingBuilder;
-import org.elasticsearch.util.guice.inject.binder.AnnotatedConstantBindingBuilder;
-import org.elasticsearch.util.guice.inject.binder.AnnotatedElementBuilder;
-import org.elasticsearch.util.guice.inject.internal.*;
-import org.elasticsearch.util.guice.inject.matcher.Matcher;
+import org.elasticsearch.util.inject.*;
+import org.elasticsearch.util.inject.binder.AnnotatedBindingBuilder;
+import org.elasticsearch.util.inject.binder.AnnotatedConstantBindingBuilder;
+import org.elasticsearch.util.inject.binder.AnnotatedElementBuilder;
+import org.elasticsearch.util.inject.internal.*;
+import org.elasticsearch.util.inject.matcher.Matcher;
 
 import java.lang.annotation.Annotation;
 import java.util.*;
 
-import static org.elasticsearch.util.guice.inject.internal.Preconditions.*;
+import static org.elasticsearch.util.inject.internal.Preconditions.*;
 
 /**
  * Exposes elements of a module so they can be inspected, validated or {@link
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/ExposedBinding.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/ExposedBinding.java
similarity index 87%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/ExposedBinding.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/ExposedBinding.java
index 767de6d2f0b..c06cfbe4439 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/ExposedBinding.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/ExposedBinding.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
-import org.elasticsearch.util.guice.inject.Binding;
-import org.elasticsearch.util.guice.inject.Binder;
+import org.elasticsearch.util.inject.Binding;
+import org.elasticsearch.util.inject.Binder;
 
 /**
  * A binding to a key exposed from an enclosed private environment.
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/HasDependencies.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/HasDependencies.java
similarity index 82%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/HasDependencies.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/HasDependencies.java
index ebba01c38af..61bfe0e6f6e 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/HasDependencies.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/HasDependencies.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
 import java.util.Set;
 
 /**
- * Implemented by {@link org.elasticsearch.util.guice.inject.Binding bindings}, {@link org.elasticsearch.util.guice.inject.Provider
+ * Implemented by {@link org.elasticsearch.util.inject.Binding bindings}, {@link org.elasticsearch.util.inject.Provider
  * providers} and instances that expose their dependencies explicitly.
  *
  * @author jessewilson@google.com (Jesse Wilson)
@@ -29,7 +29,7 @@ public interface HasDependencies {
 
   /**
    * Returns the known dependencies for this type. If this has dependencies whose values are not
-   * known statically, a dependency for the {@link org.elasticsearch.util.guice.inject.Injector Injector} will be
+   * known statically, a dependency for the {@link org.elasticsearch.util.inject.Injector Injector} will be
    * included in the returned set.
    * 
    * @return a possibly empty set
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/InjectionListener.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/InjectionListener.java
similarity index 95%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/InjectionListener.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/InjectionListener.java
index a03074e3460..d79f74b76d4 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/InjectionListener.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/InjectionListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
 /**
  * Listens for injections into instances of type {@code I}. Useful for performing further
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/InjectionPoint.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/InjectionPoint.java
similarity index 96%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/InjectionPoint.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/InjectionPoint.java
index fcc15171202..3e918f65fa5 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/InjectionPoint.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/InjectionPoint.java
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
 import org.elasticsearch.util.collect.ImmutableList;
 import org.elasticsearch.util.collect.ImmutableSet;
 import org.elasticsearch.util.collect.Lists;
-import org.elasticsearch.util.guice.inject.ConfigurationException;
-import org.elasticsearch.util.guice.inject.Inject;
-import org.elasticsearch.util.guice.inject.Key;
-import org.elasticsearch.util.guice.inject.TypeLiteral;
-import org.elasticsearch.util.guice.inject.internal.*;
+import org.elasticsearch.util.inject.ConfigurationException;
+import org.elasticsearch.util.inject.Inject;
+import org.elasticsearch.util.inject.Key;
+import org.elasticsearch.util.inject.TypeLiteral;
+import org.elasticsearch.util.inject.internal.*;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.*;
 import java.util.*;
 
-import static org.elasticsearch.util.guice.inject.internal.MoreTypes.*;
+import static org.elasticsearch.util.inject.internal.MoreTypes.*;
 
 /**
  * A constructor, field or method that can receive injections. Typically this is a member with the
@@ -137,7 +137,7 @@ public final class InjectionPoint {
   /**
    * Returns true if this injection point shall be skipped if the injector cannot resolve bindings
    * for all required dependencies. Both explicit bindings (as specified in a module), and implicit
-   * bindings ({@literal @}{@link org.elasticsearch.util.guice.inject.ImplementedBy ImplementedBy}, default
+   * bindings ({@literal @}{@link org.elasticsearch.util.inject.ImplementedBy ImplementedBy}, default
    * constructors etc.) may be used to satisfy optional injection points.
    */
   public boolean isOptional() {
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/InjectionRequest.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/InjectionRequest.java
similarity index 86%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/InjectionRequest.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/InjectionRequest.java
index 0f3c83b494d..f0b743b797f 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/InjectionRequest.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/InjectionRequest.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
-import org.elasticsearch.util.guice.inject.Binder;
-import org.elasticsearch.util.guice.inject.ConfigurationException;
-import org.elasticsearch.util.guice.inject.TypeLiteral;
-import static org.elasticsearch.util.guice.inject.internal.Preconditions.checkNotNull;
+import org.elasticsearch.util.inject.Binder;
+import org.elasticsearch.util.inject.ConfigurationException;
+import org.elasticsearch.util.inject.TypeLiteral;
+import static org.elasticsearch.util.inject.internal.Preconditions.checkNotNull;
 import java.util.Set;
 
 /**
  * A request to inject the instance fields and methods of an instance. Requests are created
- * explicitly in a module using {@link org.elasticsearch.util.guice.inject.Binder#requestInjection(Object)
+ * explicitly in a module using {@link org.elasticsearch.util.inject.Binder#requestInjection(Object)
  * requestInjection()} statements:
  * 
      *     requestInjection(serviceInstance);
    
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/InstanceBinding.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/InstanceBinding.java
similarity index 91%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/InstanceBinding.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/InstanceBinding.java
index d1348b7c050..2ad458317d5 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/InstanceBinding.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/InstanceBinding.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
-import org.elasticsearch.util.guice.inject.Binding;
+import org.elasticsearch.util.inject.Binding;
 import java.util.Set;
 
 /**
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/LinkedKeyBinding.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/LinkedKeyBinding.java
similarity index 78%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/LinkedKeyBinding.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/LinkedKeyBinding.java
index 68f16b9382d..89e15e37a91 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/LinkedKeyBinding.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/LinkedKeyBinding.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
-import org.elasticsearch.util.guice.inject.Binding;
-import org.elasticsearch.util.guice.inject.Key;
+import org.elasticsearch.util.inject.Binding;
+import org.elasticsearch.util.inject.Key;
 
 /**
  * A binding to a linked key. The other key's binding is used to resolve injections.
@@ -29,7 +29,7 @@ public interface LinkedKeyBinding extends Binding {
 
   /**
    * Returns the linked key used to resolve injections. That binding can be retrieved from an
-   * injector using {@link org.elasticsearch.util.guice.inject.Injector#getBinding(Key) Injector.getBinding(key)}.
+   * injector using {@link org.elasticsearch.util.inject.Injector#getBinding(Key) Injector.getBinding(key)}.
    */
   Key getLinkedKey();
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/MembersInjectorLookup.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/MembersInjectorLookup.java
similarity index 85%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/MembersInjectorLookup.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/MembersInjectorLookup.java
index a46d107b714..5bde3644799 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/MembersInjectorLookup.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/MembersInjectorLookup.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
-import org.elasticsearch.util.guice.inject.Binder;
-import org.elasticsearch.util.guice.inject.MembersInjector;
-import org.elasticsearch.util.guice.inject.TypeLiteral;
-import static org.elasticsearch.util.guice.inject.internal.Preconditions.checkNotNull;
-import static org.elasticsearch.util.guice.inject.internal.Preconditions.checkState;
+import org.elasticsearch.util.inject.Binder;
+import org.elasticsearch.util.inject.MembersInjector;
+import org.elasticsearch.util.inject.TypeLiteral;
+import static org.elasticsearch.util.inject.internal.Preconditions.checkNotNull;
+import static org.elasticsearch.util.inject.internal.Preconditions.checkState;
 
 /**
  * A lookup of the members injector for a type. Lookups are created explicitly in a module using
- * {@link org.elasticsearch.util.guice.inject.Binder#getMembersInjector(Class) getMembersInjector()} statements:
+ * {@link org.elasticsearch.util.inject.Binder#getMembersInjector(Class) getMembersInjector()} statements:
  * 
      *     MembersInjector<PaymentService> membersInjector
  *         = getMembersInjector(PaymentService.class);
    
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/Message.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/Message.java
similarity index 89%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/Message.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/Message.java
index 2b6a7e8cca8..eca56ed9b31 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/Message.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/Message.java
@@ -14,24 +14,24 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
 import org.elasticsearch.util.base.Objects;
 import org.elasticsearch.util.collect.ImmutableList;
-import org.elasticsearch.util.guice.inject.Binder;
-import org.elasticsearch.util.guice.inject.internal.Errors;
-import org.elasticsearch.util.guice.inject.internal.SourceProvider;
+import org.elasticsearch.util.inject.Binder;
+import org.elasticsearch.util.inject.internal.Errors;
+import org.elasticsearch.util.inject.internal.SourceProvider;
 
 import java.io.ObjectStreamException;
 import java.io.Serializable;
 import java.util.List;
 
-import static org.elasticsearch.util.guice.inject.internal.Preconditions.*;
+import static org.elasticsearch.util.inject.internal.Preconditions.*;
 
 /**
  * An error message and the context in which it occured. Messages are usually created internally by
  * Guice and its extensions. Messages can be created explicitly in a module using {@link
- * org.elasticsearch.util.guice.inject.Binder#addError(Throwable) addError()} statements:
+ * org.elasticsearch.util.inject.Binder#addError(Throwable) addError()} statements:
  * 
      *     try {
  *       bindPropertiesFromFile();
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/PrivateElements.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/PrivateElements.java
similarity index 87%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/PrivateElements.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/PrivateElements.java
index a651e64e00b..38eb6cd7d12 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/PrivateElements.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/PrivateElements.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
-import org.elasticsearch.util.guice.inject.Injector;
-import org.elasticsearch.util.guice.inject.Key;
+import org.elasticsearch.util.inject.Injector;
+import org.elasticsearch.util.inject.Key;
 import java.util.List;
 import java.util.Set;
 
 /**
  * A private collection of elements that are hidden from the enclosing injector or module by
- * default. See {@link org.elasticsearch.util.guice.inject.PrivateModule PrivateModule} for details.
+ * default. See {@link org.elasticsearch.util.inject.PrivateModule PrivateModule} for details.
  *
  * @author jessewilson@google.com (Jesse Wilson)
  * @since 2.0
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/ProviderBinding.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/ProviderBinding.java
similarity index 82%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/ProviderBinding.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/ProviderBinding.java
index 8e6ed718237..d7c3d1c93d7 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/ProviderBinding.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/ProviderBinding.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
-import org.elasticsearch.util.guice.inject.Binding;
-import org.elasticsearch.util.guice.inject.Key;
-import org.elasticsearch.util.guice.inject.Provider;
+import org.elasticsearch.util.inject.Binding;
+import org.elasticsearch.util.inject.Key;
+import org.elasticsearch.util.inject.Provider;
 
 /**
  * A binding to a {@link Provider} that delegates to the binding for the provided type. This binding
@@ -31,7 +31,7 @@ public interface ProviderBinding> extends Binding {
 
   /**
    * Returns the key whose binding is used to {@link Provider#get provide instances}. That binding
-   * can be retrieved from an injector using {@link org.elasticsearch.util.guice.inject.Injector#getBinding(Key)
+   * can be retrieved from an injector using {@link org.elasticsearch.util.inject.Injector#getBinding(Key)
    * Injector.getBinding(providedKey)}
    */
   Key getProvidedKey();
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/ProviderInstanceBinding.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/ProviderInstanceBinding.java
similarity index 88%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/ProviderInstanceBinding.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/ProviderInstanceBinding.java
index 020354570df..60c4d4f962a 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/ProviderInstanceBinding.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/ProviderInstanceBinding.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
-import org.elasticsearch.util.guice.inject.Binding;
-import org.elasticsearch.util.guice.inject.Provider;
+import org.elasticsearch.util.inject.Binding;
+import org.elasticsearch.util.inject.Provider;
 import java.util.Set;
 
 /**
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/ProviderKeyBinding.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/ProviderKeyBinding.java
similarity index 78%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/ProviderKeyBinding.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/ProviderKeyBinding.java
index 6444ea3c450..8cc094c7fac 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/ProviderKeyBinding.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/ProviderKeyBinding.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
-import org.elasticsearch.util.guice.inject.Binding;
-import org.elasticsearch.util.guice.inject.Key;
-import org.elasticsearch.util.guice.inject.Provider;
+import org.elasticsearch.util.inject.Binding;
+import org.elasticsearch.util.inject.Key;
+import org.elasticsearch.util.inject.Provider;
 
 /**
  * A binding to a provider key. To resolve injections, the provider key is first resolved, then that
@@ -31,7 +31,7 @@ public interface ProviderKeyBinding extends Binding {
 
   /**
    * Returns the key used to resolve the provider's binding. That binding can be retrieved from an
-   * injector using {@link org.elasticsearch.util.guice.inject.Injector#getBinding(Key)
+   * injector using {@link org.elasticsearch.util.inject.Injector#getBinding(Key)
    * Injector.getBinding(providerKey)}
    */
   Key> getProviderKey();
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/ProviderLookup.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/ProviderLookup.java
similarity index 85%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/ProviderLookup.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/ProviderLookup.java
index 140f596f3a4..17b168f1163 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/ProviderLookup.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/ProviderLookup.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
-import org.elasticsearch.util.guice.inject.Key;
-import org.elasticsearch.util.guice.inject.Provider;
-import org.elasticsearch.util.guice.inject.Binder;
-import static org.elasticsearch.util.guice.inject.internal.Preconditions.checkNotNull;
-import static org.elasticsearch.util.guice.inject.internal.Preconditions.checkState;
+import org.elasticsearch.util.inject.Key;
+import org.elasticsearch.util.inject.Provider;
+import org.elasticsearch.util.inject.Binder;
+import static org.elasticsearch.util.inject.internal.Preconditions.checkNotNull;
+import static org.elasticsearch.util.inject.internal.Preconditions.checkState;
 
 /**
  * A lookup of the provider for a type. Lookups are created explicitly in a module using
- * {@link org.elasticsearch.util.guice.inject.Binder#getProvider(Class) getProvider()} statements:
+ * {@link org.elasticsearch.util.inject.Binder#getProvider(Class) getProvider()} statements:
  * 
      *     Provider<PaymentService> paymentServiceProvider
  *         = getProvider(PaymentService.class);
    
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/ProviderWithDependencies.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/ProviderWithDependencies.java
similarity index 89%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/ProviderWithDependencies.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/ProviderWithDependencies.java
index 595b485e57d..a48ea26d1ca 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/ProviderWithDependencies.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/ProviderWithDependencies.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
-import org.elasticsearch.util.guice.inject.Provider;
+import org.elasticsearch.util.inject.Provider;
 
 /**
  * A provider with dependencies on other injected types. If a {@link Provider} has dependencies that
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/ScopeBinding.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/ScopeBinding.java
similarity index 83%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/ScopeBinding.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/ScopeBinding.java
index dc2b7dc2c7f..da2f8d4eaca 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/ScopeBinding.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/ScopeBinding.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
-import org.elasticsearch.util.guice.inject.Scope;
-import org.elasticsearch.util.guice.inject.Binder;
-import static org.elasticsearch.util.guice.inject.internal.Preconditions.checkNotNull;
+import org.elasticsearch.util.inject.Scope;
+import org.elasticsearch.util.inject.Binder;
+import static org.elasticsearch.util.inject.internal.Preconditions.checkNotNull;
 import java.lang.annotation.Annotation;
 
 /**
  * Registration of a scope annotation with the scope that implements it. Instances are created
- * explicitly in a module using {@link org.elasticsearch.util.guice.inject.Binder#bindScope(Class, Scope) bindScope()}
+ * explicitly in a module using {@link org.elasticsearch.util.inject.Binder#bindScope(Class, Scope) bindScope()}
  * statements:
  * 
      *     Scope recordScope = new RecordScope();
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/StaticInjectionRequest.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/StaticInjectionRequest.java
similarity index 86%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/StaticInjectionRequest.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/StaticInjectionRequest.java
index 26b2e718ab6..07f4dcab7f6 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/StaticInjectionRequest.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/StaticInjectionRequest.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
-import org.elasticsearch.util.guice.inject.ConfigurationException;
-import org.elasticsearch.util.guice.inject.Binder;
-import static org.elasticsearch.util.guice.inject.internal.Preconditions.checkNotNull;
+import org.elasticsearch.util.inject.ConfigurationException;
+import org.elasticsearch.util.inject.Binder;
+import static org.elasticsearch.util.inject.internal.Preconditions.checkNotNull;
 import java.util.Set;
 
 /**
  * A request to inject the static fields and methods of a type. Requests are created
- * explicitly in a module using {@link org.elasticsearch.util.guice.inject.Binder#requestStaticInjection(Class[])
+ * explicitly in a module using {@link org.elasticsearch.util.inject.Binder#requestStaticInjection(Class[])
  * requestStaticInjection()} statements:
  * 
      *     requestStaticInjection(MyLegacyService.class);
    
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/TypeConverter.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/TypeConverter.java
similarity index 89%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/TypeConverter.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/TypeConverter.java
index ab41e878a15..864f0911eb1 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/TypeConverter.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/TypeConverter.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
-import org.elasticsearch.util.guice.inject.TypeLiteral;
+import org.elasticsearch.util.inject.TypeLiteral;
 
 /**
  * Converts constant string values to a different type.
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/TypeConverterBinding.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/TypeConverterBinding.java
similarity index 81%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/TypeConverterBinding.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/TypeConverterBinding.java
index d03b7923b9b..11772125734 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/TypeConverterBinding.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/TypeConverterBinding.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
-import org.elasticsearch.util.guice.inject.TypeLiteral;
-import org.elasticsearch.util.guice.inject.Binder;
-import static org.elasticsearch.util.guice.inject.internal.Preconditions.checkNotNull;
-import org.elasticsearch.util.guice.inject.matcher.Matcher;
+import org.elasticsearch.util.inject.TypeLiteral;
+import org.elasticsearch.util.inject.Binder;
+import static org.elasticsearch.util.inject.internal.Preconditions.checkNotNull;
+import org.elasticsearch.util.inject.matcher.Matcher;
 
 /**
  * Registration of type converters for matching target types. Instances are created
- * explicitly in a module using {@link org.elasticsearch.util.guice.inject.Binder#convertToTypes(Matcher,
+ * explicitly in a module using {@link org.elasticsearch.util.inject.Binder#convertToTypes(Matcher,
  * TypeConverter) convertToTypes()} statements:
  * 
      *     convertToTypes(Matchers.only(DateTime.class), new DateTimeConverter());
    
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/TypeEncounter.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/TypeEncounter.java
similarity index 93%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/TypeEncounter.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/TypeEncounter.java
index 9267867123f..1c93a23ea04 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/TypeEncounter.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/TypeEncounter.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
-import org.elasticsearch.util.guice.inject.Provider;
-import org.elasticsearch.util.guice.inject.Key;
-import org.elasticsearch.util.guice.inject.MembersInjector;
-import org.elasticsearch.util.guice.inject.TypeLiteral;
+import org.elasticsearch.util.inject.Provider;
+import org.elasticsearch.util.inject.Key;
+import org.elasticsearch.util.inject.MembersInjector;
+import org.elasticsearch.util.inject.TypeLiteral;
 
 /**
  * Context of an injectable type encounter. Enables reporting errors, registering injection
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/TypeListener.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/TypeListener.java
similarity index 88%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/TypeListener.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/TypeListener.java
index fa80c256995..55a29433ea1 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/TypeListener.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/TypeListener.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
-import org.elasticsearch.util.guice.inject.TypeLiteral;
+import org.elasticsearch.util.inject.TypeLiteral;
 
 /**
  * Listens for Guice to encounter injectable types. If a given type has its constructor injected in
@@ -25,7 +25,7 @@ import org.elasticsearch.util.guice.inject.TypeLiteral;
  *
  * 
    Useful for extra type checking, {@linkplain TypeEncounter#register(InjectionListener)
  * registering injection listeners}, and {@linkplain TypeEncounter#bindInterceptor(
- * org.elasticsearch.util.guice.inject.matcher.Matcher, org.aopalliance.intercept.MethodInterceptor[])
+ * org.elasticsearch.util.inject.matcher.Matcher, org.aopalliance.intercept.MethodInterceptor[])
  * binding method interceptors}.
  * 
  * @since 2.0
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/TypeListenerBinding.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/TypeListenerBinding.java
similarity index 84%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/TypeListenerBinding.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/TypeListenerBinding.java
index b3de7e42482..72a9a762cc9 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/TypeListenerBinding.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/TypeListenerBinding.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
-import org.elasticsearch.util.guice.inject.Binder;
-import org.elasticsearch.util.guice.inject.TypeLiteral;
-import org.elasticsearch.util.guice.inject.matcher.Matcher;
+import org.elasticsearch.util.inject.Binder;
+import org.elasticsearch.util.inject.TypeLiteral;
+import org.elasticsearch.util.inject.matcher.Matcher;
 
 /**
  * Binds types (picked using a Matcher) to an type listener. Registrations are created explicitly in
- * a module using {@link org.elasticsearch.util.guice.inject.Binder#bindListener(Matcher, TypeListener)} statements:
+ * a module using {@link org.elasticsearch.util.inject.Binder#bindListener(Matcher, TypeListener)} statements:
  *
  * 
      *     register(only(new TypeLiteral<PaymentService<CreditCard>>() {}), listener);
    
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/UntargettedBinding.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/UntargettedBinding.java
similarity index 89%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/UntargettedBinding.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/UntargettedBinding.java
index d32dc9f2c30..d0c0f6787ac 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/UntargettedBinding.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/UntargettedBinding.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.spi;
+package org.elasticsearch.util.inject.spi;
 
-import org.elasticsearch.util.guice.inject.Binding;
+import org.elasticsearch.util.inject.Binding;
 
 /**
  * An untargetted binding. This binding indicates that the injector should use its implicit binding
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/package-info.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/package-info.java
similarity index 93%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/package-info.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/package-info.java
index 55ff9e9b9dc..516d029952b 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/spi/package-info.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/spi/package-info.java
@@ -18,4 +18,4 @@
  * Guice service provider interface
  */
 
-package org.elasticsearch.util.guice.inject.spi;
\ No newline at end of file
+package org.elasticsearch.util.inject.spi;
\ No newline at end of file
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/util/Modules.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/util/Modules.java
similarity index 98%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/util/Modules.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/util/Modules.java
index 54e445f854e..d9c3ea0feac 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/util/Modules.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/util/Modules.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.util;
+package org.elasticsearch.util.inject.util;
 
 import org.elasticsearch.util.collect.ImmutableSet;
 import org.elasticsearch.util.collect.Lists;
 import org.elasticsearch.util.collect.Maps;
 import org.elasticsearch.util.collect.Sets;
-import org.elasticsearch.util.guice.inject.*;
-import org.elasticsearch.util.guice.inject.spi.*;
+import org.elasticsearch.util.inject.*;
+import org.elasticsearch.util.inject.spi.*;
 
 import java.lang.annotation.Annotation;
 import java.util.Arrays;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/util/Providers.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/util/Providers.java
similarity index 93%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/util/Providers.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/util/Providers.java
index dcecdf07ac5..37b87965de0 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/util/Providers.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/util/Providers.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.elasticsearch.util.guice.inject.util;
+package org.elasticsearch.util.inject.util;
 
-import org.elasticsearch.util.guice.inject.Provider;
+import org.elasticsearch.util.inject.Provider;
 
 /**
  * Static utility methods for creating and working with instances of
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/util/Types.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/util/Types.java
similarity index 91%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/util/Types.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/util/Types.java
index 0870a2ca66b..9e86bf74174 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/util/Types.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/util/Types.java
@@ -15,13 +15,13 @@
  */
 
 
-package org.elasticsearch.util.guice.inject.util;
+package org.elasticsearch.util.inject.util;
 
-import org.elasticsearch.util.guice.inject.Provider;
-import org.elasticsearch.util.guice.inject.internal.MoreTypes;
-import org.elasticsearch.util.guice.inject.internal.MoreTypes.GenericArrayTypeImpl;
-import org.elasticsearch.util.guice.inject.internal.MoreTypes.ParameterizedTypeImpl;
-import org.elasticsearch.util.guice.inject.internal.MoreTypes.WildcardTypeImpl;
+import org.elasticsearch.util.inject.Provider;
+import org.elasticsearch.util.inject.internal.MoreTypes;
+import org.elasticsearch.util.inject.internal.MoreTypes.GenericArrayTypeImpl;
+import org.elasticsearch.util.inject.internal.MoreTypes.ParameterizedTypeImpl;
+import org.elasticsearch.util.inject.internal.MoreTypes.WildcardTypeImpl;
 import java.lang.reflect.GenericArrayType;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/util/package-info.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/util/package-info.java
similarity index 92%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/util/package-info.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/util/package-info.java
index 022c0cc2c59..5c680b4b5d2 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/guice/inject/util/package-info.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/inject/util/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Helper methods for working with Guice.
  */
-package org.elasticsearch.util.guice.inject.util;
\ No newline at end of file
+package org.elasticsearch.util.inject.util;
\ No newline at end of file
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/network/NetworkModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/network/NetworkModule.java
index 3143d02489e..8cef93bc81e 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/network/NetworkModule.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/network/NetworkModule.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.util.network;
 
-import org.elasticsearch.util.guice.inject.AbstractModule;
+import org.elasticsearch.util.inject.AbstractModule;
 
 /**
  * @author kimchy (shay.banon)
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/network/NetworkService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/network/NetworkService.java
index cab3782574a..90ecd94c0c5 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/network/NetworkService.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/network/NetworkService.java
@@ -22,7 +22,7 @@ package org.elasticsearch.util.network;
 import org.elasticsearch.util.MapBuilder;
 import org.elasticsearch.util.collect.ImmutableMap;
 import org.elasticsearch.util.component.AbstractComponent;
-import org.elasticsearch.util.guice.inject.Inject;
+import org.elasticsearch.util.inject.Inject;
 import org.elasticsearch.util.settings.Settings;
 
 import java.io.IOException;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/settings/SettingsFilter.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/settings/SettingsFilter.java
index 1a222a0a8b6..477242b1885 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/settings/SettingsFilter.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/settings/SettingsFilter.java
@@ -1,7 +1,7 @@
 package org.elasticsearch.util.settings;
 
 import org.elasticsearch.util.component.AbstractComponent;
-import org.elasticsearch.util.guice.inject.Inject;
+import org.elasticsearch.util.inject.Inject;
 
 import java.util.concurrent.CopyOnWriteArrayList;
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/settings/SettingsModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/settings/SettingsModule.java
index 3356803d8a0..13635e3e34b 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/settings/SettingsModule.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/settings/SettingsModule.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.util.settings;
 
-import org.elasticsearch.util.guice.inject.AbstractModule;
+import org.elasticsearch.util.inject.AbstractModule;
 
 /**
  * A module that binds the provided settings to the {@link Settings} interface.
diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java b/modules/elasticsearch/src/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java
index e4c102302ee..8bcb7e5a945 100644
--- a/modules/elasticsearch/src/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java
+++ b/modules/elasticsearch/src/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java
@@ -19,8 +19,8 @@
 
 package org.elasticsearch.index.analysis;
 
-import org.elasticsearch.util.guice.inject.Guice;
-import org.elasticsearch.util.guice.inject.Injector;
+import org.elasticsearch.util.inject.Guice;
+import org.elasticsearch.util.inject.Injector;
 import org.apache.lucene.analysis.Analyzer;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.IndexNameModule;
diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/xcontent/guice/IndexQueryParserModuleTests.java b/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/xcontent/guice/IndexQueryParserModuleTests.java
index 54d593ac08a..3dc6af9ef95 100644
--- a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/xcontent/guice/IndexQueryParserModuleTests.java
+++ b/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/xcontent/guice/IndexQueryParserModuleTests.java
@@ -20,8 +20,8 @@
 package org.elasticsearch.index.query.xcontent.guice;
 
 import org.elasticsearch.index.query.xcontent.XContentIndexQueryParser;
-import org.elasticsearch.util.guice.inject.Guice;
-import org.elasticsearch.util.guice.inject.Injector;
+import org.elasticsearch.util.inject.Guice;
+import org.elasticsearch.util.inject.Injector;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.IndexNameModule;
 import org.elasticsearch.index.analysis.AnalysisModule;
diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/xcontent/guice/MyJsonFilterParser.java b/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/xcontent/guice/MyJsonFilterParser.java
index 2424653cca1..6faf8b7a708 100644
--- a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/xcontent/guice/MyJsonFilterParser.java
+++ b/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/xcontent/guice/MyJsonFilterParser.java
@@ -21,8 +21,8 @@ package org.elasticsearch.index.query.xcontent.guice;
 
 import org.elasticsearch.index.query.xcontent.QueryParseContext;
 import org.elasticsearch.index.query.xcontent.XContentFilterParser;
-import org.elasticsearch.util.guice.inject.Inject;
-import org.elasticsearch.util.guice.inject.assistedinject.Assisted;
+import org.elasticsearch.util.inject.Inject;
+import org.elasticsearch.util.inject.assistedinject.Assisted;
 import org.apache.lucene.search.Filter;
 import org.elasticsearch.index.AbstractIndexComponent;
 import org.elasticsearch.index.Index;
diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/xcontent/guice/MyJsonQueryParser.java b/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/xcontent/guice/MyJsonQueryParser.java
index a23bb5b275b..a0e8d244ff4 100644
--- a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/xcontent/guice/MyJsonQueryParser.java
+++ b/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/xcontent/guice/MyJsonQueryParser.java
@@ -19,8 +19,8 @@
 
 package org.elasticsearch.index.query.xcontent.guice;
 
-import org.elasticsearch.util.guice.inject.Inject;
-import org.elasticsearch.util.guice.inject.assistedinject.Assisted;
+import org.elasticsearch.util.inject.Inject;
+import org.elasticsearch.util.inject.assistedinject.Assisted;
 import org.apache.lucene.search.Query;
 import org.elasticsearch.index.AbstractIndexComponent;
 import org.elasticsearch.index.Index;
diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/util/SizeValueTests.java b/modules/elasticsearch/src/test/java/org/elasticsearch/util/SizeValueTests.java
index 93c47eaa58e..e79e2199c80 100644
--- a/modules/elasticsearch/src/test/java/org/elasticsearch/util/SizeValueTests.java
+++ b/modules/elasticsearch/src/test/java/org/elasticsearch/util/SizeValueTests.java
@@ -37,7 +37,7 @@ public class SizeValueTests {
     }
 
     @Test public void testToString() {
-        assertThat("10b", is(new SizeValue(10, SizeUnit.BYTES).toString()));
+        assertThat("10", is(new SizeValue(10, SizeUnit.BYTES).toString()));
         assertThat("1.5k", is(new SizeValue((long) (1024 * 1.5), SizeUnit.BYTES).toString()));
         assertThat("1.5m", is(new SizeValue((long) (1024 * 1.5), SizeUnit.KB).toString()));
         assertThat("1.5g", is(new SizeValue((long) (1024 * 1.5), SizeUnit.MB).toString()));
diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/util/guice/InjectorsTests.java b/modules/elasticsearch/src/test/java/org/elasticsearch/util/guice/InjectorsTests.java
index db851c069a6..0dfde515e52 100644
--- a/modules/elasticsearch/src/test/java/org/elasticsearch/util/guice/InjectorsTests.java
+++ b/modules/elasticsearch/src/test/java/org/elasticsearch/util/guice/InjectorsTests.java
@@ -19,11 +19,11 @@
 
 package org.elasticsearch.util.guice;
 
-import org.elasticsearch.util.guice.inject.AbstractModule;
-import org.elasticsearch.util.guice.inject.BindingAnnotation;
-import org.elasticsearch.util.guice.inject.Guice;
-import org.elasticsearch.util.guice.inject.Injector;
-import org.elasticsearch.util.guice.inject.matcher.Matchers;
+import org.elasticsearch.util.inject.AbstractModule;
+import org.elasticsearch.util.inject.BindingAnnotation;
+import org.elasticsearch.util.inject.Guice;
+import org.elasticsearch.util.inject.Injector;
+import org.elasticsearch.util.inject.matcher.Matchers;
 import org.testng.annotations.Test;
 
 import java.lang.annotation.Documented;
diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/TwoInstanceUnbalancedShardsEmbeddedSearchTests.java b/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/TwoInstanceUnbalancedShardsEmbeddedSearchTests.java
index 89f314121df..4655c6a81d7 100644
--- a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/TwoInstanceUnbalancedShardsEmbeddedSearchTests.java
+++ b/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/TwoInstanceUnbalancedShardsEmbeddedSearchTests.java
@@ -48,8 +48,8 @@ import org.elasticsearch.search.query.QuerySearchResultProvider;
 import org.elasticsearch.test.integration.AbstractNodesTests;
 import org.elasticsearch.util.TimeValue;
 import org.elasticsearch.util.collect.ImmutableMap;
-import org.elasticsearch.util.guice.inject.AbstractModule;
-import org.elasticsearch.util.guice.inject.Inject;
+import org.elasticsearch.util.inject.AbstractModule;
+import org.elasticsearch.util.inject.Inject;
 import org.elasticsearch.util.settings.Settings;
 import org.elasticsearch.util.trove.ExtTIntArrayList;
 import org.testng.annotations.AfterClass;
diff --git a/plugins/analysis/icu/src/main/java/org/elasticsearch/index/analysis/IcuAnalysisBinderProcessor.java b/plugins/analysis/icu/src/main/java/org/elasticsearch/index/analysis/IcuAnalysisBinderProcessor.java
index 7f913622fa6..372190b1056 100644
--- a/plugins/analysis/icu/src/main/java/org/elasticsearch/index/analysis/IcuAnalysisBinderProcessor.java
+++ b/plugins/analysis/icu/src/main/java/org/elasticsearch/index/analysis/IcuAnalysisBinderProcessor.java
@@ -19,9 +19,9 @@
 
 package org.elasticsearch.index.analysis;
 
-import org.elasticsearch.util.guice.inject.Scopes;
-import org.elasticsearch.util.guice.inject.assistedinject.FactoryProvider;
-import org.elasticsearch.util.guice.inject.multibindings.MapBinder;
+import org.elasticsearch.util.inject.Scopes;
+import org.elasticsearch.util.inject.assistedinject.FactoryProvider;
+import org.elasticsearch.util.inject.multibindings.MapBinder;
 import org.elasticsearch.util.settings.Settings;
 
 import java.util.Map;
diff --git a/plugins/analysis/icu/src/main/java/org/elasticsearch/index/analysis/IcuCollationTokenFilterFactory.java b/plugins/analysis/icu/src/main/java/org/elasticsearch/index/analysis/IcuCollationTokenFilterFactory.java
index 1f7e042032d..7e240690317 100644
--- a/plugins/analysis/icu/src/main/java/org/elasticsearch/index/analysis/IcuCollationTokenFilterFactory.java
+++ b/plugins/analysis/icu/src/main/java/org/elasticsearch/index/analysis/IcuCollationTokenFilterFactory.java
@@ -28,8 +28,8 @@ import org.elasticsearch.env.Environment;
 import org.elasticsearch.env.FailedToResolveConfigException;
 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.inject.Inject;
+import org.elasticsearch.util.inject.assistedinject.Assisted;
 import org.elasticsearch.util.settings.Settings;
 
 import java.io.IOException;
diff --git a/plugins/analysis/icu/src/main/java/org/elasticsearch/index/analysis/IcuFoldingTokenFilterFactory.java b/plugins/analysis/icu/src/main/java/org/elasticsearch/index/analysis/IcuFoldingTokenFilterFactory.java
index 54692b154a7..c248aa153b6 100644
--- a/plugins/analysis/icu/src/main/java/org/elasticsearch/index/analysis/IcuFoldingTokenFilterFactory.java
+++ b/plugins/analysis/icu/src/main/java/org/elasticsearch/index/analysis/IcuFoldingTokenFilterFactory.java
@@ -22,8 +22,8 @@ package org.elasticsearch.index.analysis;
 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.inject.Inject;
+import org.elasticsearch.util.inject.assistedinject.Assisted;
 import org.elasticsearch.util.settings.Settings;
 
 
diff --git a/plugins/analysis/icu/src/main/java/org/elasticsearch/index/analysis/IcuNormalizerTokenFilterFactory.java b/plugins/analysis/icu/src/main/java/org/elasticsearch/index/analysis/IcuNormalizerTokenFilterFactory.java
index 224c5db9d72..edef41876aa 100644
--- a/plugins/analysis/icu/src/main/java/org/elasticsearch/index/analysis/IcuNormalizerTokenFilterFactory.java
+++ b/plugins/analysis/icu/src/main/java/org/elasticsearch/index/analysis/IcuNormalizerTokenFilterFactory.java
@@ -23,8 +23,8 @@ import com.ibm.icu.text.Normalizer2;
 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.inject.Inject;
+import org.elasticsearch.util.inject.assistedinject.Assisted;
 import org.elasticsearch.util.settings.Settings;
 
 
diff --git a/plugins/analysis/icu/src/main/java/org/elasticsearch/plugin/analysis/icu/AnalysisICUPlugin.java b/plugins/analysis/icu/src/main/java/org/elasticsearch/plugin/analysis/icu/AnalysisICUPlugin.java
index 474e6e7a8cc..41172f51326 100644
--- a/plugins/analysis/icu/src/main/java/org/elasticsearch/plugin/analysis/icu/AnalysisICUPlugin.java
+++ b/plugins/analysis/icu/src/main/java/org/elasticsearch/plugin/analysis/icu/AnalysisICUPlugin.java
@@ -22,7 +22,7 @@ package org.elasticsearch.plugin.analysis.icu;
 import org.elasticsearch.index.analysis.AnalysisModule;
 import org.elasticsearch.index.analysis.IcuAnalysisBinderProcessor;
 import org.elasticsearch.plugins.AbstractPlugin;
-import org.elasticsearch.util.guice.inject.Module;
+import org.elasticsearch.util.inject.Module;
 
 /**
  * @author kimchy (shay.banon)
diff --git a/plugins/analysis/icu/src/test/java/org/elasticsearch/index/analysis/SimpleIcuAnalysisTests.java b/plugins/analysis/icu/src/test/java/org/elasticsearch/index/analysis/SimpleIcuAnalysisTests.java
index 931479e6767..eb3d638bfe4 100644
--- a/plugins/analysis/icu/src/test/java/org/elasticsearch/index/analysis/SimpleIcuAnalysisTests.java
+++ b/plugins/analysis/icu/src/test/java/org/elasticsearch/index/analysis/SimpleIcuAnalysisTests.java
@@ -22,8 +22,8 @@ package org.elasticsearch.index.analysis;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.IndexNameModule;
 import org.elasticsearch.index.settings.IndexSettingsModule;
-import org.elasticsearch.util.guice.inject.Guice;
-import org.elasticsearch.util.guice.inject.Injector;
+import org.elasticsearch.util.inject.Guice;
+import org.elasticsearch.util.inject.Injector;
 import org.hamcrest.MatcherAssert;
 import org.testng.annotations.Test;
 
diff --git a/plugins/cloud/src/main/java/org/elasticsearch/cloud/CloudModule.java b/plugins/cloud/src/main/java/org/elasticsearch/cloud/CloudModule.java
index 6fc853af3e0..f830b85a28a 100644
--- a/plugins/cloud/src/main/java/org/elasticsearch/cloud/CloudModule.java
+++ b/plugins/cloud/src/main/java/org/elasticsearch/cloud/CloudModule.java
@@ -21,7 +21,7 @@ package org.elasticsearch.cloud;
 
 import org.elasticsearch.cloud.blobstore.CloudBlobStoreService;
 import org.elasticsearch.cloud.compute.CloudComputeService;
-import org.elasticsearch.util.guice.inject.AbstractModule;
+import org.elasticsearch.util.inject.AbstractModule;
 
 /**
  * @author kimchy (shay.banon)
diff --git a/plugins/cloud/src/main/java/org/elasticsearch/cloud/blobstore/CloudBlobStoreService.java b/plugins/cloud/src/main/java/org/elasticsearch/cloud/blobstore/CloudBlobStoreService.java
index ff9e14812e9..6f09fd85b9e 100644
--- a/plugins/cloud/src/main/java/org/elasticsearch/cloud/blobstore/CloudBlobStoreService.java
+++ b/plugins/cloud/src/main/java/org/elasticsearch/cloud/blobstore/CloudBlobStoreService.java
@@ -23,7 +23,7 @@ import org.elasticsearch.ElasticSearchException;
 import org.elasticsearch.ElasticSearchIllegalStateException;
 import org.elasticsearch.cloud.jclouds.JCloudsUtils;
 import org.elasticsearch.util.component.AbstractLifecycleComponent;
-import org.elasticsearch.util.guice.inject.Inject;
+import org.elasticsearch.util.inject.Inject;
 import org.elasticsearch.util.settings.ImmutableSettings;
 import org.elasticsearch.util.settings.Settings;
 import org.elasticsearch.util.settings.SettingsFilter;
diff --git a/plugins/cloud/src/main/java/org/elasticsearch/cloud/compute/CloudComputeService.java b/plugins/cloud/src/main/java/org/elasticsearch/cloud/compute/CloudComputeService.java
index d68a039a62b..d45ee5e82ec 100644
--- a/plugins/cloud/src/main/java/org/elasticsearch/cloud/compute/CloudComputeService.java
+++ b/plugins/cloud/src/main/java/org/elasticsearch/cloud/compute/CloudComputeService.java
@@ -23,7 +23,7 @@ import org.elasticsearch.ElasticSearchException;
 import org.elasticsearch.ElasticSearchIllegalStateException;
 import org.elasticsearch.cloud.jclouds.JCloudsUtils;
 import org.elasticsearch.util.component.AbstractLifecycleComponent;
-import org.elasticsearch.util.guice.inject.Inject;
+import org.elasticsearch.util.inject.Inject;
 import org.elasticsearch.util.settings.ImmutableSettings;
 import org.elasticsearch.util.settings.Settings;
 import org.elasticsearch.util.settings.SettingsFilter;
diff --git a/plugins/cloud/src/main/java/org/elasticsearch/discovery/cloud/CloudDiscovery.java b/plugins/cloud/src/main/java/org/elasticsearch/discovery/cloud/CloudDiscovery.java
index a85dd1f538a..ebc9ad894d0 100644
--- a/plugins/cloud/src/main/java/org/elasticsearch/discovery/cloud/CloudDiscovery.java
+++ b/plugins/cloud/src/main/java/org/elasticsearch/discovery/cloud/CloudDiscovery.java
@@ -27,7 +27,7 @@ import org.elasticsearch.discovery.zen.ping.ZenPingService;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.TransportService;
 import org.elasticsearch.util.collect.ImmutableList;
-import org.elasticsearch.util.guice.inject.Inject;
+import org.elasticsearch.util.inject.Inject;
 import org.elasticsearch.util.settings.Settings;
 
 /**
diff --git a/plugins/cloud/src/main/java/org/elasticsearch/discovery/cloud/CloudDiscoveryModule.java b/plugins/cloud/src/main/java/org/elasticsearch/discovery/cloud/CloudDiscoveryModule.java
index cea73b58253..eba01289d9f 100644
--- a/plugins/cloud/src/main/java/org/elasticsearch/discovery/cloud/CloudDiscoveryModule.java
+++ b/plugins/cloud/src/main/java/org/elasticsearch/discovery/cloud/CloudDiscoveryModule.java
@@ -21,7 +21,7 @@ package org.elasticsearch.discovery.cloud;
 
 import org.elasticsearch.discovery.Discovery;
 import org.elasticsearch.discovery.zen.ping.ZenPingService;
-import org.elasticsearch.util.guice.inject.AbstractModule;
+import org.elasticsearch.util.inject.AbstractModule;
 
 /**
  * @author kimchy (shay.banon)
diff --git a/plugins/cloud/src/main/java/org/elasticsearch/gateway/cloud/CloudGateway.java b/plugins/cloud/src/main/java/org/elasticsearch/gateway/cloud/CloudGateway.java
index b950a67cd64..084f21e2e8a 100644
--- a/plugins/cloud/src/main/java/org/elasticsearch/gateway/cloud/CloudGateway.java
+++ b/plugins/cloud/src/main/java/org/elasticsearch/gateway/cloud/CloudGateway.java
@@ -30,8 +30,8 @@ import org.elasticsearch.gateway.GatewayException;
 import org.elasticsearch.index.gateway.cloud.CloudIndexGatewayModule;
 import org.elasticsearch.util.SizeValue;
 import org.elasticsearch.util.component.AbstractLifecycleComponent;
-import org.elasticsearch.util.guice.inject.Inject;
-import org.elasticsearch.util.guice.inject.Module;
+import org.elasticsearch.util.inject.Inject;
+import org.elasticsearch.util.inject.Module;
 import org.elasticsearch.util.io.FastByteArrayInputStream;
 import org.elasticsearch.util.settings.Settings;
 import org.elasticsearch.util.xcontent.ToXContent;
diff --git a/plugins/cloud/src/main/java/org/elasticsearch/gateway/cloud/CloudGatewayModule.java b/plugins/cloud/src/main/java/org/elasticsearch/gateway/cloud/CloudGatewayModule.java
index 73f4612f9c7..a9c3827e3a1 100644
--- a/plugins/cloud/src/main/java/org/elasticsearch/gateway/cloud/CloudGatewayModule.java
+++ b/plugins/cloud/src/main/java/org/elasticsearch/gateway/cloud/CloudGatewayModule.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.gateway.cloud;
 
 import org.elasticsearch.gateway.Gateway;
-import org.elasticsearch.util.guice.inject.AbstractModule;
+import org.elasticsearch.util.inject.AbstractModule;
 
 /**
  * @author kimchy (shay.banon)
diff --git a/plugins/cloud/src/main/java/org/elasticsearch/index/gateway/cloud/CloudIndexGateway.java b/plugins/cloud/src/main/java/org/elasticsearch/index/gateway/cloud/CloudIndexGateway.java
index 0222c46223f..2a84d9a33a6 100644
--- a/plugins/cloud/src/main/java/org/elasticsearch/index/gateway/cloud/CloudIndexGateway.java
+++ b/plugins/cloud/src/main/java/org/elasticsearch/index/gateway/cloud/CloudIndexGateway.java
@@ -32,7 +32,7 @@ import org.elasticsearch.index.gateway.IndexShardGateway;
 import org.elasticsearch.index.settings.IndexSettings;
 import org.elasticsearch.util.SizeUnit;
 import org.elasticsearch.util.SizeValue;
-import org.elasticsearch.util.guice.inject.Inject;
+import org.elasticsearch.util.inject.Inject;
 import org.elasticsearch.util.settings.Settings;
 import org.jclouds.blobstore.BlobStoreContext;
 import org.jclouds.domain.Location;
diff --git a/plugins/cloud/src/main/java/org/elasticsearch/index/gateway/cloud/CloudIndexGatewayModule.java b/plugins/cloud/src/main/java/org/elasticsearch/index/gateway/cloud/CloudIndexGatewayModule.java
index 77b3a732120..429cb26b51c 100644
--- a/plugins/cloud/src/main/java/org/elasticsearch/index/gateway/cloud/CloudIndexGatewayModule.java
+++ b/plugins/cloud/src/main/java/org/elasticsearch/index/gateway/cloud/CloudIndexGatewayModule.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.index.gateway.cloud;
 
 import org.elasticsearch.index.gateway.IndexGateway;
-import org.elasticsearch.util.guice.inject.AbstractModule;
+import org.elasticsearch.util.inject.AbstractModule;
 
 /**
  * @author kimchy (shay.banon)
diff --git a/plugins/cloud/src/main/java/org/elasticsearch/index/gateway/cloud/CloudIndexShardGateway.java b/plugins/cloud/src/main/java/org/elasticsearch/index/gateway/cloud/CloudIndexShardGateway.java
index b7d3bb83e35..4ce454d8fc2 100644
--- a/plugins/cloud/src/main/java/org/elasticsearch/index/gateway/cloud/CloudIndexShardGateway.java
+++ b/plugins/cloud/src/main/java/org/elasticsearch/index/gateway/cloud/CloudIndexShardGateway.java
@@ -42,7 +42,7 @@ import org.elasticsearch.util.SizeValue;
 import org.elasticsearch.util.TimeValue;
 import org.elasticsearch.util.collect.Lists;
 import org.elasticsearch.util.collect.Maps;
-import org.elasticsearch.util.guice.inject.Inject;
+import org.elasticsearch.util.inject.Inject;
 import org.elasticsearch.util.io.FastByteArrayInputStream;
 import org.elasticsearch.util.io.stream.BytesStreamOutput;
 import org.elasticsearch.util.io.stream.InputStreamStreamInput;
diff --git a/plugins/cloud/src/main/java/org/elasticsearch/plugin/cloud/CloudPlugin.java b/plugins/cloud/src/main/java/org/elasticsearch/plugin/cloud/CloudPlugin.java
index ff524ea4a5b..042d069768b 100644
--- a/plugins/cloud/src/main/java/org/elasticsearch/plugin/cloud/CloudPlugin.java
+++ b/plugins/cloud/src/main/java/org/elasticsearch/plugin/cloud/CloudPlugin.java
@@ -24,7 +24,7 @@ import org.elasticsearch.cloud.blobstore.CloudBlobStoreService;
 import org.elasticsearch.cloud.compute.CloudComputeService;
 import org.elasticsearch.plugins.AbstractPlugin;
 import org.elasticsearch.util.component.LifecycleComponent;
-import org.elasticsearch.util.guice.inject.Module;
+import org.elasticsearch.util.inject.Module;
 import org.elasticsearch.util.settings.Settings;
 
 import java.util.Collection;
diff --git a/plugins/discovery/jgroups/src/main/java/org/elasticsearch/discovery/jgroups/JgroupsDiscovery.java b/plugins/discovery/jgroups/src/main/java/org/elasticsearch/discovery/jgroups/JgroupsDiscovery.java
index 3274dd4d82f..7ab52e8fdb3 100644
--- a/plugins/discovery/jgroups/src/main/java/org/elasticsearch/discovery/jgroups/JgroupsDiscovery.java
+++ b/plugins/discovery/jgroups/src/main/java/org/elasticsearch/discovery/jgroups/JgroupsDiscovery.java
@@ -30,7 +30,7 @@ import org.elasticsearch.discovery.InitialStateDiscoveryListener;
 import org.elasticsearch.env.Environment;
 import org.elasticsearch.transport.TransportService;
 import org.elasticsearch.util.component.AbstractLifecycleComponent;
-import org.elasticsearch.util.guice.inject.Inject;
+import org.elasticsearch.util.inject.Inject;
 import org.elasticsearch.util.io.stream.BytesStreamInput;
 import org.elasticsearch.util.io.stream.BytesStreamOutput;
 import org.elasticsearch.util.network.NetworkService;
diff --git a/plugins/discovery/jgroups/src/main/java/org/elasticsearch/discovery/jgroups/JgroupsDiscoveryModule.java b/plugins/discovery/jgroups/src/main/java/org/elasticsearch/discovery/jgroups/JgroupsDiscoveryModule.java
index c0b36a1b0a5..cbb983712bb 100644
--- a/plugins/discovery/jgroups/src/main/java/org/elasticsearch/discovery/jgroups/JgroupsDiscoveryModule.java
+++ b/plugins/discovery/jgroups/src/main/java/org/elasticsearch/discovery/jgroups/JgroupsDiscoveryModule.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.discovery.jgroups;
 
-import org.elasticsearch.util.guice.inject.AbstractModule;
+import org.elasticsearch.util.inject.AbstractModule;
 import org.elasticsearch.discovery.Discovery;
 import org.elasticsearch.util.settings.Settings;
 
diff --git a/plugins/mapper/attachments/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentAttachmentMapperService.java b/plugins/mapper/attachments/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentAttachmentMapperService.java
index 0060a0ad9d6..d76d794b45e 100644
--- a/plugins/mapper/attachments/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentAttachmentMapperService.java
+++ b/plugins/mapper/attachments/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentAttachmentMapperService.java
@@ -23,7 +23,7 @@ import org.elasticsearch.index.AbstractIndexComponent;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.settings.IndexSettings;
-import org.elasticsearch.util.guice.inject.Inject;
+import org.elasticsearch.util.inject.Inject;
 import org.elasticsearch.util.settings.Settings;
 
 /**
diff --git a/plugins/mapper/attachments/src/main/java/org/elasticsearch/plugin/mapper/attachments/MapperAttachmentsIndexModule.java b/plugins/mapper/attachments/src/main/java/org/elasticsearch/plugin/mapper/attachments/MapperAttachmentsIndexModule.java
index bd49cb04d56..40a5b2f637d 100644
--- a/plugins/mapper/attachments/src/main/java/org/elasticsearch/plugin/mapper/attachments/MapperAttachmentsIndexModule.java
+++ b/plugins/mapper/attachments/src/main/java/org/elasticsearch/plugin/mapper/attachments/MapperAttachmentsIndexModule.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.plugin.mapper.attachments;
 
 import org.elasticsearch.index.mapper.xcontent.XContentAttachmentMapperService;
-import org.elasticsearch.util.guice.inject.AbstractModule;
+import org.elasticsearch.util.inject.AbstractModule;
 
 /**
  * @author kimchy (shay.banon)
diff --git a/plugins/mapper/attachments/src/main/java/org/elasticsearch/plugin/mapper/attachments/MapperAttachmentsPlugin.java b/plugins/mapper/attachments/src/main/java/org/elasticsearch/plugin/mapper/attachments/MapperAttachmentsPlugin.java
index 4aa6392390a..7a87a1945c1 100644
--- a/plugins/mapper/attachments/src/main/java/org/elasticsearch/plugin/mapper/attachments/MapperAttachmentsPlugin.java
+++ b/plugins/mapper/attachments/src/main/java/org/elasticsearch/plugin/mapper/attachments/MapperAttachmentsPlugin.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.plugin.mapper.attachments;
 
 import org.elasticsearch.plugins.AbstractPlugin;
-import org.elasticsearch.util.guice.inject.Module;
+import org.elasticsearch.util.inject.Module;
 
 import java.util.Collection;
 
diff --git a/plugins/transport/memcached/src/main/java/org/elasticsearch/memcached/MemcachedServer.java b/plugins/transport/memcached/src/main/java/org/elasticsearch/memcached/MemcachedServer.java
index db6d5de78a6..479d660e3b7 100644
--- a/plugins/transport/memcached/src/main/java/org/elasticsearch/memcached/MemcachedServer.java
+++ b/plugins/transport/memcached/src/main/java/org/elasticsearch/memcached/MemcachedServer.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.memcached;
 
-import org.elasticsearch.util.guice.inject.Inject;
+import org.elasticsearch.util.inject.Inject;
 import org.elasticsearch.ElasticSearchException;
 import org.elasticsearch.action.admin.cluster.node.info.TransportNodesInfo;
 import org.elasticsearch.rest.RestController;
diff --git a/plugins/transport/memcached/src/main/java/org/elasticsearch/memcached/MemcachedServerModule.java b/plugins/transport/memcached/src/main/java/org/elasticsearch/memcached/MemcachedServerModule.java
index a92841c7faf..093f0769ff1 100644
--- a/plugins/transport/memcached/src/main/java/org/elasticsearch/memcached/MemcachedServerModule.java
+++ b/plugins/transport/memcached/src/main/java/org/elasticsearch/memcached/MemcachedServerModule.java
@@ -19,8 +19,8 @@
 
 package org.elasticsearch.memcached;
 
-import org.elasticsearch.util.guice.inject.AbstractModule;
-import org.elasticsearch.util.guice.inject.Module;
+import org.elasticsearch.util.inject.AbstractModule;
+import org.elasticsearch.util.inject.Module;
 import org.elasticsearch.util.Classes;
 import org.elasticsearch.util.settings.Settings;
 
diff --git a/plugins/transport/memcached/src/main/java/org/elasticsearch/memcached/netty/NettyMemcachedServerTransport.java b/plugins/transport/memcached/src/main/java/org/elasticsearch/memcached/netty/NettyMemcachedServerTransport.java
index 9a85ca5eab4..bde8d30ed59 100644
--- a/plugins/transport/memcached/src/main/java/org/elasticsearch/memcached/netty/NettyMemcachedServerTransport.java
+++ b/plugins/transport/memcached/src/main/java/org/elasticsearch/memcached/netty/NettyMemcachedServerTransport.java
@@ -27,7 +27,7 @@ import org.elasticsearch.transport.BindTransportException;
 import org.elasticsearch.transport.netty.NettyInternalESLoggerFactory;
 import org.elasticsearch.util.SizeValue;
 import org.elasticsearch.util.component.AbstractLifecycleComponent;
-import org.elasticsearch.util.guice.inject.Inject;
+import org.elasticsearch.util.inject.Inject;
 import org.elasticsearch.util.network.NetworkService;
 import org.elasticsearch.util.network.NetworkUtils;
 import org.elasticsearch.util.settings.Settings;
diff --git a/plugins/transport/memcached/src/main/java/org/elasticsearch/memcached/netty/NettyMemcachedServerTransportModule.java b/plugins/transport/memcached/src/main/java/org/elasticsearch/memcached/netty/NettyMemcachedServerTransportModule.java
index 8fcfc4891f0..1fde05cca72 100644
--- a/plugins/transport/memcached/src/main/java/org/elasticsearch/memcached/netty/NettyMemcachedServerTransportModule.java
+++ b/plugins/transport/memcached/src/main/java/org/elasticsearch/memcached/netty/NettyMemcachedServerTransportModule.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.memcached.netty;
 
-import org.elasticsearch.util.guice.inject.AbstractModule;
+import org.elasticsearch.util.inject.AbstractModule;
 import org.elasticsearch.memcached.MemcachedServerTransport;
 
 /**
diff --git a/plugins/transport/memcached/src/main/java/org/elasticsearch/plugin/transport/memcached/MemcachedTransportPlugin.java b/plugins/transport/memcached/src/main/java/org/elasticsearch/plugin/transport/memcached/MemcachedTransportPlugin.java
index 8844e26ffdb..eacda68985a 100644
--- a/plugins/transport/memcached/src/main/java/org/elasticsearch/plugin/transport/memcached/MemcachedTransportPlugin.java
+++ b/plugins/transport/memcached/src/main/java/org/elasticsearch/plugin/transport/memcached/MemcachedTransportPlugin.java
@@ -23,7 +23,7 @@ import org.elasticsearch.memcached.MemcachedServer;
 import org.elasticsearch.memcached.MemcachedServerModule;
 import org.elasticsearch.plugins.AbstractPlugin;
 import org.elasticsearch.util.component.LifecycleComponent;
-import org.elasticsearch.util.guice.inject.Module;
+import org.elasticsearch.util.inject.Module;
 import org.elasticsearch.util.settings.Settings;
 
 import java.util.Collection;