ConfigInstanceBuilder cleanups:

- Remove unused methods from ConfigInstanceBuilder
- Share the same code between ConfigInstanceBuilder and ConfigMappingContext
- Simplify ConfigMappingGenerator

Author: radcortez

implementation/src/main/java/io/smallrye/config/ConfigInstanceBuilder.java

@@ -14,7 +14,7 @@
 import org.eclipse.microprofile.config.spi.Converter;
 
 /**
- * A builder which can produce instances of a configuration interface.
+ * A builder which can produce instances of a configuration interface annotated with {@link ConfigMapping}.
  * <p>
  * Objects which are produced by this API will contain values for every property found on the configuration
  * interface or its supertypes.
@@ -24,22 +24,42 @@
  * If the runtime is Java 16 or later, the returned object <em>may</em> be a {@code Record}.
  * <p>
  * To provide a value for a property, use a method reference to indicate which property the value should be associated
- * with.
- * For example,
+ * with. For example,
  *
  * <pre>
-<code>
-ConfigInstanceBuilder&lt;MyProgramConfig&gt; builder = ConfigInstanceBuilder.forInterface(MyProgramConfig.class);
-builder.with(MyProgramConfig::message, "Hello everyone!");
-builder.with(MyProgramConfig::repeatCount, 42);
-MyProgramConfig config = builder.build();
-for (int i = 0; i < config.repeatCount(); i ++) {
-    System.out.println(config.message());
-}
-</code>
+    <code>
+
+    &#064;ConfigMapping
+    interface MyProgramConfig {
+        String message();
+        int repeatCount();
+    }
+
+    ConfigInstanceBuilder&lt;MyProgramConfig&gt; builder = ConfigInstanceBuilder.forInterface(MyProgramConfig.class);
+    builder.with(MyProgramConfig::message, "Hello everyone!");
+    builder.with(MyProgramConfig::repeatCount, 42);
+
+    MyProgramConfig config = builder.build();
+    for (int i = 0; i < config.repeatCount(); i ++) {
+        System.out.println(config.message());
+    }
+    </code>
  * </pre>
  *
+ * Configuration interface member types are automatically converted with a {@link Converter}. Global converters are
+ * registered either by being discovered via the {@link java.util.ServiceLoader} mechanism, and can be
+ * registered by providing a {@code META-INF/services/org.eclipse.microprofile.config.spi.Converter} file, which
+ * contains the fully qualified class name of the custom {@code Converter} implementation, or explicitly by calling
+ * {@link ConfigInstanceBuilder#registerConverter(Class, Converter)}.
+ * <p>
+ * Converters follow the same rules applied to {@link io.smallrye.config.SmallRyeConfig} and
+ * {@link io.smallrye.config.ConfigMapping}, including overriding the converter to use with
+ * {@link io.smallrye.config.WithConverter}.
+ *
  * @param <I> the configuration interface type
+ *
+ * @see io.smallrye.config.ConfigMapping
+ * @see org.eclipse.microprofile.config.spi.Converter
  */
 public interface ConfigInstanceBuilder<I> {
     /**
@@ -164,127 +184,9 @@ default ConfigInstanceBuilder<I> withOptional(OptionalDoubleGetter<I> getter, do
      */
     default <F extends Function<? super I, Optional<Boolean>> & Serializable> ConfigInstanceBuilder<I> withOptional(F getter,
             boolean value) {
-        return with(getter, Optional.of(Boolean.valueOf(value)));
+        return with(getter, Optional.of(value));
     }
 
-    /**
-     * Set a property to its default value (if any).
-     *
-     * @param getter the property to modify (must not be {@code null})
-     * @param <T> the value type
-     * @param <F> the accessor type
-     * @return this builder (not {@code null})
-     * @throws IllegalArgumentException if the getter is {@code null}
-     */
-    <T, F extends Function<? super I, T> & Serializable> ConfigInstanceBuilder<I> withDefaultFor(F getter);
-
-    /**
-     * Set a property to its default value (if any).
-     *
-     * @param getter the property to modify (must not be {@code null})
-     * @param <F> the accessor type
-     * @return this builder (not {@code null})
-     * @throws IllegalArgumentException if the getter is {@code null}
-     */
-    <F extends ToIntFunction<? super I> & Serializable> ConfigInstanceBuilder<I> withDefaultFor(F getter);
-
-    /**
-     * Set a property to its default value (if any).
-     *
-     * @param getter the property to modify (must not be {@code null})
-     * @param <F> the accessor type
-     * @return this builder (not {@code null})
-     * @throws IllegalArgumentException if the getter is {@code null}
-     */
-    <F extends ToLongFunction<? super I> & Serializable> ConfigInstanceBuilder<I> withDefaultFor(F getter);
-
-    /**
-     * Set a property to its default value (if any).
-     *
-     * @param getter the property to modify (must not be {@code null})
-     * @param <F> the accessor type
-     * @return this builder (not {@code null})
-     * @throws IllegalArgumentException if the getter is {@code null}
-     */
-    <F extends Predicate<? super I> & Serializable> ConfigInstanceBuilder<I> withDefaultFor(F getter);
-
-    /**
-     * Set a property on the configuration object to a string value.
-     * The value set on the property will be the result of conversion of the string
-     * using the property's converter.
-     *
-     * @param getter the property accessor (must not be {@code null})
-     * @param value the value to set (must not be {@code null})
-     * @return this builder (not {@code null})
-     * @param <F> the accessor type
-     * @throws IllegalArgumentException if the getter is {@code null},
-     *         or if the value is {@code null},
-     *         or if the value was rejected by the converter
-     */
-    <F extends Function<? super I, ?> & Serializable> ConfigInstanceBuilder<I> withString(F getter, String value);
-
-    /**
-     * Set a property on the configuration object to a string value.
-     * The value set on the property will be the result of conversion of the string
-     * using the property's converter.
-     *
-     * @param getter the property accessor (must not be {@code null})
-     * @param value the value to set (must not be {@code null})
-     * @return this builder (not {@code null})
-     * @param <F> the accessor type
-     * @throws IllegalArgumentException if the getter is {@code null},
-     *         or if the value is {@code null},
-     *         or if the value was rejected by the converter
-     */
-    <F extends ToIntFunction<? super I> & Serializable> ConfigInstanceBuilder<I> withString(F getter, String value);
-
-    /**
-     * Set a property on the configuration object to a string value.
-     * The value set on the property will be the result of conversion of the string
-     * using the property's converter.
-     *
-     * @param getter the property accessor (must not be {@code null})
-     * @param value the value to set (must not be {@code null})
-     * @return this builder (not {@code null})
-     * @param <F> the accessor type
-     * @throws IllegalArgumentException if the getter is {@code null},
-     *         or if the value is {@code null},
-     *         or if the value was rejected by the converter
-     */
-    <F extends ToLongFunction<? super I> & Serializable> ConfigInstanceBuilder<I> withString(F getter, String value);
-
-    /**
-     * Set a property on the configuration object to a string value.
-     * The value set on the property will be the result of conversion of the string
-     * using the property's converter.
-     *
-     * @param getter the property accessor (must not be {@code null})
-     * @param value the value to set (must not be {@code null})
-     * @return this builder (not {@code null})
-     * @param <F> the accessor type
-     * @throws IllegalArgumentException if the getter is {@code null},
-     *         or if the value is {@code null},
-     *         or if the value was rejected by the converter
-     */
-    <F extends Predicate<? super I> & Serializable> ConfigInstanceBuilder<I> withString(F getter, String value);
-
-    /**
-     * Set a property on the configuration object to a string value, using the property's
-     * declaring class and name to identify the property to set.
-     * The value set on the property will be the result of conversion of the string
-     * using the property's converter.
-     *
-     * @param propertyClass the declaring class of the property to set (must not be {@code null})
-     * @param propertyName the name of the property to set (must not be {@code null})
-     * @param value the value to set (must not be {@code null})
-     * @return this builder (not {@code null})
-     * @throws IllegalArgumentException if the property class or name is {@code null},
-     *         or if the value is {@code null},
-     *         or if the value was rejected by the converter,
-     *         or if no property matches the given name and declaring class
-     */
-    ConfigInstanceBuilder<I> withString(Class<? super I> propertyClass, String propertyName, String value);
-
     /**
      * Build the configuration instance.
      *
@@ -312,25 +214,63 @@ static <I> ConfigInstanceBuilder<I> forInterface(Class<I> interfaceClass)
         return ConfigInstanceBuilderImpl.forInterface(interfaceClass);
     }
 
+    /**
+     * Globally registers a {@link org.eclipse.microprofile.config.spi.Converter} to be used by the
+     * {@link io.smallrye.config.ConfigInstanceBuilder} to convert configuration interface member types.
+     *
+     * @param type the class of the type to convert
+     * @param converter the converter instance that can convert to the type
+     * @param <T> the type to convert
+     */
     static <T> void registerConverter(Class<T> type, Converter<T> converter) {
         ConfigInstanceBuilderImpl.CONVERTERS.put(type, converter);
     }
 
+    /**
+     * Represents a getter in the configuration interface of primitive type {@code int}.
+     *
+     * @param <T> the configuration interface type
+     */
     interface ToIntFunctionGetter<T> extends ToIntFunction<T>, Serializable {
     }
 
+    /**
+     * Represents a getter in the configuration interface of primitive type {@code long}.
+     *
+     * @param <T> the configuration interface type
+     */
     interface ToLongFunctionGetter<T> extends ToLongFunction<T>, Serializable {
     }
 
+    /**
+     * Represents a getter in the configuration interface of primitive type {@code double}.
+     *
+     * @param <T> the configuration interface type
+     */
     interface ToDoubleFunctionGetter<T> extends ToDoubleFunction<T>, Serializable {
     }
 
+    /**
+     * Represents a getter in the configuration interface of type {@code OptionalInt}.
+     *
+     * @param <T> the configuration interface type
+     */
     interface OptionalIntGetter<T> extends Function<T, OptionalInt>, Serializable {
     }
 
+    /**
+     * Represents a getter in the configuration interface of type {@code OptionalLong}.
+     *
+     * @param <T> the configuration interface type
+     */
     interface OptionalLongGetter<T> extends Function<T, OptionalLong>, Serializable {
     }
 
+    /**
+     * Represents a getter in the configuration interface of type {@code OptionalDouble}.
+     *
+     * @param <T> the configuration interface type
+     */
     interface OptionalDoubleGetter<T> extends Function<T, OptionalDouble>, Serializable {
     }
 }