refactoring

redisson/src/main/java/org/redisson/Redisson.java

@@ -20,7 +20,7 @@ import org.redisson.api.redisnode.*;
 import org.redisson.client.codec.Codec;
 import org.redisson.codec.JsonCodec;
 import org.redisson.command.CommandAsyncExecutor;
-import org.redisson.command.CommandSyncService;
+import org.redisson.command.CommandAsyncService;
 import org.redisson.config.Config;
 import org.redisson.config.ConfigSupport;
 import org.redisson.connection.ConnectionManager;
@@ -71,7 +71,7 @@ public class Redisson implements RedissonClient {
         if (config.isReferenceEnabled()) {
             objectBuilder = new RedissonObjectBuilder(this);
         }
-        commandExecutor = new CommandSyncService(connectionManager, objectBuilder);
+        commandExecutor = new CommandAsyncService(connectionManager, objectBuilder, RedissonObjectBuilder.ReferenceType.DEFAULT);
         evictionScheduler = new EvictionScheduler(commandExecutor);
         writeBehindService = new WriteBehindService(commandExecutor);
     }

redisson/src/main/java/org/redisson/command/CommandExecutor.java

@@ -1,25 +0,0 @@
-/**
- * Copyright (c) 2013-2022 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.command;
-
-/**
- *
- * @author Nikita Koksharov
- *
- */
-public interface CommandExecutor extends CommandSyncExecutor, CommandAsyncExecutor {
-
-}

redisson/src/main/java/org/redisson/command/CommandSyncExecutor.java

@@ -1,38 +0,0 @@
-/**
- * Copyright (c) 2013-2022 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.command;
-
-import org.redisson.api.RFuture;
-import org.redisson.client.codec.Codec;
-import org.redisson.client.protocol.RedisCommand;
-import org.redisson.connection.ConnectionManager;
-
-/**
- *
- * @author Nikita Koksharov
- *
- */
-public interface CommandSyncExecutor {
-
-    <V> V get(RFuture<V> future);
-
-    <T, R> R read(String key, RedisCommand<T> command, Object... params);
-
-    <T, R> R read(String key, Codec codec, RedisCommand<T> command, Object... params);
-
-    ConnectionManager getConnectionManager();
-
-}

redisson/src/main/java/org/redisson/command/CommandSyncService.java

@@ -1,46 +0,0 @@
-/**
- * Copyright (c) 2013-2022 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.command;
-
-import org.redisson.api.RFuture;
-import org.redisson.client.codec.Codec;
-import org.redisson.client.protocol.RedisCommand;
-import org.redisson.connection.ConnectionManager;
-import org.redisson.liveobject.core.RedissonObjectBuilder;
-
-/**
- *
- * @author Nikita Koksharov
- *
- */
-public class CommandSyncService extends CommandAsyncService implements CommandExecutor {
-
-    public CommandSyncService(ConnectionManager connectionManager, RedissonObjectBuilder objectBuilder) {
-        super(connectionManager, objectBuilder, RedissonObjectBuilder.ReferenceType.DEFAULT);
-    }
-
-    @Override
-    public <T, R> R read(String key, RedisCommand<T> command, Object... params) {
-        return read(key, codec, command, params);
-    }
-
-    @Override
-    public <T, R> R read(String key, Codec codec, RedisCommand<T> command, Object... params) {
-        RFuture<R> res = readAsync(key, codec, command, params);
-        return get(res);
-    }
-
-}