Skip to content

Commit 550053e

Browse files
committed
Merge branch 'development' into feature/fix-kvk-adres-optional-fields
2 parents 24cc869 + 8223bf2 commit 550053e

File tree

33 files changed

+41
-40
lines changed

33 files changed

+41
-40
lines changed

buildSrc/src/main/kotlin/ApiDependencies.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ object ApiDependencies {
2323
val graphqlKotlinHooksProvider by lazy { "com.expediagroup:graphql-kotlin-hooks-provider:${ApiVersions.graphqlKotlin}"}
2424
val graphqlKotlinSpringServer by lazy { "com.expediagroup:graphql-kotlin-spring-server:${ApiVersions.graphqlKotlin}"}
2525
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}"}
2727
val springCloudStream by lazy { "org.springframework.cloud:spring-cloud-stream:${ApiVersions.springCloud}" }
2828
val springCloudStreamBinderRabbit by lazy { "org.springframework.cloud:spring-cloud-stream-binder-rabbit:${ApiVersions.springCloud}" }
2929
}

buildSrc/src/main/kotlin/Versions.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ object ApiVersions {
3636
const val graphqlJava ="21.0"
3737
const val graphqlKotlin = "7.0.1"
3838
const val jacksonBom = "2.17.2"
39-
const val kotlinLogging = "3.0.5"
39+
const val kotlinLogging = "7.0.3"
4040
const val springCloud = "4.1.3"
4141
}

case/src/main/kotlin/nl/nlportal/case/autoconfigure/CaseAutoConfiguration.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package nl.nlportal.case.autoconfigure
1717

18-
import mu.KotlinLogging
18+
import io.github.oshai.kotlinlogging.KotlinLogging
1919
import nl.nlportal.case.autodeployment.CaseDefinitionApplicationReadyEventListener
2020
import nl.nlportal.case.repository.CaseDefinitionRepository
2121
import nl.nlportal.case.repository.CaseRepository

case/src/main/kotlin/nl/nlportal/case/service/CaseDefinitionService.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package nl.nlportal.case.service
1717

1818
import com.fasterxml.jackson.core.type.TypeReference
1919
import com.fasterxml.jackson.databind.node.ObjectNode
20-
import mu.KotlinLogging
20+
import io.github.oshai.kotlinlogging.KotlinLogging
2121
import nl.nlportal.case.domain.CaseDefinition
2222
import nl.nlportal.case.domain.CaseDefinitionId
2323
import nl.nlportal.case.domain.Schema

case/src/main/kotlin/nl/nlportal/case/service/CaseService.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package nl.nlportal.case.service
1717

1818
import com.fasterxml.jackson.databind.JsonNode
1919
import com.fasterxml.jackson.databind.node.ObjectNode
20-
import mu.KotlinLogging
20+
import io.github.oshai.kotlinlogging.KotlinLogging
2121
import nl.nlportal.case.domain.Case
2222
import nl.nlportal.case.domain.CaseDefinition
2323
import nl.nlportal.case.domain.CaseDefinitionId

data/src/main/kotlin/nl/nlportal/data/liquibase/LiquibaseRunner.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package nl.nlportal.data.liquibase
1717

18+
import io.github.oshai.kotlinlogging.KotlinLogging
1819
import liquibase.Contexts
1920
import liquibase.Liquibase
2021
import liquibase.database.Database
@@ -23,7 +24,6 @@ import liquibase.database.jvm.JdbcConnection
2324
import liquibase.exception.DatabaseException
2425
import liquibase.exception.LiquibaseException
2526
import liquibase.resource.ClassLoaderResourceAccessor
26-
import mu.KotlinLogging
2727
import org.springframework.boot.autoconfigure.liquibase.LiquibaseProperties
2828
import java.sql.SQLException
2929
import javax.sql.DataSource

form/src/main/kotlin/nl/nlportal/form/autodeployment/FormDefinitionDeploymentService.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode
2020
import nl.nlportal.core.util.Mapper
2121
import nl.nlportal.form.domain.request.CreateFormDefinitionRequest
2222
import nl.nlportal.form.service.FormIoFormDefinitionService
23-
import mu.KotlinLogging
23+
import io.github.oshai.kotlinlogging.KotlinLogging
2424
import org.apache.commons.io.IOUtils
2525
import org.springframework.core.io.Resource
2626
import org.springframework.core.io.ResourceLoader

graphql/src/test/kotlin/nl/nlportal/graphql/security/AuthenticationIT.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package nl.nlportal.graphql.security
1717

1818
import nl.nlportal.graphql.BaseIntegrationTest
19-
import mu.KotlinLogging
19+
import io.github.oshai.kotlinlogging.KotlinLogging
2020
import org.junit.jupiter.api.Test
2121
import org.springframework.beans.factory.annotation.Autowired
2222
import org.springframework.http.MediaType

haalcentraal/haalcentraal-all/src/test/kotlin/nl/nlportal/haalcentraal/all/TestHelper.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package nl.nlportal.haalcentraal.all
1717

18-
import mu.KotlinLogging
18+
import io.github.oshai.kotlinlogging.KotlinLogging
1919
import okhttp3.mockwebserver.MockResponse
2020
import org.springframework.test.web.reactive.server.WebTestClient
2121
import java.util.function.Consumer

haalcentraal/haalcentraal-brp/src/main/kotlin/nl/nlportal/haalcentraal/brp/service/impl/HaalCentraalBrpServiceImpl.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package nl.nlportal.haalcentraal.brp.service.impl
1717

18-
import mu.KotlinLogging
18+
import io.github.oshai.kotlinlogging.KotlinLogging
1919
import nl.nlportal.commonground.authentication.BurgerAuthentication
2020
import nl.nlportal.commonground.authentication.CommonGroundAuthentication
2121
import nl.nlportal.haalcentraal.brp.client.HaalCentraalBrpClient

haalcentraal/haalcentraal-brp/src/test/kotlin/nl/nlportal/haalcentraal/brp/TestHelper.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package nl.nlportal.haalcentraal.brp
1717

18-
import mu.KotlinLogging
18+
import io.github.oshai.kotlinlogging.KotlinLogging
1919
import okhttp3.mockwebserver.MockResponse
2020
import org.springframework.test.web.reactive.server.WebTestClient
2121
import java.util.function.Consumer

haalcentraal/haalcentraal-hr/src/main/kotlin/nl/nlportal/haalcentraal/hr/client/HandelsregisterClient.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
package nl.nlportal.haalcentraal.hr.client
1717

1818
import io.netty.handler.logging.LogLevel
19-
import mu.KLogger
20-
import mu.KotlinLogging
19+
import io.github.oshai.kotlinlogging.KLogger
20+
import io.github.oshai.kotlinlogging.KotlinLogging
2121
import nl.nlportal.core.ssl.ClientSslContextResolver
2222
import nl.nlportal.haalcentraal.hr.domain.MaatschappelijkeActiviteit
2323
import org.springframework.http.client.reactive.ReactorClientHttpConnector

haalcentraal/src/main/kotlin/nl/nlportal/haalcentraal/client/HaalCentraalClientProvider.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ package nl.nlportal.haalcentraal.client
1717

1818
import nl.nlportal.core.ssl.ClientSslContextResolver
1919
import io.netty.handler.logging.LogLevel
20-
import mu.KLogger
21-
import mu.KotlinLogging
20+
import io.github.oshai.kotlinlogging.KLogger
21+
import io.github.oshai.kotlinlogging.KotlinLogging
2222
import nl.nlportal.commonground.authentication.CommonGroundAuthentication
2323
import org.springframework.http.HttpHeaders
2424
import org.springframework.http.client.reactive.ReactorClientHttpConnector

klant/src/test/kotlin/nl/nlportal/klant/graphql/BurgerMutationIT.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package nl.nlportal.klant.graphql
1717

18-
import mu.KotlinLogging
18+
import io.github.oshai.kotlinlogging.KotlinLogging
1919
import nl.nlportal.commonground.authentication.WithBurgerUser
2020
import nl.nlportal.klant.TestHelper
2121
import nl.nlportal.klant.generiek.client.OpenKlantClientConfig

payment/src/main/kotlin/nl/nlportal/payment/service/OgonePaymentService.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package nl.nlportal.payment.service
1717

18-
import mu.KLogger
19-
import mu.KotlinLogging
18+
import io.github.oshai.kotlinlogging.KLogger
19+
import io.github.oshai.kotlinlogging.KotlinLogging
2020
import nl.nlportal.core.util.CoreUtils
2121
import nl.nlportal.payment.autoconfiguration.OgonePaymentConfig
2222
import nl.nlportal.payment.constants.OgoneState

payment/src/test/kotlin/nl/nlportal/payment/TestHelper.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package nl.nlportal.payment
1717

18-
import mu.KotlinLogging
18+
import io.github.oshai.kotlinlogging.KotlinLogging
1919
import okhttp3.mockwebserver.MockResponse
2020
import org.springframework.test.web.reactive.server.WebTestClient
2121
import java.util.function.Consumer

payment/src/test/kotlin/nl/nlportal/payment/graphql/OgonePaymentMutationIT.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package nl.nlportal.payment.graphql
1717

18-
import mu.KLogger
19-
import mu.KotlinLogging
18+
import io.github.oshai.kotlinlogging.KLogger
19+
import io.github.oshai.kotlinlogging.KotlinLogging
2020
import nl.nlportal.commonground.authentication.WithBurgerUser
2121
import nl.nlportal.payment.autoconfiguration.OgonePaymentConfig
2222
import nl.nlportal.payment.domain.OgonePayment

product/gradle.properties

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@
1414
# limitations under the License.
1515
#
1616

17-
isLib = true
17+
isLib = true
18+
org.jetbrains.dokka.experimental.gradle.pluginMode=V2EnabledWithHelpers

product/src/main/kotlin/nl/nlportal/product/client/DmnClient.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
package nl.nlportal.product.client
1717

1818
import io.netty.handler.logging.LogLevel
19-
import mu.KLogger
20-
import mu.KotlinLogging
19+
import io.github.oshai.kotlinlogging.KLogger
20+
import io.github.oshai.kotlinlogging.KotlinLogging
2121
import nl.nlportal.core.ssl.ClientSslContextResolver
2222
import nl.nlportal.idtokenauthentication.service.IdTokenGenerator
2323
import nl.nlportal.product.domain.DmnRequest

product/src/main/kotlin/nl/nlportal/product/service/DmnService.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package nl.nlportal.product.service
1717

1818
import com.jayway.jsonpath.JsonPath
19-
import mu.KotlinLogging
19+
import io.github.oshai.kotlinlogging.KotlinLogging
2020
import nl.nlportal.core.util.Mapper
2121
import nl.nlportal.product.client.DmnClient
2222
import nl.nlportal.product.domain.BeslisTabelConfiguration

product/src/main/kotlin/nl/nlportal/product/service/PrefillService.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package nl.nlportal.product.service
1818
import com.fasterxml.jackson.databind.node.ObjectNode
1919
import com.github.wnameless.json.unflattener.JsonUnflattener
2020
import com.jayway.jsonpath.JsonPath
21-
import mu.KotlinLogging
21+
import io.github.oshai.kotlinlogging.KotlinLogging
2222
import nl.nlportal.commonground.authentication.CommonGroundAuthentication
2323
import nl.nlportal.core.util.CoreUtils
2424
import nl.nlportal.core.util.Mapper

product/src/main/kotlin/nl/nlportal/product/service/ProductService.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package nl.nlportal.product.service
1717

1818
import com.fasterxml.jackson.databind.node.ObjectNode
19-
import mu.KotlinLogging
19+
import io.github.oshai.kotlinlogging.KotlinLogging
2020
import nl.nlportal.commonground.authentication.AuthenticationMachtigingsDienstService
2121
import nl.nlportal.commonground.authentication.CommonGroundAuthentication
2222
import nl.nlportal.core.util.Mapper

product/src/test/kotlin/nl/nlportal/product/TestHelper.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package nl.nlportal.product
1717

18-
import mu.KotlinLogging
18+
import io.github.oshai.kotlinlogging.KotlinLogging
1919
import okhttp3.mockwebserver.MockResponse
2020
import org.springframework.test.web.reactive.server.WebTestClient
2121
import java.util.function.Consumer

zgw/berichten/src/main/kotlin/nl/nlportal/berichten/service/BerichtenService.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package nl.nlportal.berichten.service
1717

18-
import mu.KotlinLogging
18+
import io.github.oshai.kotlinlogging.KotlinLogging
1919
import nl.nlportal.berichten.autoconfigure.BerichtenConfigurationProperties
2020
import nl.nlportal.berichten.domain.Bericht
2121
import nl.nlportal.berichten.graphql.BerichtenPage

zgw/berichten/src/test/kotlin/nl/nlportal/berichten/TestHelper.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package nl.nlportal.berichten
1717

18-
import mu.KotlinLogging
18+
import io.github.oshai.kotlinlogging.KotlinLogging
1919
import okhttp3.mockwebserver.MockResponse
2020
import org.springframework.test.web.reactive.server.WebTestClient
2121
import java.util.function.Consumer

zgw/besluiten/src/test/kotlin/nl/nlportal/besluiten/TestHelper.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package nl.nlportal.besluiten
1717

18-
import mu.KotlinLogging
18+
import io.github.oshai.kotlinlogging.KotlinLogging
1919
import okhttp3.mockwebserver.MockResponse
2020
import org.springframework.test.web.reactive.server.WebTestClient
2121
import java.util.function.Consumer

zgw/common-ground-authentication/src/main/kotlin/nl/nlportal/commonground/authentication/AuthenticationMachtigingsDienstService.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
package nl.nlportal.commonground.authentication
1717

1818
import com.fasterxml.jackson.core.type.TypeReference
19-
import mu.KLogger
20-
import mu.KotlinLogging
19+
import io.github.oshai.kotlinlogging.KLogger
20+
import io.github.oshai.kotlinlogging.KotlinLogging
2121
import nl.nlportal.core.util.Mapper
2222
import org.springframework.core.io.ResourceLoader
2323
import java.util.UUID

zgw/common-ground-authentication/src/main/kotlin/nl/nlportal/commonground/authentication/CommonGroundAuthenticationConverter.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package nl.nlportal.commonground.authentication
1717

1818
import com.fasterxml.jackson.annotation.JsonProperty
1919
import com.fasterxml.jackson.annotation.JsonValue
20-
import mu.KotlinLogging
20+
import io.github.oshai.kotlinlogging.KotlinLogging
2121
import nl.nlportal.commonground.authentication.exception.UserTypeUnsupportedException
2222
import nl.nlportal.portal.authentication.domain.PortalAuthentication
2323
import nl.nlportal.portal.authentication.domain.SUB_KEY

zgw/documenten-api/src/main/kotlin/nl/nlportal/documentenapi/autoconfigure/ClamAVConfiguration.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package nl.nlportal.documentenapi.autoconfigure
22

3-
import mu.KotlinLogging
3+
import io.github.oshai.kotlinlogging.KotlinLogging
44
import nl.nlportal.documentenapi.client.ClamAVVirusScanConfig
55
import nl.nlportal.documentenapi.service.VirusScanService
66
import nl.nlportal.documentenapi.service.impl.ClamAVService

zgw/documenten-api/src/main/kotlin/nl/nlportal/documentenapi/client/DocumentenApiClient.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import kotlinx.coroutines.Dispatchers
2020
import kotlinx.coroutines.flow.Flow
2121
import kotlinx.coroutines.reactor.awaitSingleOrNull
2222
import kotlinx.coroutines.withContext
23-
import mu.KLogger
24-
import mu.KotlinLogging
23+
import io.github.oshai.kotlinlogging.KLogger
24+
import io.github.oshai.kotlinlogging.KotlinLogging
2525
import nl.nlportal.core.ssl.ClientSslContextResolver
2626
import nl.nlportal.documentenapi.domain.Document
2727
import nl.nlportal.documentenapi.domain.PostEnkelvoudiginformatieobjectRequest

zgw/openklant/src/main/kotlin/nl/nlportal/openklant/service/OpenKlant2Service.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package nl.nlportal.openklant.service
1717

18-
import mu.KotlinLogging
18+
import io.github.oshai.kotlinlogging.KotlinLogging
1919
import nl.nlportal.commonground.authentication.CommonGroundAuthentication
2020
import nl.nlportal.openklant.client.OpenKlant2KlantinteractiesClient
2121
import nl.nlportal.openklant.client.domain.OpenKlant2DigitaleAdres

zgw/taak/src/test/kotlin/nl/nlportal/zgw/taak/TestHelper.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package nl.nlportal.zgw.taak
1717

18-
import mu.KotlinLogging
18+
import io.github.oshai.kotlinlogging.KotlinLogging
1919
import okhttp3.mockwebserver.MockResponse
2020
import org.springframework.test.web.reactive.server.WebTestClient
2121
import java.util.function.Consumer

zgw/zaken-api/src/test/kotlin/nl/nlportal/zakenapi/graphql/ZaakQueryIT.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package nl.nlportal.zakenapi.graphql
1717

18-
import mu.KotlinLogging
18+
import io.github.oshai.kotlinlogging.KotlinLogging
1919
import nl.nlportal.besluiten.client.BesluitenApiConfig
2020
import nl.nlportal.catalogiapi.client.CatalogiApiConfig
2121
import nl.nlportal.commonground.authentication.WithBedrijfUser

0 commit comments

Comments
 (0)