Skip to content

Commit

Permalink
Replace and ban next batch of Guava classes
Browse files Browse the repository at this point in the history
This commit replaces and bans:
 * com.google.common.util.concurrent.UncheckedExecutionException
 * com.google.common.util.concurrent.AtomicLongMap
 * com.google.common.primitives.Longs
 * com.google.common.io.ByteStreams
 * com.google.common.collect.UnmodifiableIterator
 * com.google.common.collect.ObjectArrays
 * com.google.common.collect.Multimap
 * com.google.common.collect.MultimapBuilder

Relates to #13224
  • Loading branch information
s1monw committed Sep 15, 2015
1 parent d472115 commit ff4a11a
Show file tree
Hide file tree
Showing 39 changed files with 263 additions and 170 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
*/
package org.apache.lucene.queries;

import com.google.common.primitives.Ints;

import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReaderContext;
import org.apache.lucene.index.LeafReaderContext;
Expand Down Expand Up @@ -141,7 +139,7 @@ protected void swap(int i, int j) {
}
@Override
protected int compare(int i, int j) {
return Ints.compare(contexts[tieBreak[j]].docFreq(), contexts[tieBreak[i]].docFreq());
return Integer.compare(contexts[tieBreak[j]].docFreq(), contexts[tieBreak[i]].docFreq());
}
}.sort(0, tieBreak.length);
int prev = contexts[tieBreak[0]].docFreq();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

package org.elasticsearch.action.admin.cluster.repositories.get;

import com.google.common.collect.ObjectArrays;
import org.elasticsearch.action.support.master.MasterNodeReadOperationRequestBuilder;
import org.elasticsearch.client.ElasticsearchClient;
import org.elasticsearch.common.util.ArrayUtils;

/**
* Get repository request builder
Expand Down Expand Up @@ -60,7 +60,7 @@ public GetRepositoriesRequestBuilder setRepositories(String... repositories) {
* @return builder
*/
public GetRepositoriesRequestBuilder addRepositories(String... repositories) {
request.repositories(ObjectArrays.concat(request.repositories(), repositories, String.class));
request.repositories(ArrayUtils.concat(request.repositories(), repositories));
return this;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

package org.elasticsearch.action.admin.cluster.snapshots.get;

import com.google.common.collect.ObjectArrays;
import org.elasticsearch.action.support.master.MasterNodeOperationRequestBuilder;
import org.elasticsearch.client.ElasticsearchClient;
import org.elasticsearch.common.util.ArrayUtils;

/**
* Get snapshots request builder
Expand Down Expand Up @@ -81,7 +81,7 @@ public GetSnapshotsRequestBuilder setCurrentSnapshot() {
* @return this builder
*/
public GetSnapshotsRequestBuilder addSnapshots(String... snapshots) {
request.snapshots(ObjectArrays.concat(request.snapshots(), snapshots, String.class));
request.snapshots(ArrayUtils.concat(request.snapshots(), snapshots));
return this;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@

package org.elasticsearch.action.admin.cluster.snapshots.status;

import com.google.common.collect.ObjectArrays;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.master.MasterNodeOperationRequestBuilder;
import org.elasticsearch.client.ElasticsearchClient;
import org.elasticsearch.common.util.ArrayUtils;

/**
* Snapshots status request builder
Expand Down Expand Up @@ -72,7 +71,7 @@ public SnapshotsStatusRequestBuilder setSnapshots(String... snapshots) {
* @return this builder
*/
public SnapshotsStatusRequestBuilder addSnapshots(String... snapshots) {
request.snapshots(ObjectArrays.concat(request.snapshots(), snapshots, String.class));
request.snapshots(ArrayUtils.concat(request.snapshots(), snapshots));
return this;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,12 @@

package org.elasticsearch.action.admin.indices.alias.get;

import com.google.common.collect.ObjectArrays;
import org.elasticsearch.action.Action;
import org.elasticsearch.action.ActionResponse;
import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.action.support.master.MasterNodeReadOperationRequestBuilder;
import org.elasticsearch.client.ElasticsearchClient;
import org.elasticsearch.client.IndicesAdminClient;
import org.elasticsearch.common.util.ArrayUtils;

/**
*/
Expand All @@ -43,7 +42,7 @@ public Builder setAliases(String... aliases) {

@SuppressWarnings("unchecked")
public Builder addAliases(String... aliases) {
request.aliases(ObjectArrays.concat(request.aliases(), aliases, String.class));
request.aliases(ArrayUtils.concat(request.aliases(), aliases));
return (Builder) this;
}

Expand All @@ -55,7 +54,7 @@ public Builder setIndices(String... indices) {

@SuppressWarnings("unchecked")
public Builder addIndices(String... indices) {
request.indices(ObjectArrays.concat(request.indices(), indices, String.class));
request.indices(ArrayUtils.concat(request.indices(), indices));
return (Builder) this;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,11 @@

package org.elasticsearch.action.admin.indices.get;

import com.google.common.collect.ObjectArrays;

import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.support.master.info.ClusterInfoRequest;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.util.ArrayUtils;

import java.io.IOException;
import java.util.Arrays;
Expand Down Expand Up @@ -115,7 +114,7 @@ public GetIndexRequest addFeatures(Feature... features) {
if (this.features == DEFAULT_FEATURES) {
return features(features);
} else {
return features(ObjectArrays.concat(featuresAsEnums(), features, Feature.class));
return features(ArrayUtils.concat(features(), features, Feature.class));
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,10 @@

package org.elasticsearch.action.admin.indices.mapping.get;

import com.google.common.collect.ObjectArrays;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.ActionRequestBuilder;
import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.client.ElasticsearchClient;
import org.elasticsearch.client.IndicesAdminClient;
import org.elasticsearch.common.util.ArrayUtils;

/** A helper class to build {@link GetFieldMappingsRequest} objects */
public class GetFieldMappingsRequestBuilder extends ActionRequestBuilder<GetFieldMappingsRequest, GetFieldMappingsResponse, GetFieldMappingsRequestBuilder> {
Expand All @@ -39,7 +37,7 @@ public GetFieldMappingsRequestBuilder setIndices(String... indices) {
}

public GetFieldMappingsRequestBuilder addIndices(String... indices) {
request.indices(ObjectArrays.concat(request.indices(), indices, String.class));
request.indices(ArrayUtils.concat(request.indices(), indices));
return this;
}

Expand All @@ -49,7 +47,7 @@ public GetFieldMappingsRequestBuilder setTypes(String... types) {
}

public GetFieldMappingsRequestBuilder addTypes(String... types) {
request.types(ObjectArrays.concat(request.types(), types, String.class));
request.types(ArrayUtils.concat(request.types(), types));
return this;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@

package org.elasticsearch.action.admin.indices.settings.get;

import com.google.common.collect.ObjectArrays;
import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.action.support.master.MasterNodeReadOperationRequestBuilder;
import org.elasticsearch.client.ElasticsearchClient;
import org.elasticsearch.common.util.ArrayUtils;

/**
*/
Expand All @@ -38,7 +38,7 @@ public GetSettingsRequestBuilder setIndices(String... indices) {
}

public GetSettingsRequestBuilder addIndices(String... indices) {
request.indices(ObjectArrays.concat(request.indices(), indices, String.class));
request.indices(ArrayUtils.concat(request.indices(), indices));
return this;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

package org.elasticsearch.action.admin.indices.warmer.get;

import com.google.common.collect.ObjectArrays;
import org.elasticsearch.action.support.master.info.ClusterInfoRequestBuilder;
import org.elasticsearch.client.ElasticsearchClient;
import org.elasticsearch.common.util.ArrayUtils;

/**
* Builder for {@link GetWarmersRequest}
Expand All @@ -40,7 +40,7 @@ public GetWarmersRequestBuilder setWarmers(String... warmers) {
}

public GetWarmersRequestBuilder addWarmers(String... warmers) {
request.warmers(ObjectArrays.concat(request.warmers(), warmers, String.class));
request.warmers(ArrayUtils.concat(request.warmers(), warmers));
return this;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@
*/
package org.elasticsearch.action.support.master.info;

import com.google.common.collect.ObjectArrays;
import org.elasticsearch.action.Action;
import org.elasticsearch.action.ActionResponse;
import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.action.support.master.MasterNodeReadOperationRequestBuilder;
import org.elasticsearch.client.ClusterAdminClient;
import org.elasticsearch.client.ElasticsearchClient;
import org.elasticsearch.client.IndicesAdminClient;
import org.elasticsearch.common.util.ArrayUtils;

/**
*/
Expand All @@ -44,7 +42,7 @@ public Builder setIndices(String... indices) {

@SuppressWarnings("unchecked")
public Builder addIndices(String... indices) {
request.indices(ObjectArrays.concat(request.indices(), indices, String.class));
request.indices(ArrayUtils.concat(request.indices(), indices));
return (Builder) this;
}

Expand All @@ -56,7 +54,7 @@ public Builder setTypes(String... types) {

@SuppressWarnings("unchecked")
public Builder addTypes(String... types) {
request.types(ObjectArrays.concat(request.types(), types, String.class));
request.types(ArrayUtils.concat(request.types(), types));
return (Builder) this;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public class TermVectorsFilter {
private final Set<String> selectedFields;
private AggregatedDfs dfs;
private Map<Term, ScoreTerm> scoreTerms;
private AtomicLongMap<String> sizes;
private Map<String, Integer> sizes = new HashMap<>();
private TFIDFSimilarity similarity;

public TermVectorsFilter(Fields termVectorsByField, Fields topLevelFields, Set<String> selectedFields, @Nullable AggregatedDfs dfs) {
Expand All @@ -64,7 +64,6 @@ public TermVectorsFilter(Fields termVectorsByField, Fields topLevelFields, Set<S

this.dfs = dfs;
this.scoreTerms = new HashMap<>();
this.sizes = AtomicLongMap.create();
this.similarity = new DefaultSimilarity();
}

Expand Down Expand Up @@ -228,10 +227,12 @@ public void selectBestTerms() throws IOException {

// retain the best terms for quick lookups
ScoreTerm scoreTerm;
int count = 0;
while ((scoreTerm = queue.pop()) != null) {
scoreTerms.put(new Term(scoreTerm.field, scoreTerm.word), scoreTerm);
sizes.incrementAndGet(scoreTerm.field);
count++;
}
sizes.put(fieldName, count);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

package org.elasticsearch.cluster.metadata;

import com.google.common.collect.UnmodifiableIterator;
import org.elasticsearch.common.collect.Tuple;

import java.util.ArrayList;
Expand Down Expand Up @@ -106,7 +105,7 @@ public Iterable<Tuple<String, AliasMetaData>> getConcreteIndexAndAliasMetaDatas(
return new Iterable<Tuple<String, AliasMetaData>>() {
@Override
public Iterator<Tuple<String, AliasMetaData>> iterator() {
return new UnmodifiableIterator<Tuple<String,AliasMetaData>>() {
return new Iterator<Tuple<String,AliasMetaData>>() {

int index = 0;

Expand All @@ -121,6 +120,11 @@ public Tuple<String, AliasMetaData> next() {
return new Tuple<>(indexMetaData.getIndex(), indexMetaData.getAliases().get(aliasName));
}

@Override
public final void remove() {
throw new UnsupportedOperationException();
}

};
}
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import com.carrotsearch.hppc.cursors.ObjectCursor;
import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.UnmodifiableIterator;
import org.apache.lucene.util.CollectionUtil;
import org.elasticsearch.cluster.Diff;
import org.elasticsearch.cluster.Diffable;
Expand Down Expand Up @@ -60,18 +59,7 @@
import org.elasticsearch.search.warmer.IndexWarmersMetaData;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
import java.util.*;
import java.util.stream.Collectors;

import static org.elasticsearch.common.settings.Settings.readSettingsFromStream;
Expand Down Expand Up @@ -569,7 +557,7 @@ public boolean routingRequired(String concreteIndex, String type) {
}

@Override
public UnmodifiableIterator<IndexMetaData> iterator() {
public Iterator<IndexMetaData> iterator() {
return indices.valuesIt();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import com.carrotsearch.hppc.ObjectHashSet;
import com.carrotsearch.hppc.cursors.ObjectCursor;
import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
import com.google.common.collect.UnmodifiableIterator;
import org.elasticsearch.Version;
import org.elasticsearch.cluster.AbstractDiffable;
import org.elasticsearch.common.Booleans;
Expand All @@ -34,11 +33,7 @@
import org.elasticsearch.common.transport.TransportAddress;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;

/**
* This class holds all {@link DiscoveryNode} in the cluster and provides convenience methods to
Expand Down Expand Up @@ -69,7 +64,7 @@ private DiscoveryNodes(ImmutableOpenMap<String, DiscoveryNode> nodes, ImmutableO
}

@Override
public UnmodifiableIterator<DiscoveryNode> iterator() {
public Iterator<DiscoveryNode> iterator() {
return nodes.valuesIt();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import com.carrotsearch.hppc.IntSet;
import com.carrotsearch.hppc.cursors.IntCursor;
import com.carrotsearch.hppc.cursors.IntObjectCursor;
import com.google.common.collect.UnmodifiableIterator;
import org.apache.lucene.util.CollectionUtil;
import org.elasticsearch.cluster.AbstractDiffable;
import org.elasticsearch.cluster.metadata.IndexMetaData;
Expand All @@ -33,12 +32,7 @@
import org.elasticsearch.index.shard.ShardId;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.*;
import java.util.concurrent.ThreadLocalRandom;

/**
Expand Down Expand Up @@ -163,7 +157,7 @@ public List<String> validate(IndexMetaData indexMetaData) {
}

@Override
public UnmodifiableIterator<IndexShardRoutingTable> iterator() {
public Iterator<IndexShardRoutingTable> iterator() {
return shards.valuesIt();
}

Expand Down

0 comments on commit ff4a11a

Please sign in to comment.