diff --git a/neo4j-store/build.gradle.kts b/neo4j-store/build.gradle.kts index e675bd518..59dfba558 100644 --- a/neo4j-store/build.gradle.kts +++ b/neo4j-store/build.gradle.kts @@ -14,6 +14,8 @@ dependencies { implementation("org.neo4j.driver:neo4j-java-driver:${Version.neo4jDriver}") implementation("org.neo4j:neo4j-slf4j:${Version.neo4j}") + implementation("com.sun.jna:jna:3.0.9") + testImplementation("com.palantir.docker.compose:docker-compose-rule-junit4:${Version.dockerComposeJunitRule}") testImplementation(kotlin("test")) diff --git a/prime-modules/src/main/kotlin/org/ostelco/prime/apierror/ApiError.kt b/prime-modules/src/main/kotlin/org/ostelco/prime/apierror/ApiError.kt index 7bd14b9ec..eebe0ac44 100644 --- a/prime-modules/src/main/kotlin/org/ostelco/prime/apierror/ApiError.kt +++ b/prime-modules/src/main/kotlin/org/ostelco/prime/apierror/ApiError.kt @@ -32,7 +32,7 @@ object ApiErrorMapper { val logger by getLogger() fun mapPaymentErrorToApiError(description: String, errorCode: ApiErrorCode, paymentError: PaymentError) : ApiError { - logger.error("description: $description, errorCode: $errorCode, paymentError: ${asJson(paymentError)}") + logger.error("{}: {}, paymentError: {}", errorCode, description, asJson(paymentError)) return when(paymentError) { is org.ostelco.prime.paymentprocessor.core.PlanAlredyPurchasedError -> ForbiddenError(description, errorCode, paymentError) is org.ostelco.prime.paymentprocessor.core.ForbiddenError -> ForbiddenError(description, errorCode, paymentError) @@ -44,7 +44,7 @@ object ApiErrorMapper { } fun mapStorageErrorToApiError(description: String, errorCode: ApiErrorCode, storeError: StoreError) : ApiError { - logger.error("description: $description, errorCode: $errorCode, storeError: ${asJson(storeError)}") + logger.error("{}: {}, storeError: {}", errorCode, description, asJson(storeError)) return when(storeError) { is org.ostelco.prime.storage.NotFoundError -> NotFoundError(description, errorCode, storeError) is org.ostelco.prime.storage.AlreadyExistsError -> ForbiddenError(description, errorCode, storeError) @@ -61,7 +61,7 @@ object ApiErrorMapper { } fun mapSimManagerErrorToApiError(description: String, errorCode: ApiErrorCode, simManagerError: SimManagerError) : ApiError { - logger.error("description: $description, errorCode: $errorCode, simManagerError: ${asJson(simManagerError)}") + logger.error("{}: {}, simManagerError: {}", errorCode, description, asJson(simManagerError)) return when (simManagerError) { is org.ostelco.prime.simmanager.NotFoundError -> NotFoundError(description, errorCode, simManagerError) is org.ostelco.prime.simmanager.NotUpdatedError -> BadRequestError(description, errorCode, simManagerError) diff --git a/prime/build.gradle.kts b/prime/build.gradle.kts index f37e365a6..b6601122a 100644 --- a/prime/build.gradle.kts +++ b/prime/build.gradle.kts @@ -10,7 +10,7 @@ plugins { } // Update version in [script/start.sh] too. -version = "1.73.0" +version = "1.73.1" dependencies { // interface module between prime and prime-modules diff --git a/prime/script/start.sh b/prime/script/start.sh index 881782bbc..63cc2dbf0 100755 --- a/prime/script/start.sh +++ b/prime/script/start.sh @@ -5,5 +5,5 @@ exec java \ -Dfile.encoding=UTF-8 \ --add-opens java.base/java.lang=ALL-UNNAMED \ --add-opens java.base/java.io=ALL-UNNAMED \ - -agentpath:/opt/cprof/profiler_java_agent.so=-cprof_service=prime,-cprof_service_version=1.73.0,-logtostderr,-minloglevel=2,-cprof_enable_heap_sampling \ + -agentpath:/opt/cprof/profiler_java_agent.so=-cprof_service=prime,-cprof_service_version=1.73.1,-logtostderr,-minloglevel=2,-cprof_enable_heap_sampling \ -jar /prime.jar server /config/config.yaml