honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace manual copying an array or collection with static methods calls (#24657)

This commit is contained in:
Koen De Groote 2017-05-15 09:35:48 +02:00 committed by Luca Cavanna
parent 17f8d2debd
commit f185b69e04
6 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/org/elasticsearch/common/inject/ModulesBuilder.java
View File

@ -20,6 +20,7 @@
package org.elasticsearch.common.inject;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@ -28,9 +29,7 @@ public class ModulesBuilder implements Iterable<Module> {
private final List<Module> modules = new ArrayList<>();
public ModulesBuilder add(Module... newModules) {
for (Module module : newModules) {
modules.add(module);
}
Collections.addAll(modules, newModules);
return this;
}

4
core/src/main/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQuery.java
View File

@ -124,9 +124,7 @@ public class MultiPhrasePrefixQuery extends Query {
Term[][] terms = new Term[termArrays.size()][];
for (int i = 0; i < termArrays.size(); i++) {
terms[i] = new Term[termArrays.get(i).length];
for (int j = 0; j < termArrays.get(i).length; j++) {
terms[i][j] = termArrays.get(i)[j];
}
System.arraycopy(termArrays.get(i), 0, terms[i], 0, termArrays.get(i).length);
}
return terms;
}

5
core/src/main/java/org/elasticsearch/index/IndexWarmer.java
View File

@ -54,9 +54,8 @@ public final class IndexWarmer extends AbstractComponent {
ArrayList<Listener> list = new ArrayList<>();
final Executor executor = threadPool.executor(ThreadPool.Names.WARMER);
list.add(new FieldDataWarmer(executor));
for (Listener listener : listeners) {
list.add(listener);
}
Collections.addAll(list, listeners);
this.listeners = Collections.unmodifiableList(list);
}

9
core/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCache.java vendored
View File

@ -19,6 +19,7 @@
package org.elasticsearch.indices.fielddata.cache;
import java.util.Collections;
import org.apache.logging.log4j.Logger;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
@ -134,9 +135,7 @@ public class IndicesFieldDataCache extends AbstractComponent implements RemovalL
//noinspection unchecked
final Accountable accountable = cache.computeIfAbsent(key, k -> {
cacheHelper.addClosedListener(IndexFieldCache.this);
for (Listener listener : this.listeners) {
k.listeners.add(listener);
}
Collections.addAll(k.listeners, this.listeners);
final AtomicFieldData fieldData = indexFieldData.loadDirect(context);
for (Listener listener : k.listeners) {
try {
@ -162,9 +161,7 @@ public class IndicesFieldDataCache extends AbstractComponent implements RemovalL
//noinspection unchecked
final Accountable accountable = cache.computeIfAbsent(key, k -> {
ElasticsearchDirectoryReader.addReaderCloseListener(indexReader, IndexFieldCache.this);
for (Listener listener : this.listeners) {
k.listeners.add(listener);
}
Collections.addAll(k.listeners, this.listeners);
final Accountable ifd = (Accountable) indexFieldData.localGlobalDirect(indexReader);
for (Listener listener : k.listeners) {
try {

5
core/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java
View File

@ -229,9 +229,8 @@ public final class DirectCandidateGenerator extends CandidateGenerator {
// Merge new candidates into existing ones,
// deduping:
final Set<Candidate> set = new HashSet<>(candidates);
for (int i = 0; i < this.candidates.length; i++) {
set.add(this.candidates[i]);
}
Collections.addAll(set, this.candidates);
this.candidates = set.toArray(new Candidate[set.size()]);
// Sort strongest to weakest:
Arrays.sort(this.candidates, Collections.reverseOrder());

6
modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubDefCall.java
View File

@ -19,6 +19,7 @@
package org.elasticsearch.painless.node;
import java.util.Collections;
import org.elasticsearch.painless.DefBootstrap;
import org.elasticsearch.painless.Definition;
import org.elasticsearch.painless.Globals;
@ -97,10 +98,7 @@ final class PSubDefCall extends AExpression {
if (argument instanceof ILambda) {
ILambda lambda = (ILambda) argument;
for (Type capture : lambda.getCaptures()) {
parameterTypes.add(capture);
}
Collections.addAll(parameterTypes, lambda.getCaptures());
}
argument.write(writer, globals);