Revert "CmdLineParser: Remove unused prefix argument"

This reverts commit 8c380ffca36399fec35a84f13677efc751650a9a.

Reason for revert: While the prefix argument defaults to "", 
it is needed to make use of the Options(prefix=) annotation.

Release-Notes: skip
Change-Id: I8941a127be47911dec6f7b99b7115489570058e1

1 files changed, 4 insertions, 3 deletions

diff --git a/java/com/google/gerrit/util/cli/CmdLineParser.java b/java/com/google/gerrit/util/cli/CmdLineParser.java
index 5b7ea3f8ea..86cc7f2e25 100644
--- a/java/com/google/gerrit/util/cli/CmdLineParser.java
+++ b/java/com/google/gerrit/util/cli/CmdLineParser.java
@@ -412,7 +412,7 @@ public class CmdLineParser {
 
     MyParser(Object bean) {
       super(bean, ParserProperties.defaults().withAtSyntax(false));
-      parseAdditionalOptions(bean, new HashSet<>());
+      parseAdditionalOptions("", bean, new HashSet<>());
       ensureOptionsInitialized();
     }
 
@@ -450,7 +450,7 @@ public class CmdLineParser {
       }
     }
 
-    private void parseAdditionalOptions(Object bean, Set<Object> parsedBeans) {
+    private void parseAdditionalOptions(String prefix, Object bean, Set<Object> parsedBeans) {
       for (Class<?> c = bean.getClass(); c != null; c = c.getSuperclass()) {
         for (Field f : c.getDeclaredFields()) {
           if (f.isAnnotationPresent(Options.class)) {
@@ -460,7 +460,8 @@ public class CmdLineParser {
             } catch (IllegalAccessException e) {
               throw new IllegalAnnotationError(e);
             }
-            parseWithPrefix(f.getAnnotation(Options.class).prefix(), additionalBean, parsedBeans);
+            parseWithPrefix(
+                prefix + f.getAnnotation(Options.class).prefix(), additionalBean, parsedBeans);
           }
         }
       }