Merge branch 'development' into feature/fix-kvk-adres-optional-fields

flinden68 · flinden68 · commit 550053e09f7d · 2025-01-16T07:32:59.000+01:00
diff --git a/buildSrc/src/main/kotlin/ApiDependencies.kt b/buildSrc/src/main/kotlin/ApiDependencies.kt
@@ -23,7 +23,7 @@ object ApiDependencies {
     val graphqlKotlinHooksProvider by lazy { "com.expediagroup:graphql-kotlin-hooks-provider:${ApiVersions.graphqlKotlin}"}
     val graphqlKotlinSpringServer by lazy { "com.expediagroup:graphql-kotlin-spring-server:${ApiVersions.graphqlKotlin}"}
     val jacksonBom by lazy { "com.fasterxml.jackson:jackson-bom:${ApiVersions.jacksonBom}" }
-    val kotlinLogging by lazy { "io.github.microutils:kotlin-logging:${ApiVersions.kotlinLogging}"}
+    val kotlinLogging by lazy { "io.github.oshai:kotlin-logging-jvm:${ApiVersions.kotlinLogging}"}
     val springCloudStream by lazy { "org.springframework.cloud:spring-cloud-stream:${ApiVersions.springCloud}" }
     val springCloudStreamBinderRabbit by lazy { "org.springframework.cloud:spring-cloud-stream-binder-rabbit:${ApiVersions.springCloud}" }
 }
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -36,6 +36,6 @@ object ApiVersions {
     const val graphqlJava ="21.0"
     const val graphqlKotlin = "7.0.1"
     const val jacksonBom = "2.17.2"
-    const val kotlinLogging = "3.0.5"
+    const val kotlinLogging = "7.0.3"
     const val springCloud = "4.1.3"
 }
diff --git a/case/src/main/kotlin/nl/nlportal/case/autoconfigure/CaseAutoConfiguration.kt b/case/src/main/kotlin/nl/nlportal/case/autoconfigure/CaseAutoConfiguration.kt
@@ -15,7 +15,7 @@
  */
 package nl.nlportal.case.autoconfigure
 
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import nl.nlportal.case.autodeployment.CaseDefinitionApplicationReadyEventListener
 import nl.nlportal.case.repository.CaseDefinitionRepository
 import nl.nlportal.case.repository.CaseRepository
diff --git a/case/src/main/kotlin/nl/nlportal/case/service/CaseDefinitionService.kt b/case/src/main/kotlin/nl/nlportal/case/service/CaseDefinitionService.kt
@@ -17,7 +17,7 @@ package nl.nlportal.case.service
 
 import com.fasterxml.jackson.core.type.TypeReference
 import com.fasterxml.jackson.databind.node.ObjectNode
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import nl.nlportal.case.domain.CaseDefinition
 import nl.nlportal.case.domain.CaseDefinitionId
 import nl.nlportal.case.domain.Schema
diff --git a/case/src/main/kotlin/nl/nlportal/case/service/CaseService.kt b/case/src/main/kotlin/nl/nlportal/case/service/CaseService.kt
@@ -17,7 +17,7 @@ package nl.nlportal.case.service
 
 import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.node.ObjectNode
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import nl.nlportal.case.domain.Case
 import nl.nlportal.case.domain.CaseDefinition
 import nl.nlportal.case.domain.CaseDefinitionId
diff --git a/data/src/main/kotlin/nl/nlportal/data/liquibase/LiquibaseRunner.kt b/data/src/main/kotlin/nl/nlportal/data/liquibase/LiquibaseRunner.kt
@@ -15,6 +15,7 @@
  */
 package nl.nlportal.data.liquibase
 
+import io.github.oshai.kotlinlogging.KotlinLogging
 import liquibase.Contexts
 import liquibase.Liquibase
 import liquibase.database.Database
@@ -23,7 +24,6 @@ import liquibase.database.jvm.JdbcConnection
 import liquibase.exception.DatabaseException
 import liquibase.exception.LiquibaseException
 import liquibase.resource.ClassLoaderResourceAccessor
-import mu.KotlinLogging
 import org.springframework.boot.autoconfigure.liquibase.LiquibaseProperties
 import java.sql.SQLException
 import javax.sql.DataSource
diff --git a/form/src/main/kotlin/nl/nlportal/form/autodeployment/FormDefinitionDeploymentService.kt b/form/src/main/kotlin/nl/nlportal/form/autodeployment/FormDefinitionDeploymentService.kt
@@ -20,7 +20,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode
 import nl.nlportal.core.util.Mapper
 import nl.nlportal.form.domain.request.CreateFormDefinitionRequest
 import nl.nlportal.form.service.FormIoFormDefinitionService
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import org.apache.commons.io.IOUtils
 import org.springframework.core.io.Resource
 import org.springframework.core.io.ResourceLoader
diff --git a/graphql/src/test/kotlin/nl/nlportal/graphql/security/AuthenticationIT.kt b/graphql/src/test/kotlin/nl/nlportal/graphql/security/AuthenticationIT.kt
@@ -16,7 +16,7 @@
 package nl.nlportal.graphql.security
 
 import nl.nlportal.graphql.BaseIntegrationTest
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.MediaType
diff --git a/haalcentraal/haalcentraal-all/src/test/kotlin/nl/nlportal/haalcentraal/all/TestHelper.kt b/haalcentraal/haalcentraal-all/src/test/kotlin/nl/nlportal/haalcentraal/all/TestHelper.kt
@@ -15,7 +15,7 @@
  */
 package nl.nlportal.haalcentraal.all
 
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import okhttp3.mockwebserver.MockResponse
 import org.springframework.test.web.reactive.server.WebTestClient
 import java.util.function.Consumer
diff --git a/haalcentraal/haalcentraal-brp/src/main/kotlin/nl/nlportal/haalcentraal/brp/service/impl/HaalCentraalBrpServiceImpl.kt b/haalcentraal/haalcentraal-brp/src/main/kotlin/nl/nlportal/haalcentraal/brp/service/impl/HaalCentraalBrpServiceImpl.kt
@@ -15,7 +15,7 @@
  */
 package nl.nlportal.haalcentraal.brp.service.impl
 
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import nl.nlportal.commonground.authentication.BurgerAuthentication
 import nl.nlportal.commonground.authentication.CommonGroundAuthentication
 import nl.nlportal.haalcentraal.brp.client.HaalCentraalBrpClient
diff --git a/haalcentraal/haalcentraal-brp/src/test/kotlin/nl/nlportal/haalcentraal/brp/TestHelper.kt b/haalcentraal/haalcentraal-brp/src/test/kotlin/nl/nlportal/haalcentraal/brp/TestHelper.kt
@@ -15,7 +15,7 @@
  */
 package nl.nlportal.haalcentraal.brp
 
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import okhttp3.mockwebserver.MockResponse
 import org.springframework.test.web.reactive.server.WebTestClient
 import java.util.function.Consumer
diff --git a/haalcentraal/haalcentraal-hr/src/main/kotlin/nl/nlportal/haalcentraal/hr/client/HandelsregisterClient.kt b/haalcentraal/haalcentraal-hr/src/main/kotlin/nl/nlportal/haalcentraal/hr/client/HandelsregisterClient.kt
@@ -16,8 +16,8 @@
 package nl.nlportal.haalcentraal.hr.client
 
 import io.netty.handler.logging.LogLevel
-import mu.KLogger
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KLogger
+import io.github.oshai.kotlinlogging.KotlinLogging
 import nl.nlportal.core.ssl.ClientSslContextResolver
 import nl.nlportal.haalcentraal.hr.domain.MaatschappelijkeActiviteit
 import org.springframework.http.client.reactive.ReactorClientHttpConnector
diff --git a/haalcentraal/src/main/kotlin/nl/nlportal/haalcentraal/client/HaalCentraalClientProvider.kt b/haalcentraal/src/main/kotlin/nl/nlportal/haalcentraal/client/HaalCentraalClientProvider.kt
@@ -17,8 +17,8 @@ package nl.nlportal.haalcentraal.client
 
 import nl.nlportal.core.ssl.ClientSslContextResolver
 import io.netty.handler.logging.LogLevel
-import mu.KLogger
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KLogger
+import io.github.oshai.kotlinlogging.KotlinLogging
 import nl.nlportal.commonground.authentication.CommonGroundAuthentication
 import org.springframework.http.HttpHeaders
 import org.springframework.http.client.reactive.ReactorClientHttpConnector
diff --git a/klant/src/test/kotlin/nl/nlportal/klant/graphql/BurgerMutationIT.kt b/klant/src/test/kotlin/nl/nlportal/klant/graphql/BurgerMutationIT.kt
@@ -15,7 +15,7 @@
  */
 package nl.nlportal.klant.graphql
 
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import nl.nlportal.commonground.authentication.WithBurgerUser
 import nl.nlportal.klant.TestHelper
 import nl.nlportal.klant.generiek.client.OpenKlantClientConfig
diff --git a/payment/src/main/kotlin/nl/nlportal/payment/service/OgonePaymentService.kt b/payment/src/main/kotlin/nl/nlportal/payment/service/OgonePaymentService.kt
@@ -15,8 +15,8 @@
  */
 package nl.nlportal.payment.service
 
-import mu.KLogger
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KLogger
+import io.github.oshai.kotlinlogging.KotlinLogging
 import nl.nlportal.core.util.CoreUtils
 import nl.nlportal.payment.autoconfiguration.OgonePaymentConfig
 import nl.nlportal.payment.constants.OgoneState
diff --git a/payment/src/test/kotlin/nl/nlportal/payment/TestHelper.kt b/payment/src/test/kotlin/nl/nlportal/payment/TestHelper.kt
@@ -15,7 +15,7 @@
  */
 package nl.nlportal.payment
 
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import okhttp3.mockwebserver.MockResponse
 import org.springframework.test.web.reactive.server.WebTestClient
 import java.util.function.Consumer
diff --git a/payment/src/test/kotlin/nl/nlportal/payment/graphql/OgonePaymentMutationIT.kt b/payment/src/test/kotlin/nl/nlportal/payment/graphql/OgonePaymentMutationIT.kt
@@ -15,8 +15,8 @@
  */
 package nl.nlportal.payment.graphql
 
-import mu.KLogger
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KLogger
+import io.github.oshai.kotlinlogging.KotlinLogging
 import nl.nlportal.commonground.authentication.WithBurgerUser
 import nl.nlportal.payment.autoconfiguration.OgonePaymentConfig
 import nl.nlportal.payment.domain.OgonePayment
diff --git a/product/gradle.properties b/product/gradle.properties
@@ -14,4 +14,5 @@
 # limitations under the License.
 #
 
-isLib = true
+isLib = true
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2EnabledWithHelpers
diff --git a/product/src/main/kotlin/nl/nlportal/product/client/DmnClient.kt b/product/src/main/kotlin/nl/nlportal/product/client/DmnClient.kt
@@ -16,8 +16,8 @@
 package nl.nlportal.product.client
 
 import io.netty.handler.logging.LogLevel
-import mu.KLogger
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KLogger
+import io.github.oshai.kotlinlogging.KotlinLogging
 import nl.nlportal.core.ssl.ClientSslContextResolver
 import nl.nlportal.idtokenauthentication.service.IdTokenGenerator
 import nl.nlportal.product.domain.DmnRequest
diff --git a/product/src/main/kotlin/nl/nlportal/product/service/DmnService.kt b/product/src/main/kotlin/nl/nlportal/product/service/DmnService.kt
@@ -16,7 +16,7 @@
 package nl.nlportal.product.service
 
 import com.jayway.jsonpath.JsonPath
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import nl.nlportal.core.util.Mapper
 import nl.nlportal.product.client.DmnClient
 import nl.nlportal.product.domain.BeslisTabelConfiguration
diff --git a/product/src/main/kotlin/nl/nlportal/product/service/PrefillService.kt b/product/src/main/kotlin/nl/nlportal/product/service/PrefillService.kt
@@ -18,7 +18,7 @@ package nl.nlportal.product.service
 import com.fasterxml.jackson.databind.node.ObjectNode
 import com.github.wnameless.json.unflattener.JsonUnflattener
 import com.jayway.jsonpath.JsonPath
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import nl.nlportal.commonground.authentication.CommonGroundAuthentication
 import nl.nlportal.core.util.CoreUtils
 import nl.nlportal.core.util.Mapper
diff --git a/product/src/main/kotlin/nl/nlportal/product/service/ProductService.kt b/product/src/main/kotlin/nl/nlportal/product/service/ProductService.kt
@@ -16,7 +16,7 @@
 package nl.nlportal.product.service
 
 import com.fasterxml.jackson.databind.node.ObjectNode
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import nl.nlportal.commonground.authentication.AuthenticationMachtigingsDienstService
 import nl.nlportal.commonground.authentication.CommonGroundAuthentication
 import nl.nlportal.core.util.Mapper
diff --git a/product/src/test/kotlin/nl/nlportal/product/TestHelper.kt b/product/src/test/kotlin/nl/nlportal/product/TestHelper.kt
@@ -15,7 +15,7 @@
  */
 package nl.nlportal.product
 
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import okhttp3.mockwebserver.MockResponse
 import org.springframework.test.web.reactive.server.WebTestClient
 import java.util.function.Consumer
diff --git a/zgw/berichten/src/main/kotlin/nl/nlportal/berichten/service/BerichtenService.kt b/zgw/berichten/src/main/kotlin/nl/nlportal/berichten/service/BerichtenService.kt
@@ -15,7 +15,7 @@
  */
 package nl.nlportal.berichten.service
 
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import nl.nlportal.berichten.autoconfigure.BerichtenConfigurationProperties
 import nl.nlportal.berichten.domain.Bericht
 import nl.nlportal.berichten.graphql.BerichtenPage
diff --git a/zgw/berichten/src/test/kotlin/nl/nlportal/berichten/TestHelper.kt b/zgw/berichten/src/test/kotlin/nl/nlportal/berichten/TestHelper.kt
@@ -15,7 +15,7 @@
  */
 package nl.nlportal.berichten
 
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import okhttp3.mockwebserver.MockResponse
 import org.springframework.test.web.reactive.server.WebTestClient
 import java.util.function.Consumer
diff --git a/zgw/besluiten/src/test/kotlin/nl/nlportal/besluiten/TestHelper.kt b/zgw/besluiten/src/test/kotlin/nl/nlportal/besluiten/TestHelper.kt
@@ -15,7 +15,7 @@
  */
 package nl.nlportal.besluiten
 
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import okhttp3.mockwebserver.MockResponse
 import org.springframework.test.web.reactive.server.WebTestClient
 import java.util.function.Consumer
diff --git a/zgw/common-ground-authentication/src/main/kotlin/nl/nlportal/commonground/authentication/AuthenticationMachtigingsDienstService.kt b/zgw/common-ground-authentication/src/main/kotlin/nl/nlportal/commonground/authentication/AuthenticationMachtigingsDienstService.kt
@@ -16,8 +16,8 @@
 package nl.nlportal.commonground.authentication
 
 import com.fasterxml.jackson.core.type.TypeReference
-import mu.KLogger
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KLogger
+import io.github.oshai.kotlinlogging.KotlinLogging
 import nl.nlportal.core.util.Mapper
 import org.springframework.core.io.ResourceLoader
 import java.util.UUID
diff --git a/zgw/common-ground-authentication/src/main/kotlin/nl/nlportal/commonground/authentication/CommonGroundAuthenticationConverter.kt b/zgw/common-ground-authentication/src/main/kotlin/nl/nlportal/commonground/authentication/CommonGroundAuthenticationConverter.kt
@@ -17,7 +17,7 @@ package nl.nlportal.commonground.authentication
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.annotation.JsonValue
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import nl.nlportal.commonground.authentication.exception.UserTypeUnsupportedException
 import nl.nlportal.portal.authentication.domain.PortalAuthentication
 import nl.nlportal.portal.authentication.domain.SUB_KEY
diff --git a/zgw/documenten-api/src/main/kotlin/nl/nlportal/documentenapi/autoconfigure/ClamAVConfiguration.kt b/zgw/documenten-api/src/main/kotlin/nl/nlportal/documentenapi/autoconfigure/ClamAVConfiguration.kt
@@ -1,6 +1,6 @@
 package nl.nlportal.documentenapi.autoconfigure
 
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import nl.nlportal.documentenapi.client.ClamAVVirusScanConfig
 import nl.nlportal.documentenapi.service.VirusScanService
 import nl.nlportal.documentenapi.service.impl.ClamAVService
diff --git a/zgw/documenten-api/src/main/kotlin/nl/nlportal/documentenapi/client/DocumentenApiClient.kt b/zgw/documenten-api/src/main/kotlin/nl/nlportal/documentenapi/client/DocumentenApiClient.kt
@@ -20,8 +20,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.reactor.awaitSingleOrNull
 import kotlinx.coroutines.withContext
-import mu.KLogger
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KLogger
+import io.github.oshai.kotlinlogging.KotlinLogging
 import nl.nlportal.core.ssl.ClientSslContextResolver
 import nl.nlportal.documentenapi.domain.Document
 import nl.nlportal.documentenapi.domain.PostEnkelvoudiginformatieobjectRequest
diff --git a/zgw/openklant/src/main/kotlin/nl/nlportal/openklant/service/OpenKlant2Service.kt b/zgw/openklant/src/main/kotlin/nl/nlportal/openklant/service/OpenKlant2Service.kt
@@ -15,7 +15,7 @@
  */
 package nl.nlportal.openklant.service
 
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import nl.nlportal.commonground.authentication.CommonGroundAuthentication
 import nl.nlportal.openklant.client.OpenKlant2KlantinteractiesClient
 import nl.nlportal.openklant.client.domain.OpenKlant2DigitaleAdres
diff --git a/zgw/taak/src/test/kotlin/nl/nlportal/zgw/taak/TestHelper.kt b/zgw/taak/src/test/kotlin/nl/nlportal/zgw/taak/TestHelper.kt
@@ -15,7 +15,7 @@
  */
 package nl.nlportal.zgw.taak
 
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import okhttp3.mockwebserver.MockResponse
 import org.springframework.test.web.reactive.server.WebTestClient
 import java.util.function.Consumer
diff --git a/zgw/zaken-api/src/test/kotlin/nl/nlportal/zakenapi/graphql/ZaakQueryIT.kt b/zgw/zaken-api/src/test/kotlin/nl/nlportal/zakenapi/graphql/ZaakQueryIT.kt
@@ -15,7 +15,7 @@
  */
 package nl.nlportal.zakenapi.graphql
 
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import nl.nlportal.besluiten.client.BesluitenApiConfig
 import nl.nlportal.catalogiapi.client.CatalogiApiConfig
 import nl.nlportal.commonground.authentication.WithBedrijfUser

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ object ApiDependencies {`
`23`	`23`	`val graphqlKotlinHooksProvider by lazy { "com.expediagroup:graphql-kotlin-hooks-provider:${ApiVersions.graphqlKotlin}"}`
`24`	`24`	`val graphqlKotlinSpringServer by lazy { "com.expediagroup:graphql-kotlin-spring-server:${ApiVersions.graphqlKotlin}"}`
`25`	`25`	`val jacksonBom by lazy { "com.fasterxml.jackson:jackson-bom:${ApiVersions.jacksonBom}" }`
`26`		`- val kotlinLogging by lazy { "io.github.microutils:kotlin-logging:${ApiVersions.kotlinLogging}"}`
	`26`	`+ val kotlinLogging by lazy { "io.github.oshai:kotlin-logging-jvm:${ApiVersions.kotlinLogging}"}`
`27`	`27`	`val springCloudStream by lazy { "org.springframework.cloud:spring-cloud-stream:${ApiVersions.springCloud}" }`
`28`	`28`	`val springCloudStreamBinderRabbit by lazy { "org.springframework.cloud:spring-cloud-stream-binder-rabbit:${ApiVersions.springCloud}" }`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,6 @@ object ApiVersions {`
`36`	`36`	`const val graphqlJava ="21.0"`
`37`	`37`	`const val graphqlKotlin = "7.0.1"`
`38`	`38`	`const val jacksonBom = "2.17.2"`
`39`		`- const val kotlinLogging = "3.0.5"`
	`39`	`+ const val kotlinLogging = "7.0.3"`
`40`	`40`	`const val springCloud = "4.1.3"`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,5 @@`
`14`	`14`	`# limitations under the License.`
`15`	`15`	`#`
`16`	`16`
`17`		`-isLib = true`
	`17`	`+isLib = true`
	`18`	`+org.jetbrains.dokka.experimental.gradle.pluginMode=V2EnabledWithHelpers`