added simple post and get endpoints for users AND made a docker-compose file, so spring boot can connect to a postgres database and could also be accessed with the pgadmin tool

Author: TommiCodes

README.md

@@ -1,16 +1,27 @@
 # Content Video 1
 Dockerize a Java Spring Boot Starter Template
 
-<<link to youtube video>>
+https://www.youtube.com/watch?v=EwwkEDz3VeE
 (published on 19th of November 2020)
 
+# Content Video 2
+- Add a docker-compose file and run also a postgres db and postgres adminer
+- Connect with Spring Boot to the db
+- Post Data && Get Data over http (to Spring Boot) and then save it in the db  
+
 # You need
 - Java
 - Maven
 - Docker
 - Spring Initiliazr (e.g. in Spring Initializr Extension in VsCode or https://start.spring.io/)
 
+# Start Commands for docker-compose file
+Builds, (re)creates, starts, and attaches to containers for a service.  
+`docker-compose up`
+
 # Start Commands for Docker
+Please follow the 1st Video, because due to docker-compose there are some changes  
+
 Build your image:  
 `docker build <your path> -t <<user>/project-name>`  
 

docker-compose.yml

@@ -0,0 +1,34 @@
+version: "3.8"
+services:
+### Postgres Database ###
+  postgres:
+    image: postgres:10.4
+    ports:
+      - "35000:5432"
+    environment: 
+      POSTGRES_USER: user
+      POSTGRES_PASSWORD: password
+      POSTGRES_DB: db
+### Postgres Adminer ###
+  postgres_admin:
+    image: dpage/pgadmin4:4.28
+    depends_on:
+      - postgres
+    environment: 
+      PGADMIN_DEFAULT_EMAIL: admin@admin.de
+      PGADMIN_DEFAULT_PASSWORD: password
+    ports:
+      - "5050:80"
+### API Spring Boot ###
+  api:
+    build:
+      dockerfile: Dockerfile
+      context: ./spring-boot-dockerized/
+    depends_on: 
+      - postgres
+    environment: 
+      DATABASE_URL: postgresql://postgres:5432/db
+      DATABASE_USER: user
+      DATABASE_PASSWORD: password
+    ports:
+      - "8080:3100"

spring-boot-dockerized/pom.xml

@@ -35,6 +35,30 @@
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.postgresql</groupId>
+			<artifactId>postgresql</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>1.18.8</version>
+			<scope>provided</scope>
+		</dependency>
+
 	</dependencies>
 
 	<build>

spring-boot-dockerized/src/main/java/com/thomas_oliver/springbootdockerized/controller/UserController.java

@@ -0,0 +1,31 @@
+package com.thomas_oliver.springbootdockerized.controller;
+
+import java.util.List;
+
+import com.thomas_oliver.springbootdockerized.model.User;
+import com.thomas_oliver.springbootdockerized.service.UserService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/users")
+public class UserController {
+    
+    @Autowired
+    UserService userService;
+
+    @GetMapping
+    public List<User> findAll() {
+        return userService.findAll();
+    }
+
+    @PostMapping
+    public User add(@RequestBody User user) {
+        return userService.add(user);
+    }
+}

spring-boot-dockerized/src/main/java/com/thomas_oliver/springbootdockerized/model/User.java

@@ -0,0 +1,22 @@
+package com.thomas_oliver.springbootdockerized.model;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import lombok.Data;
+
+@Entity
+@Table(name = "users")
+@Data
+public class User {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+
+    private String name;
+    
+}

spring-boot-dockerized/src/main/java/com/thomas_oliver/springbootdockerized/repository/UserRepository.java

@@ -0,0 +1,11 @@
+package com.thomas_oliver.springbootdockerized.repository;
+
+import com.thomas_oliver.springbootdockerized.model.User;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface UserRepository extends JpaRepository<User, Long>{
+    
+}

spring-boot-dockerized/src/main/java/com/thomas_oliver/springbootdockerized/service/UserService.java

@@ -0,0 +1,27 @@
+package com.thomas_oliver.springbootdockerized.service;
+
+import java.util.List;
+
+import com.thomas_oliver.springbootdockerized.model.User;
+import com.thomas_oliver.springbootdockerized.repository.UserRepository;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class UserService {
+    
+    @Autowired
+    private UserRepository userRepository;
+
+
+    public List<User> findAll () {
+        return userRepository.findAll();
+    }
+
+    public User add(User user) {
+        return userRepository.saveAndFlush(user);
+    }
+
+
+}

spring-boot-dockerized/src/main/resources/application.properties

@@ -1 +1,13 @@
 server.port = 3100
+
+spring.datasource.driver-class-name=org.postgresql.Driver
+spring.datasource.initialization-mode=always
+spring.datasource.platform=postgres
+spring.datasource.url=jdbc:${DATABASE_URL}
+spring.datasource.username=${DATABASE_USER}
+spring.datasource.password=${DATABASE_PASSWORD}
+
+spring.jpa.hibernate.ddl-auto=update
+spring.jpa.show-sql=true
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true

spring-boot-dockerized/src/test/resources/application.properties

@@ -0,0 +1,9 @@
+spring.datasource.url=jdbc:h2:mem:testdb
+spring.datasource.username=sa
+spring.datasource.password=
+
+spring.h2.console.enabled=false
+
+spring.jpa.show-sql=true
+spring.jpa.hibernate.ddl-auto=update
+spring.jpa.properties.hibernate.format_sql=true