[grid] Avoiding hacks to display config options properly

This makes the code a bit more decent and allows to
display the configuration help properly when an option
should be configured through an array of tables.

Author: diemol

java/server/src/org/openqa/selenium/grid/config/ConfigFlags.java

@@ -105,8 +105,10 @@ public boolean dumpConfigHelp(Config config, Set<Role> currentRoles, PrintStream
           demoToml.append("# ").append(option.description).append("\n");
         }
         demoToml.append("# Type: ").append(option.type).append("\n");
-        if (option.optionName.contains(String.format("%s.", section))) {
+        if (option.prefixed) {
           demoToml.append("[[")
+            .append(section)
+            .append(".")
             .append(option.optionName)
             .append("]]")
             .append(option.example(config))

java/server/src/org/openqa/selenium/grid/config/ConfigValue.java

@@ -34,5 +34,7 @@
 
   String name();
 
+  boolean prefixed() default false;
+
   String example();
 }

java/server/src/org/openqa/selenium/grid/config/DescribedOption.java

@@ -48,6 +48,7 @@ public class DescribedOption implements Comparable<DescribedOption> {
   public final String description;
   public final String type;
   public final String example;
+  public final boolean prefixed;
   public final boolean repeats;
   public final boolean quotable;
   public final Set<String> flags;
@@ -61,6 +62,7 @@ public class DescribedOption implements Comparable<DescribedOption> {
     this.optionName = configValue.name();
     this.type = getType(type);
     this.description = parameter.description();
+    this.prefixed = configValue.prefixed();
     this.repeats = isCollection(type);
     this.quotable = isTomlStringType(type);
     this.example = configValue.example();