fix Keva config, add --port arguments (#124)

Co-authored-by: tuna <[email protected]>
Co-authored-by: Huynh, Tu | RASIA <[email protected]>

Author: 3 people

config/src/main/java/com/keva/config/ConfigLoader.java

@@ -19,7 +19,7 @@ public static <T> T loadConfig(String[] args, Class<T> clazz) throws IOException
         ArgsHolder config = ArgsParser.parse(args);
         T overrider = ConfigLoaderUtil.fromArgs(config, clazz);
 
-        String configFilePath = config.getArgVal("f");
+        String configFilePath = config.getArgVal(new String[]{"f"});
         if (configFilePath != null) {
             returnConf = loadConfigFromFile(configFilePath, clazz);
         }

config/src/main/java/com/keva/config/annotation/CliProp.java

@@ -8,7 +8,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
 public @interface CliProp {
-    String name();
+    String[] name();
 
     CliPropType type();
 

config/src/main/java/com/keva/config/util/ArgsHolder.java

@@ -17,12 +17,14 @@ public void addFlag(String name) {
     }
 
     @SuppressWarnings("ReturnOfNull")
-    public String getFlag(String name) {
-        if (values.containsKey(name)) {
-            return "true".equalsIgnoreCase(values.get(name)) ? "true" : "false";
-        }
-        if (flags.contains(name)) {
-            return "true";
+    public String getFlag(String[] names) {
+        for (String name : names) {
+            if (values.containsKey(name)) {
+                return "true".equalsIgnoreCase(values.get(name)) ? "true" : "false";
+            }
+            if (flags.contains(name)) {
+                return "true";
+            }
         }
         return null;
     }
@@ -32,9 +34,11 @@ public void addArgVal(String name, String value) {
     }
 
     @SuppressWarnings("ReturnOfNull")
-    public String getArgVal(String name) {
-        if (values.containsKey(name)) {
-            return values.get(name);
+    public String getArgVal(String[] names) {
+        for (String name : names) {
+            if (values.containsKey(name)) {
+                return values.get(name);
+            }
         }
         return null;
     }

config/src/test/java/com/keva/config/ArgsParserTest.java

@@ -15,31 +15,31 @@ void parse() {
                 "--p", "123123", "--a", "--b"
         };
         ArgsHolder parse = ArgsParser.parse(args);
-        assertEquals("true", parse.getFlag("a"));
-        assertEquals("true", parse.getFlag("b"));
-        assertEquals("123123", parse.getArgVal("p"));
+        assertEquals("true", parse.getFlag(new String[]{"a"}));
+        assertEquals("true", parse.getFlag(new String[]{"b"}));
+        assertEquals("123123", parse.getArgVal(new String[]{"p"}));
 
         args = new String[]{
                 "--a", "--b", "false"
         };
         parse = ArgsParser.parse(args);
-        assertEquals("true", parse.getFlag("a"));
-        assertEquals("false", parse.getArgVal("b"));
+        assertEquals("true", parse.getFlag(new String[]{"a"}));
+        assertEquals("false", parse.getArgVal(new String[]{"b"}));
 
         args = new String[]{
                 "--a", "--b", "false"
         };
         parse = ArgsParser.parse(args);
-        assertEquals("true", parse.getFlag("a"));
-        assertEquals("false", parse.getFlag("b"));
+        assertEquals("true", parse.getFlag(new String[]{"a"}));
+        assertEquals("false", parse.getFlag(new String[]{"b"}));
 
         args = new String[]{
                 "--a", "aa", "--b", "notTrue"
         };
         parse = ArgsParser.parse(args);
-        assertEquals("aa", parse.getArgVal("a"));
-        assertEquals("false", parse.getFlag("b"));
-        assertNull(parse.getFlag("c"));
-        assertNull(parse.getArgVal("c"));
+        assertEquals("aa", parse.getArgVal(new String[]{"a"}));
+        assertEquals("false", parse.getFlag(new String[]{"b"}));
+        assertNull(parse.getFlag(new String[]{"c"}));
+        assertNull(parse.getArgVal(new String[]{"c"}));
     }
 }

core/src/main/java/dev/keva/core/config/KevaConfig.java

@@ -16,16 +16,16 @@
 @AllArgsConstructor
 @Configuration
 public class KevaConfig {
-    @ConfigProp(name = "host", defaultVal = "localhost")
-    @CliProp(name = "host", type = CliPropType.VAL)
+    @ConfigProp(name = "hostname", defaultVal = "localhost")
+    @CliProp(name = {"h", "host"}, type = CliPropType.VAL)
     private String hostname;
 
     @ConfigProp(name = "port", defaultVal = "6379")
-    @CliProp(name = "port", type = CliPropType.VAL)
+    @CliProp(name = {"p", "port"}, type = CliPropType.VAL)
     private Integer port;
 
     @ConfigProp(name = "save", defaultVal = "true")
-    @CliProp(name = "save", type = CliPropType.FLAG)
+    @CliProp(name = {"save", "s"}, type = CliPropType.FLAG)
     private Boolean persistence;
 
     @ConfigProp(name = "appendonly", defaultVal = "false")
@@ -57,7 +57,6 @@ public static KevaConfig ofDefaults() {
                 .persistence(true)
                 .aof(false)
                 .aofInterval(1000)
-                .ioThreads(-1)
                 .build();
     }
 }

docs/src/guide/overview/install.md

@@ -24,7 +24,7 @@ Parameters:
 
     Option                          Description
     ------                          -----------
-    --port <Integer>                Accept connections on the specified port (default: 6379)
+    --p, --port <Integer>           Accept connections on the specified port (default: 6379)
     --save <Boolean>                Enable save the DB to disk (default: true)
     --appendonly <Boolean>          Enable append-only-file (default: false)
     --appendfsync <Integer>         Define append-only fsync in ms (default: 1000)