tmp bžilion bžilionu

Signed-off-by: David Kral <[email protected]>

Author: Verdent

docs/src/main/asciidoc/se/webclient.adoc

@@ -519,6 +519,55 @@ include::{sourcedir}/se/WebClientSnippets.java[tag=snippet_8,indent=0]
 <1> `application.yaml` is a default configuration source loaded when YAML support is on classpath, so we can just use `Config.create()`
 <2> Passing the client configuration node
 
+=== Setting connection limits
+It is possible to limit connection numbers for specific hosts, proxies or even the total number of connections the client is allowed to create. None of these limits is mandatory to set.
+
+In the examples below we are setting fixed limit implementations, but it is possible to use any implementation of the interface `io.helidon.common.concurrency.limits.Limit`.
+
+Note: Connection limiting is currently supported only for the HTTP1 client connections.
+
+==== Setting connection limit in your code
+Below is an example of how to set connection limit to your client programmatically.
+
+[source,java]
+----
+include::{sourcedir}/se/WebClientSnippets.java[tag=snippet_13,indent=0]
+----
+
+<1> Overall connection limit set to 100. The client will not create more active connections than that.
+<2> Setting a per-host limit. Every host will have their connection count limited to 5.
+<3> This is how we can set limit only to the specific host. This overrides the per-host limit set above. This client will not create more than 2 connections to the host with the name `some-host`.
+<4> Disable shared cache so your cache configuration can take effect.
+
+==== Setting connection limit via configuration
+It is also possible to set different limits via configuration.
+
+[source,yaml]
+.Setting up Http1Client configuration.
+----
+client:
+  share-connection-cache: false
+  connection-cache-config:
+    connection-limit:
+      fixed:
+        permits: 100
+    connection-per-host-limit:
+      fixed:
+        permits: 5
+    host-limits:
+      - host: "some-host"
+        limit:
+          fixed:
+            permits: 2
+----
+Then, in your application code, load the configuration from that file.
+
+[source,java]
+.Http1Client initialization using the `application.yaml` file located on the classpath
+----
+include::{sourcedir}/se/WebClientSnippets.java[tag=snippet_14,indent=0]
+----
+
 == Reference
 
 * link:{webclient-javadoc-base-url}.api/module-summary.html[Helidon Webclient API]

docs/src/main/java/io/helidon/docs/se/WebClientSnippets.java

@@ -15,6 +15,7 @@
  */
 package io.helidon.docs.se;
 
+import io.helidon.common.concurrency.limits.FixedLimit;
 import io.helidon.common.media.type.MediaTypes;
 import io.helidon.config.Config;
 import io.helidon.http.Method;
@@ -24,7 +25,9 @@
 import io.helidon.webclient.api.HttpClientResponse;
 import io.helidon.webclient.api.Proxy;
 import io.helidon.webclient.api.WebClient;
+import io.helidon.webclient.http1.Http1Client;
 import io.helidon.webclient.http1.Http1ClientProtocolConfig;
+import io.helidon.webclient.http1.Http1ConnectionCacheConfig;
 import io.helidon.webclient.metrics.WebClientMetrics;
 import io.helidon.webclient.spi.WebClientService;
 
@@ -176,4 +179,28 @@ void snippet_12() {
         // end::snippet_12[]
     }
 
+    void snippet_13() {
+        // tag::snippet_13[]
+        Http1ConnectionCacheConfig cacheConfig = Http1ConnectionCacheConfig.builder()
+                .connectionLimit(FixedLimit.builder().permits(100).build()) // <1>
+                .connectionPerHostLimit(FixedLimit.builder().permits(5).build()) // <2>
+                .addHostLimit(builder -> builder.host("some-host") // <3>
+                        .limit(FixedLimit.builder().permits(2).build()))
+                .build();
+
+        Http1Client client = Http1Client.builder()
+                .shareConnectionCache(false) // <4>
+                .connectionCacheConfig(cacheConfig)
+                .build();
+        // end::snippet_13[]
+    }
+
+    void snippet_14() {
+        // tag::snippet_14[]
+        Config config = Config.create();
+
+        Http1Client client = Http1Client.create(config.get("client"));
+        // end::snippet_14[]
+    }
+
 }

webclient/api/src/main/java/io/helidon/webclient/api/TcpClientConnection.java

@@ -192,10 +192,12 @@ public void closeResource() {
         if (closed) {
             return;
         }
-        try {
-            this.socket.close();
-        } catch (IOException e) {
-            LOGGER.log(TRACE, "Failed to close a client socket", e);
+        if (this.socket != null) {
+            try {
+                this.socket.close();
+            } catch (IOException e) {
+                LOGGER.log(TRACE, "Failed to close a client socket", e);
+            }
         }
         this.closed = true;
         closeConsumer.accept(this);

webclient/http1/pom.xml

@@ -68,6 +68,10 @@
             <groupId>io.helidon.common</groupId>
             <artifactId>helidon-common-context</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.common.concurrency</groupId>
+            <artifactId>helidon-common-concurrency-limits</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.helidon.common.features</groupId>
             <artifactId>helidon-common-features-api</artifactId>
@@ -103,8 +107,14 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.helidon.common.concurrency</groupId>
-            <artifactId>helidon-common-concurrency-limits</artifactId>
+            <groupId>io.helidon.config</groupId>
+            <artifactId>helidon-config</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.config</groupId>
+            <artifactId>helidon-config-yaml</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 

webclient/http1/src/main/java/io/helidon/webclient/http1/HostLimitConfigBlueprint.java

@@ -90,7 +90,14 @@ static Http1Client create(Config config) {
         return create(it -> it.config(config));
     }
 
+    /**
+     * Configure the default Http1 client configuration.
+     * Note: This method needs to be used before Helidon is started to have the full effect.
+     *
+     * @param clientConfig global client config
+     */
     static void configureDefaults(Http1ClientConfig clientConfig) {
         Http1ClientImpl.GLOBAL_CONFIG.compareAndSet(null, clientConfig);
     }
+
 }

webclient/http1/src/main/java/io/helidon/webclient/http1/Http1Client.java

@@ -16,12 +16,8 @@
 
 package io.helidon.webclient.http1;
 
-import java.util.Optional;
-
 import io.helidon.builder.api.Option;
 import io.helidon.builder.api.Prototype;
-import io.helidon.common.concurrency.limits.Limit;
-import io.helidon.common.concurrency.limits.spi.LimitProvider;
 import io.helidon.webclient.api.HttpClientConfig;
 
 /**
@@ -38,7 +34,13 @@ interface Http1ClientConfigBlueprint extends HttpClientConfig, Prototype.Factory
     @Option.Default("create()")
     Http1ClientProtocolConfig protocolConfig();
 
+    /**
+     * Client connection cache configuration.
+     *
+     * @return cache configuration
+     */
     @Option.Default("create()")
-    Http1ConnectionCacheConfig connectionCache();
+    @Option.Configured
+    Http1ConnectionCacheConfig connectionCacheConfig();
 
 }

webclient/http1/src/main/java/io/helidon/webclient/http1/Http1ClientConfigBlueprint.java

@@ -50,7 +50,7 @@ class Http1ClientImpl implements Http1Client, HttpClientSpi {
             this.connectionCache = Http1ConnectionCache.shared();
             this.clientCache = null;
         } else {
-            this.connectionCache = Http1ConnectionCache.create(clientConfig.connectionCache());
+            this.connectionCache = Http1ConnectionCache.create(clientConfig.connectionCacheConfig());
             this.clientCache = connectionCache;
         }
     }