files gateway can now boot

Kangol · Kangol · commit 1b36173024d4 · 2023-05-19T18:19:14.000+08:00
diff --git a/boot/src/main/java/com/ricequant/rqboot/boot/IApplication.java b/boot/src/main/java/com/ricequant/rqboot/boot/IApplication.java
@@ -10,10 +10,6 @@
  */
 public interface IApplication {
 
-  default boolean withDefaultArgs() {
-    return false;
-  }
-
   String getAppName();
 
   void customizeArgs(CommandLineArgs definedArgs);
diff --git a/boot/src/main/java/com/ricequant/rqboot/boot/RicequantMain.java b/boot/src/main/java/com/ricequant/rqboot/boot/RicequantMain.java
@@ -146,7 +146,7 @@ public void init(String[] args) {
     }
 
     CommandLineParser cp = new CommandLineParser(iApplication.getAppName());
-    CommandLineArgs definedArgs = new CommandLineArgs(iApplication.withDefaultArgs());
+    CommandLineArgs definedArgs = new CommandLineArgs();
     iApplication.customizeArgs(definedArgs);
 
     OptionMap optionMap = cp.parse(args, definedArgs);
diff --git a/config/src/main/java/com/ricequant/rqboot/config/cmd/CommandLineArgs.java b/config/src/main/java/com/ricequant/rqboot/config/cmd/CommandLineArgs.java
@@ -17,31 +17,18 @@ public class CommandLineArgs {
   private final List<IArgument> iArgumentList;
 
   public CommandLineArgs() {
-    this(false);
-  }
-
-  public CommandLineArgs(boolean withDefaultOptions) {
     iOptions = new Options();
     iNameArgumentMap = new HashMap<>();
     iArgumentList = new ArrayList<>();
 
     withArguments(RicemapDefaultArgs.Help);
     withArguments(RicemapDefaultArgs.InstanceName);
-
-    if (withDefaultOptions)
-      initOptions();
   }
 
-  private void initOptions() {
-    withArguments(RicemapDefaultArgs.DevMode);
-    withArguments(RicemapDefaultArgs.ConfigFile);
-    withArguments(RicemapDefaultArgs.TempDir);
-    withArguments(RicemapDefaultArgs.DebugLevel);
-    withArguments(RicemapDefaultArgs.JmxPort);
-    withArguments(RicemapDefaultArgs.JmxHost);
-    withArguments(RicemapDefaultArgs.Cwd);
-    withArguments(RicemapDefaultArgs.IsStatOpen);
-    withArguments(RicemapDefaultArgs.SerializerType);
+  public void withDefaultOptions() {
+    withArguments(RicemapDefaultArgs.DevMode, RicemapDefaultArgs.ConfigFile, RicemapDefaultArgs.TempDir,
+            RicemapDefaultArgs.DebugLevel, RicemapDefaultArgs.JmxPort, RicemapDefaultArgs.JmxHost,
+            RicemapDefaultArgs.Cwd, RicemapDefaultArgs.IsStatOpen, RicemapDefaultArgs.SerializerType);
   }
 
   public void withArguments(IArgument... arguments) {

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ public void init(String[] args) {`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`CommandLineParser cp = new CommandLineParser(iApplication.getAppName());`
`149`		`- CommandLineArgs definedArgs = new CommandLineArgs(iApplication.withDefaultArgs());`
	`149`	`+ CommandLineArgs definedArgs = new CommandLineArgs();`
`150`	`150`	`iApplication.customizeArgs(definedArgs);`
`151`	`151`
`152`	`152`	`OptionMap optionMap = cp.parse(args, definedArgs);`