fixiki

sokomishalov · Feb 11, 2020 · f67c160 · f67c160
1 parent d9a7df5
commit f67c160
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 31 deletions.
diff --git a/commons-core/pom.xml b/commons-core/pom.xml
@@ -7,11 +7,11 @@
     <parent>
         <groupId>ru.sokomishalov.commons</groupId>
         <artifactId>commons-parent</artifactId>
-        <version>1.1.9</version>
+        <version>1.1.10</version>
     </parent>
 
     <artifactId>commons-core</artifactId>
-    <version>1.1.9</version>
+    <version>1.1.10</version>
 
     <dependencies>
 

diff --git a/commons-coroutines/pom.xml b/commons-coroutines/pom.xml
@@ -7,17 +7,17 @@
     <parent>
         <groupId>ru.sokomishalov.commons</groupId>
         <artifactId>commons-parent</artifactId>
-        <version>1.1.9</version>
+        <version>1.1.10</version>
     </parent>
 
     <artifactId>commons-coroutines</artifactId>
-    <version>1.1.9</version>
+    <version>1.1.10</version>
 
     <dependencies>
         <dependency>
             <groupId>ru.sokomishalov.commons</groupId>
             <artifactId>commons-core</artifactId>
-            <version>1.1.9</version>
+            <version>1.1.10</version>
         </dependency>
 
         <dependency>

diff --git a/commons-coroutines/src/main/kotlin/ru/sokomishalov/commons/core/reactor/ReactorUtils.kt b/commons-coroutines/src/main/kotlin/ru/sokomishalov/commons/core/reactor/ReactorUtils.kt
@@ -32,7 +32,7 @@ import kotlin.coroutines.EmptyCoroutineContext
 
 fun <T> aFlux(
         context: CoroutineContext = EmptyCoroutineContext,
-        block: suspend () -> Iterable<T>
+        block: suspend CoroutineScope.() -> Iterable<T>
 ): Flux<T> {
     return flux(context) { block().forEach { send(it) } }
 }

diff --git a/commons-logging/pom.xml b/commons-logging/pom.xml
@@ -7,17 +7,17 @@
     <parent>
         <groupId>ru.sokomishalov.commons</groupId>
         <artifactId>commons-parent</artifactId>
-        <version>1.1.9</version>
+        <version>1.1.10</version>
     </parent>
 
     <artifactId>commons-logging</artifactId>
-    <version>1.1.9</version>
+    <version>1.1.10</version>
 
     <dependencies>
         <dependency>
             <groupId>ru.sokomishalov.commons</groupId>
             <artifactId>commons-core</artifactId>
-            <version>1.1.9</version>
+            <version>1.1.10</version>
         </dependency>
 
         <dependency>

diff --git a/commons-reactor/pom.xml b/commons-reactor/pom.xml
@@ -7,17 +7,17 @@
     <parent>
         <groupId>ru.sokomishalov.commons</groupId>
         <artifactId>commons-parent</artifactId>
-        <version>1.1.9</version>
+        <version>1.1.10</version>
     </parent>
 
     <artifactId>commons-reactor</artifactId>
-    <version>1.1.9</version>
+    <version>1.1.10</version>
 
     <dependencies>
         <dependency>
             <groupId>ru.sokomishalov.commons</groupId>
             <artifactId>commons-core</artifactId>
-            <version>1.1.9</version>
+            <version>1.1.10</version>
         </dependency>
 
         <dependency>

diff --git a/commons-serialization/pom.xml b/commons-serialization/pom.xml
@@ -7,19 +7,19 @@
     <parent>
         <groupId>ru.sokomishalov.commons</groupId>
         <artifactId>commons-parent</artifactId>
-        <version>1.1.9</version>
+        <version>1.1.10</version>
     </parent>
 
     <artifactId>commons-serialization</artifactId>
-    <version>1.1.9</version>
+    <version>1.1.10</version>
 
     <dependencies>
         <!--    COMPILE DEPS    -->
 
         <dependency>
             <groupId>ru.sokomishalov.commons</groupId>
             <artifactId>commons-core</artifactId>
-            <version>1.1.9</version>
+            <version>1.1.10</version>
         </dependency>
 
         <dependency>

diff --git a/commons-spring/pom.xml b/commons-spring/pom.xml
@@ -7,11 +7,11 @@
     <parent>
         <groupId>ru.sokomishalov.commons</groupId>
         <artifactId>commons-parent</artifactId>
-        <version>1.1.9</version>
+        <version>1.1.10</version>
     </parent>
 
     <artifactId>commons-spring</artifactId>
-    <version>1.1.9</version>
+    <version>1.1.10</version>
 
     <dependencies>
 
@@ -20,19 +20,19 @@
         <dependency>
             <groupId>ru.sokomishalov.commons</groupId>
             <artifactId>commons-core</artifactId>
-            <version>1.1.9</version>
+            <version>1.1.10</version>
         </dependency>
 
         <dependency>
             <groupId>ru.sokomishalov.commons</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.1.9</version>
+            <version>1.1.10</version>
         </dependency>
 
         <dependency>
             <groupId>ru.sokomishalov.commons</groupId>
             <artifactId>commons-serialization</artifactId>
-            <version>1.1.9</version>
+            <version>1.1.10</version>
         </dependency>
 
         <dependency>
@@ -58,14 +58,14 @@
         <dependency>
             <groupId>ru.sokomishalov.commons</groupId>
             <artifactId>commons-reactor</artifactId>
-            <version>1.1.9</version>
+            <version>1.1.10</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>ru.sokomishalov.commons</groupId>
             <artifactId>commons-coroutines</artifactId>
-            <version>1.1.9</version>
+            <version>1.1.10</version>
             <optional>true</optional>
         </dependency>
 

diff --git a/...spring/src/main/kotlin/ru/sokomishalov/commons/spring/webclient/ReactiveWebClientUtils.kt b/...spring/src/main/kotlin/ru/sokomishalov/commons/spring/webclient/ReactiveWebClientUtils.kt
@@ -17,7 +17,9 @@
 
 package ru.sokomishalov.commons.spring.webclient
 
+import org.springframework.http.client.reactive.ClientHttpConnector
 import org.springframework.http.client.reactive.ReactorClientHttpConnector
+import org.springframework.http.codec.CodecConfigurer
 import org.springframework.http.codec.json.Jackson2JsonDecoder
 import org.springframework.http.codec.json.Jackson2JsonEncoder
 import org.springframework.web.reactive.function.client.ExchangeFilterFunction
@@ -39,9 +41,15 @@ fun createReactiveWebClient(
         baseUrl: String? = null,
         fixedThreadPoolSize: Int? = null,
         reactorNettyClient: HttpClient = createReactorNettyClient(baseUrl = baseUrl, fixedThreadPoolSize = fixedThreadPoolSize),
+        clientConnector: ClientHttpConnector = ReactorClientHttpConnector(reactorNettyClient),
         encoder: Jackson2JsonEncoder = JACKSON_ENCODER,
         decoder: Jackson2JsonDecoder = JACKSON_DECODER,
         maxBufferSize: Int? = null,
+        codecs: CodecConfigurer.DefaultCodecs.() -> Unit = {
+            jackson2JsonEncoder(encoder)
+            jackson2JsonDecoder(decoder)
+            maxBufferSize?.let { maxInMemorySize(it) }
+        },
         filters: List<ExchangeFilterFunction> = emptyList()
 ): WebClient {
     return WebClient
@@ -52,16 +60,10 @@ fun createReactiveWebClient(
                     else -> this
                 }
             }
-            .clientConnector(ReactorClientHttpConnector(reactorNettyClient))
+            .clientConnector(clientConnector)
             .exchangeStrategies(ExchangeStrategies
                     .builder()
-                    .codecs { ccc ->
-                        ccc.defaultCodecs().apply {
-                            jackson2JsonEncoder(encoder)
-                            jackson2JsonDecoder(decoder)
-                            maxBufferSize?.let { maxInMemorySize(it) }
-                        }
-                    }
+                    .codecs { ccc -> ccc.defaultCodecs().apply(codecs) }
                     .build()
             )
             .apply {

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>ru.sokomishalov.commons</groupId>
     <artifactId>commons-parent</artifactId>
-    <version>1.1.9</version>
+    <version>1.1.10</version>
     <packaging>pom</packaging>
 
     <properties>