[geode] branch feature/GEODE-3926_2 updated: Fixed some breaking compilation

[ud...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

udo pushed a commit to branch feature/GEODE-3926_2
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/feature/GEODE-3926_2 by this push:
     new 0feefc4  Fixed some breaking compilation
0feefc4 is described below

commit 0feefc4f2dc718c2dc3b215b6a2e6369bca291f6
Author: Udo <uk...@pivotal.io>
AuthorDate: Wed Mar 14 16:20:44 2018 -0700

    Fixed some breaking compilation
---
 .../lucene/internal/PartitionedRepositoryManager.java     |  2 +-
 .../internal/LuceneIndexRecoveryHAIntegrationTest.java    | 15 ++++++---------
 .../internal/PartitionedRepositoryManagerJUnitTest.java   |  4 +++-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/PartitionedRepositoryManager.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/PartitionedRepositoryManager.java
index f0f0045..9e2e4fd 100755
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/PartitionedRepositoryManager.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/PartitionedRepositoryManager.java
@@ -39,7 +39,7 @@ import org.apache.geode.internal.logging.LogService;
 
 public class PartitionedRepositoryManager implements RepositoryManager {
   private final Logger logger = LogService.getLogger();
-  public IndexRepositoryFactory indexRepositoryFactory = new IndexRepositoryFactory();
+  public static IndexRepositoryFactory indexRepositoryFactory = new IndexRepositoryFactory();
   /**
    * map of the parent bucket region to the index repository
    *
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexRecoveryHAIntegrationTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexRecoveryHAIntegrationTest.java
index 0381c16..fb739e7 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexRecoveryHAIntegrationTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexRecoveryHAIntegrationTest.java
@@ -45,7 +45,7 @@ import org.apache.geode.test.junit.categories.LuceneTest;
 
 @Category({IntegrationTest.class, LuceneTest.class})
 public class LuceneIndexRecoveryHAIntegrationTest {
-  String[] indexedFields = new String[]{"txt"};
+  String[] indexedFields = new String[] {"txt"};
   HeterogeneousLuceneSerializer mapper = new HeterogeneousLuceneSerializer();
   Analyzer analyzer = new StandardAnalyzer();
 
@@ -55,7 +55,7 @@ public class LuceneIndexRecoveryHAIntegrationTest {
 
   @Before
   public void setup() {
-    indexedFields = new String[]{"txt"};
+    indexedFields = new String[] {"txt"};
     mapper = new HeterogeneousLuceneSerializer();
     analyzer = new StandardAnalyzer();
     LuceneServiceImpl.registerDataSerializables();
@@ -92,10 +92,8 @@ public class LuceneIndexRecoveryHAIntegrationTest {
     userRegion.put("rebalance", "test");
     service.waitUntilFlushed("index1", "userRegion", 30000, TimeUnit.MILLISECONDS);
 
-    RepositoryManager
-        manager =
-        new PartitionedRepositoryManager((LuceneIndexImpl) index, mapper,
-            Executors.newSingleThreadExecutor());
+    RepositoryManager manager = new PartitionedRepositoryManager((LuceneIndexImpl) index, mapper,
+        Executors.newSingleThreadExecutor());
     IndexRepository repo = manager.getRepository(userRegion, 0, null);
     assertNotNull(repo);
 
@@ -110,9 +108,8 @@ public class LuceneIndexRecoveryHAIntegrationTest {
 
     userRegion = (PartitionedRegion) regionfactory.create("userRegion");
     userRegion.put("rebalance", "test");
-    manager =
-        new PartitionedRepositoryManager((LuceneIndexImpl) index, mapper,
-            Executors.newSingleThreadExecutor());
+    manager = new PartitionedRepositoryManager((LuceneIndexImpl) index, mapper,
+        Executors.newSingleThreadExecutor());
     IndexRepository newRepo = manager.getRepository(userRegion, 0, null);
 
     Assert.assertNotEquals(newRepo, repo);
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
index b2c30b1..9fdc10b 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
@@ -33,6 +33,7 @@ import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.Executors;
 
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.apache.lucene.index.IndexWriter;
@@ -142,7 +143,8 @@ public class PartitionedRepositoryManagerJUnitTest {
     when(prRoot.get("rid")).thenReturn(prConfig);
     PowerMockito.mockStatic(PartitionedRegionHelper.class);
     PowerMockito.when(PartitionedRegionHelper.getPRRoot(cache)).thenReturn(prRoot);
-    repoManager = new PartitionedRepositoryManager(indexForPR, serializer);
+    repoManager = new PartitionedRepositoryManager(indexForPR, serializer,
+        Executors.newSingleThreadExecutor());
     repoManager.setUserRegionForRepositoryManager(userRegion);
     repoManager.allowRepositoryComputation();
   }

-- 
To stop receiving notification emails like this one, please contact
udo@apache.org.