From 706dc2b7238652d826232e7946944d0af0e75e49 Mon Sep 17 00:00:00 2001 From: sokomishalov Date: Wed, 15 Jul 2020 20:31:38 +0300 Subject: [PATCH] compile fix --- README.md | 2 +- .../kotlin/ru/sokomishalov/commons/core/http/HttpUtils.kt | 2 +- .../commons/core/serialization/CsvObjectMapperHelper.kt | 2 +- .../commons/core/serialization/JsonObjectMapperHelper.kt | 2 +- .../commons/core/serialization/ProtobufObjectMapperHelper.kt | 2 +- .../commons/core/serialization/XmlObjectMapperHelper.kt | 2 +- .../commons/core/serialization/YamlObjectMapperHelper.kt | 2 +- .../commons/spring/serialization/SerializationUtils.kt | 4 ++-- .../commons/spring/webclient/ReactiveWebClientUtils.kt | 2 +- pom.xml | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 039beb0..7abee66 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Add the dependency: com.github.sokomishalov.commons commons-[module] - 1.1.17 + 1.1.18 ``` diff --git a/commons-reactor/src/main/kotlin/ru/sokomishalov/commons/core/http/HttpUtils.kt b/commons-reactor/src/main/kotlin/ru/sokomishalov/commons/core/http/HttpUtils.kt index 7beba39..441f732 100644 --- a/commons-reactor/src/main/kotlin/ru/sokomishalov/commons/core/http/HttpUtils.kt +++ b/commons-reactor/src/main/kotlin/ru/sokomishalov/commons/core/http/HttpUtils.kt @@ -29,7 +29,7 @@ import reactor.netty.tcp.TcpClient import ru.sokomishalov.commons.core.string.isNotNullOrBlank import java.time.Duration -@JvmField + val REACTIVE_NETTY_HTTP_CLIENT: HttpClient = createReactorNettyClient() fun createReactorNettyClient( diff --git a/commons-serialization/src/main/kotlin/ru/sokomishalov/commons/core/serialization/CsvObjectMapperHelper.kt b/commons-serialization/src/main/kotlin/ru/sokomishalov/commons/core/serialization/CsvObjectMapperHelper.kt index a56051a..94295bb 100644 --- a/commons-serialization/src/main/kotlin/ru/sokomishalov/commons/core/serialization/CsvObjectMapperHelper.kt +++ b/commons-serialization/src/main/kotlin/ru/sokomishalov/commons/core/serialization/CsvObjectMapperHelper.kt @@ -24,5 +24,5 @@ import com.fasterxml.jackson.dataformat.csv.CsvFactory * @author sokomishalov */ -@JvmField + val CSV_OBJECT_MAPPER: ObjectMapper = buildComplexObjectMapper(factory = CsvFactory()) \ No newline at end of file diff --git a/commons-serialization/src/main/kotlin/ru/sokomishalov/commons/core/serialization/JsonObjectMapperHelper.kt b/commons-serialization/src/main/kotlin/ru/sokomishalov/commons/core/serialization/JsonObjectMapperHelper.kt index afc0e15..cbfdc09 100644 --- a/commons-serialization/src/main/kotlin/ru/sokomishalov/commons/core/serialization/JsonObjectMapperHelper.kt +++ b/commons-serialization/src/main/kotlin/ru/sokomishalov/commons/core/serialization/JsonObjectMapperHelper.kt @@ -21,5 +21,5 @@ import com.fasterxml.jackson.databind.ObjectMapper * @author sokomishalov */ -@JvmField + val OBJECT_MAPPER: ObjectMapper = buildComplexObjectMapper() \ No newline at end of file diff --git a/commons-serialization/src/main/kotlin/ru/sokomishalov/commons/core/serialization/ProtobufObjectMapperHelper.kt b/commons-serialization/src/main/kotlin/ru/sokomishalov/commons/core/serialization/ProtobufObjectMapperHelper.kt index 1b52bea..ee62b93 100644 --- a/commons-serialization/src/main/kotlin/ru/sokomishalov/commons/core/serialization/ProtobufObjectMapperHelper.kt +++ b/commons-serialization/src/main/kotlin/ru/sokomishalov/commons/core/serialization/ProtobufObjectMapperHelper.kt @@ -24,5 +24,5 @@ import com.fasterxml.jackson.dataformat.protobuf.ProtobufFactory * @author sokomishalov */ -@JvmField + val PROTOBUF_OBJECT_MAPPER: ObjectMapper = buildComplexObjectMapper(factory = ProtobufFactory()) \ No newline at end of file diff --git a/commons-serialization/src/main/kotlin/ru/sokomishalov/commons/core/serialization/XmlObjectMapperHelper.kt b/commons-serialization/src/main/kotlin/ru/sokomishalov/commons/core/serialization/XmlObjectMapperHelper.kt index b589937..a1c9f31 100644 --- a/commons-serialization/src/main/kotlin/ru/sokomishalov/commons/core/serialization/XmlObjectMapperHelper.kt +++ b/commons-serialization/src/main/kotlin/ru/sokomishalov/commons/core/serialization/XmlObjectMapperHelper.kt @@ -24,5 +24,5 @@ import com.fasterxml.jackson.dataformat.xml.XmlFactory * @author sokomishalov */ -@JvmField + val XML_OBJECT_MAPPER: ObjectMapper = buildComplexObjectMapper(factory = XmlFactory()) \ No newline at end of file diff --git a/commons-serialization/src/main/kotlin/ru/sokomishalov/commons/core/serialization/YamlObjectMapperHelper.kt b/commons-serialization/src/main/kotlin/ru/sokomishalov/commons/core/serialization/YamlObjectMapperHelper.kt index 548545a..4a93f47 100644 --- a/commons-serialization/src/main/kotlin/ru/sokomishalov/commons/core/serialization/YamlObjectMapperHelper.kt +++ b/commons-serialization/src/main/kotlin/ru/sokomishalov/commons/core/serialization/YamlObjectMapperHelper.kt @@ -24,5 +24,5 @@ import com.fasterxml.jackson.dataformat.yaml.YAMLFactory * @author sokomishalov */ -@JvmField + val YAML_OBJECT_MAPPER: ObjectMapper = buildComplexObjectMapper(factory = YAMLFactory()) \ No newline at end of file diff --git a/commons-spring/src/main/kotlin/ru/sokomishalov/commons/spring/serialization/SerializationUtils.kt b/commons-spring/src/main/kotlin/ru/sokomishalov/commons/spring/serialization/SerializationUtils.kt index 91b331d..d37a501 100644 --- a/commons-spring/src/main/kotlin/ru/sokomishalov/commons/spring/serialization/SerializationUtils.kt +++ b/commons-spring/src/main/kotlin/ru/sokomishalov/commons/spring/serialization/SerializationUtils.kt @@ -25,8 +25,8 @@ import ru.sokomishalov.commons.core.serialization.OBJECT_MAPPER * @author sokomishalov */ -@JvmField + val JACKSON_ENCODER = Jackson2JsonEncoder(OBJECT_MAPPER) -@JvmField + val JACKSON_DECODER = Jackson2JsonDecoder(OBJECT_MAPPER) \ No newline at end of file diff --git a/commons-spring/src/main/kotlin/ru/sokomishalov/commons/spring/webclient/ReactiveWebClientUtils.kt b/commons-spring/src/main/kotlin/ru/sokomishalov/commons/spring/webclient/ReactiveWebClientUtils.kt index 1be91e0..41e4670 100644 --- a/commons-spring/src/main/kotlin/ru/sokomishalov/commons/spring/webclient/ReactiveWebClientUtils.kt +++ b/commons-spring/src/main/kotlin/ru/sokomishalov/commons/spring/webclient/ReactiveWebClientUtils.kt @@ -35,7 +35,7 @@ import ru.sokomishalov.commons.spring.serialization.JACKSON_ENCODER * @author sokomishalov */ -@JvmField + val REACTIVE_WEB_CLIENT: WebClient = createReactiveWebClient() fun createReactiveWebClient( diff --git a/pom.xml b/pom.xml index a8d18e0..0a0ac79 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom - 1.1.17 + 1.1.18 1.8 1.3.72