DATAGEODE-10 - Adapt to API changes in the org.apache.geode.cache.lucene.LuceneQueryFactory interface.

(cherry picked from commit 78d1717381e167827fec4b9e9c1e3c938858617a)
Signed-off-by: John Blum <jblum@pivotal.io>
This commit is contained in:
John Blum
2017-05-14 16:54:55 -07:00
parent 7659ba18fb
commit 23d15285fd
3 changed files with 47 additions and 64 deletions

View File

@@ -17,7 +17,6 @@
package org.springframework.data.gemfire.search.lucene;
import static org.springframework.data.gemfire.util.ArrayUtils.nullSafeArray;
import static org.springframework.data.gemfire.util.SpringUtils.safeGetValue;
import java.util.Optional;
@@ -137,23 +136,22 @@ public abstract class LuceneAccessor extends LuceneOperationsSupport implements
* @param projectionFields {@link String} array containing the fields of the object to project.
* @return an instance of the {@link LuceneQueryFactory} to create and execute {@link LuceneQuery Lucene queries}.
* @see org.apache.geode.cache.lucene.LuceneQueryFactory
* @see #createLuceneQueryFactory(int, int, String...)
* @see #createLuceneQueryFactory(int, int)
*/
public LuceneQueryFactory createLuceneQueryFactory(String... projectionFields) {
return createLuceneQueryFactory(DEFAULT_RESULT_LIMIT, DEFAULT_PAGE_SIZE, projectionFields);
return createLuceneQueryFactory(DEFAULT_RESULT_LIMIT, DEFAULT_PAGE_SIZE);
}
/**
* Creates an instance of the {@link LuceneQueryFactory} to create and execute {@link LuceneQuery Lucene queries}.
*
* @param resultLimit limit to the number of results returned by the query.
* @param projectionFields {@link String} array containing the fields of the object to project.
* @return an instance of the {@link LuceneQueryFactory} to create and execute {@link LuceneQuery Lucene queries}.
* @see org.apache.geode.cache.lucene.LuceneQueryFactory
* @see #createLuceneQueryFactory(int, int, String...)
* @see #createLuceneQueryFactory(int, int)
*/
public LuceneQueryFactory createLuceneQueryFactory(int resultLimit, String... projectionFields) {
return createLuceneQueryFactory(resultLimit, DEFAULT_PAGE_SIZE, projectionFields);
public LuceneQueryFactory createLuceneQueryFactory(int resultLimit) {
return createLuceneQueryFactory(resultLimit, DEFAULT_PAGE_SIZE);
}
/**
@@ -161,14 +159,11 @@ public abstract class LuceneAccessor extends LuceneOperationsSupport implements
*
* @param resultLimit limit to the number of results returned by the query.
* @param pageSize number of results appearing on a single page.
* @param projectionFields {@link String} array containing the fields of the object to project.
* @return an instance of the {@link LuceneQueryFactory} to create and execute {@link LuceneQuery Lucene queries}.
* @see #createLuceneQueryFactory()
*/
@SuppressWarnings("deprecation")
public LuceneQueryFactory createLuceneQueryFactory(int resultLimit, int pageSize, String... projectionFields) {
return createLuceneQueryFactory().setResultLimit(resultLimit).setPageSize(pageSize)
.setProjectionFields(nullSafeArray(projectionFields, String.class));
public LuceneQueryFactory createLuceneQueryFactory(int resultLimit, int pageSize) {
return createLuceneQueryFactory().setLimit(resultLimit).setPageSize(pageSize);
}
/**