ISPN-11797 Introduce strong typed indexing configuration

infinispan · Nov 27, 2020 · 2701352 · 2701352
1 parent 24feb14
commit 2701352
Show file tree

Hide file tree

Showing 182 changed files with 2,124 additions and 583 deletions.
diff --git a/.../hotrod-client/src/test/java/org/infinispan/client/hotrod/admin/RemoteCacheAdminTest.java b/.../hotrod-client/src/test/java/org/infinispan/client/hotrod/admin/RemoteCacheAdminTest.java
@@ -1,5 +1,6 @@
 package org.infinispan.client.hotrod.admin;
 
+import static org.infinispan.configuration.cache.IndexStorage.LOCAL_HEAP;
 import static org.infinispan.server.hotrod.test.HotRodTestingUtil.hotRodCacheConfiguration;
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertFalse;
@@ -33,7 +34,6 @@
 import org.infinispan.protostream.SerializationContextInitializer;
 import org.infinispan.query.dsl.embedded.testdomain.Transaction;
 import org.infinispan.query.dsl.embedded.testdomain.User;
-import org.infinispan.query.helper.SearchConfig;
 import org.infinispan.server.core.admin.embeddedserver.EmbeddedServerAdminOperationHandler;
 import org.infinispan.server.hotrod.HotRodServer;
 import org.infinispan.server.hotrod.configuration.HotRodServerConfigurationBuilder;
@@ -47,8 +47,8 @@ protected void createCacheManagers() throws Throwable {
       ConfigurationBuilder builder = hotRodCacheConfiguration(
             getDefaultClusteredCacheConfig(CacheMode.DIST_SYNC, false));
       builder.indexing().enable()
-             .addIndexedEntity("sample_bank_account.Transaction")
-             .addProperty(SearchConfig.DIRECTORY_TYPE, SearchConfig.HEAP);
+             .storage(LOCAL_HEAP)
+             .addIndexedEntity("sample_bank_account.Transaction");
       createHotRodServers(2, builder);
    }
 

diff --git a/...java/org/infinispan/client/hotrod/event/ClientListenerWithDslFilterObjectStorageTest.java b/...java/org/infinispan/client/hotrod/event/ClientListenerWithDslFilterObjectStorageTest.java
@@ -1,6 +1,7 @@
 package org.infinispan.client.hotrod.event;
 
 
+import static org.infinispan.configuration.cache.IndexStorage.LOCAL_HEAP;
 import static org.infinispan.server.hotrod.test.HotRodTestingUtil.hotRodCacheConfiguration;
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertNotNull;
@@ -82,8 +83,8 @@ protected ConfigurationBuilder getConfigurationBuilder() {
       cfgBuilder.encoding().key().mediaType(MediaType.APPLICATION_OBJECT_TYPE);
       cfgBuilder.encoding().value().mediaType(MediaType.APPLICATION_OBJECT_TYPE);
       cfgBuilder.indexing().enable()
-            .addIndexedEntities(UserHS.class)
-            .addProperty("directory.type", "local-heap");
+            .storage(LOCAL_HEAP)
+            .addIndexedEntities(UserHS.class);
       return cfgBuilder;
    }
 

diff --git a/...st/java/org/infinispan/client/hotrod/event/ClientListenerWithIndexingAndProtobufTest.java b/...st/java/org/infinispan/client/hotrod/event/ClientListenerWithIndexingAndProtobufTest.java
@@ -1,6 +1,7 @@
 package org.infinispan.client.hotrod.event;
 
 
+import static org.infinispan.configuration.cache.IndexStorage.LOCAL_HEAP;
 import static org.infinispan.server.hotrod.test.HotRodTestingUtil.hotRodCacheConfiguration;
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertNotNull;
@@ -38,8 +39,8 @@ public class ClientListenerWithIndexingAndProtobufTest extends MultiHotRodServer
    protected void createCacheManagers() throws Throwable {
       ConfigurationBuilder cfgBuilder = hotRodCacheConfiguration(getDefaultClusteredCacheConfig(CacheMode.DIST_SYNC, false));
       cfgBuilder.indexing().enable()
-                .addIndexedEntity("sample_bank_account.User")
-                .addProperty("directory.type", "local-heap");
+            .storage(LOCAL_HEAP)
+            .addIndexedEntity("sample_bank_account.User");
 
       createHotRodServers(NUM_NODES, cfgBuilder);
       waitForClusterToForm();

diff --git a/...nt/src/test/java/org/infinispan/client/hotrod/event/ContinuousQueryObjectStorageTest.java b/...nt/src/test/java/org/infinispan/client/hotrod/event/ContinuousQueryObjectStorageTest.java
@@ -1,5 +1,6 @@
 package org.infinispan.client.hotrod.event;
 
+import static org.infinispan.configuration.cache.IndexStorage.LOCAL_HEAP;
 import static org.infinispan.server.hotrod.test.HotRodTestingUtil.hotRodCacheConfiguration;
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertNotNull;
@@ -81,8 +82,8 @@ protected ConfigurationBuilder getConfigurationBuilder() {
       cfgBuilder.encoding().key().mediaType(MediaType.APPLICATION_OBJECT_TYPE);
       cfgBuilder.encoding().value().mediaType(MediaType.APPLICATION_OBJECT_TYPE);
       cfgBuilder.indexing().enable()
-            .addIndexedEntities(UserHS.class)
-            .addProperty("directory.type", "local-heap");
+            .storage(LOCAL_HEAP)
+            .addIndexedEntities(UserHS.class);
       cfgBuilder.expiration().disableReaper();
       return cfgBuilder;
    }

diff --git a/...rg/infinispan/client/hotrod/event/RemoteContinuousQueryLeavingRemoteCacheManagerTest.java b/...rg/infinispan/client/hotrod/event/RemoteContinuousQueryLeavingRemoteCacheManagerTest.java
@@ -1,6 +1,7 @@
 package org.infinispan.client.hotrod.event;
 
 
+import static org.infinispan.configuration.cache.IndexStorage.LOCAL_HEAP;
 import static org.infinispan.server.hotrod.test.HotRodTestingUtil.hotRodCacheConfiguration;
 import static org.testng.AssertJUnit.assertNotNull;
 import static org.testng.AssertJUnit.assertNull;
@@ -74,8 +75,8 @@ protected void createCacheManagers() throws Throwable {
    protected ConfigurationBuilder getConfigurationBuilder() {
       ConfigurationBuilder cfgBuilder = hotRodCacheConfiguration(getDefaultClusteredCacheConfig(CacheMode.DIST_SYNC, false));
       cfgBuilder.indexing().enable()
-                .addIndexedEntity("sample_bank_account.User")
-                .addProperty("directory.type", "local-heap");
+            .storage(LOCAL_HEAP)
+            .addIndexedEntity("sample_bank_account.User");
       cfgBuilder.expiration().disableReaper();
       return cfgBuilder;
    }

diff --git a/...od-client/src/test/java/org/infinispan/client/hotrod/event/RemoteContinuousQueryTest.java b/...od-client/src/test/java/org/infinispan/client/hotrod/event/RemoteContinuousQueryTest.java
@@ -1,6 +1,7 @@
 package org.infinispan.client.hotrod.event;
 
 
+import static org.infinispan.configuration.cache.IndexStorage.LOCAL_HEAP;
 import static org.infinispan.server.hotrod.test.HotRodTestingUtil.hotRodCacheConfiguration;
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertNotNull;
@@ -78,8 +79,8 @@ protected SerializationContextInitializer contextInitializer() {
    protected ConfigurationBuilder getConfigurationBuilder() {
       ConfigurationBuilder cfgBuilder = hotRodCacheConfiguration(getDefaultClusteredCacheConfig(CacheMode.DIST_SYNC, false));
       cfgBuilder.indexing().enable()
-                .addIndexedEntity("sample_bank_account.User")
-                .addProperty("directory.type", "local-heap");
+            .storage(LOCAL_HEAP)
+            .addIndexedEntity("sample_bank_account.User");
       cfgBuilder.expiration().disableReaper();
       return cfgBuilder;
    }
@@ -133,7 +134,7 @@ public void testContinuousQuery() {
       QueryFactory qf = Search.getQueryFactory(remoteCache);
 
       Query<User> query = qf.<User>create("FROM sample_bank_account.User WHERE age <= :ageParam")
-                      .setParameter("ageParam", 32);
+            .setParameter("ageParam", 32);
 
       final BlockingQueue<KeyValuePair<String, User>> joined = new LinkedBlockingQueue<>();
       final BlockingQueue<KeyValuePair<String, User>> updated = new LinkedBlockingQueue<>();

diff --git a/...ent/src/test/java/org/infinispan/client/hotrod/event/RemoteListenerWithDslFilterTest.java b/...ent/src/test/java/org/infinispan/client/hotrod/event/RemoteListenerWithDslFilterTest.java
@@ -1,6 +1,7 @@
 package org.infinispan.client.hotrod.event;
 
 
+import static org.infinispan.configuration.cache.IndexStorage.LOCAL_HEAP;
 import static org.infinispan.server.hotrod.test.HotRodTestingUtil.hotRodCacheConfiguration;
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertNotNull;
@@ -79,8 +80,8 @@ protected SerializationContextInitializer contextInitializer() {
    protected ConfigurationBuilder getConfigurationBuilder() {
       ConfigurationBuilder cfgBuilder = hotRodCacheConfiguration(getDefaultClusteredCacheConfig(CacheMode.DIST_SYNC, false));
       cfgBuilder.indexing().enable()
-                .addIndexedEntity("sample_bank_account.User")
-                .addProperty("directory.type", "local-heap");
+            .storage(LOCAL_HEAP)
+            .addIndexedEntity("sample_bank_account.User");
       return cfgBuilder;
    }
 
@@ -132,7 +133,7 @@ public void testEventFilter() {
       QueryFactory qf = Search.getQueryFactory(remoteCache);
 
       Query<Object[]> query = qf.<Object[]>create("SELECT age FROM sample_bank_account.User WHERE age <= :ageParam")
-                      .setParameter("ageParam", 32);
+            .setParameter("ageParam", 32);
 
       ClientEntryListener listener = new ClientEntryListener(serCtx);
       ClientEvents.addClientQueryListener(remoteCache, listener, query);
@@ -197,7 +198,7 @@ public void testEventFilterChangingParameter() {
       QueryFactory qf = Search.getQueryFactory(remoteCache);
 
       Query<Object[]> query = qf.<Object[]>create("SELECT age FROM sample_bank_account.User WHERE age <= :ageParam")
-                      .setParameter("ageParam", 32);
+            .setParameter("ageParam", 32);
 
       ClientEntryListener listener = new ClientEntryListener(serCtx);
       ClientEvents.addClientQueryListener(remoteCache, listener, query);

diff --git a/.../java/org/infinispan/client/hotrod/impl/iteration/ProtobufRemoteIteratorIndexingTest.java b/.../java/org/infinispan/client/hotrod/impl/iteration/ProtobufRemoteIteratorIndexingTest.java
@@ -1,5 +1,6 @@
 package org.infinispan.client.hotrod.impl.iteration;
 
+import static org.infinispan.configuration.cache.IndexStorage.LOCAL_HEAP;
 import static org.infinispan.server.hotrod.test.HotRodTestingUtil.hotRodCacheConfiguration;
 import static org.testng.Assert.assertEquals;
 
@@ -34,8 +35,8 @@ public class ProtobufRemoteIteratorIndexingTest extends MultiHotRodServersTest i
    protected void createCacheManagers() throws Throwable {
       ConfigurationBuilder cfg = getDefaultClusteredCacheConfig(CacheMode.REPL_SYNC, false);
       cfg.indexing().enable()
-         .addIndexedEntity("sample_bank_account.Account")
-         .addProperty("directory.type", "local-heap");
+            .storage(LOCAL_HEAP)
+            .addIndexedEntity("sample_bank_account.Account");
       createHotRodServers(NUM_NODES, hotRodCacheConfiguration(cfg));
       waitForClusterToForm();
    }

diff --git a/...t/src/test/java/org/infinispan/client/hotrod/marshall/EmbeddedRemoteInteropQueryTest.java b/...t/src/test/java/org/infinispan/client/hotrod/marshall/EmbeddedRemoteInteropQueryTest.java
@@ -2,6 +2,7 @@
 
 import static org.infinispan.client.hotrod.test.HotRodClientTestingUtil.killRemoteCacheManager;
 import static org.infinispan.client.hotrod.test.HotRodClientTestingUtil.killServers;
+import static org.infinispan.configuration.cache.IndexStorage.LOCAL_HEAP;
 import static org.infinispan.server.hotrod.test.HotRodTestingUtil.hotRodCacheConfiguration;
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertNotNull;
@@ -92,8 +93,8 @@ protected org.infinispan.configuration.cache.ConfigurationBuilder createConfigBu
       builder.encoding().key().mediaType(MediaType.APPLICATION_OBJECT_TYPE);
       builder.encoding().value().mediaType(MediaType.APPLICATION_OBJECT_TYPE);
       builder.indexing().enable()
-            .addIndexedEntities(UserHS.class, AccountHS.class, TransactionHS.class)
-            .addProperty("directory.type", "local-heap");
+            .storage(LOCAL_HEAP)
+            .addIndexedEntities(UserHS.class, AccountHS.class, TransactionHS.class);
       return builder;
    }
 

diff --git a/.../hotrod-client/src/test/java/org/infinispan/client/hotrod/query/BuiltInAnalyzersTest.java b/.../hotrod-client/src/test/java/org/infinispan/client/hotrod/query/BuiltInAnalyzersTest.java
@@ -1,6 +1,7 @@
 package org.infinispan.client.hotrod.query;
 
 
+import static org.infinispan.configuration.cache.IndexStorage.LOCAL_HEAP;
 import static org.testng.AssertJUnit.assertEquals;
 
 import org.infinispan.Cache;
@@ -35,8 +36,8 @@ public class BuiltInAnalyzersTest extends SingleHotRodServerTest {
    protected EmbeddedCacheManager createCacheManager() throws Exception {
       org.infinispan.configuration.cache.ConfigurationBuilder builder = new org.infinispan.configuration.cache.ConfigurationBuilder();
       builder.indexing().enable()
-             .addIndexedEntity("TestEntity")
-             .addProperty("directory.type", "local-heap");
+            .storage(LOCAL_HEAP)
+            .addIndexedEntity("TestEntity");
 
       EmbeddedCacheManager manager = TestCacheManagerFactory.createServerModeCacheManager();
       Cache<String, String> metadataCache = manager.getCache(ProtobufMetadataManagerConstants.PROTOBUF_METADATA_CACHE_NAME);

diff --git a/...od-client/src/test/java/org/infinispan/client/hotrod/query/HotRodQueryFileSystemTest.java b/...od-client/src/test/java/org/infinispan/client/hotrod/query/HotRodQueryFileSystemTest.java
@@ -7,6 +7,7 @@
 import org.infinispan.commons.test.CommonsTestingUtil;
 import org.infinispan.commons.util.Util;
 import org.infinispan.configuration.cache.ConfigurationBuilder;
+import org.infinispan.configuration.cache.IndexStorage;
 import org.testng.annotations.Test;
 
 /**
@@ -23,9 +24,7 @@ public class HotRodQueryFileSystemTest extends HotRodQueryIspnDirectoryTest {
    @Override
    protected ConfigurationBuilder getConfigurationBuilder() {
       ConfigurationBuilder builder = super.getConfigurationBuilder();
-      builder.indexing()
-            .addProperty("directory.type", "local-filesystem")
-            .addProperty("directory.root", indexDirectory);
+      builder.indexing().storage(IndexStorage.FILESYSTEM).path(indexDirectory);
       return builder;
    }
 

diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/query/HotRodQueryTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/query/HotRodQueryTest.java
@@ -2,6 +2,7 @@
 
 import static org.infinispan.client.hotrod.test.HotRodClientTestingUtil.killRemoteCacheManager;
 import static org.infinispan.client.hotrod.test.HotRodClientTestingUtil.killServers;
+import static org.infinispan.configuration.cache.IndexStorage.LOCAL_HEAP;
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertNotNull;
 import static org.testng.AssertJUnit.assertTrue;
@@ -84,8 +85,8 @@ protected void configure(GlobalConfigurationBuilder builder) {
    protected ConfigurationBuilder getConfigurationBuilder() {
       ConfigurationBuilder builder = new ConfigurationBuilder();
       builder.indexing().enable()
-             .addIndexedEntity("sample_bank_account.User")
-             .addProperty("directory.type", "local-heap");
+            .storage(LOCAL_HEAP)
+            .addIndexedEntity("sample_bank_account.User");
       return builder;
    }
 

diff --git a/...nt/src/test/java/org/infinispan/client/hotrod/query/IndexedCacheNonIndexedEntityTest.java b/...nt/src/test/java/org/infinispan/client/hotrod/query/IndexedCacheNonIndexedEntityTest.java
@@ -107,12 +107,11 @@ public void shouldPreventNonIndexedEntities() {
                   "  <cache-container>" +
                   "     <local-cache name=\"" + CACHE_NAME + "\">\n" +
                   "        <encoding media-type=\"application/x-protostream\"/>\n" +
-                  "        <indexing>\n" +
+                  "        <indexing storage=\"local-heap\">\n" +
                   "           <indexed-entities>\n" +
                   "              <indexed-entity>Entity</indexed-entity>\n" +
                   "              <indexed-entity>EvilTwin</indexed-entity>\n" +
                   "           </indexed-entities>\n" +
-                  "           <property name=\"directory.type\">local-heap</property>\n" +
                   "          </indexing>" +
                   "       </local-cache>" +
                   "  </cache-container>" +

diff --git a/...t/src/test/java/org/infinispan/client/hotrod/query/MultiHotRodServerIspnDirQueryTest.java b/...t/src/test/java/org/infinispan/client/hotrod/query/MultiHotRodServerIspnDirQueryTest.java
@@ -1,5 +1,6 @@
 package org.infinispan.client.hotrod.query;
 
+import static org.infinispan.configuration.cache.IndexStorage.LOCAL_HEAP;
 import static org.infinispan.server.hotrod.test.HotRodTestingUtil.hotRodCacheConfiguration;
 
 import org.infinispan.configuration.cache.CacheMode;
@@ -24,8 +25,8 @@ protected void createCacheManagers() throws Throwable {
 
       ConfigurationBuilder builder = hotRodCacheConfiguration(getDefaultClusteredCacheConfig(CacheMode.REPL_SYNC, false));
       builder.indexing().enable()
-             .addIndexedEntity("sample_bank_account.User")
-             .addProperty("directory.type", "local-heap");
+            .storage(LOCAL_HEAP)
+            .addIndexedEntity("sample_bank_account.User");
 
       for (EmbeddedCacheManager cm : cacheManagers) {
          cm.defineConfiguration(TEST_CACHE, builder.build());

diff --git a/...c/test/java/org/infinispan/client/hotrod/query/MultiHotRodServerIspnDirReplQueryTest.java b/...c/test/java/org/infinispan/client/hotrod/query/MultiHotRodServerIspnDirReplQueryTest.java
@@ -1,5 +1,6 @@
 package org.infinispan.client.hotrod.query;
 
+import static org.infinispan.configuration.cache.IndexStorage.LOCAL_HEAP;
 import static org.infinispan.server.hotrod.test.HotRodTestingUtil.hotRodCacheConfiguration;
 
 import org.infinispan.configuration.cache.CacheMode;
@@ -22,8 +23,8 @@ protected void createCacheManagers() throws Throwable {
 
       ConfigurationBuilder builder = hotRodCacheConfiguration(getDefaultClusteredCacheConfig(CacheMode.DIST_SYNC, false));
       builder.indexing().enable()
-             .addIndexedEntity("sample_bank_account.User")
-             .addProperty("directory.type", "local-heap");
+            .storage(LOCAL_HEAP)
+            .addIndexedEntity("sample_bank_account.User");
 
       for (EmbeddedCacheManager cm : cacheManagers) {
          cm.defineConfiguration(TEST_CACHE, builder.build());

diff --git a/...d-client/src/test/java/org/infinispan/client/hotrod/query/MultiHotRodServerQueryTest.java b/...d-client/src/test/java/org/infinispan/client/hotrod/query/MultiHotRodServerQueryTest.java
@@ -1,5 +1,6 @@
 package org.infinispan.client.hotrod.query;
 
+import static org.infinispan.configuration.cache.IndexStorage.LOCAL_HEAP;
 import static org.infinispan.server.hotrod.test.HotRodTestingUtil.hotRodCacheConfiguration;
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertNotNull;
@@ -51,8 +52,8 @@ protected void modifyGlobalConfiguration(GlobalConfigurationBuilder builder) {
    protected void createCacheManagers() throws Throwable {
       ConfigurationBuilder builder = hotRodCacheConfiguration(getDefaultClusteredCacheConfig(CacheMode.REPL_SYNC, useTransactions()));
       builder.indexing().enable()
-             .addIndexedEntity("sample_bank_account.User")
-             .addProperty("directory.type", "local-heap");
+            .storage(LOCAL_HEAP)
+            .addIndexedEntity("sample_bank_account.User");
 
       createHotRodServers(3, builder);
 

diff --git a/...od-client/src/test/java/org/infinispan/client/hotrod/query/MultiServerStoreQueryTest.java b/...od-client/src/test/java/org/infinispan/client/hotrod/query/MultiServerStoreQueryTest.java
@@ -1,5 +1,6 @@
 package org.infinispan.client.hotrod.query;
 
+import static org.infinispan.configuration.cache.IndexStorage.LOCAL_HEAP;
 import static org.infinispan.server.hotrod.test.HotRodTestingUtil.hotRodCacheConfiguration;
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertFalse;
@@ -20,7 +21,6 @@
 import org.infinispan.protostream.annotations.ProtoDoc;
 import org.infinispan.protostream.annotations.ProtoField;
 import org.infinispan.protostream.annotations.ProtoSchemaBuilder;
-import org.infinispan.query.helper.SearchConfig;
 import org.infinispan.query.remote.client.ProtobufMetadataManagerConstants;
 import org.testng.annotations.Test;
 
@@ -90,13 +90,10 @@ public Configuration getLuceneCacheConfig(String storeName) {
    public Configuration buildIndexedConfig(String storeName) {
       ConfigurationBuilder builder = hotRodCacheConfiguration(getDefaultClusteredCacheConfig(CacheMode.DIST_SYNC, false));
       builder.indexing().enable()
-            .addIndexedEntity("News")
-            .addProperty(SearchConfig.DIRECTORY_TYPE, SearchConfig.HEAP)
-            .addProperty(SearchConfig.IO_STRATEGY, SearchConfig.NEAR_REAL_TIME)
-            .addProperty(SearchConfig.COMMIT_INTERVAL, "500")
-            .addProperty(SearchConfig.IO_MERGE_FACTOR, "30")
-            .addProperty(SearchConfig.IO_MERGE_MAX_SIZE, "1024")
-            .addProperty(SearchConfig.IO_WRITER_RAM_BUFFER_SIZE, "256");
+            .storage(LOCAL_HEAP)
+            .writer().commitInterval(500).ramBufferSize(256)
+            .merge().factor(30).maxSize(1024)
+            .addIndexedEntity("News");
 
       builder.memory().storageType(storageType);
       if (evictionSize > 0) {

diff --git a/...rod-client/src/test/java/org/infinispan/client/hotrod/query/MultipleIndexedCacheTest.java b/...rod-client/src/test/java/org/infinispan/client/hotrod/query/MultipleIndexedCacheTest.java
@@ -1,5 +1,6 @@
 package org.infinispan.client.hotrod.query;
 
+import static org.infinispan.configuration.cache.IndexStorage.LOCAL_HEAP;
 import static org.infinispan.server.hotrod.test.HotRodTestingUtil.hotRodCacheConfiguration;
 import static org.testng.Assert.assertEquals;
 
@@ -41,9 +42,9 @@ public class MultipleIndexedCacheTest extends MultiHotRodServersTest {
    public Configuration buildIndexedConfig() {
       ConfigurationBuilder builder = hotRodCacheConfiguration(getDefaultClusteredCacheConfig(CacheMode.DIST_SYNC, false));
       builder.indexing().enable()
-             .addIndexedEntity("sample_bank_account.User")
-             .addIndexedEntity("sample_bank_account.Account")
-             .addProperty("directory.type", "local-heap");
+            .storage(LOCAL_HEAP)
+            .addIndexedEntity("sample_bank_account.User")
+            .addIndexedEntity("sample_bank_account.Account");
       return builder.build();
    }
 

diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/query/ReindexCacheTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/query/ReindexCacheTest.java
@@ -1,5 +1,6 @@
 package org.infinispan.client.hotrod.query;
 
+import static org.infinispan.configuration.cache.IndexStorage.LOCAL_HEAP;
 import static org.infinispan.server.hotrod.test.HotRodTestingUtil.hotRodCacheConfiguration;
 import static org.infinispan.test.fwk.TestCacheManagerFactory.createServerModeCacheManager;
 import static org.testng.Assert.assertEquals;
@@ -63,8 +64,8 @@ public ConfigurationBuilder buildIndexedConfig() {
       ConfigurationBuilder builder = hotRodCacheConfiguration(new ConfigurationBuilder());
       builder.memory().storageType(storageType)
              .indexing().enable()
-             .addIndexedEntity("sample_bank_account.User")
-             .addProperty("directory.type", "local-heap");
+            .storage(LOCAL_HEAP)
+            .addIndexedEntity("sample_bank_account.User");
       return builder;
    }