Configuration annotation processor.

bom/pom.xml

@@ -291,6 +291,16 @@
                 <artifactId>helidon-config-mp</artifactId>
                 <version>${helidon.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.helidon.config</groupId>
+                <artifactId>helidon-config-metadata</artifactId>
+                <version>${helidon.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.helidon.config</groupId>
+                <artifactId>helidon-config-metadata-processor</artifactId>
+                <version>${helidon.version}</version>
+            </dependency>
             <!-- security -->
             <dependency>
                 <groupId>io.helidon.security</groupId>

common/configurable/pom.xml

@@ -46,6 +46,18 @@
             <groupId>io.helidon.config</groupId>
             <artifactId>helidon-config</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.config</groupId>
+            <artifactId>helidon-config-metadata</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.config</groupId>
+            <artifactId>helidon-config-metadata-processor</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>io.helidon.common</groupId>
             <artifactId>helidon-common-service-loader</artifactId>

common/configurable/src/main/java/io/helidon/common/configurable/LruCache.java

@@ -24,6 +24,8 @@
 import java.util.function.Supplier;
 
 import io.helidon.config.Config;
+import io.helidon.config.metadata.Configured;
+import io.helidon.config.metadata.ConfiguredOption;
 
 /**
  * Least recently used cache.
@@ -216,6 +218,7 @@ V directGet(K key) {
      * @param <K> type of keys
      * @param <V> type of values
      */
+    @Configured
     public static class Builder<K, V> implements io.helidon.common.Builder<LruCache<K, V>> {
         private int capacity = DEFAULT_CAPACITY;
 
@@ -241,6 +244,7 @@ public Builder<K, V> config(Config config) {
          * @param capacity maximal number of records in the cache before the oldest one is removed
          * @return updated builder instance
          */
+        @ConfiguredOption("10000")
         public Builder<K, V> capacity(int capacity) {
             this.capacity = capacity;
             return this;

common/configurable/src/main/java/io/helidon/common/configurable/Resource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020 Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2021 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,9 @@
 
 import io.helidon.config.Config;
 import io.helidon.config.ConfigException;
+import io.helidon.config.DeprecatedConfig;
+import io.helidon.config.metadata.Configured;
+import io.helidon.config.metadata.ConfiguredOption;
 
 /**
  * A representation of a resource that can be
@@ -41,6 +44,7 @@
  * there is an option: call {@link #cacheBytes()} before accessing it by other threads.
  * Note that this stores all the bytes in memory, so use with care!!!
  */
+@Configured
 public interface Resource {
     /**
      * Load resource from URI provided.
@@ -102,6 +106,7 @@ static Resource create(Path fsPath) {
      * @param bytes       raw bytes of this resource
      * @return resource instance
      */
+    @ConfiguredOption(key = "content", description = "Base64 encoded content of the resource")
     static Resource create(String description, byte[] bytes) {
         Objects.requireNonNull(bytes, "Resource bytes must not be null");
         return new ResourceImpl(Source.BINARY_CONTENT, description, bytes);
@@ -150,10 +155,20 @@ static Resource create(String description, InputStream inputStream) {
      * @return a resource ready to load from one of the locations
      * @throws io.helidon.config.ConfigException in case this config does not define a resource configuration
      */
+    @ConfiguredOption(key = "resource-path", description = "Classpath location of the resource.")
+    @ConfiguredOption(key = "path", description = "File system path to the resource.")
+    @ConfiguredOption(key = "content-plain", description = "Plain text content of the resource")
+    @ConfiguredOption(key = "uri", type = URI.class, description = "URI of the resource.")
+    @ConfiguredOption(key = "proxy-host", description = "Host of the proxy when using url.")
+    @ConfiguredOption(key = "proxy-port", type = Integer.class, description = "Port of the proxy when using url.")
+    @ConfiguredOption(key = "use-proxy",
+                      type = Boolean.class,
+                      description = "Whether to use proxy. Only used if proxy-host is defined as well.",
+                      value = "true")
     static Resource create(Config resourceConfig) {
         return ResourceUtil.fromConfigPath(resourceConfig.get("path"))
                 .or(() -> ResourceUtil.fromConfigResourcePath(resourceConfig.get("resource-path")))
-                .or(() -> ResourceUtil.fromConfigUrl(resourceConfig.get("url")))
+                .or(() -> ResourceUtil.fromConfigUrl(DeprecatedConfig.get(resourceConfig, "uri", "url")))
                 .or(() -> ResourceUtil.fromConfigContent(resourceConfig.get("content-plain")))
                 .or(() -> ResourceUtil.fromConfigB64Content(resourceConfig.get("content")))
                 .orElseThrow(() -> new ConfigException("Config is not a resource configuration on key: " + resourceConfig.key()

common/configurable/src/main/java/io/helidon/common/configurable/ScheduledThreadPoolSupplier.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,8 @@
 import io.helidon.common.LazyValue;
 import io.helidon.common.context.Contexts;
 import io.helidon.config.Config;
+import io.helidon.config.metadata.Configured;
+import io.helidon.config.metadata.ConfiguredOption;
 
 /**
  * Supplier of a custom scheduled thread pool.
@@ -117,6 +119,7 @@ public ScheduledExecutorService get() {
     /**
      * A fluent API builder for {@link ScheduledThreadPoolSupplier}.
      */
+    @Configured
     public static final class Builder implements io.helidon.common.Builder<ScheduledThreadPoolSupplier> {
         private int corePoolSize = EXECUTOR_DEFAULT_CORE_POOL_SIZE;
         private boolean isDaemon = EXECUTOR_DEFAULT_IS_DAEMON;
@@ -137,6 +140,7 @@ public ScheduledThreadPoolSupplier build() {
          * @param corePoolSize see {@link ThreadPoolExecutor#getCorePoolSize()}
          * @return updated builder instance
          */
+        @ConfiguredOption("16")
         public Builder corePoolSize(int corePoolSize) {
             this.corePoolSize = corePoolSize;
             return this;
@@ -148,6 +152,7 @@ public Builder corePoolSize(int corePoolSize) {
          * @param daemon whether the threads are daemon threads
          * @return updated builder instance
          */
+        @ConfiguredOption(key = "is-daemon", value = "true")
         public Builder daemon(boolean daemon) {
             isDaemon = daemon;
             return this;
@@ -159,6 +164,7 @@ public Builder daemon(boolean daemon) {
          * @param threadNamePrefix prefix of a thread name
          * @return updated builder instance
          */
+        @ConfiguredOption("helidon-")
         public Builder threadNamePrefix(String threadNamePrefix) {
             this.threadNamePrefix = threadNamePrefix;
             return this;
@@ -170,6 +176,7 @@ public Builder threadNamePrefix(String threadNamePrefix) {
          * @param prestart whether to prestart the threads
          * @return updated builder instance
          */
+        @ConfiguredOption(key = "should-prestart", value = "true")
         public Builder prestart(boolean prestart) {
             this.prestart = prestart;
             return this;

common/configurable/src/main/java/io/helidon/common/configurable/ThreadPoolSupplier.java

@@ -26,6 +26,8 @@
 import io.helidon.common.LazyValue;
 import io.helidon.common.context.Contexts;
 import io.helidon.config.Config;
+import io.helidon.config.metadata.Configured;
+import io.helidon.config.metadata.ConfiguredOption;
 
 /**
  * Supplier of a custom thread pool.
@@ -146,6 +148,7 @@ public int corePoolSize() {
     /**
      * A fluent API builder for {@link ThreadPoolSupplier}.
      */
+    @Configured
     public static final class Builder implements io.helidon.common.Builder<ThreadPoolSupplier> {
         private int corePoolSize = DEFAULT_CORE_POOL_SIZE;
         private int maxPoolSize = DEFAULT_MAX_POOL_SIZE;
@@ -189,6 +192,7 @@ public ThreadPoolSupplier build() {
          * @param corePoolSize see {@link ThreadPoolExecutor#getCorePoolSize()}
          * @return updated builder instance
          */
+        @ConfiguredOption("10")
         public Builder corePoolSize(int corePoolSize) {
             this.corePoolSize = corePoolSize;
             return this;
@@ -200,6 +204,7 @@ public Builder corePoolSize(int corePoolSize) {
          * @param maxPoolSize see {@link ThreadPoolExecutor#getMaximumPoolSize()}
          * @return updated builder instance
          */
+        @ConfiguredOption("50")
         public Builder maxPoolSize(int maxPoolSize) {
             this.maxPoolSize = maxPoolSize;
             return this;
@@ -211,6 +216,7 @@ public Builder maxPoolSize(int maxPoolSize) {
          * @param keepAliveMinutes see {@link ThreadPoolExecutor#getKeepAliveTime(TimeUnit)}
          * @return updated builder instance
          */
+        @ConfiguredOption("3")
         public Builder keepAliveMinutes(int keepAliveMinutes) {
             this.keepAliveMinutes = keepAliveMinutes;
             return this;
@@ -222,6 +228,7 @@ public Builder keepAliveMinutes(int keepAliveMinutes) {
          * @param queueCapacity capacity of the queue backing the executor
          * @return updated builder instance
          */
+        @ConfiguredOption("10000")
         public Builder queueCapacity(int queueCapacity) {
             this.queueCapacity = queueCapacity;
             return this;
@@ -233,6 +240,7 @@ public Builder queueCapacity(int queueCapacity) {
          * @param daemon whether the threads are daemon threads
          * @return updated builder instance
          */
+        @ConfiguredOption(key = "is-daemon", value = "true")
         public Builder daemon(boolean daemon) {
             isDaemon = daemon;
             return this;
@@ -255,6 +263,7 @@ public Builder name(String name) {
          * @param growthThreshold the growth threshold
          * @return updated builder instance
          */
+        @ConfiguredOption("256")
         Builder growthThreshold(int growthThreshold) {
             this.growthThreshold = growthThreshold;
             return this;
@@ -274,6 +283,7 @@ Builder growthThreshold(int growthThreshold) {
          * @param growthRate the growth rate
          * @return updated builder instance
          */
+        @ConfiguredOption("5")
         Builder growthRate(int growthRate) {
             this.growthRate = growthRate;
             return this;
@@ -296,6 +306,7 @@ public Builder rejectionHandler(ThreadPool.RejectionHandler rejectionHandler) {
          * @param threadNamePrefix prefix of a thread name
          * @return updated builder instance
          */
+        @ConfiguredOption("helidon-")
         public Builder threadNamePrefix(String threadNamePrefix) {
             this.threadNamePrefix = threadNamePrefix;
             return this;
@@ -307,6 +318,7 @@ public Builder threadNamePrefix(String threadNamePrefix) {
          * @param prestart whether to prestart the threads
          * @return updated builder instance
          */
+        @ConfiguredOption(key = "should-prestart", value = "true")
         public Builder prestart(boolean prestart) {
             this.prestart = prestart;
             return this;
@@ -433,6 +445,7 @@ private void warnExperimental(String key) {
          * @return updated builder instance
          * @see #virtualIfAvailable(boolean)
          */
+        @ConfiguredOption(value = "false", experimental = true)
         public Builder virtualEnforced(boolean enforceVirtualThreads) {
             this.virtualThreadsEnforced = enforceVirtualThreads;
             return this;
@@ -448,6 +461,7 @@ public Builder virtualEnforced(boolean enforceVirtualThreads) {
          * @param useVirtualThreads whether to use virtual threads or not, defaults to {@code false}
          * @return updated builder instance
          */
+        @ConfiguredOption(key = "virtual-threads", value = "false", experimental = true)
         public Builder virtualIfAvailable(boolean useVirtualThreads) {
             this.useVirtualThreads = useVirtualThreads;
             return this;

common/configurable/src/main/java/module-info.java

@@ -25,5 +25,7 @@
     requires transitive io.helidon.config;
     requires io.helidon.common;
     requires io.helidon.common.context;
+    requires static io.helidon.config.metadata;
+
     exports io.helidon.common.configurable;
 }

common/key-util/pom.xml

@@ -34,6 +34,18 @@
             <groupId>io.helidon.common</groupId>
             <artifactId>helidon-common-configurable</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.config</groupId>
+            <artifactId>helidon-config-metadata</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.config</groupId>
+            <artifactId>helidon-config-metadata-processor</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>io.helidon.bundles</groupId>
             <artifactId>helidon-bundles-config</artifactId>

common/key-util/src/main/java/io/helidon/common/pki/DerUtils.java

@@ -21,9 +21,6 @@
 import java.security.spec.KeySpec;
 import java.security.spec.RSAPrivateCrtKeySpec;
 
-import sun.security.util.DerInputStream;
-import sun.security.util.DerValue;
-
 final class DerUtils {
     private DerUtils() {
     }
@@ -43,8 +40,9 @@ static void checkEnabled() {
 
     static KeySpec pkcs1RsaKeySpec(byte[] bytes) {
         try {
-            DerInputStream derReader = new DerInputStream(bytes);
-            DerValue[] seq = derReader.getSequence(0);
+            // fully qualified class names allow us to compile this without failure
+            sun.security.util.DerInputStream derReader = new sun.security.util.DerInputStream(bytes);
+            sun.security.util.DerValue[] seq = derReader.getSequence(0);
             // skip version seq[0];
             BigInteger modulus = seq[1].getBigInteger();
             BigInteger publicExp = seq[2].getBigInteger();