Update Spring Boot to 2.0.0 version #1323

redisson/pom.xml

@@ -268,10 +268,25 @@
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-actuator</artifactId>
-            <version>[1.4,2.0.0)</version>
+            <version>[2.0.0,)</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+            <version>[2.0.0,)</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-core</artifactId>
+            <version>[1.0.1,)</version>
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>

redisson/src/main/java/org/redisson/spring/cache/RedissonCache.java

@@ -43,8 +43,10 @@ public class RedissonCache implements Cache {
 
     private final AtomicLong hits = new AtomicLong();
 
+    private final AtomicLong puts = new AtomicLong();
+
     private final AtomicLong misses = new AtomicLong();
-
+    
     public RedissonCache(RMapCache<Object, Object> mapCache, CacheConfig config, boolean allowNullValues) {
         this(mapCache, allowNullValues);
         this.mapCache = mapCache;
@@ -106,6 +108,7 @@ public void put(Object key, Object value) {
         } else {
             map.fastPut(key, value);
         }
+        addCachePut();
     }
 
     public ValueWrapper putIfAbsent(Object key, Object value) {
@@ -119,6 +122,9 @@ public ValueWrapper putIfAbsent(Object key, Object value) {
             } else {
                 prevValue = map.putIfAbsent(key, value);
             }
+            if (prevValue == null) {
+                addCachePut();
+            }
         }
 
         return toValueWrapper(prevValue);
@@ -205,6 +211,14 @@ long getCacheHits(){
     long getCacheMisses(){
         return misses.get();
     }
+
+    long getCachePuts() {
+        return puts.get();
+    }
+
+    private void addCachePut() {
+        puts.incrementAndGet();
+    }
 
     private void addCacheHit(){
         hits.incrementAndGet();

redisson/src/main/java/org/redisson/spring/cache/RedissonCacheMeterBinderProvider.java

@@ -0,0 +1,36 @@
+/**
+ * Copyright 2018 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.spring.cache;
+
+import org.springframework.boot.actuate.metrics.cache.CacheMeterBinderProvider;
+
+import io.micrometer.core.instrument.Tag;
+import io.micrometer.core.instrument.binder.MeterBinder;
+
+/**
+ * 
+ * 
+ * @author Nikita Koksharov
+ *
+ */
+public class RedissonCacheMeterBinderProvider implements CacheMeterBinderProvider<RedissonCache> {
+
+    @Override
+    public MeterBinder getMeterBinder(RedissonCache cache, Iterable<Tag> tags) {
+        return new RedissonCacheMetrics(cache, tags);
+    }
+
+}

redisson/src/main/java/org/redisson/spring/cache/RedissonCacheMetrics.java

@@ -0,0 +1,78 @@
+/**
+ * Copyright 2018 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.spring.cache;
+
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Tag;
+import io.micrometer.core.instrument.binder.cache.CacheMeterBinder;
+
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ */
+public class RedissonCacheMetrics extends CacheMeterBinder {
+
+    private final RedissonCache cache;
+
+    public RedissonCacheMetrics(RedissonCache cache, Iterable<Tag> tags) {
+        super(cache, cache.getName(), tags);
+        this.cache = cache;
+    }
+
+    /**
+     * Record metrics on a Redisson cache.
+     *
+     * @param registry - registry to bind metrics to
+     * @param cache - cache to instrument
+     * @param tags - tags to apply to all recorded metrics
+     * @return cache
+     */
+    public static RedissonCache monitor(MeterRegistry registry, RedissonCache cache, Iterable<Tag> tags) {
+        new RedissonCacheMetrics(cache, tags).bindTo(registry);
+        return cache;
+    }
+
+    @Override
+    protected Long size() {
+        return (long) cache.getNativeCache().size();
+    }
+
+    @Override
+    protected long hitCount() {
+        return cache.getCacheHits();
+    }
+
+    @Override
+    protected long missCount() {
+        return cache.getCacheMisses();
+    }
+
+    @Override
+    protected Long evictionCount() {
+        return null;
+    }
+
+    @Override
+    protected long putCount() {
+        return cache.getCachePuts();
+    }
+
+    @Override
+    protected void bindImplementationSpecificMetrics(MeterRegistry registry) {
+    }
+
+}

redisson/src/main/java/org/redisson/spring/cache/RedissonCacheStatisticsAutoConfiguration.java

@@ -15,7 +15,6 @@
  */
 package org.redisson.spring.cache;
 
-import org.springframework.boot.actuate.cache.CacheStatisticsProvider;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.cache.CacheAutoConfiguration;
@@ -25,20 +24,25 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import io.micrometer.core.instrument.binder.MeterBinder;
+
 /**
  *
  * @author Craig Andrews
+ * @author Nikita Koksharov
  *
- * {@link EnableAutoConfiguration Auto-configuration} for {@link RedissonCacheStatisticsProvider}
+ * {@link EnableAutoConfiguration Auto-configuration} for {@link RedissonCacheMeterBinderProvider}
  *
  */
 @Configuration
 @AutoConfigureAfter(CacheAutoConfiguration.class)
 @ConditionalOnBean(CacheManager.class)
-@ConditionalOnClass(CacheStatisticsProvider.class)
+@ConditionalOnClass(MeterBinder.class)
 public class RedissonCacheStatisticsAutoConfiguration {
+
     @Bean
-    public RedissonCacheStatisticsProvider redissonCacheStatisticsProvider(){
-        return new RedissonCacheStatisticsProvider();
+    public RedissonCacheMeterBinderProvider redissonCacheMeterBinderProvider(){
+        return new RedissonCacheMeterBinderProvider();
     }
+
 }