ISPN-14002 Configuration for multimap

infinispan · May 2, 2023 · 2682445 · 2682445
1 parent bad38b3
commit 2682445
Show file tree

Hide file tree

Showing 40 changed files with 958 additions and 85 deletions.
diff --git a/api/src/main/java/org/infinispan/api/async/AsyncMultiMaps.java b/api/src/main/java/org/infinispan/api/async/AsyncMultiMaps.java
@@ -3,23 +3,23 @@
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Flow;
 
-import org.infinispan.api.configuration.MultiMapConfiguration;
+import org.infinispan.api.configuration.MultimapConfiguration;
 
 /**
  * @since 14.0
  **/
 public interface AsyncMultiMaps {
-   <K, V> CompletionStage<AsyncMultiMap<K, V>> create(String name, MultiMapConfiguration cacheConfiguration);
+   <K, V> CompletionStage<AsyncMultimap<K, V>> create(String name, MultimapConfiguration cacheConfiguration);
 
-   <K, V> CompletionStage<AsyncMultiMap<K, V>> create(String name, String template);
+   <K, V> CompletionStage<AsyncMultimap<K, V>> create(String name, String template);
 
-   <K, V> CompletionStage<AsyncMultiMap<K, V>> get(String name);
+   <K, V> CompletionStage<AsyncMultimap<K, V>> get(String name);
 
    CompletionStage<Void> remove(String name);
 
    Flow.Publisher<String> names();
 
-   CompletionStage<Void> createTemplate(String name, MultiMapConfiguration cacheConfiguration);
+   CompletionStage<Void> createTemplate(String name, MultimapConfiguration cacheConfiguration);
 
    CompletionStage<Void> removeTemplate(String name);
 

diff --git a/...g/infinispan/api/async/AsyncMultiMap.java → ...g/infinispan/api/async/AsyncMultimap.java b/...g/infinispan/api/async/AsyncMultiMap.java → ...g/infinispan/api/async/AsyncMultimap.java
@@ -3,12 +3,12 @@
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Flow;
 
-import org.infinispan.api.configuration.MultiMapConfiguration;
+import org.infinispan.api.configuration.MultimapConfiguration;
 
 /**
  * @since 14.0
  **/
-public interface AsyncMultiMap<K, V> {
+public interface AsyncMultimap<K, V> {
    /**
     * The name of this multimap
     *
@@ -21,7 +21,7 @@ public interface AsyncMultiMap<K, V> {
     *
     * @return
     */
-   CompletionStage<MultiMapConfiguration> configuration();
+   CompletionStage<MultimapConfiguration> configuration();
 
    /**
     * Return the container of this MultiMap

diff --git a/.../configuration/MultiMapConfiguration.java → .../configuration/MultimapConfiguration.java b/.../configuration/MultiMapConfiguration.java → .../configuration/MultimapConfiguration.java
@@ -5,5 +5,5 @@
  *
  * @since 14.0
  **/
-public interface MultiMapConfiguration {
+public interface MultimapConfiguration {
 }
diff --git a/api/src/main/java/org/infinispan/api/mutiny/MutinyContainer.java b/api/src/main/java/org/infinispan/api/mutiny/MutinyContainer.java
@@ -15,7 +15,7 @@
 public interface MutinyContainer extends Infinispan {
    MutinyCaches caches();
 
-   MutinyMultiMaps multiMaps();
+   MutinyMultimaps multiMaps();
 
    MutinyStrongCounters strongCounters();
 

diff --git a/api/src/main/java/org/infinispan/api/mutiny/MutinyMultiMaps.java b/api/src/main/java/org/infinispan/api/mutiny/MutinyMultiMaps.java
diff --git a/...infinispan/api/mutiny/MutinyMultiMap.java → ...infinispan/api/mutiny/MutinyMultimap.java b/...infinispan/api/mutiny/MutinyMultiMap.java → ...infinispan/api/mutiny/MutinyMultimap.java
@@ -1,6 +1,6 @@
 package org.infinispan.api.mutiny;
 
-import org.infinispan.api.configuration.MultiMapConfiguration;
+import org.infinispan.api.configuration.MultimapConfiguration;
 
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
@@ -10,14 +10,14 @@
  * @param <V>
  * @since 14.0
  */
-public interface MutinyMultiMap<K, V> {
+public interface MutinyMultimap<K, V> {
 
    String name();
 
-   Uni<MultiMapConfiguration> configuration();
+   Uni<MultimapConfiguration> configuration();
 
    /**
-    * Return the container of this MultiMap
+    * Return the container of this Multimap.
     *
     * @return
     */

diff --git a/api/src/main/java/org/infinispan/api/mutiny/MutinyMultimaps.java b/api/src/main/java/org/infinispan/api/mutiny/MutinyMultimaps.java
@@ -0,0 +1,27 @@
+package org.infinispan.api.mutiny;
+
+import org.infinispan.api.configuration.MultimapConfiguration;
+
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
+
+/**
+ * @since 14.0
+ **/
+public interface MutinyMultimaps {
+   <K, V> Uni<MutinyMultimap<K, V>> create(String name, MultimapConfiguration cacheConfiguration);
+
+   <K, V> Uni<MutinyMultimap<K, V>> create(String name, String template);
+
+   <K, V> Uni<MutinyMultimap<K, V>> get(String name);
+
+   Uni<Void> remove(String name);
+
+   Multi<String> names();
+
+   Uni<Void> createTemplate(String name, MultimapConfiguration cacheConfiguration);
+
+   Uni<Void> removeTemplate(String name);
+
+   Multi<String> templateNames();
+}
diff --git a/api/src/main/java/org/infinispan/api/sync/SyncMultiMap.java b/api/src/main/java/org/infinispan/api/sync/SyncMultiMap.java
@@ -1,7 +1,7 @@
 package org.infinispan.api.sync;
 
 import org.infinispan.api.common.CloseableIterable;
-import org.infinispan.api.configuration.MultiMapConfiguration;
+import org.infinispan.api.configuration.MultimapConfiguration;
 
 /**
  * @param <K>
@@ -12,7 +12,7 @@ public interface SyncMultiMap<K, V> {
 
    String name();
 
-   MultiMapConfiguration configuration();
+   MultimapConfiguration configuration();
 
    /**
     * Return the container of this multimap

diff --git a/api/src/main/java/org/infinispan/api/sync/SyncMultiMaps.java b/api/src/main/java/org/infinispan/api/sync/SyncMultiMaps.java
@@ -1,23 +1,23 @@
 package org.infinispan.api.sync;
 
 import org.infinispan.api.common.CloseableIterable;
-import org.infinispan.api.configuration.MultiMapConfiguration;
+import org.infinispan.api.configuration.MultimapConfiguration;
 
 /**
  * @since 14.0
  **/
 public interface SyncMultiMaps {
    <K, V> SyncMultiMap<K, V> get(String name);
 
-   <K, V> SyncMultiMap<K, V> create(String name, MultiMapConfiguration cacheConfiguration);
+   <K, V> SyncMultiMap<K, V> create(String name, MultimapConfiguration cacheConfiguration);
 
    <K, V> SyncMultiMap<K, V> create(String name, String template);
 
    void remove(String name);
 
    CloseableIterable<String> names();
 
-   void createTemplate(String name, MultiMapConfiguration cacheConfiguration);
+   void createTemplate(String name, MultimapConfiguration cacheConfiguration);
 
    void removeTemplate(String name);
 

diff --git a/client/hotrod/src/main/java/org/infinispan/hotrod/HotRodAsyncMultiMap.java b/client/hotrod/src/main/java/org/infinispan/hotrod/HotRodAsyncMultiMap.java
@@ -3,13 +3,13 @@
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Flow;
 
-import org.infinispan.api.async.AsyncMultiMap;
-import org.infinispan.api.configuration.MultiMapConfiguration;
+import org.infinispan.api.async.AsyncMultimap;
+import org.infinispan.api.configuration.MultimapConfiguration;
 
 /**
  * @since 14.0
  **/
-public class HotRodAsyncMultiMap<K, V> implements AsyncMultiMap<K, V> {
+public class HotRodAsyncMultiMap<K, V> implements AsyncMultimap<K, V> {
    private final HotRod hotrod;
    private final String name;
 
@@ -24,7 +24,7 @@ public String name() {
    }
 
    @Override
-   public CompletionStage<MultiMapConfiguration> configuration() {
+   public CompletionStage<MultimapConfiguration> configuration() {
       return null;
    }
 

diff --git a/client/hotrod/src/main/java/org/infinispan/hotrod/HotRodAsyncMultiMaps.java b/client/hotrod/src/main/java/org/infinispan/hotrod/HotRodAsyncMultiMaps.java
@@ -4,9 +4,9 @@
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Flow;
 
-import org.infinispan.api.async.AsyncMultiMap;
+import org.infinispan.api.async.AsyncMultimap;
 import org.infinispan.api.async.AsyncMultiMaps;
-import org.infinispan.api.configuration.MultiMapConfiguration;
+import org.infinispan.api.configuration.MultimapConfiguration;
 
 /**
  * @since 14.0
@@ -19,17 +19,17 @@ public class HotRodAsyncMultiMaps implements AsyncMultiMaps {
    }
 
    @Override
-   public <K, V> CompletionStage<AsyncMultiMap<K, V>> create(String name, MultiMapConfiguration cacheConfiguration) {
+   public <K, V> CompletionStage<AsyncMultimap<K, V>> create(String name, MultimapConfiguration cacheConfiguration) {
       return CompletableFuture.completedFuture(new HotRodAsyncMultiMap<>(hotrod, name)); // PLACEHOLDER
    }
 
    @Override
-   public <K, V> CompletionStage<AsyncMultiMap<K, V>> create(String name, String template) {
+   public <K, V> CompletionStage<AsyncMultimap<K, V>> create(String name, String template) {
       return CompletableFuture.completedFuture(new HotRodAsyncMultiMap<>(hotrod, name)); // PLACEHOLDER
    }
 
    @Override
-   public <K, V> CompletionStage<AsyncMultiMap<K, V>> get(String name) {
+   public <K, V> CompletionStage<AsyncMultimap<K, V>> get(String name) {
       return CompletableFuture.completedFuture(new HotRodAsyncMultiMap<>(hotrod, name)); // PLACEHOLDER
    }
 
@@ -44,7 +44,7 @@ public Flow.Publisher<String> names() {
    }
 
    @Override
-   public CompletionStage<Void> createTemplate(String name, MultiMapConfiguration cacheConfiguration) {
+   public CompletionStage<Void> createTemplate(String name, MultimapConfiguration cacheConfiguration) {
       return null;
    }
 

diff --git a/client/hotrod/src/main/java/org/infinispan/hotrod/HotRodMutinyMultiMap.java b/client/hotrod/src/main/java/org/infinispan/hotrod/HotRodMutinyMultiMap.java
@@ -1,15 +1,15 @@
 package org.infinispan.hotrod;
 
-import org.infinispan.api.configuration.MultiMapConfiguration;
-import org.infinispan.api.mutiny.MutinyMultiMap;
+import org.infinispan.api.configuration.MultimapConfiguration;
+import org.infinispan.api.mutiny.MutinyMultimap;
 
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
 
 /**
  * @since 14.0
  **/
-public class HotRodMutinyMultiMap<K, V> implements MutinyMultiMap<K, V> {
+public class HotRodMutinyMultiMap<K, V> implements MutinyMultimap<K, V> {
    private final HotRod hotrod;
    private final String name;
 
@@ -24,7 +24,7 @@ public String name() {
    }
 
    @Override
-   public Uni<MultiMapConfiguration> configuration() {
+   public Uni<MultimapConfiguration> configuration() {
       return null;
    }
 

diff --git a/client/hotrod/src/main/java/org/infinispan/hotrod/HotRodMutinyMultiMaps.java b/client/hotrod/src/main/java/org/infinispan/hotrod/HotRodMutinyMultiMaps.java
@@ -1,34 +1,34 @@
 package org.infinispan.hotrod;
 
-import org.infinispan.api.configuration.MultiMapConfiguration;
-import org.infinispan.api.mutiny.MutinyMultiMap;
-import org.infinispan.api.mutiny.MutinyMultiMaps;
+import org.infinispan.api.configuration.MultimapConfiguration;
+import org.infinispan.api.mutiny.MutinyMultimap;
+import org.infinispan.api.mutiny.MutinyMultimaps;
 
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
 
 /**
  * @since 14.0
  **/
-public class HotRodMutinyMultiMaps implements MutinyMultiMaps {
+public class HotRodMutinyMultiMaps implements MutinyMultimaps {
    private final HotRod hotrod;
 
    HotRodMutinyMultiMaps(HotRod hotrod) {
       this.hotrod = hotrod;
    }
 
    @Override
-   public <K, V> Uni<MutinyMultiMap<K, V>> create(String name, MultiMapConfiguration cacheConfiguration) {
+   public <K, V> Uni<MutinyMultimap<K, V>> create(String name, MultimapConfiguration cacheConfiguration) {
       return Uni.createFrom().item(new HotRodMutinyMultiMap(hotrod, name)); // PLACEHOLDER
    }
 
    @Override
-   public <K, V> Uni<MutinyMultiMap<K, V>> create(String name, String template) {
+   public <K, V> Uni<MutinyMultimap<K, V>> create(String name, String template) {
       return Uni.createFrom().item(new HotRodMutinyMultiMap(hotrod, name)); // PLACEHOLDER
    }
 
    @Override
-   public <K, V> Uni<MutinyMultiMap<K, V>> get(String name) {
+   public <K, V> Uni<MutinyMultimap<K, V>> get(String name) {
       return Uni.createFrom().item(new HotRodMutinyMultiMap(hotrod, name)); // PLACEHOLDER
    }
 
@@ -43,7 +43,7 @@ public Multi<String> names() {
    }
 
    @Override
-   public Uni<Void> createTemplate(String name, MultiMapConfiguration cacheConfiguration) {
+   public Uni<Void> createTemplate(String name, MultimapConfiguration cacheConfiguration) {
       return null;
    }
 

diff --git a/client/hotrod/src/main/java/org/infinispan/hotrod/HotRodSyncMultiMap.java b/client/hotrod/src/main/java/org/infinispan/hotrod/HotRodSyncMultiMap.java
@@ -1,7 +1,7 @@
 package org.infinispan.hotrod;
 
 import org.infinispan.api.common.CloseableIterable;
-import org.infinispan.api.configuration.MultiMapConfiguration;
+import org.infinispan.api.configuration.MultimapConfiguration;
 import org.infinispan.api.sync.SyncMultiMap;
 
 /**
@@ -22,7 +22,7 @@ public String name() {
    }
 
    @Override
-   public MultiMapConfiguration configuration() {
+   public MultimapConfiguration configuration() {
       return null;
    }
 

diff --git a/client/hotrod/src/main/java/org/infinispan/hotrod/HotRodSyncMultiMaps.java b/client/hotrod/src/main/java/org/infinispan/hotrod/HotRodSyncMultiMaps.java
@@ -1,7 +1,7 @@
 package org.infinispan.hotrod;
 
 import org.infinispan.api.common.CloseableIterable;
-import org.infinispan.api.configuration.MultiMapConfiguration;
+import org.infinispan.api.configuration.MultimapConfiguration;
 import org.infinispan.api.sync.SyncMultiMaps;
 
 /**
@@ -20,7 +20,7 @@ public <K, V> HotRodSyncMultiMap<K, V> get(String name) {
    }
 
    @Override
-   public <K, V> HotRodSyncMultiMap<K, V> create(String name, MultiMapConfiguration cacheConfiguration) {
+   public <K, V> HotRodSyncMultiMap<K, V> create(String name, MultimapConfiguration cacheConfiguration) {
       return new HotRodSyncMultiMap<>(hotrod, name);
    }
 
@@ -40,7 +40,7 @@ public CloseableIterable<String> names() {
    }
 
    @Override
-   public void createTemplate(String name, MultiMapConfiguration cacheConfiguration) {
+   public void createTemplate(String name, MultimapConfiguration cacheConfiguration) {
 
    }
 

diff --git a/commons/all/src/main/java/org/infinispan/commons/marshall/ProtoStreamTypeIds.java b/commons/all/src/main/java/org/infinispan/commons/marshall/ProtoStreamTypeIds.java
@@ -122,6 +122,7 @@ public interface ProtoStreamTypeIds {
    // MultiMap 5300 -> 5399
    int MULTIMAP_LOWER_BOUND = 5300;
    int MULTIMAP_BUCKET = MULTIMAP_LOWER_BOUND;
+   int MULTIMAP_CONFIGURATION = MULTIMAP_LOWER_BOUND + 1;
 
    // Server Core 5400 -> 5799
    int SERVER_CORE_LOWER_BOUND = 5400;