Make following changes:

- Bump up kapt version
- Modify Dockerfile
- Rename main app class and its related classes
- Update README file

Author: nixos89

Dockerfile

@@ -1,30 +1,12 @@
-FROM openjdk:8
-COPY build/libs/sb-kotlin-java-app-0.1.jar /app/sb-kotlin-java-app-0.1.jar
-COPY wait-for-it.sh wait-for-it.sh
-RUN chmod +x wait-for-it.sh
-#COPY ormconfig.docker.json ./ormconfig.json
-
-EXPOSE 8080 8081 5432 5440
-
-ADD build/libs/sb-kotlin-java-app-0.1.jar sb-kotlin-java-app-0.1.jar
-ADD ./wait-for-it.sh wait-for-it.sh
-
-# TODO: fix CMD/ENTRYPOINT for wait-for-it script so following error does NOT occur:
-#nikola@ns-dell3537:~/IntellIJIDEA_WS/first-java-kotlin-gradle-project$ docker run -p 8080:8080 nixos89/sb-kotlin-java-app
-#Error: you need to provide a host and port to test.
-#Usage:
-#    wait-for-it.sh host:port [-s] [-t timeout] [-- command args]
-#    -h HOST | --host=HOST       Host or IP under test
-#    -p PORT | --port=PORT       TCP port under test
-#                                Alternatively, you specify the host and port as host:port
-#    -s | --strict               Only execute subcommand if the test succeeds
-#    -q | --quiet                Don't output any status messages
-#    -t TIMEOUT | --timeout=TIMEOUT
-#                                Timeout in seconds, zero for no timeout
-#    -- COMMAND ARGS             Execute command with args after the test finishes
-
-
-ENTRYPOINT [ "/bin/bash", "-c" ]
-# modify 2nd argumet in next (i.e. `CMD`) line
-CMD ["/wait-for-it.sh" , "[localhost:5432]" , "--strict" , "--timeout=300" , "--" , "java -jar /app/sb-kotlin-java-app-0.1.jar"]
-#ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/app/sb-kotlin-java-app-0.1.jar"]
+FROM gradle:jdk8-jammy AS build
+LABEL maintainer="Nikola Stevanovic <[email protected]>"
+COPY --chown=gradle:gradle . /home/gradle/src
+WORKDIR /home/gradle/src
+RUN gradle build
+
+# Example by https://dev.to/scaledynamics/deploy-a-spring-boot-kotlin-application-with-docker-4do3
+FROM openjdk:8-jre-slim
+COPY --from=build /home/gradle/src/build/libs/todo-app-0.1.jar /app/
+RUN bash -c 'touch /app/todo-app-0.1.jar'
+EXPOSE 8080
+ENTRYPOINT ["java", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCGroupMemoryLimitForHeap", "-Djava.security.egd=file:/dev/./urandom","-jar","/app/todo-app-0.1.jar"]

Dockerfile2

@@ -0,0 +1,30 @@
+FROM openjdk:8
+COPY build/libs/sb-kotlin-java-app-0.1.jar /app/sb-kotlin-java-app-0.1.jar
+COPY wait-for-it.sh wait-for-it.sh
+RUN chmod +x wait-for-it.sh
+#COPY ormconfig.docker.json ./ormconfig.json
+
+EXPOSE 8080 8081 5432 5440
+
+ADD build/libs/sb-kotlin-java-app-0.1.jar sb-kotlin-java-app-0.1.jar
+ADD ./wait-for-it.sh wait-for-it.sh
+
+# TODO: fix CMD/ENTRYPOINT for wait-for-it script so following error does NOT occur:
+#nikola@ns-dell3537:~/IntellIJIDEA_WS/first-java-kotlin-gradle-project$ docker run -p 8080:8080 nixos89/sb-kotlin-java-app
+#Error: you need to provide a host and port to test.
+#Usage:
+#    wait-for-it.sh host:port [-s] [-t timeout] [-- command args]
+#    -h HOST | --host=HOST       Host or IP under test
+#    -p PORT | --port=PORT       TCP port under test
+#                                Alternatively, you specify the host and port as host:port
+#    -s | --strict               Only execute subcommand if the test succeeds
+#    -q | --quiet                Don't output any status messages
+#    -t TIMEOUT | --timeout=TIMEOUT
+#                                Timeout in seconds, zero for no timeout
+#    -- COMMAND ARGS             Execute command with args after the test finishes
+
+
+ENTRYPOINT [ "/bin/bash", "-c" ]
+# modify 2nd argumet in next (i.e. `CMD`) line
+CMD ["/wait-for-it.sh" , "[localhost:5432]" , "--strict" , "--timeout=300" , "--" , "java -jar /app/sb-kotlin-java-app-0.1.jar"]
+#ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/app/sb-kotlin-java-app-0.1.jar"]

README.md

@@ -7,28 +7,33 @@ Simple ToDo app containing REST API written in Java and Kotlin using:
 * JUnit5
 
 
-## Steps for setting and running app:
+## 1. Setting up and running the app
+To properly set up and run the app perform following steps:
 1. Create `todo_db` database in Postgres DB ver 12 using following credentials:
    **username**=`postgres`<br/>
-   **password**=`system`<br/>
+   **password**=`postgres`<br/>
    **NOTE**: Make sure they are matching `spring.datasource.username` / `spring.flyway.user` properties in `application.properties` file
 2. Enter directory of `todo-kotlin-java-app` module
 3. Make sure  property `spring.flyway.enabled` is set to `true` located in `src/main/resources/application.properties`
 4. Execute `./gradlew bootRun` command
 5. Before 2nd and every other app run (i.e. before executing Step4) set `spring.flyway.enabled` property to `false` located in `src/main/resources/application.properties` 
 
-## Target one of following endpoints:
+## 2. App containerization
+If you prefer not to have...
+#TODO: Finish this!
 
+
+## 3. REST Endpoints
+Target one of following endpoints
 1. **GET** all Todo(s) [http://localhost:8080/api/todos](http://localhost:8080/api/todos) <br/>
 2. **GET** Single Todo (with id=1) [http://localhost:8080/api/todos/1](http://localhost:8080/api/todos/1) <br/>
-3. **POST** Todo [http://localhost:8080/api/todos](http://localhost:8080/api/todos) <br/>
-...using following body
+3. **POST** Todo [http://localhost:8080/api/todos](http://localhost:8080/api/todos) <br/>...using following body
 ```json
    {
       "title": "Kotlin app review",
       "description": "Survive the Kotlin app review"
    }
-   ```
+```
 4. **PATCH** Todo [http://localhost:8080/api/todos/3](http://localhost:8080/api/todos/3) <br/>
 ...using following body
 ```json

build.gradle.kts

@@ -10,7 +10,7 @@ plugins {
     kotlin("plugin.spring") version "1.5.10"
     kotlin("plugin.jpa") version "1.5.10"
     kotlin("plugin.allopen") version "1.5.10"
-    kotlin("kapt") version "1.5.10"
+    kotlin("kapt") version "1.6.0"
 }
 
 allOpen {
@@ -69,10 +69,10 @@ tasks.withType<Test> {
 }
 
 application {
-    mainClass.set("org.example.java_kotlin.FirstJavaKotlinGradleApp")
+    mainClass.set("org.example.java_kotlin.TodoKotlinJavaApp")
 }
 
 tasks.bootJar {
-    archiveBaseName.set("sb-kotlin-java-app")
+    archiveBaseName.set("todo-app")
     archiveVersion.set("0.1")
 }

docker-compose.yml

@@ -1,4 +1,5 @@
 version: "3.7"
+# TODO Read following docs:
 # https://github.com/docker-library/docs/blob/master/postgres/README.md
 # https://github.com/docker-library/docs/tree/master/openjdk
 # https://docs.docker.com/compose/startup-order/
@@ -15,7 +16,7 @@ services:
       - postgres-data:/var/lib/postgresql/data
     environment:
       POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: root
+      POSTGRES_PASSWORD: postgres
       POSTGRES_DB: todo_db
       # TODO: try mapping to different host and container ports
     ports:
@@ -28,18 +29,18 @@ services:
       - postgres-db
     ports:
       - "8080:8080"
-      - "8081:8080"
     volumes:
       - ./build/libs:/app
-    command: wait-for-it.sh localhost:5432 -t 20 && java -jar /app/sb-kotlin-java-app-0.1.jar
+    # TODO: modify `command` statement in order to execute
+    command: wait-for-it.sh localhost:5432 -t 20 && java -jar /app/todo-app-0.1.jar
 #    entrypoint:
     environment:
       - SPRING_DATASOURCE_URL=jdbc:postgresql://localhost:5432/todo_db
       - SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.postgresql.Driver
       - SPRING_DATASOURCE_USERNAME=postgres
-      - SPRING_DATASOURCE_PASSWORD=root
+      - SPRING_DATASOURCE_PASSWORD=postgres
       - SPRING_JPA_HIBERNATE_DDL_AUTO=update
       - SPRING_FLYWAY_USER=postgres
-      - SPRING_FLYWAY_PASSWORD=root
+      - SPRING_FLYWAY_PASSWORD=postgres
 volumes:
   postgres-data:

src/main/java/org/example/java_kotlin/FirstJavaKotlinGradleApp.java renamed to src/main/java/org/example/java_kotlin/TodoKotlinJavaApp.java

@@ -7,9 +7,9 @@
 
 @SpringBootApplication
 @EnableConfigurationProperties(ToDoConfiguration.class)
-public class FirstJavaKotlinGradleApp {
+public class TodoKotlinJavaApp {
 
     public static void main(String[] args) {
-        SpringApplication.run(FirstJavaKotlinGradleApp.class, args);
+        SpringApplication.run(TodoKotlinJavaApp.class, args);
     }
 }

src/main/java/org/example/java_kotlin/controller/TodoController.kt

@@ -9,6 +9,8 @@ import org.springframework.util.ObjectUtils
 import org.springframework.validation.annotation.Validated
 import org.springframework.web.bind.annotation.*
 
+// TODO: Remove all unnecessary and unused variables in this class
+
 @RestController
 @RequestMapping("/api/todos")
 class TodoController(private val todoRepository: TodoRepository, private val toDoService: ToDoService) {

src/main/resources/application.properties

@@ -5,7 +5,7 @@ management.endpoints.web.exposure.include=health,info,shutdown
 # setting up Postgres DB
 spring.datasource.url=jdbc:postgresql://localhost:5432/todo_db
 spring.datasource.username=postgres
-spring.datasource.password=root
+spring.datasource.password=postgres
 spring.datasource.driverClassName=org.postgresql.Driver
 
 spring.flyway.enabled=true
@@ -19,5 +19,5 @@ spring.flyway.repeatable-sql-migration-prefix=R
 spring.flyway.sql-migration-separator=__
 spring.flyway.sql-migration-suffixes=.sql
 spring.flyway.user=postgres
-spring.flyway.password=root
+spring.flyway.password=postgres
 spring.flyway.locations=classpath:db/migration

src/test/java/org/example/java_kotlin/FirstJavaKotlinGradleAppTest.java

@@ -0,0 +1,11 @@
+package org.example.java_kotlin;
+
+
+//@SpringBootTest
+public class TodoKotlinJavaAppTest {
+
+//    @Test
+//    void contextLoads() {
+//    }
+
+}