Skip to content

Commit 5966d20

Browse files
committed
refacto package name from facets to facet (make more sense when facet will be easily pluggable)
1 parent 0a0ac35 commit 5966d20

File tree

78 files changed

+223
-223
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+223
-223
lines changed

modules/elasticsearch/src/main/java/org/elasticsearch/action/search/SearchResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.elasticsearch.common.xcontent.XContentBuilder;
2727
import org.elasticsearch.common.xcontent.XContentBuilderString;
2828
import org.elasticsearch.search.SearchHits;
29-
import org.elasticsearch.search.facets.Facets;
29+
import org.elasticsearch.search.facet.Facets;
3030
import org.elasticsearch.search.internal.InternalSearchResponse;
3131

3232
import java.io.IOException;

modules/elasticsearch/src/main/java/org/elasticsearch/client/action/search/SearchRequestBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.elasticsearch.index.query.xcontent.XContentQueryBuilder;
3232
import org.elasticsearch.search.Scroll;
3333
import org.elasticsearch.search.builder.SearchSourceBuilder;
34-
import org.elasticsearch.search.facets.AbstractFacetBuilder;
34+
import org.elasticsearch.search.facet.AbstractFacetBuilder;
3535
import org.elasticsearch.search.highlight.HighlightBuilder;
3636
import org.elasticsearch.search.sort.SortBuilder;
3737
import org.elasticsearch.search.sort.SortOrder;

modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchModule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.elasticsearch.search.action.SearchServiceTransportAction;
2424
import org.elasticsearch.search.controller.SearchPhaseController;
2525
import org.elasticsearch.search.dfs.DfsPhase;
26-
import org.elasticsearch.search.facets.FacetsPhase;
26+
import org.elasticsearch.search.facet.FacetsPhase;
2727
import org.elasticsearch.search.fetch.FetchPhase;
2828
import org.elasticsearch.search.highlight.HighlightPhase;
2929
import org.elasticsearch.search.query.QueryPhase;

modules/elasticsearch/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.elasticsearch.common.xcontent.XContentFactory;
3131
import org.elasticsearch.common.xcontent.XContentType;
3232
import org.elasticsearch.index.query.xcontent.XContentQueryBuilder;
33-
import org.elasticsearch.search.facets.AbstractFacetBuilder;
33+
import org.elasticsearch.search.facet.AbstractFacetBuilder;
3434
import org.elasticsearch.search.highlight.HighlightBuilder;
3535
import org.elasticsearch.search.sort.SortBuilder;
3636
import org.elasticsearch.search.sort.SortBuilders;

modules/elasticsearch/src/main/java/org/elasticsearch/search/controller/SearchPhaseController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
import org.elasticsearch.search.SearchShardTarget;
3131
import org.elasticsearch.search.dfs.AggregatedDfs;
3232
import org.elasticsearch.search.dfs.DfsSearchResult;
33-
import org.elasticsearch.search.facets.Facet;
34-
import org.elasticsearch.search.facets.internal.InternalFacet;
35-
import org.elasticsearch.search.facets.internal.InternalFacets;
33+
import org.elasticsearch.search.facet.Facet;
34+
import org.elasticsearch.search.facet.internal.InternalFacet;
35+
import org.elasticsearch.search.facet.internal.InternalFacets;
3636
import org.elasticsearch.search.fetch.FetchSearchResult;
3737
import org.elasticsearch.search.fetch.FetchSearchResultProvider;
3838
import org.elasticsearch.search.internal.InternalSearchHit;

modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/AbstractFacetBuilder.java renamed to modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/AbstractFacetBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.search.facets;
20+
package org.elasticsearch.search.facet;
2121

2222
import org.elasticsearch.common.xcontent.ToXContent;
2323
import org.elasticsearch.common.xcontent.XContentBuilder;

modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/Facet.java renamed to modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/Facet.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.search.facets;
20+
package org.elasticsearch.search.facet;
2121

2222
import org.elasticsearch.ElasticSearchIllegalArgumentException;
23-
import org.elasticsearch.search.facets.filter.FilterFacet;
24-
import org.elasticsearch.search.facets.geodistance.GeoDistanceFacet;
25-
import org.elasticsearch.search.facets.histogram.HistogramFacet;
26-
import org.elasticsearch.search.facets.query.QueryFacet;
27-
import org.elasticsearch.search.facets.range.RangeFacet;
28-
import org.elasticsearch.search.facets.statistical.StatisticalFacet;
29-
import org.elasticsearch.search.facets.terms.TermsFacet;
23+
import org.elasticsearch.search.facet.filter.FilterFacet;
24+
import org.elasticsearch.search.facet.geodistance.GeoDistanceFacet;
25+
import org.elasticsearch.search.facet.histogram.HistogramFacet;
26+
import org.elasticsearch.search.facet.query.QueryFacet;
27+
import org.elasticsearch.search.facet.range.RangeFacet;
28+
import org.elasticsearch.search.facet.statistical.StatisticalFacet;
29+
import org.elasticsearch.search.facet.terms.TermsFacet;
3030

3131
/**
3232
* A search facet.

modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/FacetBuilders.java renamed to modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/FacetBuilders.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.search.facets;
20+
package org.elasticsearch.search.facet;
2121

2222
import org.elasticsearch.index.query.xcontent.XContentFilterBuilder;
2323
import org.elasticsearch.index.query.xcontent.XContentQueryBuilder;
24-
import org.elasticsearch.search.facets.filter.FilterFacetBuilder;
25-
import org.elasticsearch.search.facets.geodistance.GeoDistanceFacetBuilder;
26-
import org.elasticsearch.search.facets.histogram.HistogramFacetBuilder;
27-
import org.elasticsearch.search.facets.histogram.HistogramScriptFacetBuilder;
28-
import org.elasticsearch.search.facets.query.QueryFacetBuilder;
29-
import org.elasticsearch.search.facets.range.RangeFacetBuilder;
30-
import org.elasticsearch.search.facets.range.RangeScriptFacetBuilder;
31-
import org.elasticsearch.search.facets.statistical.StatisticalFacetBuilder;
32-
import org.elasticsearch.search.facets.statistical.StatisticalScriptFacetBuilder;
33-
import org.elasticsearch.search.facets.terms.TermsFacetBuilder;
24+
import org.elasticsearch.search.facet.filter.FilterFacetBuilder;
25+
import org.elasticsearch.search.facet.geodistance.GeoDistanceFacetBuilder;
26+
import org.elasticsearch.search.facet.histogram.HistogramFacetBuilder;
27+
import org.elasticsearch.search.facet.histogram.HistogramScriptFacetBuilder;
28+
import org.elasticsearch.search.facet.query.QueryFacetBuilder;
29+
import org.elasticsearch.search.facet.range.RangeFacetBuilder;
30+
import org.elasticsearch.search.facet.range.RangeScriptFacetBuilder;
31+
import org.elasticsearch.search.facet.statistical.StatisticalFacetBuilder;
32+
import org.elasticsearch.search.facet.statistical.StatisticalScriptFacetBuilder;
33+
import org.elasticsearch.search.facet.terms.TermsFacetBuilder;
3434

3535
/**
3636
* @author kimchy (shay.banon)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.search.facets;
20+
package org.elasticsearch.search.facet;
2121

2222
import org.elasticsearch.ElasticSearchException;
2323

modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/Facets.java renamed to modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/Facets.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.search.facets;
20+
package org.elasticsearch.search.facet;
2121

2222
import java.util.List;
2323
import java.util.Map;

modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/FacetsParseElement.java renamed to modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/FacetsParseElement.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.search.facets;
20+
package org.elasticsearch.search.facet;
2121

2222
import org.apache.lucene.search.Filter;
2323
import org.elasticsearch.common.collect.ImmutableMap;
@@ -27,15 +27,15 @@
2727
import org.elasticsearch.index.query.xcontent.XContentIndexQueryParser;
2828
import org.elasticsearch.search.SearchParseElement;
2929
import org.elasticsearch.search.SearchParseException;
30-
import org.elasticsearch.search.facets.collector.FacetCollector;
31-
import org.elasticsearch.search.facets.collector.FacetCollectorParser;
32-
import org.elasticsearch.search.facets.filter.FilterFacetCollectorParser;
33-
import org.elasticsearch.search.facets.geodistance.GeoDistanceFacetCollectorParser;
34-
import org.elasticsearch.search.facets.histogram.HistogramFacetCollectorParser;
35-
import org.elasticsearch.search.facets.query.QueryFacetCollectorParser;
36-
import org.elasticsearch.search.facets.range.RangeFacetCollectorParser;
37-
import org.elasticsearch.search.facets.statistical.StatisticalFacetCollectorParser;
38-
import org.elasticsearch.search.facets.terms.TermsFacetCollectorParser;
30+
import org.elasticsearch.search.facet.collector.FacetCollector;
31+
import org.elasticsearch.search.facet.collector.FacetCollectorParser;
32+
import org.elasticsearch.search.facet.filter.FilterFacetCollectorParser;
33+
import org.elasticsearch.search.facet.geodistance.GeoDistanceFacetCollectorParser;
34+
import org.elasticsearch.search.facet.histogram.HistogramFacetCollectorParser;
35+
import org.elasticsearch.search.facet.query.QueryFacetCollectorParser;
36+
import org.elasticsearch.search.facet.range.RangeFacetCollectorParser;
37+
import org.elasticsearch.search.facet.statistical.StatisticalFacetCollectorParser;
38+
import org.elasticsearch.search.facet.terms.TermsFacetCollectorParser;
3939
import org.elasticsearch.search.internal.SearchContext;
4040

4141
import java.util.List;

modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/FacetsPhase.java renamed to modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/FacetsPhase.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.search.facets;
20+
package org.elasticsearch.search.facet;
2121

2222
import org.apache.lucene.search.*;
2323
import org.elasticsearch.ElasticSearchException;
@@ -29,8 +29,8 @@
2929
import org.elasticsearch.index.mapper.DocumentMapper;
3030
import org.elasticsearch.search.SearchParseElement;
3131
import org.elasticsearch.search.SearchPhase;
32-
import org.elasticsearch.search.facets.collector.FacetCollector;
33-
import org.elasticsearch.search.facets.internal.InternalFacets;
32+
import org.elasticsearch.search.facet.collector.FacetCollector;
33+
import org.elasticsearch.search.facet.internal.InternalFacets;
3434
import org.elasticsearch.search.internal.SearchContext;
3535
import org.elasticsearch.search.query.QueryPhaseExecutionException;
3636

modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/SearchContextFacets.java renamed to modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/SearchContextFacets.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.search.facets;
20+
package org.elasticsearch.search.facet;
2121

22-
import org.elasticsearch.search.facets.collector.FacetCollector;
22+
import org.elasticsearch.search.facet.collector.FacetCollector;
2323

2424
import java.util.List;
2525

modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/collector/FacetCollector.java renamed to modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/collector/FacetCollector.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.search.facets.collector;
20+
package org.elasticsearch.search.facet.collector;
2121

2222
import org.apache.lucene.search.Collector;
2323
import org.apache.lucene.search.Filter;
24-
import org.elasticsearch.search.facets.Facet;
24+
import org.elasticsearch.search.facet.Facet;
2525

2626
/**
2727
* @author kimchy (shay.banon)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.search.facets.collector;
20+
package org.elasticsearch.search.facet.collector;
2121

2222
import org.elasticsearch.common.xcontent.XContentParser;
2323
import org.elasticsearch.search.internal.SearchContext;

modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/filter/FilterFacet.java renamed to modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/filter/FilterFacet.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.search.facets.filter;
20+
package org.elasticsearch.search.facet.filter;
2121

22-
import org.elasticsearch.search.facets.Facet;
22+
import org.elasticsearch.search.facet.Facet;
2323

2424
/**
2525
* A query facets returns the count (number of hits) for a facet based on a query.

modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/filter/FilterFacetBuilder.java renamed to modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/filter/FilterFacetBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.search.facets.filter;
20+
package org.elasticsearch.search.facet.filter;
2121

2222
import org.elasticsearch.common.xcontent.XContentBuilder;
2323
import org.elasticsearch.index.query.xcontent.XContentFilterBuilder;
2424
import org.elasticsearch.search.builder.SearchSourceBuilderException;
25-
import org.elasticsearch.search.facets.AbstractFacetBuilder;
25+
import org.elasticsearch.search.facet.AbstractFacetBuilder;
2626

2727
import java.io.IOException;
2828

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.search.facets.filter;
20+
package org.elasticsearch.search.facet.filter;
2121

2222
import org.apache.lucene.index.IndexReader;
2323
import org.apache.lucene.search.Filter;
2424
import org.elasticsearch.common.lucene.docset.DocSet;
2525
import org.elasticsearch.common.lucene.docset.DocSets;
2626
import org.elasticsearch.index.cache.filter.FilterCache;
27-
import org.elasticsearch.search.facets.Facet;
28-
import org.elasticsearch.search.facets.support.AbstractFacetCollector;
27+
import org.elasticsearch.search.facet.Facet;
28+
import org.elasticsearch.search.facet.support.AbstractFacetCollector;
2929

3030
import java.io.IOException;
3131

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.search.facets.filter;
20+
package org.elasticsearch.search.facet.filter;
2121

2222
import org.apache.lucene.search.Filter;
2323
import org.elasticsearch.common.xcontent.XContentParser;
2424
import org.elasticsearch.index.query.xcontent.XContentIndexQueryParser;
25-
import org.elasticsearch.search.facets.collector.FacetCollector;
26-
import org.elasticsearch.search.facets.collector.FacetCollectorParser;
25+
import org.elasticsearch.search.facet.collector.FacetCollector;
26+
import org.elasticsearch.search.facet.collector.FacetCollectorParser;
2727
import org.elasticsearch.search.internal.SearchContext;
2828

2929
import java.io.IOException;
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.search.facets.filter;
20+
package org.elasticsearch.search.facet.filter;
2121

2222
import org.elasticsearch.common.io.stream.StreamInput;
2323
import org.elasticsearch.common.io.stream.StreamOutput;
2424
import org.elasticsearch.common.xcontent.XContentBuilder;
2525
import org.elasticsearch.common.xcontent.XContentBuilderString;
26-
import org.elasticsearch.search.facets.Facet;
27-
import org.elasticsearch.search.facets.internal.InternalFacet;
26+
import org.elasticsearch.search.facet.Facet;
27+
import org.elasticsearch.search.facet.internal.InternalFacet;
2828

2929
import java.io.IOException;
3030

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.search.facets.geodistance;
20+
package org.elasticsearch.search.facet.geodistance;
2121

2222
import org.elasticsearch.common.unit.DistanceUnit;
23-
import org.elasticsearch.search.facets.Facet;
23+
import org.elasticsearch.search.facet.Facet;
2424

2525
import java.util.List;
2626

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.search.facets.geodistance;
20+
package org.elasticsearch.search.facet.geodistance;
2121

2222
import org.elasticsearch.common.collect.Lists;
2323
import org.elasticsearch.common.collect.Maps;
@@ -26,7 +26,7 @@
2626
import org.elasticsearch.index.query.xcontent.XContentFilterBuilder;
2727
import org.elasticsearch.index.search.geo.GeoDistance;
2828
import org.elasticsearch.search.builder.SearchSourceBuilderException;
29-
import org.elasticsearch.search.facets.AbstractFacetBuilder;
29+
import org.elasticsearch.search.facet.AbstractFacetBuilder;
3030

3131
import java.io.IOException;
3232
import java.util.List;
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.search.facets.geodistance;
20+
package org.elasticsearch.search.facet.geodistance;
2121

2222
import org.apache.lucene.index.IndexReader;
2323
import org.elasticsearch.common.unit.DistanceUnit;
@@ -26,9 +26,9 @@
2626
import org.elasticsearch.index.mapper.xcontent.geo.GeoPointFieldData;
2727
import org.elasticsearch.index.mapper.xcontent.geo.GeoPointFieldDataType;
2828
import org.elasticsearch.index.search.geo.GeoDistance;
29-
import org.elasticsearch.search.facets.Facet;
30-
import org.elasticsearch.search.facets.FacetPhaseExecutionException;
31-
import org.elasticsearch.search.facets.support.AbstractFacetCollector;
29+
import org.elasticsearch.search.facet.Facet;
30+
import org.elasticsearch.search.facet.FacetPhaseExecutionException;
31+
import org.elasticsearch.search.facet.support.AbstractFacetCollector;
3232
import org.elasticsearch.search.internal.SearchContext;
3333

3434
import java.io.IOException;
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.search.facets.geodistance;
20+
package org.elasticsearch.search.facet.geodistance;
2121

2222
import org.elasticsearch.common.collect.Lists;
2323
import org.elasticsearch.common.thread.ThreadLocals;
@@ -26,9 +26,9 @@
2626
import org.elasticsearch.index.mapper.xcontent.geo.GeoPointFieldMapper;
2727
import org.elasticsearch.index.search.geo.GeoDistance;
2828
import org.elasticsearch.index.search.geo.GeoHashUtils;
29-
import org.elasticsearch.search.facets.FacetPhaseExecutionException;
30-
import org.elasticsearch.search.facets.collector.FacetCollector;
31-
import org.elasticsearch.search.facets.collector.FacetCollectorParser;
29+
import org.elasticsearch.search.facet.FacetPhaseExecutionException;
30+
import org.elasticsearch.search.facet.collector.FacetCollector;
31+
import org.elasticsearch.search.facet.collector.FacetCollectorParser;
3232
import org.elasticsearch.search.internal.SearchContext;
3333

3434
import java.io.IOException;
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.search.facets.geodistance;
20+
package org.elasticsearch.search.facet.geodistance;
2121

2222
import org.elasticsearch.common.collect.ImmutableList;
2323
import org.elasticsearch.common.io.stream.StreamInput;
2424
import org.elasticsearch.common.io.stream.StreamOutput;
2525
import org.elasticsearch.common.unit.DistanceUnit;
2626
import org.elasticsearch.common.xcontent.XContentBuilder;
2727
import org.elasticsearch.common.xcontent.XContentBuilderString;
28-
import org.elasticsearch.search.facets.Facet;
29-
import org.elasticsearch.search.facets.internal.InternalFacet;
28+
import org.elasticsearch.search.facet.Facet;
29+
import org.elasticsearch.search.facet.internal.InternalFacet;
3030

3131
import java.io.IOException;
3232
import java.util.Iterator;

0 commit comments

Comments
 (0)