From 361bba5b65261bfba3dc160001a5036ece94d5d5 Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer <volkmer_p@ukw.de>
Date: Mon, 31 Jul 2023 09:05:51 +0200
Subject: [PATCH] Code polish for PR

* Keep old config files
---
 src/main/resources/application-dev.yml | 30 +++++++-------------------
 src/main/resources/application.yml     | 14 +-----------
 2 files changed, 9 insertions(+), 35 deletions(-)

diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index d840055..99e4bbf 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -2,28 +2,14 @@ spring:
   docker:
     compose:
       file: ./dev-compose.yml
-  datasource:
-    hikari:
-      jdbc-url: "jdbc:mariadb://localhost:13306/dev"
-      driver-class-name: "org.mariadb.jdbc.Driver"
-      username: "dev"
-      password: "dev"
-    url: "jdbc:mariadb://localhost:13306/dev"
-app:
- # rest:
- #   uri: "https://bwhc-test.diz.uni-marburg.de/bwhc/etl/api/MTBFile"
-  pseudonymizer: GPAS
-  pseudonymize:
-    prefix: "test"
-    gpas:
-      target: "demo.study.demo"
-      uri: "http://localhost:8080/ttp-fhir/fhir/gpas/$pseudonymizeAllowCreate"
-      username: ""
-      password: ""
-      sslCaLocation: ""
 
-  kafka:
-    servers: "localhost:9092"
-    topic: test-dev
+app:
+  rest:
+    uri: http://localhost:9000/bwhc/etl/api/MTBFile
+  #kafka:
+  #  topic: test
+  #  servers: kafka:9092
+
 server:
   port: 8000
+
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5bdf6ca..39acb37 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -4,16 +4,4 @@ spring:
     template:
       default-topic: ${app.kafka.topic}
   flyway:
-    locations: "classpath:db/migration/{vendor}"
-  main:
-    allow-bean-definition-overriding: true
-
-
-app:
-  rest:
-    #uri: "localhost:9000/bwhc/etl/api/MTBFile"
-  pseudonymizer: BUILDIN
-
-
-server:
-  port: 8000
+    locations: "classpath:db/migration/{vendor}"
\ No newline at end of file