[grid] AnnotatedConfig should ignore default values of primitive types

For primitive types, it is impossible to determine whether
or not a value has been set to the default value (false for
booleans, 0 for numbers) or has merely been left blank. The
annotated configs must therefore support the ability to
ignore those values, otherwise they'll be "set", and that
prevents the CompoundConfig from working as expected.

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

@@ -18,6 +18,7 @@
 package org.openqa.selenium.grid.config;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.common.primitives.Primitives;
 
 import java.lang.reflect.Field;
 import java.util.ArrayDeque;
@@ -71,6 +72,21 @@ public AnnotatedConfig(Object obj) {
         continue;
       }
 
+      if (boolean.class.isAssignableFrom(field.getType()) && !(boolean) value) {
+        continue;
+      }
+
+      if (field.getType().isPrimitive()) {
+        Class<?> wrapped = Primitives.wrap(field.getType());
+        if (Number.class.isAssignableFrom(wrapped) && ((Number) value).floatValue() == 0) {
+          continue;
+        }
+      }
+
+      if (Number.class.isAssignableFrom(field.getType()) && ((Number) value).floatValue() == 0f) {
+
+      }
+
       ConfigValue annotation = field.getAnnotation(ConfigValue.class);
       Map<String, String> section = values.getOrDefault(annotation.section(), new HashMap<>());
       section.put(annotation.name(), String.valueOf(value));

java/server/test/org/openqa/selenium/grid/config/AnnotatedConfigTest.java

@@ -18,6 +18,7 @@
 package org.openqa.selenium.grid.config;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -111,4 +112,25 @@ class Child extends Parent {
 
   }
 
+  @Test
+  public void defaultValuesForPrimitivesAreIgnored() {
+    // There's no way to tell the difference between the default values and the value having been
+    // set to the default. Best not worry about it.
+    class Defaults {
+      @ConfigValue(section = "default", name = "bool")
+      private boolean bool;
+      @ConfigValue(section = "default", name = "int")
+      private int integer;
+      @ConfigValue(section = "default", name = "string")
+      private String string;
+    }
+
+    Config config = new AnnotatedConfig(new Defaults());
+
+    assertFalse(config.get("default", "bool").isPresent());
+    assertFalse(config.getBool("default", "bool").isPresent());
+    assertFalse(config.get("default", "int").isPresent());
+    assertFalse(config.getInt("default", "int").isPresent());
+    assertFalse(config.get("default", "string").isPresent());
+  }
 }