From 3ca5c8c234069df34201870c580cd4b83a52470a Mon Sep 17 00:00:00 2001 From: Daniel Geller Date: Thu, 18 Jan 2018 12:51:54 -0500 Subject: [PATCH 1/2] Make prefixName and suffixName be static methods. They do not use any instance variables or instance context, and making them static allows for easier extension of Redisson with custom functionality on Redisson internal admin/management objects. --- redisson/src/main/java/org/redisson/RedissonObject.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/redisson/src/main/java/org/redisson/RedissonObject.java b/redisson/src/main/java/org/redisson/RedissonObject.java index 1c2e6e7dd..0bbd82121 100644 --- a/redisson/src/main/java/org/redisson/RedissonObject.java +++ b/redisson/src/main/java/org/redisson/RedissonObject.java @@ -57,14 +57,14 @@ public abstract class RedissonObject implements RObject { return commandExecutor.await(future, timeout, timeoutUnit); } - protected String prefixName(String prefix, String name) { + protected static String prefixName(String prefix, String name) { if (name.contains("{")) { return prefix + ":" + name; } return prefix + ":{" + name + "}"; } - protected String suffixName(String name, String suffix) { + protected static String suffixName(String name, String suffix) { if (name.contains("{")) { return name + ":" + suffix; } From 949bbe7f0110d00084ed67766ea4419477e24c34 Mon Sep 17 00:00:00 2001 From: Nikita Date: Wed, 24 Jan 2018 09:48:05 +0300 Subject: [PATCH 2/2] compilation fixed --- redisson/src/main/java/org/redisson/RedissonDoubleAdder.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/redisson/src/main/java/org/redisson/RedissonDoubleAdder.java b/redisson/src/main/java/org/redisson/RedissonDoubleAdder.java index 2803d7ef3..66cc94cb6 100644 --- a/redisson/src/main/java/org/redisson/RedissonDoubleAdder.java +++ b/redisson/src/main/java/org/redisson/RedissonDoubleAdder.java @@ -15,13 +15,12 @@ */ package org.redisson; -import java.util.concurrent.atomic.DoubleAdder; - import org.redisson.api.RAtomicDouble; import org.redisson.api.RDoubleAdder; import org.redisson.api.RFuture; import org.redisson.api.RedissonClient; import org.redisson.command.CommandAsyncExecutor; +import org.redisson.misc.DoubleAdder; /** *