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

Add missing license headers, move package names after license headers

This commit is contained in:
Igor Motov 2014-01-07 13:58:24 -05:00
parent 2b49ec138c
commit b9aaa79afd
36 changed files with 318 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/apache/lucene/index/memory/ExtendedMemoryIndex.java
View File

@ -1,5 +1,3 @@
package org.apache.lucene.index.memory;
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
@ -19,6 +17,8 @@ package org.apache.lucene.index.memory;
* under the License.
*/
package org.apache.lucene.index.memory;
/**
* This class overwrites {@link MemoryIndex} to make the reuse constructor visible.
*/

4
src/main/java/org/apache/lucene/queries/ExtendedCommonTermsQuery.java
View File

@ -1,4 +1,3 @@
package org.apache.lucene.queries;
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
@ -17,6 +16,9 @@ package org.apache.lucene.queries;
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.lucene.queries;
import org.apache.lucene.search.BooleanClause.Occur;
import org.elasticsearch.common.lucene.search.Queries;

22
src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIndices.java
View File

@ -1,4 +1,3 @@
package org.elasticsearch.action.admin.cluster.stats;
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
@ -18,6 +17,7 @@ package org.elasticsearch.action.admin.cluster.stats;
* under the License.
*/
package org.elasticsearch.action.admin.cluster.stats;
import com.carrotsearch.hppc.ObjectObjectOpenHashMap;
import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
@ -249,17 +249,23 @@ public class ClusterStatsIndices implements ToXContent, Streamable {
return (((double) (total - primaries)) / primaries);
}
/** the maximum number of shards (primary+replicas) an index has */
/**
* the maximum number of shards (primary+replicas) an index has
*/
public int getMaxIndexShards() {
return this.maxIndexShards;
}
/** the minimum number of shards (primary+replicas) an index has */
/**
* the minimum number of shards (primary+replicas) an index has
*/
public int getMinIndexShards() {
return this.minIndexShards;
}
/** average number of shards (primary+replicas) across the indices */
/**
* average number of shards (primary+replicas) across the indices
*/
public double getAvgIndexShards() {
if (this.indices == 0) {
return -1;
@ -274,12 +280,16 @@ public class ClusterStatsIndices implements ToXContent, Streamable {
return this.maxIndexPrimaryShards;
}
/** the minimum number of primary shards an index has */
/**
* the minimum number of primary shards an index has
*/
public int getMinIndexPrimaryShards() {
return this.minIndexPrimaryShards;
}
/** the average number primary shards across the indices */
/**
* the average number primary shards across the indices
*/
public double getAvgIndexPrimaryShards() {
if (this.indices == 0) {
return -1;

2
src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodes.java
View File

@ -1,4 +1,3 @@
package org.elasticsearch.action.admin.cluster.stats;
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
@ -18,6 +17,7 @@ package org.elasticsearch.action.admin.cluster.stats;
* under the License.
*/
package org.elasticsearch.action.admin.cluster.stats;
import com.carrotsearch.hppc.ObjectIntOpenHashMap;
import com.carrotsearch.hppc.cursors.ObjectIntCursor;

4
src/main/java/org/elasticsearch/action/termvector/MultiTermVectorsRequest.java
View File

@ -1,5 +1,3 @@
package org.elasticsearch.action.termvector;
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
@ -19,6 +17,8 @@ package org.elasticsearch.action.termvector;
* under the License.
*/
package org.elasticsearch.action.termvector;
import org.elasticsearch.ElasticsearchIllegalArgumentException;
import org.elasticsearch.ElasticsearchParseException;
import org.elasticsearch.action.ActionRequest;

2
src/main/java/org/elasticsearch/action/termvector/MultiTermVectorsRequestBuilder.java
View File

@ -1,4 +1,3 @@
package org.elasticsearch.action.termvector;
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
@ -18,6 +17,7 @@ package org.elasticsearch.action.termvector;
* under the License.
*/
package org.elasticsearch.action.termvector;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.ActionRequestBuilder;

19
src/main/java/org/elasticsearch/action/update/UpdateHelper.java
View File

@ -1,3 +1,22 @@
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch licenses this file to you under
* the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.action.update;
import org.elasticsearch.ElasticsearchIllegalArgumentException;

19
src/main/java/org/elasticsearch/common/collect/HppcMaps.java
View File

@ -1,3 +1,22 @@
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch licenses this file to you under
* the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.common.collect;
import com.carrotsearch.hppc.ObjectIntOpenHashMap;

19
src/main/java/org/elasticsearch/common/joda/DateMathParser.java
View File

@ -1,3 +1,22 @@
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch licenses this file to you under
* the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.common.joda;
import org.elasticsearch.ElasticsearchParseException;

20
src/main/java/org/elasticsearch/index/analysis/CJKBigramFilterFactory.java
View File

@ -1,4 +1,3 @@
package org.elasticsearch.index.analysis;
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
@ -17,9 +16,8 @@ package org.elasticsearch.index.analysis;
* specific language governing permissions and limitations
* under the License.
*/
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
package org.elasticsearch.index.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.cjk.CJKBigramFilter;
@ -29,18 +27,22 @@ import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.Index;
import org.elasticsearch.index.settings.IndexSettings;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
/**
* Factory that creates a {@link CJKBigramFilter} to form bigrams of CJK terms
* that are generated from StandardTokenizer or ICUTokenizer.
* <p>
* <p/>
* CJK types are set by these tokenizers, but you can also use flags to
* explicitly control which of the CJK scripts are turned into bigrams.
* <p>
* <p/>
* By default, when a CJK character has no adjacent characters to form a bigram,
* it is output in unigram form. If you want to always output both unigrams and
* bigrams, set the <code>outputUnigrams</code> flag. This can be used for a
* combined unigram+bigram approach.
* <p>
* <p/>
* In all cases, all non-CJK input is passed thru unmodified.
*/
public final class CJKBigramFilterFactory extends AbstractTokenFilterFactory {
@ -63,9 +65,9 @@ public final class CJKBigramFilterFactory extends AbstractTokenFilterFactory {
flags |= CJKBigramFilter.HAN;
} else if ("hiragana".equals(script)) {
flags |= CJKBigramFilter.HIRAGANA;
} else if("katakana".equals(script)) {
} else if ("katakana".equals(script)) {
flags |= CJKBigramFilter.KATAKANA;
} else if("hangul".equals(script)) {
} else if ("hangul".equals(script)) {
flags |= CJKBigramFilter.HANGUL;
}
}

4
src/main/java/org/elasticsearch/index/analysis/CJKWidthFilterFactory.java
View File

@ -1,4 +1,3 @@
package org.elasticsearch.index.analysis;
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
@ -17,6 +16,9 @@ package org.elasticsearch.index.analysis;
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.index.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.cjk.CJKWidthFilter;
import org.elasticsearch.common.inject.Inject;

3
src/main/java/org/elasticsearch/index/analysis/KeepWordFilterFactory.java
View File

@ -1,4 +1,3 @@
package org.elasticsearch.index.analysis;
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
@ -18,6 +17,8 @@ package org.elasticsearch.index.analysis;
* under the License.
*/
package org.elasticsearch.index.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.miscellaneous.KeepWordFilter;
import org.apache.lucene.analysis.util.CharArraySet;

19
src/main/java/org/elasticsearch/index/fielddata/AbstractIndexFieldData.java
View File

@ -1,3 +1,22 @@
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch licenses this file to you under
* the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.index.fielddata;
import org.apache.lucene.index.AtomicReaderContext;

3
src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/DoubleValuesComparatorBase.java
View File

@ -1,4 +1,3 @@
package org.elasticsearch.index.fielddata.fieldcomparator;
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
@ -18,6 +17,8 @@ package org.elasticsearch.index.fielddata.fieldcomparator;
* under the License.
*/
package org.elasticsearch.index.fielddata.fieldcomparator;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.search.FieldComparator;
import org.elasticsearch.index.fielddata.DoubleValues;

3
src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/LongValuesComparatorBase.java
View File

@ -1,4 +1,3 @@
package org.elasticsearch.index.fielddata.fieldcomparator;
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
@ -18,6 +17,8 @@ package org.elasticsearch.index.fielddata.fieldcomparator;
* under the License.
*/
package org.elasticsearch.index.fielddata.fieldcomparator;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.search.FieldComparator;
import org.elasticsearch.index.fielddata.IndexNumericFieldData;

19
src/main/java/org/elasticsearch/index/percolator/PercolatorQueriesRegistry.java
View File

@ -1,3 +1,22 @@
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch licenses this file to you under
* the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.index.percolator;
import org.apache.lucene.index.Term;

18
src/main/java/org/elasticsearch/index/query/SimpleQueryStringFlag.java
View File

@ -1,3 +1,21 @@
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch licenses this file to you under
* the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.index.query;
import org.apache.lucene.queryparser.XSimpleQueryParser;

19
src/main/java/org/elasticsearch/percolator/PercolateException.java
View File

@ -1,3 +1,22 @@
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch licenses this file to you under
* the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.percolator;
import org.elasticsearch.ElasticsearchException;

34
src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java
View File

@ -1,4 +1,3 @@
package org.elasticsearch.search.rescore;
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
@ -17,6 +16,9 @@ package org.elasticsearch.search.rescore;
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.search.rescore;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.*;
@ -41,6 +43,7 @@ public final class QueryRescorer implements Rescorer {
public float combine(float primary, float secondary) {
return (primary + secondary) / 2;
}
@Override
public String toString() {
return "avg";
@ -51,6 +54,7 @@ public final class QueryRescorer implements Rescorer {
public float combine(float primary, float secondary) {
return Math.max(primary, secondary);
}
@Override
public String toString() {
return "max";
@ -61,6 +65,7 @@ public final class QueryRescorer implements Rescorer {
public float combine(float primary, float secondary) {
return Math.min(primary, secondary);
}
@Override
public String toString() {
return "min";
@ -71,6 +76,7 @@ public final class QueryRescorer implements Rescorer {
public float combine(float primary, float secondary) {
return primary + secondary;
}
@Override
public String toString() {
return "sum";
@ -81,6 +87,7 @@ public final class QueryRescorer implements Rescorer {
public float combine(float primary, float secondary) {
return primary * secondary;
}
@Override
public String toString() {
return "product";
@ -99,7 +106,7 @@ public final class QueryRescorer implements Rescorer {
}
@Override
public void rescore(TopDocs topDocs, SearchContext context, RescoreSearchContext rescoreContext) throws IOException{
public void rescore(TopDocs topDocs, SearchContext context, RescoreSearchContext rescoreContext) throws IOException {
assert rescoreContext != null;
QueryRescoreContext rescore = ((QueryRescoreContext) rescoreContext);
TopDocs queryTopDocs = context.queryResult().topDocs();
@ -119,7 +126,7 @@ public final class QueryRescorer implements Rescorer {
Explanation primaryExplain = searcher.explain(context.query(), topLevelDocId);
if (primaryExplain == null) {
// this should not happen but just in case
return new ComplexExplanation(false, 0.0f, "nothing matched");
return new ComplexExplanation(false, 0.0f, "nothing matched");
}
Explanation rescoreExplain = searcher.explain(rescore.query(), topLevelDocId);
float primaryWeight = rescore.queryWeight();
@ -161,9 +168,9 @@ public final class QueryRescorer implements Rescorer {
rescoreContext.setParsedQuery(parsedQuery);
}
} else if (token.isValue()) {
if("query_weight".equals(fieldName)) {
if ("query_weight".equals(fieldName)) {
rescoreContext.setQueryWeight(parser.floatValue());
} else if("rescore_query_weight".equals(fieldName)) {
} else if ("rescore_query_weight".equals(fieldName)) {
rescoreContext.setRescoreQueryWeight(parser.floatValue());
} else if ("score_mode".equals(fieldName)) {
String sScoreMode = parser.text();
@ -264,6 +271,7 @@ public final class QueryRescorer implements Rescorer {
private static final class DocIdSorter extends IntroSorter {
private ScoreDoc[] array;
private ScoreDoc pivot;
@Override
protected void swap(int i, int j) {
ScoreDoc scoreDoc = array[i];
@ -301,6 +309,7 @@ public final class QueryRescorer implements Rescorer {
private static final class ScoreSorter extends IntroSorter {
private ScoreDoc[] array;
private ScoreDoc pivot;
@Override
protected void swap(int i, int j) {
ScoreDoc scoreDoc = array[i];
@ -331,6 +340,7 @@ public final class QueryRescorer implements Rescorer {
private static final class TopDocsFilter extends Filter {
private final int[] docIds;
public TopDocsFilter(TopDocs topDocs) {
this.docIds = new int[topDocs.scoreDocs.length];
ScoreDoc[] scoreDocs = topDocs.scoreDocs;
@ -340,17 +350,18 @@ public final class QueryRescorer implements Rescorer {
Arrays.sort(docIds);
}
@Override
public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) throws IOException {
final int docBase = context.docBase;
int limit = docBase + context.reader().maxDoc();
int limit = docBase + context.reader().maxDoc();
int offset = Arrays.binarySearch(docIds, docBase);
if (offset < 0 ) {
offset = (-offset)-1;
if (offset < 0) {
offset = (-offset) - 1;
}
int end = Arrays.binarySearch(docIds, limit);
if (end < 0) {
end = (-end)-1;
end = (-end) - 1;
}
final int start = offset;
final int stop = end;
@ -366,7 +377,7 @@ public final class QueryRescorer implements Rescorer {
@Override
public int nextDoc() throws IOException {
if (current < stop) {
return docId = docIds[current++]-docBase;
return docId = docIds[current++] - docBase;
}
return docId = NO_MORE_DOCS;
}
@ -382,7 +393,8 @@ public final class QueryRescorer implements Rescorer {
current = stop;
return docId = NO_MORE_DOCS;
}
while(nextDoc() < target) {}
while (nextDoc() < target) {
}
return docId;
}

20
src/main/java/org/elasticsearch/search/rescore/Rescorer.java
View File

@ -1,4 +1,3 @@
package org.elasticsearch.search.rescore;
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
@ -17,8 +16,8 @@ package org.elasticsearch.search.rescore;
* specific language governing permissions and limitations
* under the License.
*/
import java.io.IOException;
import java.util.Set;
package org.elasticsearch.search.rescore;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.Explanation;
@ -27,6 +26,9 @@ import org.elasticsearch.action.search.SearchType;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.search.internal.SearchContext;
import java.io.IOException;
import java.util.Set;
/**
* A query rescorer interface used to re-rank the Top-K results of a previously
* executed search.
@ -42,8 +44,8 @@ public interface Rescorer {
* Modifies the result of the previously executed search ({@link TopDocs})
* in place based on the given {@link RescoreSearchContext}.
*
* @param topDocs the result of the previously exectued search
* @param context the current {@link SearchContext}. This will never be <code>null</code>.
* @param topDocs the result of the previously exectued search
* @param context the current {@link SearchContext}. This will never be <code>null</code>.
* @param rescoreContext the {@link RescoreSearchContext}. This will never be <code>null</code>
* @throws IOException if an {@link IOException} occurs during rescoring
*/
@ -51,8 +53,9 @@ public interface Rescorer {
/**
* Executes an {@link Explanation} phase on the rescorer.
* @param topLevelDocId the global / top-level document ID to explain
* @param context the current {@link SearchContext}
*
* @param topLevelDocId the global / top-level document ID to explain
* @param context the current {@link SearchContext}
* @param rescoreContext TODO
* @return the explain for the given top level document ID.
* @throws IOException if an {@link IOException} occurs
@ -61,7 +64,8 @@ public interface Rescorer {
/**
* Parses the {@link RescoreSearchContext} for this impelementation
* @param parser the parser to read the context from
*
* @param parser the parser to read the context from
* @param context the current search context
* @return the parsed {@link RescoreSearchContext}
* @throws IOException if an {@link IOException} occurs while parsing the context

4
src/main/java/org/elasticsearch/search/scan/ScanContext.java
View File

@ -1,4 +1,3 @@
package org.elasticsearch.search.scan;
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
@ -17,6 +16,9 @@ package org.elasticsearch.search.scan;
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.search.scan;
import com.google.common.collect.Maps;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;

4
src/main/java/org/elasticsearch/search/suggest/completion/PayloadProcessor.java
View File

@ -1,4 +1,3 @@
package org.elasticsearch.search.suggest.completion;
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
@ -17,6 +16,9 @@ package org.elasticsearch.search.suggest.completion;
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.search.suggest.completion;
import org.apache.lucene.util.BytesRef;
import java.io.IOException;

19
src/main/java/org/elasticsearch/snapshots/SnapshotShardFailure.java
View File

@ -1,3 +1,22 @@
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch licenses this file to you under
* the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.snapshots;
import org.elasticsearch.ElasticsearchParseException;

19
src/main/java/org/elasticsearch/snapshots/SnapshotState.java
View File

@ -1,3 +1,22 @@
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch licenses this file to you under
* the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.snapshots;
import org.elasticsearch.ElasticsearchIllegalArgumentException;

1
src/main/java/org/joda/time/base/BaseDateTime.java
View File

@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.joda.time.base;
import org.joda.time.Chronology;

2
src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsTests.java
View File

@ -1,4 +1,3 @@
package org.elasticsearch.action.admin.cluster.stats;
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
@ -18,6 +17,7 @@ package org.elasticsearch.action.admin.cluster.stats;
* under the License.
*/
package org.elasticsearch.action.admin.cluster.stats;
import org.elasticsearch.Version;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus;

20
src/test/java/org/elasticsearch/action/termvector/AbstractTermVectorTests.java
View File

@ -1,5 +1,3 @@
package org.elasticsearch.action.termvector;
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
@ -19,6 +17,8 @@ package org.elasticsearch.action.termvector;
* under the License.
*/
package org.elasticsearch.action.termvector;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.Tokenizer;
@ -37,8 +37,6 @@ import org.apache.lucene.search.TopDocs;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.RAMDirectory;
import org.elasticsearch.Version;
import org.elasticsearch.action.termvector.TermVectorRequestBuilder;
import org.elasticsearch.action.termvector.TermVectorResponse;
import org.elasticsearch.common.inject.internal.Join;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.xcontent.XContentBuilder;
@ -205,11 +203,11 @@ public abstract class AbstractTermVectorTests extends ElasticsearchIntegrationTe
* Generate test documentsThe returned documents are already indexed.
*/
protected TestDoc[] generateTestDocs(int numberOfDocs, TestFieldSetting[] fieldSettings) {
String[] fieldContentOptions = new String[] { "Generating a random permutation of a sequence (such as when shuffling cards).",
String[] fieldContentOptions = new String[]{"Generating a random permutation of a sequence (such as when shuffling cards).",
"Selecting a random sample of a population (important in statistical sampling).",
"Allocating experimental units via random assignment to a treatment or control condition.",
"Generating random numbers: see Random number generation.",
"Transforming a data stream (such as when using a scrambler in telecommunications)." };
"Transforming a data stream (such as when using a scrambler in telecommunications)."};
String[] contentArray = new String[fieldSettings.length];
Map<String, Object> docSource = new HashMap<String, Object>();
@ -252,21 +250,21 @@ public abstract class AbstractTermVectorTests extends ElasticsearchIntegrationTe
}
TestConfig config = new TestConfig(testDocs[randomInt(testDocs.length - 1)], selectedFields == null ? null
: selectedFields.toArray(new String[] {}), randomBoolean(), randomBoolean(), randomBoolean());
: selectedFields.toArray(new String[]{}), randomBoolean(), randomBoolean(), randomBoolean());
configs.add(config);
}
// always adds a test that fails
configs.add(new TestConfig(new TestDoc("doesnt_exist", new TestFieldSetting[] {}, new String[] {}).index("doesn't_exist"),
new String[] { "doesnt_exist" }, true, true, true).expectedException(IndexMissingException.class));
configs.add(new TestConfig(new TestDoc("doesnt_exist", new TestFieldSetting[]{}, new String[]{}).index("doesn't_exist"),
new String[]{"doesnt_exist"}, true, true, true).expectedException(IndexMissingException.class));
refresh();
return configs.toArray(new TestConfig[] {});
return configs.toArray(new TestConfig[]{});
}
protected TestFieldSetting[] getFieldSettings() {
return new TestFieldSetting[] { new TestFieldSetting("field_with_positions", false, false, true),
return new TestFieldSetting[]{new TestFieldSetting("field_with_positions", false, false, true),
new TestFieldSetting("field_with_offsets", true, false, false),
new TestFieldSetting("field_with_only_tv", false, false, false),
new TestFieldSetting("field_with_positions_offsets", false, false, true),

8
src/test/java/org/elasticsearch/action/termvector/MultiTermVectorsTests.java
View File

@ -1,4 +1,3 @@
package org.elasticsearch.action.termvector;
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
@ -18,16 +17,14 @@ package org.elasticsearch.action.termvector;
* under the License.
*/
package org.elasticsearch.action.termvector;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.Fields;
import org.elasticsearch.action.termvector.MultiTermVectorsItemResponse;
import org.elasticsearch.action.termvector.MultiTermVectorsRequestBuilder;
import org.elasticsearch.action.termvector.MultiTermVectorsResponse;
import org.elasticsearch.action.termvector.TermVectorRequestBuilder;
import org.junit.Test;
import static org.hamcrest.Matchers.equalTo;
public class MultiTermVectorsTests extends AbstractTermVectorTests {
@Test
@ -64,6 +61,7 @@ public class MultiTermVectorsTests extends AbstractTermVectorTests {
}
}
public void testMissingIndexThrowsMissingIndex() throws Exception {
TermVectorRequestBuilder requestBuilder = client().prepareTermVector("testX", "typeX", Integer.toString(1));
MultiTermVectorsRequestBuilder mtvBuilder = new MultiTermVectorsRequestBuilder(client());

2
src/test/java/org/elasticsearch/client/transport/TransportClientTests.java
View File

@ -1,4 +1,3 @@
package org.elasticsearch.client.transport;
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
@ -18,6 +17,7 @@ package org.elasticsearch.client.transport;
* under the License.
*/
package org.elasticsearch.client.transport;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.test.ElasticsearchIntegrationTest;

2
src/test/java/org/elasticsearch/cluster/ClusterHealthResponsesTests.java
View File

@ -1,4 +1,3 @@
package org.elasticsearch.cluster;
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
@ -18,6 +17,7 @@ package org.elasticsearch.cluster;
* under the License.
*/
package org.elasticsearch.cluster;
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;

4
src/test/java/org/elasticsearch/cluster/allocation/ShardsAllocatorModuleTests.java
View File

@ -1,5 +1,3 @@
package org.elasticsearch.cluster.allocation;
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
@ -19,6 +17,8 @@ package org.elasticsearch.cluster.allocation;
* under the License.
*/
package org.elasticsearch.cluster.allocation;
import org.elasticsearch.cluster.routing.allocation.allocator.BalancedShardsAllocator;
import org.elasticsearch.cluster.routing.allocation.allocator.EvenShardsCountAllocator;
import org.elasticsearch.cluster.routing.allocation.allocator.ShardsAllocator;

2
src/test/java/org/elasticsearch/common/BooleansTests.java
View File

@ -1,4 +1,3 @@
package org.elasticsearch.common;
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
@ -18,6 +17,7 @@ package org.elasticsearch.common;
* under the License.
*/
package org.elasticsearch.common;
import org.elasticsearch.test.ElasticsearchTestCase;
import org.hamcrest.Matchers;

4
src/test/java/org/elasticsearch/common/xcontent/support/XContentHelperTests.java
View File

@ -1,4 +1,3 @@
package org.elasticsearch.common.xcontent.support;
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
@ -18,6 +17,7 @@ package org.elasticsearch.common.xcontent.support;
* under the License.
*/
package org.elasticsearch.common.xcontent.support;
import org.elasticsearch.common.xcontent.XContentHelper;
import org.elasticsearch.test.ElasticsearchTestCase;
@ -29,8 +29,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static org.hamcrest.MatcherAssert.assertThat;
public class XContentHelperTests extends ElasticsearchTestCase {
Map<String, Object> getMap(Object... keyValues) {

2
src/test/java/org/elasticsearch/index/VersionTypeTests.java
View File

@ -1,4 +1,3 @@
package org.elasticsearch.index;
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
@ -18,6 +17,7 @@ package org.elasticsearch.index;
* under the License.
*/
package org.elasticsearch.index;
import org.elasticsearch.common.lucene.uid.Versions;
import org.elasticsearch.test.ElasticsearchTestCase;

2
src/test/java/org/elasticsearch/search/source/SourceFetchingTests.java
View File

@ -1,4 +1,3 @@
package org.elasticsearch.search.source;
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
@ -18,6 +17,7 @@ package org.elasticsearch.search.source;
* under the License.
*/
package org.elasticsearch.search.source;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.test.ElasticsearchIntegrationTest;

4
src/test/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellCheckerTests.java
View File

@ -1,4 +1,3 @@
package org.elasticsearch.search.suggest.phrase;
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
@ -17,6 +16,8 @@ package org.elasticsearch.search.suggest.phrase;
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.search.suggest.phrase;
import com.google.common.base.Charsets;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenFilter;
@ -51,6 +52,7 @@ import java.util.Map;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThan;
public class NoisyChannelSpellCheckerTests extends ElasticsearchTestCase{
private final BytesRef space = new BytesRef(" ");
private final BytesRef preTag = new BytesRef("<em>");