Repository: geode Updated Branches: refs/heads/develop da3767da6 -> 2f2562591
GEODE-2543: Remove incorrectly marked deprecated methods from LuceneService and LuceneQueryFactory api Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/337f5afc Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/337f5afc Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/337f5afc Branch: refs/heads/develop Commit: 337f5afc0b65a4ee252e84e2cba698820079ab6f Parents: da3767d Author: Jason Huynh <[email protected]> Authored: Fri Feb 24 11:20:12 2017 -0800 Committer: Jason Huynh <[email protected]> Committed: Fri Feb 24 16:41:55 2017 -0800 ---------------------------------------------------------------------- .../java/org/apache/geode/cache/lucene/LuceneQuery.java | 5 ----- .../apache/geode/cache/lucene/LuceneQueryFactory.java | 11 ----------- .../apache/geode/cache/lucene/LuceneResultStruct.java | 8 -------- .../org/apache/geode/cache/lucene/LuceneService.java | 8 +------- .../cache/lucene/internal/LuceneQueryFactoryImpl.java | 8 +------- .../geode/cache/lucene/internal/LuceneQueryImpl.java | 9 +-------- .../cache/lucene/internal/LuceneResultStructImpl.java | 5 ----- .../lucene/internal/LuceneQueryFactoryImplJUnitTest.java | 3 --- .../cache/lucene/internal/LuceneQueryImplJUnitTest.java | 2 +- 9 files changed, 4 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/337f5afc/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneQuery.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneQuery.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneQuery.java index 93e54ea..1afb35a 100644 --- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneQuery.java +++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneQuery.java @@ -57,9 +57,4 @@ public interface LuceneQuery<K, V> { */ public int getLimit(); - /** - * Get projected fields setting of current query. - */ - public String[] getProjectedFieldNames(); - } http://git-wip-us.apache.org/repos/asf/geode/blob/337f5afc/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneQueryFactory.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneQueryFactory.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneQueryFactory.java index 4c81f07..174e7e1 100644 --- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneQueryFactory.java +++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneQueryFactory.java @@ -58,17 +58,6 @@ public interface LuceneQueryFactory { LuceneQueryFactory setResultLimit(int limit); /** - * Set a list of fields for result projection. - * - * @param fieldNames - * @return itself - * - * @deprecated TODO This feature is not yet implemented - */ - @Deprecated - LuceneQueryFactory setProjectionFields(String... fieldNames); - - /** * Create wrapper object for lucene's QueryParser object using default standard analyzer. The * queryString is using lucene QueryParser's syntax. QueryParser is for easy-to-use with human * understandable syntax. http://git-wip-us.apache.org/repos/asf/geode/blob/337f5afc/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneResultStruct.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneResultStruct.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneResultStruct.java index f3668fe..b922185 100644 --- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneResultStruct.java +++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneResultStruct.java @@ -23,14 +23,6 @@ import org.apache.geode.annotations.Experimental; */ @Experimental public interface LuceneResultStruct<K, V> { - /** - * Return the value associated with the given field name - * - * @param fieldName the String name of the field - * @return the value associated with the specified field - * @throws IllegalArgumentException If this struct does not have a field named fieldName - */ - public Object getProjectedField(String fieldName); /** * Return key of the entry http://git-wip-us.apache.org/repos/asf/geode/blob/337f5afc/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneService.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneService.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneService.java index 6fffe09..d273760 100644 --- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneService.java +++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneService.java @@ -103,9 +103,7 @@ public interface LuceneService { * Destroy the lucene index * * @param index index object - * @deprecated TODO This feature is not yet implemented */ - @Deprecated public void destroyIndex(LuceneIndex index); /** @@ -131,17 +129,13 @@ public interface LuceneService { */ public LuceneQueryFactory createLuceneQueryFactory(); - /* + /** * wait until the current entries in cache are indexed * * @param indexName index name - * * @param regionPath region name - * * @param timeout max wait time - * * @param unit granularity of the timeout - * * @return if entries are flushed within timeout */ public boolean waitUntilFlushed(String indexName, String regionPath, long timeout, TimeUnit unit) http://git-wip-us.apache.org/repos/asf/geode/blob/337f5afc/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryFactoryImpl.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryFactoryImpl.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryFactoryImpl.java index 798afce..b798e30 100644 --- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryFactoryImpl.java +++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryFactoryImpl.java @@ -24,7 +24,6 @@ import org.apache.geode.cache.lucene.LuceneQueryProvider; public class LuceneQueryFactoryImpl implements LuceneQueryFactory { private int limit = DEFAULT_LIMIT; private int pageSize = DEFAULT_PAGESIZE; - private String[] projectionFields = null; private Cache cache; LuceneQueryFactoryImpl(Cache cache) { @@ -57,14 +56,9 @@ public class LuceneQueryFactoryImpl implements LuceneQueryFactory { throw new IllegalArgumentException("Region not found: " + regionName); } LuceneQueryImpl<K, V> luceneQuery = - new LuceneQueryImpl<K, V>(indexName, region, provider, projectionFields, limit, pageSize); + new LuceneQueryImpl<K, V>(indexName, region, provider, limit, pageSize); return luceneQuery; } - @Override - public LuceneQueryFactory setProjectionFields(String... fieldNames) { - projectionFields = fieldNames.clone(); - return this; - } } http://git-wip-us.apache.org/repos/asf/geode/blob/337f5afc/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryImpl.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryImpl.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryImpl.java index b50996b..de622e0 100644 --- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryImpl.java +++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryImpl.java @@ -47,20 +47,17 @@ public class LuceneQueryImpl<K, V> implements LuceneQuery<K, V> { private int limit = LuceneQueryFactory.DEFAULT_LIMIT; private int pageSize = LuceneQueryFactory.DEFAULT_PAGESIZE; private String indexName; - // The projected fields are local to a specific index per Query object. - private String[] projectedFieldNames; /* the lucene Query object to be wrapped here */ private LuceneQueryProvider query; private Region<K, V> region; private String defaultField; public LuceneQueryImpl(String indexName, Region<K, V> region, LuceneQueryProvider provider, - String[] projectionFields, int limit, int pageSize) { + int limit, int pageSize) { this.indexName = indexName; this.region = region; this.limit = limit; this.pageSize = pageSize; - this.projectedFieldNames = projectionFields; this.query = provider; } @@ -138,8 +135,4 @@ public class LuceneQueryImpl<K, V> implements LuceneQuery<K, V> { return this.limit; } - @Override - public String[] getProjectedFieldNames() { - return this.projectedFieldNames; - } } http://git-wip-us.apache.org/repos/asf/geode/blob/337f5afc/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneResultStructImpl.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneResultStructImpl.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneResultStructImpl.java index c9d7c5b..6c31025 100644 --- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneResultStructImpl.java +++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneResultStructImpl.java @@ -29,11 +29,6 @@ public class LuceneResultStructImpl<K, V> implements LuceneResultStruct<K, V> { } @Override - public Object getProjectedField(String fieldName) { - throw new UnsupportedOperationException(); - } - - @Override public K getKey() { return key; } http://git-wip-us.apache.org/repos/asf/geode/blob/337f5afc/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneQueryFactoryImplJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneQueryFactoryImplJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneQueryFactoryImplJUnitTest.java index 7fb3eb5..ccc5bb7 100644 --- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneQueryFactoryImplJUnitTest.java +++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneQueryFactoryImplJUnitTest.java @@ -44,13 +44,10 @@ public class LuceneQueryFactoryImplJUnitTest { LuceneQueryFactoryImpl f = new LuceneQueryFactoryImpl(cache); f.setPageSize(5); f.setResultLimit(25); - String[] projection = new String[] {"a", "b"}; - f.setProjectionFields(projection); LuceneQuery<Object, Object> query = f.create("index", "region", new StringQueryProvider("test", DEFAULT_FIELD)); assertEquals(25, query.getLimit()); assertEquals(5, query.getPageSize()); - assertArrayEquals(projection, query.getProjectedFieldNames()); Mockito.verify(cache).getRegion(Mockito.eq("region")); } http://git-wip-us.apache.org/repos/asf/geode/blob/337f5afc/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneQueryImplJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneQueryImplJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneQueryImplJUnitTest.java index 9f826d5..ca439fe 100644 --- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneQueryImplJUnitTest.java +++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneQueryImplJUnitTest.java @@ -66,7 +66,7 @@ public class LuceneQueryImplJUnitTest { when(execution.withCollector(any())).thenReturn(execution); when(execution.execute(anyString())).thenReturn((ResultCollector) collector); - query = new LuceneQueryImpl<Object, Object>("index", region, provider, null, LIMIT, 20) { + query = new LuceneQueryImpl<Object, Object>("index", region, provider, LIMIT, 20) { @Override protected Execution onRegion() { return execution;
