From 9bb7a2e7641c3a7d7b5173c727c8858a7be9db3f Mon Sep 17 00:00:00 2001
From: Peter Siegmund <developer@mars3142.org>
Date: Sat, 23 Aug 2025 00:06:46 +0200
Subject: [PATCH] optimize setup

Signed-off-by: Peter Siegmund <developer@mars3142.org>
---
 Dockerfile                                         |  2 +-
 app.json                                           | 14 --------------
 build.gradle                                       | 10 +++++-----
 src/main/resources/configurations/edge-service.yml |  4 ++--
 .../resources/configurations/google-service.yml    |  0
 5 files changed, 8 insertions(+), 22 deletions(-)
 delete mode 100644 app.json
 create mode 100644 src/main/resources/configurations/google-service.yml

diff --git a/Dockerfile b/Dockerfile
index 0026264..2fa5e87 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@ USER app
 
 # Copy all needed project files to a folder
 COPY --chown=app ./gradle/ ./gradle
-COPY --chown=app ./gradlew ./build.gradle ./settings.gradle ./app.json ./
+COPY --chown=app ./gradlew ./build.gradle ./settings.gradle ./
 COPY --chown=app ./src ./src
 
 RUN curl -OL https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar
diff --git a/app.json b/app.json
deleted file mode 100644
index ded8ad0..0000000
--- a/app.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "healthchecks": {
-    "web": [
-      {
-        "type":        "readiness",
-        "name":        "web check",
-        "description": "Checking if the app responds to the /actuator/health/readiness endpoint",
-        "path":        "/actuator/health/readiness",
-        "port": 5000,
-        "attempts": 3
-      }
-    ]
-  }
-}
diff --git a/build.gradle b/build.gradle
index 5b3bd38..795959d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,12 +28,12 @@ ext {
 }
 
 dependencies {
-	implementation 'org.springframework.cloud:spring-cloud-config-server'
-	implementation 'org.springframework.boot:spring-boot-starter-actuator'
-	implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'
-	implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'
-	compileOnly 'org.projectlombok:lombok'
 	annotationProcessor 'org.projectlombok:lombok'
+	compileOnly 'org.projectlombok:lombok'
+	implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'
+	implementation 'org.springframework.boot:spring-boot-starter-actuator'
+	implementation 'org.springframework.cloud:spring-cloud-config-server'
+	implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
diff --git a/src/main/resources/configurations/edge-service.yml b/src/main/resources/configurations/edge-service.yml
index 0133ffd..1426666 100644
--- a/src/main/resources/configurations/edge-service.yml
+++ b/src/main/resources/configurations/edge-service.yml
@@ -43,7 +43,7 @@ spring:
             - RewritePath=/timezone-service/(?<segment>.*), /$\{segment}
 
         - id: google-service
-          uri: ${GOOGLE_SERVICE_URI:http://google-service.web:8080}
+          uri: lb://google-service
           predicates:
             - Path=/v1/account/**, /health/google, /google-service/v3/api-docs
           filters:
@@ -51,7 +51,7 @@ spring:
             - RewritePath=/google-service/(?<segment>.*), /$\{segment}
 
         - id: token-service
-          uri: ${BACKEND_SERVICE_URI:http://backend-service.web:8080}
+          uri: lb://backend-service
           predicates:
             - Path=/v1/token/**, /health/backend, /token-service/v3/api-docs
           filters:
diff --git a/src/main/resources/configurations/google-service.yml b/src/main/resources/configurations/google-service.yml
new file mode 100644
index 0000000..e69de29