Cleanup around GFLauncher and StartServerHelper

Signed-off-by: David Matějček <[email protected]>

Author: dmatej

nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/CLICommand.java

@@ -285,7 +285,7 @@ public int execute(String... argv) throws CommandException {
         validate();
         if (programOpts.isEcho()) {
             logger.info(echoCommand());
-            // In order to avoid echoing commands used intenally to the
+            // In order to avoid echoing commands used internally to the
             // implementation of *this* command, we turn off echo after
             // having echoed this command.
             programOpts.setEcho(false);
@@ -297,14 +297,14 @@ public int execute(String... argv) throws CommandException {
     }
 
     /**
-     * Return the name of this command.
+     * @return the name of this command.
      */
     public String getName() {
         return name;
     }
 
     /**
-     * Return the command scope for this command.  The command scope is
+     * @return the command scope for this command.  The command scope is
      * a name space in which commands are defined. Command clients can specify a scope
      * to use in looking up a command. Currently this is only used for remote
      * commands. By default, the context is null.
@@ -330,7 +330,7 @@ public ProgramOptions getProgramOptions() {
     }
 
     /**
-     * Return a BufferedReader for the man page for this command, or null if not found.
+     * @return a BufferedReader for the man page for this command, or null if not found.
      */
     public BufferedReader getManPage() {
         String commandName = getName();
@@ -347,17 +347,17 @@ public BufferedReader getManPage() {
     }
 
     /**
-     * Return a man page for this command that has the tokens substituted
+     * @return a man page for this command that has the tokens substituted
      */
-    public BufferedReader expandManPage(Reader r) {
+    public BufferedReader expandManPage(Reader reader) {
         manpageTokenValues[0] = programOpts.getCommandName();
         manpageTokenValues[1] = Environment.getPrefix();
         manpageTokenValues[2] = Version.getProductNameAbbreviation();
         TokenValueSet tvs = new TokenValueSet();
         for (int i = 0; i < manpageTokens.length; i++) {
             tvs.add(new TokenValue(manpageTokens[i], manpageTokenValues[i], "{", "}"));
         }
-        return new BufferedReader(new LineTokenReplacer(tvs).getReader(r));
+        return new BufferedReader(new LineTokenReplacer(tvs).getReader(reader));
     }
 
     /**
@@ -368,15 +368,14 @@ public BufferedReader expandManPage(Reader r) {
      */
     public String getUsage() {
         String usage;
-        if (commandModel != null && ok(usage = commandModel.getUsageText())) {
-            StringBuilder usageText = new StringBuilder();
-            usageText.append(strings.get("Usage", strings.get("Usage.brief", programOpts.getCommandName())));
-            usageText.append(" ");
-            usageText.append(usage);
-            return usageText.toString();
-        } else {
+        if (commandModel == null || !ok(usage = commandModel.getUsageText())) {
             return generateUsageText();
         }
+        StringBuilder usageText = new StringBuilder();
+        usageText.append(strings.get("Usage", strings.get("Usage.brief", programOpts.getCommandName())));
+        usageText.append(" ");
+        usageText.append(usage);
+        return usageText.toString();
     }
 
     private String generateUsageText() {
@@ -632,9 +631,8 @@ public static String quote(String value) {
             StringBuilder sb = new StringBuilder(len + 2);
             sb.append('"').append(value).append('"');
             return sb.toString();
-        } else {
-            return value;
         }
+        return value;
     }
 
     /**
@@ -798,30 +796,25 @@ protected void checkSanity() {
      * option. If so, get the man page using the getManPage method, copy the content to System.out, and return true.
      * Otherwise return false. Subclasses may override this method to perform a different check or to use a different method
      * to display the man page. If this method returns true, the validate and executeCommand methods won't be called.
+     *
+     * @return true to end the program as we just printed the man page.
      */
     protected boolean checkHelp() throws CommandException {
-        if (programOpts.isHelp()) {
-            BufferedReader br = getManPage();
-            if (br == null) {
-                throw new CommandException(strings.get("ManpageMissing", name));
-            }
-            br = expandManPage(br);
+        if (!programOpts.isHelp()) {
+            return false;
+        }
+        final BufferedReader manPage = getManPage();
+        if (manPage == null) {
+            throw new CommandException(strings.get("ManpageMissing", name));
+        }
+        try (BufferedReader expandedManPage = expandManPage(manPage)) {
             String line;
-            try {
-                while ((line = br.readLine()) != null) {
-                    System.out.println(line);
-                }
-            } catch (IOException ioex) {
-                throw new CommandException(strings.get("ManpageMissing", name), ioex);
-            } finally {
-                try {
-                    br.close();
-                } catch (IOException ex) {
-                }
+            while ((line = expandedManPage.readLine()) != null) {
+                System.out.println(line);
             }
             return true;
-        } else {
-            return false;
+        } catch (IOException ioex) {
+            throw new CommandException(strings.get("ManpageMissing", name), ioex);
         }
     }
 

nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/HelpCommand.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Contributors to the Eclipse Foundation.
+ * Copyright (c) 2024, 2025 Contributors to the Eclipse Foundation.
  * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -54,16 +54,17 @@ public class HelpCommand extends CLICommand {
 
     @Override
     protected int executeCommand() throws CommandException, CommandValidationException {
-        try {
-            new More(getPageLength(), getSource(), getDestination(), getUserInput(), getUserOutput(), getQuitChar(), getPrompt());
+        try (Reader source = getSource()) {
+            More more = new More(getUserInput(), getUserOutput(), getQuitChar(), getPrompt());
+            more.view(getPageLength(), source, getDestination());
+            return 0;
         } catch (IOException ioe) {
             throw new CommandException(ioe);
         }
-        return 0;
     }
 
     private String getCommandName() {
-        return cmd != null ? cmd : DEFAULT_HELP_PAGE;
+        return cmd == null ? DEFAULT_HELP_PAGE : cmd;
     }
 
     private Writer getDestination() {
@@ -87,11 +88,11 @@ private String getQuitChar() {
 
     private Reader getSource() throws CommandException, CommandValidationException {
         CLICommand command = CLICommand.getCommand(habitat, getCommandName());
-        Reader r = command.getManPage();
-        if (r == null) {
+        final Reader reader = command.getManPage();
+        if (reader == null) {
             throw new CommandException(strings.get("ManpageMissing", getCommandName()));
         }
-        return expandManPage(r);
+        return expandManPage(reader);
     }
 
     private Reader getUserInput() {

nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/More.java

@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation.
  * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -29,20 +30,21 @@
  *
  * This class provides a primitive more(1) functionality, paging through the given file, with an optional pagelength.
  */
-
-public class More {
+class More {
     private BufferedReader in;
     private BufferedWriter out;
     private String quit;
     private String prompt;
 
-    public More(int linesPerPage, Reader src, Writer dest, Reader fromUser, Writer toUser, String quitPrefix, String prompt)
-            throws IOException {
+    More(Reader fromUser, Writer toUser, String quitPrefix, String prompt) throws IOException {
         in = new BufferedReader(fromUser);
         out = new BufferedWriter(toUser);
         quit = quitPrefix;
         this.prompt = prompt;
 
+    }
+
+    void view(int linesPerPage, Reader src, Writer dest) throws IOException {
         Pager pager = new Pager(linesPerPage, src, dest);
         do {
             pager.nextPage();
@@ -53,7 +55,7 @@ public More(int linesPerPage, Reader src, Writer dest, Reader fromUser, Writer t
      * Return false iff the line read from the user starts with the quit character. This is a blocking call, waiting on
      * input from the user
      */
-    boolean wantsToContinue() throws IOException {
+    private boolean wantsToContinue() throws IOException {
         out.write(prompt);
         out.newLine();
         out.flush();

nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/ProgramOptions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022, 2025 Contributors to the Eclipse Foundation
  * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -566,18 +566,12 @@ public void setInteractive(boolean interactive) {
      * @return the help
      */
     public boolean isHelp() {
-        boolean help = false;
         if (options.containsKey(HELP)) {
             String value = options.getOne(HELP);
-            if (ok(value)) {
-                help = Boolean.parseBoolean(value);
-            } else {
-                help = true;
-            }
-        } else {
-            help = env.getBooleanOption(HELP);
+            // --help=true or --help
+            return ok(value) ? Boolean.parseBoolean(value) : true;
         }
-        return help;
+        return env.getBooleanOption(HELP);
     }
 
     /**

nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/GFEmbeddedLauncher.java

@@ -104,8 +104,8 @@ public void setup() throws GFLauncherException, MiniXmlParserException {
         setup = true;
         try {
             setupFromEnv();
-        } catch (GFLauncherException gfle) {
-            throw new GFLauncherException(GENERAL_MESSAGE + gfle.getMessage(), gfle);
+        } catch (GFLauncherException e) {
+            throw new GFLauncherException(GENERAL_MESSAGE + e.getMessage(), e);
         }
 
         initCommandLine();
@@ -161,7 +161,7 @@ public void setup() throws GFLauncherException, MiniXmlParserException {
     }
 
     @Override
-    public String getLogFilename() throws GFLauncherException {
+    public String getLogFilename() {
         return logFilename;
     }