delombok var val (#94)

* done for server package * done for config package * done for command.impl package * done for command package * done for all * run refactor auto by intellij * done config props * fix tests
keva-dev · Dec 23, 2021 · 4fdb23d · 4fdb23d
1 parent 9a80c8d
commit 4fdb23d
Show file tree

Hide file tree

Showing 45 changed files with 129 additions and 171 deletions.
diff --git a/app/src/main/java/dev/keva/app/Application.java b/app/src/main/java/dev/keva/app/Application.java
@@ -5,14 +5,14 @@
 import com.keva.config.ConfigLoader;
 import dev.keva.core.config.KevaConfig;
 import dev.keva.core.server.KevaServer;
+import dev.keva.core.server.Server;
 import lombok.extern.slf4j.Slf4j;
-import lombok.val;
 import org.slf4j.LoggerFactory;
 
 @Slf4j
 public final class Application {
     static {
-        val ctx = (LoggerContext) LoggerFactory.getILoggerFactory();
+        LoggerContext ctx = (LoggerContext) LoggerFactory.getILoggerFactory();
         ctx.getLogger("io.netty").setLevel(Level.OFF);
         ctx.getLogger("net.openhft").setLevel(Level.OFF);
         ctx.getLogger("org.reflections").setLevel(Level.OFF);
@@ -21,8 +21,8 @@ public final class Application {
 
     public static void main(String[] args) {
         try {
-            val config = ConfigLoader.loadConfig(args, KevaConfig.class);
-            val server = KevaServer.of(config);
+            KevaConfig config = ConfigLoader.loadConfig(args, KevaConfig.class);
+            Server server = KevaServer.of(config);
             Runtime.getRuntime().addShutdownHook(new Thread(server::shutdown));
             server.run();
         } catch (Exception e) {

diff --git a/config/src/main/java/com/keva/config/ConfigLoader.java b/config/src/main/java/com/keva/config/ConfigLoader.java
@@ -1,9 +1,9 @@
 package com.keva.config;
 
+import com.keva.config.util.ArgsHolder;
 import com.keva.config.util.ArgsParser;
 import com.keva.config.util.ConfigLoaderUtil;
 import lombok.extern.slf4j.Slf4j;
-import lombok.val;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -16,10 +16,10 @@ public final class ConfigLoader {
 
     public static <T> T loadConfig(String[] args, Class<T> clazz) throws IOException {
         T returnConf = ConfigLoaderUtil.fromProperties(new Properties(), clazz);
-        val config = ArgsParser.parse(args);
-        val overrider = ConfigLoaderUtil.fromArgs(config, clazz);
+        ArgsHolder config = ArgsParser.parse(args);
+        T overrider = ConfigLoaderUtil.fromArgs(config, clazz);
 
-        val configFilePath = config.getArgVal("f");
+        String configFilePath = config.getArgVal("f");
         if (configFilePath != null) {
             returnConf = loadConfigFromFile(configFilePath, clazz);
         }
@@ -33,8 +33,8 @@ public static <T> T loadConfigFromFile(String filePath, Class<T> clazz) throws I
         if (filePath.isEmpty()) {
             filePath = DEFAULT_FILE_PATH;
         }
-        val props = new Properties();
-        try (val file = new FileInputStream(filePath)) {
+        Properties props = new Properties();
+        try (FileInputStream file = new FileInputStream(filePath)) {
             props.load(file);
         }
 

diff --git a/config/src/main/java/com/keva/config/util/ArgsParser.java b/config/src/main/java/com/keva/config/util/ArgsParser.java
@@ -1,14 +1,12 @@
 package com.keva.config.util;
 
-import lombok.val;
-
 public final class ArgsParser {
     public static ArgsHolder parse(String[] args) {
-        val holder = new ArgsHolder();
+        ArgsHolder holder = new ArgsHolder();
         for (int i = 0; i < args.length; i++) {
-            val token = args[i];
+            String token = args[i];
             if (token.startsWith("--")) {
-                val name = token.substring(2);
+                String name = token.substring(2);
                 if (i >= args.length - 1) {
                     holder.addFlag(name);
                 } else if (args[i + 1].startsWith("--")) {

diff --git a/config/src/main/java/com/keva/config/util/ConfigLoaderUtil.java b/config/src/main/java/com/keva/config/util/ConfigLoaderUtil.java
@@ -5,20 +5,20 @@
 import com.keva.config.annotation.ConfigProp;
 import lombok.NonNull;
 import lombok.SneakyThrows;
-import lombok.val;
 
+import java.lang.reflect.Field;
 import java.util.Properties;
 
 public class ConfigLoaderUtil {
     @SneakyThrows
     public static <T> T fromProperties(@NonNull Properties props, Class<T> clazz) {
-        val configHolder = clazz.getDeclaredConstructor().newInstance();
-        val fields = clazz.getDeclaredFields();
-        for (val field : fields) {
+        T configHolder = clazz.getDeclaredConstructor().newInstance();
+        Field[] fields = clazz.getDeclaredFields();
+        for (Field field : fields) {
             if (field.isAnnotationPresent(ConfigProp.class)) {
                 field.setAccessible(true);
-                val annotation = field.getAnnotation(ConfigProp.class);
-                val value = parse(props.getProperty(annotation.name(), annotation.defaultVal()), field.getType());
+                ConfigProp annotation = field.getAnnotation(ConfigProp.class);
+                Object value = parse(props.getProperty(annotation.name(), annotation.defaultVal()), field.getType());
                 field.set(configHolder, value);
             }
         }
@@ -28,21 +28,21 @@ public static <T> T fromProperties(@NonNull Properties props, Class<T> clazz) {
 
     @SneakyThrows
     public static <T> T fromArgs(@NonNull ArgsHolder args, Class<T> clazz) {
-        val configHolder = clazz.getDeclaredConstructor().newInstance();
+        T configHolder = clazz.getDeclaredConstructor().newInstance();
 
-        val fields = clazz.getDeclaredFields();
-        for (val field : fields) {
+        Field[] fields = clazz.getDeclaredFields();
+        for (Field field : fields) {
             if (field.isAnnotationPresent(CliProp.class)) {
                 field.setAccessible(true);
-                val cliAnnotate = field.getAnnotation(CliProp.class);
+                CliProp cliAnnotate = field.getAnnotation(CliProp.class);
                 String strVal = null;
                 if (cliAnnotate.type() == CliPropType.VAL) {
                     strVal = args.getArgVal(cliAnnotate.name());
                 } else if (cliAnnotate.type() == CliPropType.FLAG) {
                     strVal = args.getFlag(cliAnnotate.name());
                 }
                 if (strVal != null) {
-                    val value = parse(strVal, field.getType());
+                    Object value = parse(strVal, field.getType());
                     field.set(configHolder, value);
                 }
             }
@@ -54,9 +54,9 @@ public static <T> T fromArgs(@NonNull ArgsHolder args, Class<T> clazz) {
     @SneakyThrows
     public static <T> void merge(T obj1, T obj2) {
         if (obj1 != null && obj2 != null && !obj1.equals(obj2)) {
-            for (val field : obj2.getClass().getDeclaredFields()) {
+            for (Field field : obj2.getClass().getDeclaredFields()) {
                 field.setAccessible(true);
-                val overrideVal = field.get(obj2);
+                Object overrideVal = field.get(obj2);
                 if (overrideVal != null) {
                     field.set(obj1, overrideVal);
                 }

diff --git a/core/src/main/java/dev/keva/core/aof/AOFManager.java b/core/src/main/java/dev/keva/core/aof/AOFManager.java
@@ -1,13 +1,13 @@
 package dev.keva.core.aof;
 
 import dev.keva.core.command.mapping.CommandMapper;
+import dev.keva.core.command.mapping.CommandWrapper;
 import dev.keva.core.config.KevaConfig;
 import dev.keva.ioc.annotation.Autowired;
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.Command;
 import dev.keva.util.hashbytes.BytesKey;
 import lombok.extern.slf4j.Slf4j;
-import lombok.val;
 
 import java.io.IOException;
 import java.util.List;
@@ -36,8 +36,8 @@ public void init() {
             if (commands != null) {
                 log.info("Processing {} commands from AOF file", commands.size());
                 for (Command command : commands) {
-                    val name = command.getName();
-                    val commandWrapper = commandMapper.getMethods().get(new BytesKey(name));
+                    byte[] name = command.getName();
+                    CommandWrapper commandWrapper = commandMapper.getMethods().get(new BytesKey(name));
                     if (commandWrapper != null) {
                         commandWrapper.execute(null, command);
                     }

diff --git a/core/src/main/java/dev/keva/core/command/impl/hash/HDel.java b/core/src/main/java/dev/keva/core/command/impl/hash/HDel.java
@@ -8,7 +8,6 @@
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.IntegerReply;
 import dev.keva.store.KevaDatabase;
-import lombok.val;
 
 @Component
 @CommandImpl("hdel")
@@ -25,8 +24,8 @@ public HDel(KevaDatabase database) {
     @Execute
     public IntegerReply execute(byte[] key, byte[]... fields) {
         int deleted = 0;
-        for (val field : fields) {
-            val result = database.hdel(key, field);
+        for (byte[] field : fields) {
+            boolean result = database.hdel(key, field);
             if (result) {
                 deleted++;
             }

diff --git a/core/src/main/java/dev/keva/core/command/impl/hash/HExists.java b/core/src/main/java/dev/keva/core/command/impl/hash/HExists.java
@@ -7,7 +7,6 @@
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.IntegerReply;
 import dev.keva.store.KevaDatabase;
-import lombok.val;
 
 @Component
 @CommandImpl("hexists")
@@ -22,7 +21,7 @@ public HExists(KevaDatabase database) {
 
     @Execute
     public IntegerReply execute(byte[] key, byte[] field) {
-        val got = database.hget(key, field);
+        byte[] got = database.hget(key, field);
         return got == null ? new IntegerReply(0) : new IntegerReply(1);
     }
 }
diff --git a/core/src/main/java/dev/keva/core/command/impl/hash/HGet.java b/core/src/main/java/dev/keva/core/command/impl/hash/HGet.java
@@ -7,7 +7,6 @@
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.BulkReply;
 import dev.keva.store.KevaDatabase;
-import lombok.val;
 
 @Component
 @CommandImpl("hget")
@@ -22,7 +21,7 @@ public HGet(KevaDatabase database) {
 
     @Execute
     public BulkReply execute(byte[] key, byte[] field) {
-        val got = database.hget(key, field);
+        byte[] got = database.hget(key, field);
         return got == null ? BulkReply.NIL_REPLY : new BulkReply(got);
     }
 }
diff --git a/core/src/main/java/dev/keva/core/command/impl/hash/HGetAll.java b/core/src/main/java/dev/keva/core/command/impl/hash/HGetAll.java
@@ -8,7 +8,6 @@
 import dev.keva.protocol.resp.reply.BulkReply;
 import dev.keva.protocol.resp.reply.MultiBulkReply;
 import dev.keva.store.KevaDatabase;
-import lombok.val;
 
 @Component
 @CommandImpl("hgetall")
@@ -23,7 +22,7 @@ public HGetAll(KevaDatabase database) {
 
     @Execute
     public MultiBulkReply execute(byte[] key) {
-        val got = database.hgetAll(key);
+        byte[][] got = database.hgetAll(key);
         BulkReply[] replies = new BulkReply[got.length];
         for (int i = 0; i < got.length; i++) {
             replies[i] = new BulkReply(got[i]);

diff --git a/core/src/main/java/dev/keva/core/command/impl/hash/HKeys.java b/core/src/main/java/dev/keva/core/command/impl/hash/HKeys.java
@@ -8,7 +8,6 @@
 import dev.keva.protocol.resp.reply.BulkReply;
 import dev.keva.protocol.resp.reply.MultiBulkReply;
 import dev.keva.store.KevaDatabase;
-import lombok.val;
 
 @Component
 @CommandImpl("hkeys")
@@ -23,7 +22,7 @@ public HKeys(KevaDatabase database) {
 
     @Execute
     public MultiBulkReply execute(byte[] key) {
-        val got = database.hkeys(key);
+        byte[][] got = database.hkeys(key);
         BulkReply[] replies = new BulkReply[got.length];
         for (int i = 0; i < got.length; i++) {
             replies[i] = new BulkReply(got[i]);

diff --git a/core/src/main/java/dev/keva/core/command/impl/hash/HLen.java b/core/src/main/java/dev/keva/core/command/impl/hash/HLen.java
@@ -7,7 +7,6 @@
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.IntegerReply;
 import dev.keva.store.KevaDatabase;
-import lombok.val;
 
 @Component
 @CommandImpl("hlen")
@@ -22,7 +21,7 @@ public HLen(KevaDatabase database) {
 
     @Execute
     public IntegerReply execute(byte[] key) {
-        val got = database.hgetAll(key);
+        byte[][] got = database.hgetAll(key);
         return got == null ? new IntegerReply(0) : new IntegerReply(got.length / 2);
     }
 }
diff --git a/core/src/main/java/dev/keva/core/command/impl/hash/HStrLen.java b/core/src/main/java/dev/keva/core/command/impl/hash/HStrLen.java
@@ -7,7 +7,6 @@
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.IntegerReply;
 import dev.keva.store.KevaDatabase;
-import lombok.val;
 
 @Component
 @CommandImpl("hstrlen")
@@ -22,7 +21,7 @@ public HStrLen(KevaDatabase database) {
 
     @Execute
     public IntegerReply execute(byte[] key, byte[] field) {
-        val got = database.hget(key, field);
+        byte[] got = database.hget(key, field);
         return got == null ? new IntegerReply(0) : new IntegerReply(got.length);
     }
 }
diff --git a/core/src/main/java/dev/keva/core/command/impl/hash/HVals.java b/core/src/main/java/dev/keva/core/command/impl/hash/HVals.java
@@ -8,7 +8,6 @@
 import dev.keva.protocol.resp.reply.BulkReply;
 import dev.keva.protocol.resp.reply.MultiBulkReply;
 import dev.keva.store.KevaDatabase;
-import lombok.val;
 
 @Component
 @CommandImpl("hvals")
@@ -23,7 +22,7 @@ public HVals(KevaDatabase database) {
 
     @Execute
     public MultiBulkReply execute(byte[] key) {
-        val got = database.hvals(key);
+        byte[][] got = database.hvals(key);
         BulkReply[] replies = new BulkReply[got.length];
         for (int i = 0; i < got.length; i++) {
             replies[i] = new BulkReply(got[i]);

diff --git a/core/src/main/java/dev/keva/core/command/impl/key/Dump.java b/core/src/main/java/dev/keva/core/command/impl/key/Dump.java
@@ -8,7 +8,6 @@
 import dev.keva.protocol.resp.reply.BulkReply;
 import dev.keva.protocol.resp.reply.Reply;
 import dev.keva.store.KevaDatabase;
-import lombok.val;
 
 import java.util.Base64;
 
@@ -25,7 +24,7 @@ public Dump(KevaDatabase database) {
 
     @Execute
     public Reply<?> execute(byte[] key) {
-        val got = database.get(key);
+        byte[] got = database.get(key);
         if (got == null) {
             return BulkReply.NIL_REPLY;
         }

diff --git a/core/src/main/java/dev/keva/core/command/impl/key/ExpireAt.java b/core/src/main/java/dev/keva/core/command/impl/key/ExpireAt.java
@@ -6,11 +6,10 @@
 import dev.keva.ioc.annotation.Autowired;
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.IntegerReply;
+import dev.keva.store.KevaDatabase;
 
 import java.nio.charset.StandardCharsets;
 
-import dev.keva.store.KevaDatabase;
-
 @Component
 @CommandImpl("expireat")
 @ParamLength(2)

diff --git a/core/src/main/java/dev/keva/core/command/impl/key/Restore.java b/core/src/main/java/dev/keva/core/command/impl/key/Restore.java
@@ -9,7 +9,6 @@
 import dev.keva.protocol.resp.reply.Reply;
 import dev.keva.protocol.resp.reply.StatusReply;
 import dev.keva.store.KevaDatabase;
-import lombok.val;
 
 import java.math.BigInteger;
 import java.util.Base64;
@@ -27,7 +26,7 @@ public Restore(KevaDatabase database) {
 
     @Execute
     public Reply<?> execute(byte[] key, byte[] ttl, byte[] dump, byte[] replace) {
-        val old = database.get(key);
+        byte[] old = database.get(key);
         boolean isReplace = replace != null && new String(replace).equalsIgnoreCase("REPLACE");
         if (old != null && !isReplace) {
             return new ErrorReply("ERR Target key name is busy");

diff --git a/core/src/main/java/dev/keva/core/command/impl/key/Type.java b/core/src/main/java/dev/keva/core/command/impl/key/Type.java
@@ -7,7 +7,6 @@
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.StatusReply;
 import dev.keva.store.KevaDatabase;
-import lombok.val;
 import org.apache.commons.lang3.SerializationException;
 import org.apache.commons.lang3.SerializationUtils;
 
@@ -28,7 +27,7 @@ public Type(KevaDatabase database) {
 
     @Execute
     public StatusReply execute(byte[] key) {
-        val got = database.get(key);
+        byte[] got = database.get(key);
         if (got == null) {
             return new StatusReply("none");
         }

diff --git a/core/src/main/java/dev/keva/core/command/impl/list/LIndex.java b/core/src/main/java/dev/keva/core/command/impl/list/LIndex.java
@@ -7,7 +7,6 @@
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.BulkReply;
 import dev.keva.store.KevaDatabase;
-import lombok.val;
 
 @Component
 @CommandImpl("lindex")
@@ -22,7 +21,7 @@ public LIndex(KevaDatabase database) {
 
     @Execute
     public BulkReply execute(byte[] key, byte[] index) {
-        val got = database.lindex(key, Integer.parseInt(new String(index)));
+        byte[] got = database.lindex(key, Integer.parseInt(new String(index)));
         return got == null ? BulkReply.NIL_REPLY : new BulkReply(got);
     }
 }