Fixed - missed caches-native for Micronaut 3.x and Micronaut 2.x

redisson-micronaut/redisson-micronaut-20/src/main/java/org/redisson/micronaut/RedissonFactory.java

@@ -18,12 +18,15 @@ package org.redisson.micronaut;
 import io.micronaut.context.annotation.*;
 import io.micronaut.core.convert.ConversionService;
 import io.micronaut.scheduling.TaskExecutors;
+import org.redisson.MapCacheNativeWrapper;
 import org.redisson.Redisson;
 import org.redisson.api.RMap;
 import org.redisson.api.RMapCache;
+import org.redisson.api.RMapCacheNative;
 import org.redisson.api.RedissonClient;
 import org.redisson.client.codec.Codec;
 import org.redisson.config.Config;
+import org.redisson.micronaut.cache.RedissonCacheNativeConfiguration;
 import org.redisson.micronaut.cache.RedissonSyncCache;
 import org.redisson.micronaut.cache.RedissonCacheConfiguration;
 
@@ -64,5 +67,15 @@ public class RedissonFactory {
         return new RedissonSyncCache(conversionService, null, map, executorService, configuration);
     }
 
+    @EachBean(RedissonCacheNativeConfiguration.class)
+    public RedissonSyncCache cache(@Parameter RedissonCacheNativeConfiguration configuration,
+                                   RedissonClient redisson,
+                                   ConversionService conversionService,
+                                   @Named(TaskExecutors.IO) ExecutorService executorService) {
+        Codec codec = Optional.ofNullable(configuration.getCodec())
+                .orElse(redisson.getConfig().getCodec());
+        RMapCacheNative<Object, Object> mapCache = redisson.getMapCacheNative(configuration.getName(), codec);
+        return new RedissonSyncCache(conversionService, new MapCacheNativeWrapper<>(mapCache, (Redisson) redisson), mapCache, executorService, configuration);
+    }
 
 }

redisson-micronaut/redisson-micronaut-20/src/main/java/org/redisson/micronaut/cache/RedissonCacheNativeConfiguration.java

@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2013-2024 Nikita Koksharov
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.redisson.micronaut.cache;
+
+import io.micronaut.context.annotation.EachProperty;
+import io.micronaut.context.annotation.Parameter;
+
+/**
+ * Micronaut Cache settings.
+ *
+ * @author Nikita Koksharov
+ *
+ */
+@EachProperty("redisson.caches-native")
+public class RedissonCacheNativeConfiguration extends BaseCacheConfiguration {
+
+    public RedissonCacheNativeConfiguration(@Parameter String name) {
+        super(name);
+    }
+
+}

redisson-micronaut/redisson-micronaut-20/src/main/java/org/redisson/micronaut/cache/RedissonSyncCache.java

@@ -37,7 +37,7 @@ public class RedissonSyncCache extends AbstractMapBasedSyncCache<RMap<Object, Ob
 
     private final ConversionService<?> conversionService;
     private final ExecutorService executorService;
-    private final RedissonCacheConfiguration configuration;
+    private final BaseCacheConfiguration configuration;
     private final RMapCache<Object, Object> mapCache;
     private final RMap<Object, Object> map;
 
@@ -45,7 +45,7 @@ public class RedissonSyncCache extends AbstractMapBasedSyncCache<RMap<Object, Ob
                              RMapCache<Object, Object> mapCache,
                              RMap<Object, Object> map,
                              ExecutorService executorService,
-                             RedissonCacheConfiguration configuration) {
+                             BaseCacheConfiguration configuration) {
         super(conversionService, map);
         this.executorService = executorService;
         this.configuration = configuration;

redisson-micronaut/redisson-micronaut-30/src/main/java/org/redisson/micronaut/RedissonFactory.java

@@ -20,13 +20,16 @@ import io.micronaut.core.convert.ConversionService;
 import io.micronaut.scheduling.TaskExecutors;
 import jakarta.inject.Named;
 import jakarta.inject.Singleton;
+import org.redisson.MapCacheNativeWrapper;
 import org.redisson.Redisson;
 import org.redisson.api.RMap;
 import org.redisson.api.RMapCache;
+import org.redisson.api.RMapCacheNative;
 import org.redisson.api.RedissonClient;
 import org.redisson.client.codec.Codec;
 import org.redisson.config.Config;
 import org.redisson.micronaut.cache.RedissonCacheConfiguration;
+import org.redisson.micronaut.cache.RedissonCacheNativeConfiguration;
 import org.redisson.micronaut.cache.RedissonSyncCache;
 
 import java.util.Optional;
@@ -64,5 +67,15 @@ public class RedissonFactory {
         return new RedissonSyncCache(conversionService, null, map, executorService, configuration);
     }
 
+    @EachBean(RedissonCacheNativeConfiguration.class)
+    public RedissonSyncCache cache(@Parameter RedissonCacheNativeConfiguration configuration,
+                                   RedissonClient redisson,
+                                   ConversionService conversionService,
+                                   @Named(TaskExecutors.IO) ExecutorService executorService) {
+        Codec codec = Optional.ofNullable(configuration.getCodec())
+                .orElse(redisson.getConfig().getCodec());
+        RMapCacheNative<Object, Object> mapCache = redisson.getMapCacheNative(configuration.getName(), codec);
+        return new RedissonSyncCache(conversionService, new MapCacheNativeWrapper<>(mapCache, (Redisson) redisson), mapCache, executorService, configuration);
+    }
 
 }

redisson-micronaut/redisson-micronaut-30/src/main/java/org/redisson/micronaut/cache/RedissonCacheNativeConfiguration.java

@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2013-2024 Nikita Koksharov
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.redisson.micronaut.cache;
+
+import io.micronaut.context.annotation.EachProperty;
+import io.micronaut.context.annotation.Parameter;
+
+/**
+ * Micronaut Cache settings.
+ *
+ * @author Nikita Koksharov
+ *
+ */
+@EachProperty("redisson.caches-native")
+public class RedissonCacheNativeConfiguration extends BaseCacheConfiguration {
+
+    public RedissonCacheNativeConfiguration(@Parameter String name) {
+        super(name);
+    }
+
+}

redisson-micronaut/redisson-micronaut-30/src/main/java/org/redisson/micronaut/cache/RedissonSyncCache.java

@@ -37,7 +37,7 @@ public class RedissonSyncCache extends AbstractMapBasedSyncCache<RMap<Object, Ob
 
     private final ConversionService<?> conversionService;
     private final ExecutorService executorService;
-    private final RedissonCacheConfiguration configuration;
+    private final BaseCacheConfiguration configuration;
     private final RMapCache<Object, Object> mapCache;
     private final RMap<Object, Object> map;
 
@@ -45,7 +45,7 @@ public class RedissonSyncCache extends AbstractMapBasedSyncCache<RMap<Object, Ob
                              RMapCache<Object, Object> mapCache,
                              RMap<Object, Object> map,
                              ExecutorService executorService,
-                             RedissonCacheConfiguration configuration) {
+                             BaseCacheConfiguration configuration) {
         super(conversionService, map);
         this.executorService = executorService;
         this.configuration = configuration;