Skip to content

Commit b2572d4

Browse files
committed
basic mechanism for term facets
1 parent b421cb5 commit b2572d4

29 files changed

+1709
-588
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@ atlassian-ide-plugin.xml
33
## Ignore svn files
44
.svn
55

6+
## ignore any target dir
67
target
7-
data
8+
9+
##ignore only top level data dir - local node data files for unit tests
10+
/data
811

912
## Ignore project files created by Eclipse
1013
.settings

src/main/java/org/springframework/data/elasticsearch/annotations/Field.java

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,26 @@
2020
/**
2121
* @author Rizwan Idrees
2222
* @author Mohsin Husen
23+
* @author Artur Konczak
24+
* @author Jonathan Yan
2325
*/
2426
@Retention(RetentionPolicy.RUNTIME)
2527
@Target(ElementType.FIELD)
2628
@Documented
2729
public @interface Field {
2830

29-
String type() default "";
31+
String type() default "";
3032

31-
String index() default "";
33+
String index() default "";
3234

33-
boolean store() default false;
35+
boolean store() default false;
3436

35-
String searchAnalyzer() default "";
37+
String searchAnalyzer() default "";
3638

37-
String indexAnalyzer() default "";
39+
String indexAnalyzer() default "";
40+
41+
boolean facetable() default false;
42+
43+
boolean sortable() default false;
3844

3945
}

src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchOperations.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public interface ElasticsearchOperations {
8484
* @param clazz
8585
* @return
8686
*/
87-
<T> Page<T> queryForPage(SearchQuery query, Class<T> clazz);
87+
<T> FacetedPage<T> queryForPage(SearchQuery query, Class<T> clazz);
8888

8989
/**
9090
* Execute the query against elasticsearch and return result as {@link Page}
@@ -93,7 +93,7 @@ public interface ElasticsearchOperations {
9393
* @param resultsMapper
9494
* @return
9595
*/
96-
<T> Page<T> queryForPage(SearchQuery query, ResultsMapper<T> resultsMapper);
96+
<T> FacetedPage<T> queryForPage(SearchQuery query, ResultsMapper<T> resultsMapper);
9797

9898
/**
9999
* Execute the query against elasticsearch and return result as {@link Page}
@@ -111,7 +111,7 @@ public interface ElasticsearchOperations {
111111
* @param clazz
112112
* @return
113113
*/
114-
<T> Page<T> queryForPage(StringQuery query, Class<T> clazz);
114+
<T> FacetedPage<T> queryForPage(StringQuery query, Class<T> clazz);
115115

116116
/**
117117
* Execute the criteria query against elasticsearch and return result as {@link List}

0 commit comments

Comments
 (0)