internalize guice (no need to aop) and reduce deps

This commit is contained in:
kimchy 2010-04-26 02:10:42 +03:00
parent e56321b414
commit 2a19160ad6
656 changed files with 51449 additions and 460 deletions

View File

@ -1,14 +0,0 @@
<component name="libraryTable">
<library name="guice">
<CLASSES>
<root url="jar://$GRADLE_REPOSITORY$/com.google.inject/guice/jars/guice-2.0.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/com.google.inject.extensions/guice-assisted-inject/jars/guice-assisted-inject-2.0.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/com.google.inject.extensions/guice-multibindings/jars/guice-multibindings-2.0.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/aopalliance/aopalliance/jars/aopalliance-1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="file://$PROJECT_DIR$/../../../opt/guice/2.0-src/src" />
</SOURCES>
</library>
</component>

View File

@ -17,7 +17,6 @@
<orderEntry type="library" exported="" name="lucene" level="project" />
<orderEntry type="library" exported="" name="joda-time" level="project" />
<orderEntry type="library" exported="" name="jackson" level="project" />
<orderEntry type="library" exported="" name="guice" level="project" />
<orderEntry type="library" exported="" name="jline" level="project" />
<orderEntry type="library" exported="" name="netty" level="project" />
<orderEntry type="library" scope="TEST" name="testng" level="project" />

View File

@ -41,11 +41,6 @@ dependencies {
compile 'org.codehaus.jackson:jackson-core-asl:1.5.1'
compile 'org.codehaus.jackson:jackson-mapper-asl:1.5.1'
compile 'aopalliance:aopalliance:1.0'
compile 'com.google.inject:guice:2.0'
compile 'com.google.inject.extensions:guice-assisted-inject:2.0'
compile 'com.google.inject.extensions:guice-multibindings:2.0'
compile 'org.apache.lucene:lucene-core:3.0.1'
compile 'org.apache.lucene:lucene-analyzers:3.0.1'
compile 'org.apache.lucene:lucene-queries:3.0.1'

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action;
import com.google.inject.AbstractModule;
import org.elasticsearch.util.guice.inject.AbstractModule;
import org.elasticsearch.action.admin.cluster.health.TransportClusterHealthAction;
import org.elasticsearch.action.admin.cluster.node.info.TransportNodesInfo;
import org.elasticsearch.action.admin.cluster.node.shutdown.TransportNodesShutdown;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.admin.cluster.health;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;

View File

@ -20,7 +20,7 @@
package org.elasticsearch.action.admin.cluster.node.info;
import org.elasticsearch.util.gcommon.collect.ImmutableMap;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.support.nodes.NodeOperationRequest;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.admin.cluster.node.shutdown;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.ElasticSearchIllegalStateException;
import org.elasticsearch.action.TransportActions;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.admin.cluster.ping.broadcast;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.action.ShardOperationFailedException;
import org.elasticsearch.action.TransportActions;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.admin.cluster.ping.replication;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.support.replication.TransportIndexReplicationOperationAction;
import org.elasticsearch.cluster.ClusterService;
import org.elasticsearch.cluster.routing.GroupShardsIterator;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.admin.cluster.ping.replication;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.support.replication.TransportIndicesReplicationOperationAction;
import org.elasticsearch.cluster.ClusterService;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.admin.cluster.ping.replication;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.support.replication.TransportShardReplicationOperationAction;
import org.elasticsearch.cluster.ClusterService;
import org.elasticsearch.cluster.ClusterState;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.admin.cluster.ping.single;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.support.single.TransportSingleOperationAction;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.admin.cluster.state;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.admin.indices.alias;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.admin.indices.cache.clear;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.action.ShardOperationFailedException;
import org.elasticsearch.action.TransportActions;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.admin.indices.create;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.admin.indices.delete;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.admin.indices.flush;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.action.ShardOperationFailedException;
import org.elasticsearch.action.TransportActions;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.admin.indices.gateway.snapshot;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.support.replication.TransportIndicesReplicationOperationAction;
import org.elasticsearch.cluster.ClusterService;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.admin.indices.gateway.snapshot;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.support.replication.TransportIndexReplicationOperationAction;
import org.elasticsearch.cluster.ClusterService;
import org.elasticsearch.cluster.routing.GroupShardsIterator;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.admin.indices.gateway.snapshot;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.support.replication.TransportShardReplicationOperationAction;
import org.elasticsearch.cluster.ClusterService;
import org.elasticsearch.cluster.ClusterState;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.admin.indices.mapping.put;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.admin.indices.optimize;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.action.ShardOperationFailedException;
import org.elasticsearch.action.TransportActions;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.admin.indices.refresh;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.action.ShardOperationFailedException;
import org.elasticsearch.action.TransportActions;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.admin.indices.status;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.action.ShardOperationFailedException;
import org.elasticsearch.action.TransportActions;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.count;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.action.ShardOperationFailedException;
import org.elasticsearch.action.TransportActions;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.delete;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ExceptionsHelper;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.TransportActions;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.deletebyquery;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.support.replication.TransportIndicesReplicationOperationAction;
import org.elasticsearch.cluster.ClusterService;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.deletebyquery;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.support.replication.TransportIndexReplicationOperationAction;
import org.elasticsearch.cluster.ClusterService;
import org.elasticsearch.cluster.routing.GroupShardsIterator;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.deletebyquery;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchIllegalStateException;
import org.elasticsearch.action.support.replication.TransportShardReplicationOperationAction;
import org.elasticsearch.cluster.ClusterService;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.get;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.FieldSelector;
import org.apache.lucene.document.Fieldable;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.index;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ExceptionsHelper;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.TransportActions;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.mlt;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.Term;
import org.elasticsearch.ElasticSearchException;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.search;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.search.type.TransportSearchDfsQueryAndFetchAction;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.search;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchIllegalArgumentException;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.TransportActions;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.search.type;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.search.*;
import org.elasticsearch.cluster.ClusterService;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.search.type;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.search.*;
import org.elasticsearch.cluster.ClusterService;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.search.type;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchResponse;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.search.type;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.search.*;
import org.elasticsearch.cluster.ClusterService;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.search.type;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.search.*;
import org.elasticsearch.cluster.ClusterService;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.search.type;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.search.*;
import org.elasticsearch.cluster.ClusterService;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.support.nodes;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.FailedNodeException;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.support.replication;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.ActionResponse;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.action.support.replication;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.ActionResponse;
import org.elasticsearch.action.support.BaseAction;

View File

@ -20,7 +20,7 @@
package org.elasticsearch.action.terms;
import org.elasticsearch.util.gcommon.collect.Maps;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermDocs;
import org.apache.lucene.index.TermEnum;

View File

@ -19,8 +19,8 @@
package org.elasticsearch.bootstrap;
import com.google.inject.CreationException;
import com.google.inject.spi.Message;
import org.elasticsearch.util.guice.inject.CreationException;
import org.elasticsearch.util.guice.inject.spi.Message;
import org.elasticsearch.ExceptionsHelper;
import org.elasticsearch.Version;
import org.elasticsearch.env.Environment;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.node;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.client.AdminClient;
import org.elasticsearch.client.ClusterAdminClient;
import org.elasticsearch.client.IndicesAdminClient;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.node;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.ActionFuture;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.count.CountRequest;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.node;
import com.google.inject.AbstractModule;
import org.elasticsearch.util.guice.inject.AbstractModule;
import org.elasticsearch.client.AdminClient;
import org.elasticsearch.client.Client;
import org.elasticsearch.client.ClusterAdminClient;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.node;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.ActionFuture;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.node;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.ActionFuture;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport;
import com.google.inject.AbstractModule;
import org.elasticsearch.util.guice.inject.AbstractModule;
import org.elasticsearch.client.transport.support.InternalTransportAdminClient;
import org.elasticsearch.client.transport.support.InternalTransportClient;
import org.elasticsearch.client.transport.support.InternalTransportClusterAdminClient;

View File

@ -20,9 +20,9 @@
package org.elasticsearch.client.transport;
import org.elasticsearch.util.gcommon.collect.ImmutableList;
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Module;
import org.elasticsearch.util.guice.inject.Guice;
import org.elasticsearch.util.guice.inject.Injector;
import org.elasticsearch.util.guice.inject.Module;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.action.ActionFuture;
import org.elasticsearch.action.ActionListener;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport;
import com.google.inject.AbstractModule;
import org.elasticsearch.util.guice.inject.AbstractModule;
import org.elasticsearch.cluster.ClusterService;
import org.elasticsearch.cluster.service.InternalClusterService;
import org.elasticsearch.discovery.DiscoveryModule;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.cluster.ClusterService;
import org.elasticsearch.discovery.DiscoveryService;
import org.elasticsearch.util.component.AbstractComponent;

View File

@ -20,7 +20,7 @@
package org.elasticsearch.client.transport;
import org.elasticsearch.util.gcommon.collect.ImmutableList;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport.action;
import com.google.inject.AbstractModule;
import org.elasticsearch.util.guice.inject.AbstractModule;
import org.elasticsearch.client.transport.action.admin.cluster.health.ClientTransportClusterHealthAction;
import org.elasticsearch.client.transport.action.admin.cluster.node.info.ClientTransportNodesInfoAction;
import org.elasticsearch.client.transport.action.admin.cluster.node.shutdown.ClientTransportNodesShutdownAction;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport.action.admin.cluster.health;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport.action.admin.cluster.node.info;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.admin.cluster.node.info.NodesInfoRequest;
import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport.action.admin.cluster.node.shutdown;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.admin.cluster.node.shutdown.NodesShutdownRequest;
import org.elasticsearch.action.admin.cluster.node.shutdown.NodesShutdownResponse;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport.action.admin.cluster.ping.broadcast;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.admin.cluster.ping.broadcast.BroadcastPingRequest;
import org.elasticsearch.action.admin.cluster.ping.broadcast.BroadcastPingResponse;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport.action.admin.cluster.ping.replication;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.admin.cluster.ping.replication.ReplicationPingRequest;
import org.elasticsearch.action.admin.cluster.ping.replication.ReplicationPingResponse;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport.action.admin.cluster.ping.single;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.admin.cluster.ping.single.SinglePingRequest;
import org.elasticsearch.action.admin.cluster.ping.single.SinglePingResponse;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport.action.admin.cluster.state;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest;
import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport.action.admin.indices.alias;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest;
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesResponse;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport.action.admin.indices.cache.clear;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.admin.indices.cache.clear.ClearIndicesCacheRequest;
import org.elasticsearch.action.admin.indices.cache.clear.ClearIndicesCacheResponse;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport.action.admin.indices.create;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.admin.indices.create.CreateIndexRequest;
import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport.action.admin.indices.delete;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport.action.admin.indices.flush;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.admin.indices.flush.FlushRequest;
import org.elasticsearch.action.admin.indices.flush.FlushResponse;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport.action.admin.indices.gateway.snapshot;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.admin.indices.gateway.snapshot.GatewaySnapshotRequest;
import org.elasticsearch.action.admin.indices.gateway.snapshot.GatewaySnapshotResponse;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport.action.admin.indices.mapping.create;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport.action.admin.indices.optimize;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.admin.indices.optimize.OptimizeRequest;
import org.elasticsearch.action.admin.indices.optimize.OptimizeResponse;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport.action.admin.indices.refresh;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
import org.elasticsearch.action.admin.indices.refresh.RefreshResponse;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport.action.admin.indices.status;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.admin.indices.status.IndicesStatusRequest;
import org.elasticsearch.action.admin.indices.status.IndicesStatusResponse;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport.action.count;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.count.CountRequest;
import org.elasticsearch.action.count.CountResponse;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport.action.delete;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.delete.DeleteRequest;
import org.elasticsearch.action.delete.DeleteResponse;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport.action.deletebyquery;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.deletebyquery.DeleteByQueryRequest;
import org.elasticsearch.action.deletebyquery.DeleteByQueryResponse;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport.action.get;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.get.GetRequest;
import org.elasticsearch.action.get.GetResponse;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport.action.index;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.index.IndexRequest;
import org.elasticsearch.action.index.IndexResponse;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport.action.mlt;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.mlt.MoreLikeThisRequest;
import org.elasticsearch.action.search.SearchResponse;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport.action.search;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchResponse;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport.action.search;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.search.SearchScrollRequest;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport.action.terms;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.action.TransportActions;
import org.elasticsearch.action.terms.TermsRequest;
import org.elasticsearch.action.terms.TermsResponse;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport.support;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.client.AdminClient;
import org.elasticsearch.client.ClusterAdminClient;
import org.elasticsearch.client.IndicesAdminClient;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport.support;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.action.ActionFuture;
import org.elasticsearch.action.ActionListener;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport.support;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.action.ActionFuture;
import org.elasticsearch.action.ActionListener;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.transport.support;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.action.ActionFuture;
import org.elasticsearch.action.ActionListener;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.cluster;
import com.google.inject.AbstractModule;
import org.elasticsearch.util.guice.inject.AbstractModule;
import org.elasticsearch.cluster.action.index.MappingUpdatedAction;
import org.elasticsearch.cluster.action.index.NodeIndexCreatedAction;
import org.elasticsearch.cluster.action.index.NodeIndexDeletedAction;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.cluster;
import com.google.inject.AbstractModule;
import org.elasticsearch.util.guice.inject.AbstractModule;
import org.elasticsearch.util.settings.Settings;
/**

View File

@ -19,7 +19,7 @@
package org.elasticsearch.cluster.action.index;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.ActionResponse;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.cluster.action.index;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.cluster.ClusterService;
import org.elasticsearch.cluster.node.DiscoveryNodes;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.cluster.action.index;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.cluster.ClusterService;
import org.elasticsearch.cluster.node.DiscoveryNodes;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.cluster.action.index;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.cluster.ClusterService;
import org.elasticsearch.cluster.node.DiscoveryNodes;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.cluster.action.shard;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.cluster.ClusterService;
import org.elasticsearch.cluster.ClusterState;

View File

@ -20,7 +20,7 @@
package org.elasticsearch.cluster.metadata;
import org.elasticsearch.util.gcommon.collect.Maps;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.cluster.ClusterService;
import org.elasticsearch.cluster.ClusterState;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.cluster.routing;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.cluster.*;
import org.elasticsearch.cluster.routing.strategy.ShardsRoutingStrategy;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.cluster.service;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.cluster.*;
import org.elasticsearch.cluster.node.DiscoveryNode;

View File

@ -19,8 +19,8 @@
package org.elasticsearch.discovery;
import com.google.inject.AbstractModule;
import com.google.inject.Module;
import org.elasticsearch.util.guice.inject.AbstractModule;
import org.elasticsearch.util.guice.inject.Module;
import org.elasticsearch.discovery.local.LocalDiscoveryModule;
import org.elasticsearch.discovery.zen.ZenDiscoveryModule;
import org.elasticsearch.util.settings.Settings;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.discovery;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.util.TimeValue;

View File

@ -19,7 +19,7 @@
package org.elasticsearch.discovery.local;
import com.google.inject.Inject;
import org.elasticsearch.util.guice.inject.Inject;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.ElasticSearchIllegalStateException;
import org.elasticsearch.cluster.*;

Some files were not shown because too many files have changed in this diff Show More