From a05f86d3be46142185a419c1ff8286edb350ab55 Mon Sep 17 00:00:00 2001
From: Swordsteel <swordsteel@gmail.com>
Date: Tue, 29 Jul 2025 12:45:59 +0200
Subject: [PATCH] update project

---
 build.gradle.kts                                  | 15 +++++----------
 gradle.properties                                 |  2 +-
 .../ltd/hlaeja/service/MeasurementService.kt      |  2 +-
 src/main/resources/application.yml                | 14 ++++++++++++++
 .../resources/{logback.xml => logback-spring.xml} |  0
 src/main/resources/logback-test.xml               | 11 -----------
 6 files changed, 21 insertions(+), 23 deletions(-)
 rename src/main/resources/{logback.xml => logback-spring.xml} (100%)
 delete mode 100644 src/main/resources/logback-test.xml

diff --git a/build.gradle.kts b/build.gradle.kts
index 5474f45..91828bb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,13 +1,12 @@
 import com.bmuschko.gradle.docker.tasks.container.DockerCreateContainer
-import java.lang.System.getenv
 
 plugins {
-    alias(hlaeja.plugins.com.bmuschko.docker)
+    alias(hlaeja.plugins.gradle.docker)
     alias(hlaeja.plugins.kotlin.jvm)
     alias(hlaeja.plugins.kotlin.spring)
-    alias(hlaeja.plugins.ltd.hlaeja.plugin.service)
+    alias(hlaeja.plugins.spring.boot)
     alias(hlaeja.plugins.spring.dependency.management)
-    alias(hlaeja.plugins.springframework.boot)
+    alias(hlaeja.plugins.service)
 }
 
 dependencies {
@@ -15,7 +14,7 @@ dependencies {
     implementation(hlaeja.kotlin.logging)
     implementation(hlaeja.kotlin.reflect)
     implementation(hlaeja.kotlinx.coroutines)
-    implementation(hlaeja.library.hlaeja.common.messages)
+    implementation(hlaeja.library.common.messages)
     implementation(hlaeja.springboot.starter.actuator)
     implementation(hlaeja.springboot.starter.webflux)
 
@@ -30,11 +29,7 @@ dependencies {
 
 group = "ltd.hlaeja"
 
-fun influxDbToken(): String = if (extra.has("influxdb.token")) {
-    extra["influxdb.token"] as String
-} else {
-    getenv("INFLUXDB_TOKEN") ?: "missing_token"
-}
+fun influxDbToken(): String = config.findOrDefault("influxdb.token", "INFLUXDB_TOKEN", "missing_token")
 
 tasks {
     named("containerCreate", DockerCreateContainer::class) {
diff --git a/gradle.properties b/gradle.properties
index b80a10f..6dbdbf6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 kotlin.code.style=official
 version=0.2.0-SNAPSHOT
-catalog=0.6.0
+catalog=0.11.0-SNAPSHOT
 container.port.host=9020
diff --git a/src/main/kotlin/ltd/hlaeja/service/MeasurementService.kt b/src/main/kotlin/ltd/hlaeja/service/MeasurementService.kt
index 4efc52f..a171952 100644
--- a/src/main/kotlin/ltd/hlaeja/service/MeasurementService.kt
+++ b/src/main/kotlin/ltd/hlaeja/service/MeasurementService.kt
@@ -1,10 +1,10 @@
 package ltd.hlaeja.service
 
 import com.influxdb.client.write.Point
+import io.github.oshai.kotlinlogging.KotlinLogging
 import java.util.UUID
 import ltd.hlaeja.library.deviceData.MeasurementData
 import ltd.hlaeja.repository.MeasurementRepository
-import mu.KotlinLogging
 import org.springframework.http.HttpStatus.NOT_FOUND
 import org.springframework.stereotype.Service
 import org.springframework.web.server.ResponseStatusException
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9113a82..25d970a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,6 +10,20 @@ spring:
         name: "%APP_BUILD_OS_NAME%"
         version: "%APP_BUILD_OS_VERSION%"
 
+management:
+  endpoints:
+    access:
+      default: none
+    web:
+      exposure:
+        include: "health,info"
+  endpoint:
+    health:
+      show-details: always
+      access: read_only
+    info:
+      access: read_only
+
 influxdb:
   bucket: device-data
   org: hlaeja_ltd
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback-spring.xml
similarity index 100%
rename from src/main/resources/logback.xml
rename to src/main/resources/logback-spring.xml
diff --git a/src/main/resources/logback-test.xml b/src/main/resources/logback-test.xml
deleted file mode 100644
index 3d69919..0000000
--- a/src/main/resources/logback-test.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<configuration>
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-  <root level="INFO">
-    <appender-ref ref="STDOUT"/>
-  </root>
-  <logger level="DEBUG" name="ltd.hlaeja"/>
-</configuration>