You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2017/08/04 23:25:51 UTC
[23/27] geode git commit: GEODE-3387: Cleaned up and minor
refactoring of Lucene module
GEODE-3387: Cleaned up and minor refactoring of Lucene module
* In waitUntilFlushedFunction, cleaned out the unused vaiables
* Removed mentions of gemfire from the module in comments
* Removed comment “/* wrapper of IndexWriter */“ in LuceneIndexForPartitionedRegion
* Renamed initializeAEQ to more suitable / function appropriate name.
* Removing the unused imports and typos
This closes #681
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/3fd63300
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/3fd63300
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/3fd63300
Branch: refs/heads/feature/GEODE-3299
Commit: 3fd6330048f19124d6d7c2406d40e800e920cac3
Parents: c8cc4e6
Author: nabarun <nn...@pivotal.io>
Authored: Wed Aug 2 18:31:52 2017 -0700
Committer: nabarun <nn...@pivotal.io>
Committed: Fri Aug 4 11:45:16 2017 -0700
----------------------------------------------------------------------
.../internal/cache/xmlcache/CacheXmlParser.java | 4 ++--
.../internal/cache/xmlcache/XmlGenerator.java | 4 ++--
.../internal/cache/xmlcache/XmlParser.java | 7 ++----
.../mock/AbstractMockExtensionXmlGenerator.java | 2 +-
.../extension/mock/MockExtensionXmlParser.java | 2 +-
.../xmlcache/AbstractXmlParserJUnitTest.java | 2 +-
.../cache/xmlcache/CacheXmlParserJUnitTest.java | 2 +-
.../apache/geode/cache/lucene/LuceneQuery.java | 1 -
.../geode/cache/lucene/LuceneQueryFactory.java | 2 +-
.../AbstractPartitionedRepositoryManager.java | 2 +-
.../lucene/internal/LuceneBucketListener.java | 1 -
.../lucene/internal/LuceneEventListener.java | 2 --
.../internal/LuceneEventSubstitutionFilter.java | 1 -
.../internal/LuceneIndexCreationProfile.java | 1 -
.../lucene/internal/LuceneIndexFactoryImpl.java | 1 -
.../LuceneIndexForPartitionedRegion.java | 1 -
.../cache/lucene/internal/LuceneIndexImpl.java | 7 ++++--
.../lucene/internal/LuceneServiceImpl.java | 3 ++-
.../PageableLuceneQueryResultsImpl.java | 2 +-
.../internal/RawIndexRepositoryFactory.java | 1 -
.../lucene/internal/StringQueryProvider.java | 3 ---
.../internal/cli/LuceneIndexCommands.java | 2 +-
.../lucene/internal/cli/LuceneIndexDetails.java | 3 ---
.../lucene/internal/cli/LuceneQueryInfo.java | 2 --
.../internal/cli/LuceneSearchResults.java | 2 +-
.../internal/directory/DumpDirectoryFiles.java | 15 -------------
.../internal/directory/RegionDirectory.java | 1 -
.../distributed/WaitUntilFlushedFunction.java | 23 --------------------
.../WaitUntilFlushedFunctionContext.java | 4 ----
.../cache/lucene/internal/filesystem/File.java | 2 +-
.../internal/filesystem/FileSystemStats.java | 1 -
.../management/LuceneIndexStatsMonitor.java | 1 -
.../partition/BucketTargetingFixedResolver.java | 6 -----
.../internal/partition/BucketTargetingMap.java | 3 ---
.../HeterogeneousLuceneSerializer.java | 1 -
.../repository/serializer/SerializerUtil.java | 10 ++++-----
.../repository/serializer/package-info.java | 2 +-
.../lucene/internal/results/PageEntry.java | 1 -
.../internal/xml/LuceneIndexCreation.java | 2 --
.../internal/xml/LuceneIndexXmlGenerator.java | 2 +-
.../internal/xml/LuceneServiceXmlGenerator.java | 2 +-
.../lucene/internal/xml/LuceneXmlParser.java | 4 +---
.../LuceneIndexCreationIntegrationTest.java | 1 -
.../LuceneIndexCreationOnFixedPRDUnitTest.java | 2 --
.../cache/lucene/LuceneQueriesDUnitTest.java | 3 ---
.../geode/cache/lucene/RebalanceDUnitTest.java | 1 -
.../internal/LuceneEventListenerJUnitTest.java | 7 +-----
.../lucene/internal/LuceneIndexFactorySpy.java | 2 --
.../LuceneIndexForPartitionedRegionTest.java | 12 ++++++----
.../LuceneQueryFactoryImplJUnitTest.java | 1 -
.../internal/LuceneQueryImplJUnitTest.java | 3 ---
...PageableLuceneQueryResultsImplJUnitTest.java | 2 --
.../RawLuceneRepositoryManagerJUnitTest.java | 4 ----
.../LuceneDestroyIndexFunctionJUnitTest.java | 2 --
.../directory/DumpDirectoryFilesJUnitTest.java | 3 ---
.../directory/RegionDirectoryJUnitTest.java | 10 +--------
.../DistributedScoringJUnitTest.java | 2 --
.../TopEntriesFunctionCollectorJUnitTest.java | 1 -
.../WaitUntilFlushedFunctionJUnitTest.java | 6 -----
.../filesystem/FileSystemStatsJUnitTest.java | 1 -
.../BucketTargetingFixedResolverTest.java | 5 ++---
.../partition/BucketTargetingMapTest.java | 4 ----
.../IndexRepositoryImplJUnitTest.java | 6 ++---
.../results/LuceneGetPageFunctionJUnitTest.java | 5 -----
.../internal/results/PageEntryJUnitTest.java | 1 -
.../xml/LuceneIndexXmlGeneratorJUnitTest.java | 1 -
.../xml/LuceneIndexXmlParserJUnitTest.java | 1 -
.../cache/lucene/test/IndexRepositorySpy.java | 1 -
68 files changed, 46 insertions(+), 181 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParser.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParser.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParser.java
index b1d2929..53e39ee 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParser.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParser.java
@@ -2768,11 +2768,11 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
final ServiceLoader<XmlParser> serviceLoader =
ServiceLoader.load(XmlParser.class, ClassPathLoader.getLatestAsClassLoader());
for (final XmlParser xmlParser : serviceLoader) {
- if (xmlParser.getNamspaceUri().equals(namespaceUri)) {
+ if (xmlParser.getNamespaceUri().equals(namespaceUri)) {
delegate = xmlParser;
delegate.setStack(stack);
delegate.setDocumentLocator(documentLocator);
- delegates.put(xmlParser.getNamspaceUri(), xmlParser);
+ delegates.put(xmlParser.getNamespaceUri(), xmlParser);
break;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlGenerator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlGenerator.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlGenerator.java
index 0eacf8e..a618236 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlGenerator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlGenerator.java
@@ -19,7 +19,7 @@ import org.xml.sax.SAXException;
/**
* Interface for configuration XML generators. Used by {@link CacheXmlGenerator} to generate
- * entities defined in the XML Namespace returned by {@link #getNamspaceUri()} .
+ * entities defined in the XML Namespace returned by {@link #getNamespaceUri()} .
*
*
* @since GemFire 8.1
@@ -32,7 +32,7 @@ public interface XmlGenerator<T> {
* @return XML Namespace.
* @since GemFire 8.1
*/
- String getNamspaceUri();
+ String getNamespaceUri();
// TODO jbarrett - investigate new logging.
// /**
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlParser.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlParser.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlParser.java
index f874b9b..926786d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlParser.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlParser.java
@@ -20,12 +20,9 @@ import java.util.Stack;
import org.xml.sax.ContentHandler;
-import org.apache.geode.LogWriter;
-import org.apache.geode.i18n.LogWriterI18n;
-
/**
* Interface for configuration XML parsers. Used by {@link CacheXmlParser} to parse entities defined
- * in the XML Namespace returned by {@link #getNamspaceUri()} .
+ * in the XML Namespace returned by {@link #getNamespaceUri()} .
*
* Loaded by {@link ServiceLoader} on {@link XmlParser} class. See file
* <code>META-INF/services/org.apache.geode.internal.cache.xmlcache.XmlParser</code>
@@ -41,7 +38,7 @@ public interface XmlParser extends ContentHandler {
* @return XML Namespace.
* @since GemFire 8.1
*/
- String getNamspaceUri();
+ String getNamespaceUri();
/**
* Sets the XML config stack on this parser.
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AbstractMockExtensionXmlGenerator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AbstractMockExtensionXmlGenerator.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AbstractMockExtensionXmlGenerator.java
index e2c6459..d33bc16 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AbstractMockExtensionXmlGenerator.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AbstractMockExtensionXmlGenerator.java
@@ -31,7 +31,7 @@ public abstract class AbstractMockExtensionXmlGenerator<T> implements XmlGenerat
}
@Override
- public String getNamspaceUri() {
+ public String getNamespaceUri() {
return MockExtensionXmlParser.NAMESPACE;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockExtensionXmlParser.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockExtensionXmlParser.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockExtensionXmlParser.java
index 5afff5e..2c85e57 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockExtensionXmlParser.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockExtensionXmlParser.java
@@ -44,7 +44,7 @@ public class MockExtensionXmlParser extends AbstractXmlParser {
public static final String PREFIX = "mock";
@Override
- public String getNamspaceUri() {
+ public String getNamespaceUri() {
return NAMESPACE;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java
index dff049c..66df3cf 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java
@@ -154,7 +154,7 @@ public class AbstractXmlParserJUnitTest {
}
@Override
- public String getNamspaceUri() {
+ public String getNamespaceUri() {
throw new IllegalStateException();
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParserJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParserJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParserJUnitTest.java
index 4043888..c168668 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParserJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParserJUnitTest.java
@@ -189,7 +189,7 @@ public class CacheXmlParserJUnitTest {
public static class MockXmlParser extends AbstractXmlParser {
@Override
- public String getNamspaceUri() {
+ public String getNamespaceUri() {
return "urn:java:org.apache.geode.internal.cache.xmlcache.MockXmlParser";
}
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/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 cbee23f..8233c84 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
@@ -22,7 +22,6 @@ import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.execute.FunctionException;
import org.apache.geode.cache.lucene.internal.LuceneQueryImpl;
import org.apache.geode.cache.persistence.PartitionOfflineException;
-import org.apache.geode.internal.cache.PrimaryBucketException;
/**
* <p>
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/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 6236d12..0c2895c 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
@@ -78,7 +78,7 @@ public interface LuceneQueryFactory {
/**
* <p>
- * Create a query based on a programatically constructed Lucene {@link Query}. This can be used
+ * Create a query based on a programmatically constructed Lucene {@link Query}. This can be used
* for queries that are not covered by {@link StandardQueryParser}, such as range queries.
* </p>
* <p>
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/AbstractPartitionedRepositoryManager.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/AbstractPartitionedRepositoryManager.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/AbstractPartitionedRepositoryManager.java
index 867794d..3b8df7e 100755
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/AbstractPartitionedRepositoryManager.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/AbstractPartitionedRepositoryManager.java
@@ -103,7 +103,7 @@ public abstract class AbstractPartitionedRepositoryManager implements Repository
try {
isDataRegionReady.await();
} catch (InterruptedException e) {
- throw new InternalGemFireError("Uable to create index repository", e);
+ throw new InternalGemFireError("Unable to create index repository", e);
}
IndexRepository repo = indexRepositories.compute(bucketId, (key, oldRepository) -> {
try {
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneBucketListener.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneBucketListener.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneBucketListener.java
index 37871aa..3506e0e 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneBucketListener.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneBucketListener.java
@@ -16,7 +16,6 @@ package org.apache.geode.cache.lucene.internal;
import org.apache.geode.cache.partition.PartitionListenerAdapter;
import org.apache.geode.distributed.internal.DM;
-import org.apache.geode.internal.cache.BucketNotFoundException;
import org.apache.geode.internal.cache.PrimaryBucketException;
import org.apache.geode.internal.logging.LogService;
import org.apache.logging.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneEventListener.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneEventListener.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneEventListener.java
index bc4a7da..ac5c971 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneEventListener.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneEventListener.java
@@ -21,9 +21,7 @@ import java.util.List;
import java.util.Set;
import org.apache.geode.cache.EntryDestroyedException;
-import org.apache.geode.cache.Region.Entry;
import org.apache.geode.internal.cache.EntrySnapshot;
-import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderQueue;
import org.apache.logging.log4j.Logger;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.InternalGemFireError;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneEventSubstitutionFilter.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneEventSubstitutionFilter.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneEventSubstitutionFilter.java
index 1c129a0..ca41019 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneEventSubstitutionFilter.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneEventSubstitutionFilter.java
@@ -17,7 +17,6 @@ package org.apache.geode.cache.lucene.internal;
import org.apache.geode.cache.EntryEvent;
import org.apache.geode.cache.wan.GatewayEventSubstitutionFilter;
-import org.apache.geode.internal.cache.Token;
/**
* A substitution filter which throws away the value of the entry and replaces it with an empty
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexCreationProfile.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexCreationProfile.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexCreationProfile.java
index 26d28cc..28d84e5 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexCreationProfile.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexCreationProfile.java
@@ -16,7 +16,6 @@ package org.apache.geode.cache.lucene.internal;
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.CacheServiceProfile;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.lucene.analysis.Analyzer;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactoryImpl.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactoryImpl.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactoryImpl.java
index 23f2206..b77d8b6 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactoryImpl.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactoryImpl.java
@@ -18,7 +18,6 @@ import org.apache.geode.cache.lucene.LuceneIndexFactory;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegion.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
index 41505d7..3300ca6 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
@@ -42,7 +42,6 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.PartitionedRegion;
-/* wrapper of IndexWriter */
public class LuceneIndexForPartitionedRegion extends LuceneIndexImpl {
protected Region fileAndChunkRegion;
protected final FileSystemStats fileSystemStats;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexImpl.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexImpl.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexImpl.java
index 31efd8a..a8358fa 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexImpl.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexImpl.java
@@ -138,14 +138,17 @@ public abstract class LuceneIndexImpl implements InternalLuceneIndex {
}
}
- protected void initializeAEQ(RegionAttributes attributes, String aeqId) {
+ protected void setupAEQ(RegionAttributes attributes, String aeqId) {
if (!hasInitializedAEQ) {
- repositoryManager = createRepositoryManager();
createAEQ(attributes, aeqId);
hasInitializedAEQ = true;
}
}
+ protected void setupRepositoryManager() {
+ repositoryManager = createRepositoryManager();
+ }
+
protected abstract RepositoryManager createRepositoryManager();
protected abstract void createLuceneListenersAndFileChunkRegions(
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
index c263884..39b5d36 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
@@ -232,7 +232,8 @@ public class LuceneServiceImpl implements InternalLuceneService {
index.setSearchableFields(fields);
index.setAnalyzer(analyzer);
index.setFieldAnalyzers(fieldAnalyzers);
- index.initializeAEQ(attributes, aeqId);
+ index.setupRepositoryManager();
+ index.setupAEQ(attributes, aeqId);
return index;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/PageableLuceneQueryResultsImpl.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/PageableLuceneQueryResultsImpl.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/PageableLuceneQueryResultsImpl.java
index 8e2b47c..f34966f 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/PageableLuceneQueryResultsImpl.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/PageableLuceneQueryResultsImpl.java
@@ -34,7 +34,7 @@ import org.apache.geode.cache.lucene.internal.results.LuceneGetPageFunction;
import org.apache.geode.cache.lucene.internal.results.MapResultCollector;
/**
- * Implementation of PageableLuceneQueryResults that fetchs a page at a time from the server, given
+ * Implementation of PageableLuceneQueryResults that fetches a page at a time from the server, given
* a set of EntryScores (key and score).
*
* @param <K> The type of the key
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/RawIndexRepositoryFactory.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/RawIndexRepositoryFactory.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/RawIndexRepositoryFactory.java
index b960935..5fd3671 100755
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/RawIndexRepositoryFactory.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/RawIndexRepositoryFactory.java
@@ -23,7 +23,6 @@ import org.apache.lucene.store.Directory;
import org.apache.lucene.store.NIOFSDirectory;
import org.apache.lucene.store.RAMDirectory;
-import org.apache.geode.cache.lucene.internal.directory.RegionDirectory;
import org.apache.geode.cache.lucene.internal.repository.IndexRepository;
import org.apache.geode.cache.lucene.internal.repository.IndexRepositoryImpl;
import org.apache.geode.cache.lucene.internal.repository.serializer.LuceneSerializer;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/StringQueryProvider.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/StringQueryProvider.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/StringQueryProvider.java
index 82dd10f..1a88056 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/StringQueryProvider.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/StringQueryProvider.java
@@ -26,12 +26,9 @@ import org.apache.lucene.queryparser.flexible.standard.StandardQueryParser;
import org.apache.lucene.search.Query;
import org.apache.geode.DataSerializer;
-import org.apache.geode.GemFireCheckedException;
-import org.apache.geode.GemFireException;
import org.apache.geode.cache.lucene.LuceneIndex;
import org.apache.geode.cache.lucene.LuceneQueryException;
import org.apache.geode.cache.lucene.LuceneQueryProvider;
-import org.apache.geode.cache.query.QueryException;
import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.logging.LogService;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
index 30bef69..41c8923 100755
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
@@ -555,7 +555,7 @@ public class LuceneIndexCommands implements GfshCommand {
private Result getResults(int fromIndex, int toIndex, boolean keysonly) throws Exception {
final TabularResultData data = ResultBuilder.createTabularResultData();
for (int i = fromIndex; i < toIndex; i++) {
- if (!searchResults.get(i).getExeptionFlag()) {
+ if (!searchResults.get(i).getExceptionFlag()) {
data.accumulate("key", searchResults.get(i).getKey());
if (!keysonly) {
data.accumulate("value", searchResults.get(i).getValue());
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexDetails.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexDetails.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexDetails.java
index b2b0466..2acc144 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexDetails.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexDetails.java
@@ -14,15 +14,12 @@
*/
package org.apache.geode.cache.lucene.internal.cli;
-import java.io.Serializable;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.lucene.internal.LuceneIndexCreationProfile;
import org.apache.geode.cache.lucene.internal.LuceneIndexImpl;
import org.apache.geode.cache.lucene.internal.LuceneIndexStats;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneQueryInfo.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneQueryInfo.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneQueryInfo.java
index e57badb..cf84b30 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneQueryInfo.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneQueryInfo.java
@@ -15,8 +15,6 @@
package org.apache.geode.cache.lucene.internal.cli;
-import java.io.Serializable;
-
import org.apache.geode.cache.lucene.LuceneQueryFactory;
public class LuceneQueryInfo extends LuceneFunctionSerializable {
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneSearchResults.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneSearchResults.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneSearchResults.java
index ff98b8f..95167d5 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneSearchResults.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneSearchResults.java
@@ -62,7 +62,7 @@ public class LuceneSearchResults<K, V> implements Comparable<LuceneSearchResults
return Float.compare(getScore(), searchResults.getScore()) * -1;
}
- public boolean getExeptionFlag() {
+ public boolean getExceptionFlag() {
return exceptionFlag;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/directory/DumpDirectoryFiles.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/directory/DumpDirectoryFiles.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/directory/DumpDirectoryFiles.java
index 5bb2e85..7cbdd60 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/directory/DumpDirectoryFiles.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/directory/DumpDirectoryFiles.java
@@ -16,40 +16,25 @@
package org.apache.geode.cache.lucene.internal.directory;
import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
import java.util.Collection;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.execute.Function;
-import org.apache.geode.cache.execute.FunctionAdapter;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.FunctionException;
import org.apache.geode.cache.execute.RegionFunctionContext;
-import org.apache.geode.cache.execute.ResultSender;
-import org.apache.geode.cache.lucene.LuceneQueryProvider;
import org.apache.geode.cache.lucene.LuceneService;
import org.apache.geode.cache.lucene.LuceneServiceProvider;
import org.apache.geode.cache.lucene.internal.InternalLuceneIndex;
-import org.apache.geode.cache.lucene.internal.LuceneServiceImpl;
-import org.apache.geode.cache.lucene.internal.distributed.CollectorManager;
-import org.apache.geode.cache.lucene.internal.distributed.LuceneFunctionContext;
-import org.apache.geode.cache.lucene.internal.distributed.TopEntriesCollector;
-import org.apache.geode.cache.lucene.internal.distributed.TopEntriesCollectorManager;
import org.apache.geode.cache.lucene.internal.filesystem.FileSystem;
import org.apache.geode.cache.lucene.internal.repository.IndexRepository;
-import org.apache.geode.cache.lucene.internal.repository.IndexRepositoryImpl;
-import org.apache.geode.cache.lucene.internal.repository.IndexResultCollector;
import org.apache.geode.cache.lucene.internal.repository.RepositoryManager;
-import org.apache.geode.cache.query.QueryException;
import org.apache.geode.internal.InternalEntity;
import org.apache.geode.internal.cache.BucketNotFoundException;
import org.apache.geode.internal.logging.LogService;
import org.apache.logging.log4j.Logger;
import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.store.Directory;
public class DumpDirectoryFiles implements Function, InternalEntity {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/directory/RegionDirectory.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/directory/RegionDirectory.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/directory/RegionDirectory.java
index 9cdf94b..b648ffc 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/directory/RegionDirectory.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/directory/RegionDirectory.java
@@ -15,7 +15,6 @@
package org.apache.geode.cache.lucene.internal.directory;
-import org.apache.geode.cache.lucene.internal.filesystem.ChunkKey;
import org.apache.geode.cache.lucene.internal.filesystem.File;
import org.apache.geode.cache.lucene.internal.filesystem.FileSystem;
import org.apache.geode.cache.lucene.internal.filesystem.FileSystemStats;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunction.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunction.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunction.java
index e11384c..bae0e74 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunction.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunction.java
@@ -15,36 +15,18 @@
package org.apache.geode.cache.lucene.internal.distributed;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
import java.util.concurrent.TimeUnit;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.execute.Function;
-import org.apache.geode.cache.lucene.internal.LuceneIndexImpl;
-import org.apache.geode.cache.lucene.internal.LuceneIndexStats;
import org.apache.geode.cache.lucene.internal.LuceneServiceImpl;
-import org.apache.logging.log4j.Logger;
-import org.apache.lucene.search.Query;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.asyncqueue.internal.AsyncEventQueueImpl;
-import org.apache.geode.cache.execute.FunctionAdapter;
import org.apache.geode.cache.execute.FunctionContext;
-import org.apache.geode.cache.execute.FunctionException;
import org.apache.geode.cache.execute.RegionFunctionContext;
import org.apache.geode.cache.execute.ResultSender;
-import org.apache.geode.cache.lucene.LuceneQueryException;
-import org.apache.geode.cache.lucene.LuceneQueryProvider;
-import org.apache.geode.cache.lucene.LuceneService;
-import org.apache.geode.cache.lucene.LuceneServiceProvider;
-import org.apache.geode.cache.lucene.internal.repository.IndexRepository;
-import org.apache.geode.cache.lucene.internal.repository.IndexResultCollector;
-import org.apache.geode.cache.lucene.internal.repository.RepositoryManager;
import org.apache.geode.internal.InternalEntity;
-import org.apache.geode.internal.cache.BucketNotFoundException;
-import org.apache.geode.internal.logging.LogService;
/**
* {@link WaitUntilFlushedFunction} will check all the members with index to wait until the events
@@ -55,8 +37,6 @@ public class WaitUntilFlushedFunction implements Function, InternalEntity {
private static final long serialVersionUID = 1L;
public static final String ID = WaitUntilFlushedFunction.class.getName();
- private static final Logger logger = LogService.getLogger();
-
@Override
public void execute(FunctionContext context) {
RegionFunctionContext ctx = (RegionFunctionContext) context;
@@ -72,9 +52,6 @@ public class WaitUntilFlushedFunction implements Function, InternalEntity {
long timeout = arg.getTimeout();
TimeUnit unit = arg.getTimeunit();
- LuceneService service = LuceneServiceProvider.get(cache);
- LuceneIndexImpl index = (LuceneIndexImpl) service.getIndex(indexName, region.getFullPath());
-
boolean result = false;
String aeqId = LuceneServiceImpl.getUniqueIndexName(indexName, region.getFullPath());
AsyncEventQueueImpl queue = (AsyncEventQueueImpl) cache.getAsyncEventQueue(aeqId);
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunctionContext.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunctionContext.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunctionContext.java
index 88d0e63..a8f5385 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunctionContext.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunctionContext.java
@@ -21,10 +21,6 @@ import java.io.IOException;
import java.util.concurrent.TimeUnit;
import org.apache.geode.DataSerializer;
-import org.apache.geode.cache.lucene.LuceneQueryFactory;
-import org.apache.geode.cache.lucene.LuceneQueryProvider;
-import org.apache.geode.cache.lucene.internal.repository.IndexRepository;
-import org.apache.geode.cache.lucene.internal.repository.IndexResultCollector;
import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.Version;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/File.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/File.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/File.java
index 23db07d..bd2e241 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/File.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/File.java
@@ -28,7 +28,7 @@ import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.Version;
/**
- * A file that is stored in a gemfire region.
+ * A file that is stored in a Apache Geode region.
*/
public class File implements DataSerializableFixedID {
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemStats.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemStats.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemStats.java
index 09bb989..a5da4a0 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemStats.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemStats.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.cache.lucene.internal.filesystem;
-import java.util.function.IntSupplier;
import java.util.function.LongSupplier;
import org.apache.geode.StatisticDescriptor;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/management/LuceneIndexStatsMonitor.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/management/LuceneIndexStatsMonitor.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/management/LuceneIndexStatsMonitor.java
index 26eeff6..3dd88c9 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/management/LuceneIndexStatsMonitor.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/management/LuceneIndexStatsMonitor.java
@@ -20,7 +20,6 @@ import org.apache.geode.cache.lucene.management.LuceneIndexMetrics;
import org.apache.geode.management.internal.beans.stats.MBeanStatsMonitor;
import org.apache.geode.management.internal.beans.stats.StatType;
import org.apache.geode.management.internal.beans.stats.StatsAverageLatency;
-import org.apache.geode.management.internal.beans.stats.StatsRate;
public class LuceneIndexStatsMonitor extends MBeanStatsMonitor {
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingFixedResolver.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingFixedResolver.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingFixedResolver.java
index 66035c4..f40169e 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingFixedResolver.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingFixedResolver.java
@@ -15,17 +15,11 @@
package org.apache.geode.cache.lucene.internal.partition;
import org.apache.geode.cache.EntryOperation;
-import org.apache.geode.cache.FixedPartitionAttributes;
import org.apache.geode.cache.FixedPartitionResolver;
-import org.apache.geode.cache.PartitionResolver;
-import org.apache.geode.internal.cache.FixedPartitionAttributesImpl;
import org.apache.geode.internal.cache.PartitionedRegion;
-import java.util.List;
import java.util.Map;
-import java.util.Optional;
import java.util.Set;
-import java.util.concurrent.ConcurrentMap;
/**
* A partition resolver that expects the actual bucket id to be the callback argument of all
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingMap.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingMap.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingMap.java
index 19fb4dc..0f8015f 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingMap.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingMap.java
@@ -18,11 +18,8 @@ import org.apache.geode.cache.EntryExistsException;
import org.apache.geode.cache.EntryNotFoundException;
import org.apache.geode.cache.Region;
import org.apache.geode.internal.cache.BucketRegion;
-import org.apache.geode.internal.cache.LocalDataSet;
-import org.apache.geode.internal.cache.PartitionedRegion;
import java.util.AbstractMap;
-import java.util.Collections;
import java.util.Set;
public class BucketTargetingMap<K, V> extends AbstractMap<K, V> {
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/HeterogeneousLuceneSerializer.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/HeterogeneousLuceneSerializer.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/HeterogeneousLuceneSerializer.java
index b0a98a1..3c2f8b7 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/HeterogeneousLuceneSerializer.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/HeterogeneousLuceneSerializer.java
@@ -20,7 +20,6 @@ import java.util.Map;
import org.apache.logging.log4j.Logger;
import org.apache.lucene.document.Document;
-import org.apache.geode.cache.lucene.LuceneIndex;
import org.apache.geode.cache.lucene.LuceneService;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.util.concurrent.CopyOnWriteWeakHashMap;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/SerializerUtil.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/SerializerUtil.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/SerializerUtil.java
index 98a9026..dde375d 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/SerializerUtil.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/SerializerUtil.java
@@ -76,7 +76,7 @@ public class SerializerUtil {
private SerializerUtil() {}
/**
- * Add a gemfire key to a document
+ * Add a Apache Geode key to a document
*/
public static void addKey(Object key, Document doc) {
if (key instanceof String) {
@@ -122,7 +122,7 @@ public class SerializerUtil {
}
/**
- * Extract the gemfire key from a lucene document
+ * Extract the Apache Geode key from a lucene document
*/
public static Object getKey(Document doc) {
IndexableField field = doc.getField(KEY_FIELD);
@@ -134,7 +134,7 @@ public class SerializerUtil {
}
/**
- * Extract the gemfire key term from a lucene document
+ * Extract the Apache Geode key term from a lucene document
*/
public static Term getKeyTerm(Document doc) {
IndexableField field = doc.getField(KEY_FIELD);
@@ -146,8 +146,8 @@ public class SerializerUtil {
}
/**
- * Convert a gemfire key into a key search term that can be used to update or delete the document
- * associated with this key.
+ * Convert a Apache Geode key into a key search term that can be used to update or delete the
+ * document associated with this key.
*/
public static Term toKeyTerm(Object key) {
if (key instanceof String) {
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/package-info.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/package-info.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/package-info.java
index b7ba92f..715d7b5 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/package-info.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/package-info.java
@@ -13,7 +13,7 @@
* the License.
*/
/**
- * Classes for converting gemfire objects into lucene documents.
+ * Classes for converting Apache Geode objects into lucene documents.
*/
package org.apache.geode.cache.lucene.internal.repository.serializer;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/results/PageEntry.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/results/PageEntry.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/results/PageEntry.java
index 1f52c2e..1845773 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/results/PageEntry.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/results/PageEntry.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.cache.lucene.internal.results;
-import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
import org.apache.geode.internal.cache.CachedDeserializable;
import org.apache.geode.internal.offheap.StoredObject;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexCreation.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexCreation.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexCreation.java
index 30e6b04..e4c1ea0 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexCreation.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexCreation.java
@@ -16,7 +16,6 @@
package org.apache.geode.cache.lucene.internal.xml;
import java.util.*;
-import java.util.concurrent.TimeUnit;
import org.apache.geode.cache.lucene.LuceneIndexExistsException;
import org.apache.geode.internal.i18n.LocalizedStrings;
@@ -29,7 +28,6 @@ import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.lucene.LuceneIndex;
-import org.apache.geode.cache.lucene.LuceneService;
import org.apache.geode.cache.lucene.LuceneServiceProvider;
import org.apache.geode.cache.lucene.internal.LuceneServiceImpl;
import org.apache.geode.internal.cache.extension.Extensible;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGenerator.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGenerator.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGenerator.java
index 69865d4..292d52a 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGenerator.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGenerator.java
@@ -36,7 +36,7 @@ public class LuceneIndexXmlGenerator implements XmlGenerator<Region<?, ?>> {
}
@Override
- public String getNamspaceUri() {
+ public String getNamespaceUri() {
return NAMESPACE;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneServiceXmlGenerator.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneServiceXmlGenerator.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneServiceXmlGenerator.java
index c9bfa15..2e14e49 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneServiceXmlGenerator.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneServiceXmlGenerator.java
@@ -23,7 +23,7 @@ import org.apache.geode.internal.cache.xmlcache.XmlGenerator;
public class LuceneServiceXmlGenerator implements XmlGenerator<Cache> {
@Override
- public String getNamspaceUri() {
+ public String getNamespaceUri() {
return LuceneXmlConstants.NAMESPACE;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneXmlParser.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneXmlParser.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneXmlParser.java
index 07a3c2a..c891283 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneXmlParser.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneXmlParser.java
@@ -24,15 +24,13 @@ import org.apache.lucene.analysis.Analyzer;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-import org.apache.geode.cache.lucene.internal.LuceneServiceImpl;
import org.apache.geode.internal.cache.xmlcache.AbstractXmlParser;
-import org.apache.geode.internal.cache.xmlcache.RegionAttributesCreation;
import org.apache.geode.internal.cache.xmlcache.RegionCreation;
public class LuceneXmlParser extends AbstractXmlParser {
@Override
- public String getNamspaceUri() {
+ public String getNamespaceUri() {
return NAMESPACE;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationIntegrationTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationIntegrationTest.java
index b590afb..1d688fb 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationIntegrationTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationIntegrationTest.java
@@ -43,7 +43,6 @@ import org.apache.geode.cache.lucene.internal.LuceneIndexImplFactory;
import org.apache.geode.cache.lucene.internal.LuceneRawIndex;
import org.apache.geode.cache.lucene.internal.LuceneRawIndexFactory;
import org.apache.geode.cache.lucene.internal.LuceneServiceImpl;
-import org.apache.geode.cache.lucene.internal.xml.LuceneIndexCreation;
import org.apache.geode.cache.lucene.test.LuceneTestUtilities;
import org.apache.geode.cache.lucene.test.TestObject;
import org.apache.geode.internal.cache.BucketNotFoundException;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationOnFixedPRDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationOnFixedPRDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationOnFixedPRDUnitTest.java
index 4471291..ef66c0b 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationOnFixedPRDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationOnFixedPRDUnitTest.java
@@ -14,8 +14,6 @@
*/
package org.apache.geode.cache.lucene;
-import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.cache.lucene.test.LuceneTestUtilities;
import org.apache.geode.test.dunit.SerializableRunnableIF;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.junit.experimental.categories.Category;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesDUnitTest.java
index ba71010..7502ba8 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesDUnitTest.java
@@ -31,9 +31,6 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
import junitparams.JUnitParamsRunner;
import junitparams.Parameters;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/test/java/org/apache/geode/cache/lucene/RebalanceDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/RebalanceDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/RebalanceDUnitTest.java
index ad5595b..163365f 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/RebalanceDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/RebalanceDUnitTest.java
@@ -17,7 +17,6 @@ package org.apache.geode.cache.lucene;
import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.*;
import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
import java.util.stream.IntStream;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneEventListenerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneEventListenerJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneEventListenerJUnitTest.java
index 88057e5..fd42d21 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneEventListenerJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneEventListenerJUnitTest.java
@@ -15,27 +15,22 @@
package org.apache.geode.cache.lucene.internal;
import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.*;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.geode.InternalGemFireError;
import org.apache.geode.internal.cache.EntrySnapshot;
-import org.apache.geode.internal.cache.RegionEntry;
+
import org.junit.After;
-import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.mockito.Mockito;
-import org.apache.geode.cache.Operation;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.asyncqueue.AsyncEvent;
import org.apache.geode.cache.lucene.internal.repository.IndexRepository;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactorySpy.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactorySpy.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactorySpy.java
index 69dfbf6..4985e90 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactorySpy.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactorySpy.java
@@ -14,8 +14,6 @@
*/
package org.apache.geode.cache.lucene.internal;
-import static org.mockito.Matchers.any;
-
import java.util.function.Consumer;
import org.mockito.Mockito;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java
index b2fdd84..985fd8a 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java
@@ -219,7 +219,8 @@ public class LuceneIndexForPartitionedRegionTest {
LuceneIndexForPartitionedRegion spy = spy(index);
doReturn(null).when(spy).createFileRegion(any(), any(), any(), any(), any());
doReturn(null).when(spy).createAEQ(any(), any());
- spy.initializeAEQ(region.getAttributes(), aeq);
+ spy.setupRepositoryManager();
+ spy.setupAEQ(region.getAttributes(), aeq);
spy.initialize();
return spy;
}
@@ -274,7 +275,8 @@ public class LuceneIndexForPartitionedRegionTest {
LuceneIndexForPartitionedRegion spy = spy(index);
doReturn(null).when(spy).createFileRegion(any(), any(), any(), any(), any());
doReturn(null).when(spy).createAEQ((RegionAttributes) any(), any());
- spy.initializeAEQ(any(), any());
+ spy.setupRepositoryManager();
+ spy.setupAEQ(any(), any());
spy.initialize();
verify(spy).createFileRegion(eq(RegionShortcut.PARTITION_PERSISTENT),
@@ -295,7 +297,8 @@ public class LuceneIndexForPartitionedRegionTest {
LuceneIndexForPartitionedRegion spy = spy(index);
doReturn(null).when(spy).createFileRegion(any(), any(), any(), any(), any());
doReturn(null).when(spy).createAEQ(any(), any());
- spy.initializeAEQ(any(), any());
+ spy.setupRepositoryManager();
+ spy.setupAEQ(any(), any());
spy.initialize();
spy.initialize();
@@ -320,7 +323,8 @@ public class LuceneIndexForPartitionedRegionTest {
index = spy(index);
when(index.getFieldNames()).thenReturn(fields);
doReturn(aeq).when(index).createAEQ(any(), any());
- index.initializeAEQ(cache.getRegionAttributes(regionPath), aeq.getId());
+ index.setupRepositoryManager();
+ index.setupAEQ(cache.getRegionAttributes(regionPath), aeq.getId());
index.initialize();
PartitionedRegion region = (PartitionedRegion) cache.getRegion(regionPath);
ResultCollector collector = mock(ResultCollector.class);
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/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 8c00eb2..3f0edad 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
@@ -16,7 +16,6 @@ package org.apache.geode.cache.lucene.internal;
import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.DEFAULT_FIELD;
import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
import static org.mockito.Mockito.*;
import org.junit.Rule;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/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 58c0feb..fddd8fb 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
@@ -26,7 +26,6 @@ import static org.mockito.Mockito.when;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheTransactionManager;
import org.apache.geode.cache.Region;
-import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.cache.lucene.LuceneQueryException;
@@ -47,9 +46,7 @@ import org.mockito.ArgumentCaptor;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
@Category(UnitTest.class)
public class LuceneQueryImplJUnitTest {
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/PageableLuceneQueryResultsImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/PageableLuceneQueryResultsImplJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/PageableLuceneQueryResultsImplJUnitTest.java
index bc38112..3458ff3 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/PageableLuceneQueryResultsImplJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/PageableLuceneQueryResultsImplJUnitTest.java
@@ -39,14 +39,12 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.mockito.ArgumentCaptor;
-import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.lucene.LuceneResultStruct;
import org.apache.geode.cache.lucene.internal.distributed.EntryScore;
-import org.apache.geode.cache.lucene.internal.distributed.TopEntries;
import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/RawLuceneRepositoryManagerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/RawLuceneRepositoryManagerJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/RawLuceneRepositoryManagerJUnitTest.java
index 86a5535..ca4d170 100755
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/RawLuceneRepositoryManagerJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/RawLuceneRepositoryManagerJUnitTest.java
@@ -19,17 +19,13 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.when;
-import java.io.File;
-
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.NIOFSDirectory;
import org.junit.After;
import org.junit.Before;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
import org.mockito.Mockito;
import org.apache.geode.cache.lucene.internal.repository.IndexRepositoryImpl;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneDestroyIndexFunctionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneDestroyIndexFunctionJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneDestroyIndexFunctionJUnitTest.java
index ce0344d..ef787c4 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneDestroyIndexFunctionJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneDestroyIndexFunctionJUnitTest.java
@@ -19,10 +19,8 @@ import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.cache.lucene.internal.InternalLuceneService;
import org.apache.geode.cache.lucene.internal.LuceneServiceImpl;
import org.apache.geode.cache.lucene.internal.cli.LuceneDestroyIndexInfo;
-import org.apache.geode.cache.lucene.internal.cli.LuceneIndexInfo;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.management.internal.configuration.domain.XmlEntity;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Before;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/directory/DumpDirectoryFilesJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/directory/DumpDirectoryFilesJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/directory/DumpDirectoryFilesJUnitTest.java
index 854d49f..9ea3f91 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/directory/DumpDirectoryFilesJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/directory/DumpDirectoryFilesJUnitTest.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.cache.lucene.internal.directory;
-import static org.junit.Assert.*;
import static org.mockito.Mockito.*;
import java.io.File;
@@ -23,13 +22,11 @@ import java.util.Collections;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.execute.RegionFunctionContext;
import org.apache.geode.cache.execute.ResultSender;
-import org.apache.geode.cache.lucene.LuceneService;
import org.apache.geode.cache.lucene.internal.InternalLuceneIndex;
import org.apache.geode.cache.lucene.internal.InternalLuceneService;
import org.apache.geode.cache.lucene.internal.filesystem.FileSystem;
import org.apache.geode.cache.lucene.internal.repository.IndexRepository;
import org.apache.geode.cache.lucene.internal.repository.RepositoryManager;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.BucketNotFoundException;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.test.fake.Fakes;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/directory/RegionDirectoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/directory/RegionDirectoryJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/directory/RegionDirectoryJUnitTest.java
index 3f468f4..c507268 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/directory/RegionDirectoryJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/directory/RegionDirectoryJUnitTest.java
@@ -14,27 +14,19 @@
*/
package org.apache.geode.cache.lucene.internal.directory;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyLong;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
import java.io.IOException;
import java.nio.file.Path;
import java.util.concurrent.ConcurrentHashMap;
import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
-import org.apache.geode.distributed.internal.locks.DLockService;
-import org.apache.geode.internal.cache.PartitionedRegionHelper;
+
import org.apache.lucene.store.BaseDirectoryTestCase;
import org.apache.lucene.store.Directory;
-import org.junit.After;
-import org.junit.Before;
import org.junit.Rule;
import org.junit.experimental.categories.Category;
-import org.apache.geode.cache.lucene.internal.filesystem.ChunkKey;
-import org.apache.geode.cache.lucene.internal.filesystem.File;
import org.apache.geode.cache.lucene.internal.filesystem.FileSystemStats;
import org.apache.geode.test.junit.categories.UnitTest;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/DistributedScoringJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/DistributedScoringJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/DistributedScoringJUnitTest.java
index 41d90ef..ee1c70f 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/DistributedScoringJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/DistributedScoringJUnitTest.java
@@ -34,8 +34,6 @@ import org.mockito.Mockito;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.lucene.internal.LuceneIndexStats;
import org.apache.geode.cache.lucene.internal.directory.RegionDirectory;
-import org.apache.geode.cache.lucene.internal.filesystem.ChunkKey;
-import org.apache.geode.cache.lucene.internal.filesystem.File;
import org.apache.geode.cache.lucene.internal.filesystem.FileSystemStats;
import org.apache.geode.cache.lucene.internal.repository.IndexRepositoryImpl;
import org.apache.geode.cache.lucene.internal.repository.serializer.HeterogeneousLuceneSerializer;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
index 7b12449..1debc99 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
@@ -15,7 +15,6 @@
package org.apache.geode.cache.lucene.internal.distributed;
import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
import static org.mockito.Mockito.*;
import java.util.Collection;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunctionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunctionJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunctionJUnitTest.java
index f92a296..508f12c 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunctionJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunctionJUnitTest.java
@@ -15,11 +15,9 @@
package org.apache.geode.cache.lucene.internal.distributed;
-import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.DEFAULT_FIELD;
import static org.junit.Assert.*;
import static org.mockito.Mockito.*;
-import java.util.ArrayList;
import java.util.concurrent.TimeUnit;
import org.apache.geode.cache.Region;
@@ -31,14 +29,10 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.execute.InternalRegionFunctionContext;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.search.Query;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
-import org.mockito.Mockito;
@Category(UnitTest.class)
public class WaitUntilFlushedFunctionJUnitTest {
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemStatsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemStatsJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemStatsJUnitTest.java
index 7dd5a7f..c41467d 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemStatsJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemStatsJUnitTest.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.cache.lucene.internal.filesystem;
-import static org.junit.Assert.*;
import static org.mockito.Mockito.*;
import org.apache.geode.Statistics;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingFixedResolverTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingFixedResolverTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingFixedResolverTest.java
index ed01d2a..db172ff 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingFixedResolverTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingFixedResolverTest.java
@@ -15,7 +15,6 @@
package org.apache.geode.cache.lucene.internal.partition;
import static org.junit.Assert.*;
-import static org.junit.Assume.assumeThat;
import static org.junit.Assume.assumeTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -24,12 +23,12 @@ import com.pholser.junit.quickcheck.Property;
import com.pholser.junit.quickcheck.generator.InRange;
import com.pholser.junit.quickcheck.generator.Size;
import com.pholser.junit.quickcheck.runner.JUnitQuickcheck;
-import org.apache.geode.cache.EntryOperation;
+
import org.apache.geode.cache.Operation;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.PartitionedRegionHelper;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Test;
+
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingMapTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingMapTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingMapTest.java
index 8850f45..1dfee40 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingMapTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingMapTest.java
@@ -16,19 +16,15 @@ package org.apache.geode.cache.lucene.internal.partition;
import static org.junit.Assert.*;
import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.apache.geode.internal.cache.BucketRegion;
-import org.apache.geode.internal.cache.PartitionedRegion;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.mockito.Mock;
@Category(UnitTest.class)
public class BucketTargetingMapTest {
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java
index 78fc657..23c2e9c 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java
@@ -44,16 +44,14 @@ import org.mockito.Mockito;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.lucene.internal.LuceneIndexStats;
import org.apache.geode.cache.lucene.internal.directory.RegionDirectory;
-import org.apache.geode.cache.lucene.internal.filesystem.ChunkKey;
-import org.apache.geode.cache.lucene.internal.filesystem.File;
import org.apache.geode.cache.lucene.internal.filesystem.FileSystemStats;
import org.apache.geode.cache.lucene.internal.repository.serializer.HeterogeneousLuceneSerializer;
import org.apache.geode.cache.lucene.internal.repository.serializer.Type2;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
- * Test of the {@link IndexRepository} and everything below it. This tests that we can save gemfire
- * objects or PDXInstance objects into a lucene index and search for those objects later.
+ * Test of the {@link IndexRepository} and everything below it. This tests that we can save Apache
+ * Geode objects or PDXInstance objects into a lucene index and search for those objects later.
*/
@Category(IntegrationTest.class)
public class IndexRepositoryImplJUnitTest {
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/LuceneGetPageFunctionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/LuceneGetPageFunctionJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/LuceneGetPageFunctionJUnitTest.java
index 5f1ca3f..bd9e499 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/LuceneGetPageFunctionJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/LuceneGetPageFunctionJUnitTest.java
@@ -14,17 +14,12 @@
*/
package org.apache.geode.cache.lucene.internal.results;
-import static org.junit.Assert.*;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.Region.Entry;
-import org.apache.geode.cache.execute.FunctionContext;
-import org.apache.geode.cache.execute.RegionFunctionContext;
import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.internal.cache.EntrySnapshot;
import org.apache.geode.internal.cache.PartitionedRegion;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageEntryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageEntryJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageEntryJUnitTest.java
index 6e26942..b82d89a 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageEntryJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageEntryJUnitTest.java
@@ -23,7 +23,6 @@ import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.CachedDeserializable;
import org.apache.geode.internal.cache.PreferBytesCachedDeserializable;
-import org.apache.geode.internal.util.BlobHelper;
import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java
index 1c8cda1..672b10a 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java
@@ -15,7 +15,6 @@
package org.apache.geode.cache.lucene.internal.xml;
import static org.junit.Assert.*;
-import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.*;
import java.util.Arrays;
http://git-wip-us.apache.org/repos/asf/geode/blob/3fd63300/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserJUnitTest.java
index 82271ea..15d78ab 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserJUnitTest.java
@@ -30,7 +30,6 @@ import org.mockito.Mockito;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-import org.apache.geode.cache.Region;
import org.apache.geode.internal.cache.extension.SimpleExtensionPoint;
import org.apache.geode.internal.cache.xmlcache.CacheCreation;
import org.apache.geode.internal.cache.xmlcache.RegionAttributesCreation;