From 9cfaf5857bb7c1f232af72dfb271f19a7cd3391f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torma=20Krist=C3=B3f?= <tormakristof@tormakristof.eu>
Date: Wed, 11 Aug 2021 16:43:08 +0200
Subject: [PATCH] update deps

---
 build.gradle                            | 14 +++++++-------
 gradle.properties                       |  2 +-
 k8s/configmap.yml                       | 10 +++++-----
 k8s/deployment.yml                      | 14 +++++++-------
 k8s/service.yml                         |  8 ++++----
 src/api/route/OutputServiceRDBServer.kt |  4 ++--
 6 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/build.gradle b/build.gradle
index f6dfbcf..649685a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,13 +39,13 @@ repositories {
 }
 
 dependencies {
-    compile 'org.postgresql:postgresql:42.2.2'
-    compile 'org.jetbrains.exposed:exposed-core:0.23.1'
-    compile 'org.jetbrains.exposed:exposed-dao:0.23.1'
-    compile 'org.jetbrains.exposed:exposed-jdbc:0.23.1'
-    compile 'org.jetbrains.exposed:exposed-java-time:0.23.1'
-    compile 'com.rabbitmq:amqp-client:2.7.1'
-    compile 'com.zaxxer:HikariCP:2.7.8'
+    compile 'org.postgresql:postgresql:42.2.23'
+    compile 'org.jetbrains.exposed:exposed-core:0.32.1'
+    compile 'org.jetbrains.exposed:exposed-dao:0.32.1'
+    compile 'org.jetbrains.exposed:exposed-jdbc:0.33.1'
+    compile 'org.jetbrains.exposed:exposed-java-time:0.33.1'
+    compile 'com.rabbitmq:amqp-client:5.13.0'
+    compile 'com.zaxxer:HikariCP:5.0.0'
     compile 'com.viartemev:the-white-rabbit:0.0.5'
     implementation "org.koin:koin-ktor:$koin_version"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
diff --git a/gradle.properties b/gradle.properties
index a1c1bc9..87b2eeb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-ktor_version=1.4.2
+ktor_version=1.6.2
 kotlin.code.style=official
 kotlin_version=1.4.10
 logback_version=1.2.1
diff --git a/k8s/configmap.yml b/k8s/configmap.yml
index b769882..b266233 100644
--- a/k8s/configmap.yml
+++ b/k8s/configmap.yml
@@ -1,15 +1,15 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: output-service-rdb-config
+  name: sample-service-config
   labels:
-    app: output-service-rdb
+    app: sample-service
   namespace: birbnetes
 data:
   PORT: "8080"
-  DB_URL: "jdbc:postgresql://output-postgres:5432/output-service"
-  DB_USER: output-service
-  DB_PASSWORD: output-service-supersecret
+  DB_URL: "jdbc:postgresql://sample-postgres:5432/sample-service"
+  DB_USER: sample-service
+  DB_PASSWORD: sample-service-supersecret
   MQ_HOST: birb-rabbitmq
   MQ_USERNAME: user
   MQ_PASSWORD: F3ACadDRsT
diff --git a/k8s/deployment.yml b/k8s/deployment.yml
index f27c6de..04cba4d 100644
--- a/k8s/deployment.yml
+++ b/k8s/deployment.yml
@@ -1,29 +1,29 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: output-service-rdb
+  name: sample-service
   namespace: birbnetes
   labels:
-    app: output-service-rdb
+    app: sample-service
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: output-service-rdb
+      app: sample-service
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
-        app: output-service-rdb
+        app: sample-service
     spec:
       containers:
-        - image: registry.kmlabz.com/birbnetes/output-service-rdb
+        - image: registry.kmlabz.com/birbnetes/sample-service
           imagePullPolicy: Always
-          name: output-service-rdb
+          name: sample-service
           envFrom:
             - configMapRef:
-                name: output-service-rdb-config
+                name: sample-service-config
           ports:
             - containerPort: 8080
       imagePullSecrets:
diff --git a/k8s/service.yml b/k8s/service.yml
index c77c4bb..d5b1946 100644
--- a/k8s/service.yml
+++ b/k8s/service.yml
@@ -1,16 +1,16 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: output-service-rdb
+  name: sample-service
   namespace: birbnetes
   labels:
-    app: output-service-rdb
+    app: sample-service
 spec:
   ports:
-    - name: output-service-rdb
+    - name: sample-service
       port: 80
       targetPort: 8080
       protocol: TCP
   selector:
-    app: output-service-rdb
+    app: sample-service
   type: ClusterIP
\ No newline at end of file
diff --git a/src/api/route/OutputServiceRDBServer.kt b/src/api/route/OutputServiceRDBServer.kt
index 5f8168b..5b6e1e9 100644
--- a/src/api/route/OutputServiceRDBServer.kt
+++ b/src/api/route/OutputServiceRDBServer.kt
@@ -29,7 +29,7 @@ class OutputServiceRDBServer {
             val dateAfter = call.parameters["dateAfter"] ?: error(HttpStatusCode.NotAcceptable)
             val dateTimeFormatter: DateTimeFormatter = DateTimeFormatter.ISO_LOCAL_DATE
             val localDateAfter : LocalDate = LocalDate.parse(dateAfter,dateTimeFormatter)
-            val resultList = resultObjectService.getSampleObjectafterDate(localDateAfter) ?: call.respond(HttpStatusCode.NotFound)
+            val resultList = resultObjectService.getSampleObjectafterDate(localDateAfter)
 
             call.respond(resultList)
         }
@@ -38,7 +38,7 @@ class OutputServiceRDBServer {
             val dateAfter = call.parameters["dateBefore"] ?: error(HttpStatusCode.NotAcceptable)
             val dateTimeFormatter: DateTimeFormatter = DateTimeFormatter.ISO_LOCAL_DATE
             val localDateBefore : LocalDate = LocalDate.parse(dateAfter,dateTimeFormatter)
-            val resultList = resultObjectService.getSampleObjectbeforeDate(localDateBefore) ?: call.respond(HttpStatusCode.NotFound)
+            val resultList = resultObjectService.getSampleObjectbeforeDate(localDateBefore)
 
             call.respond(resultList)
         }