Merge pull request #11 from piomin/renovate/spring-boot

Update dependency org.springframework.boot:spring-boot-starter-parent to v2.7.7

Author: piomin

.circleci/config.yml

@@ -3,17 +3,20 @@ version: 2.1
 jobs:
   build:
     docker:
-      - image: 'cimg/openjdk:17.0.5'
+      - image: 'cimg/openjdk:17.0'
     steps:
       - checkout
       - run:
           name: Analyze on SonarCloud
-          command: mvn verify sonar:sonar
+          command: mvn verify sonar:sonar -DskipTests
 
 executors:
-  j17:
-    docker:
-      - image: 'cimg/openjdk:17.0'
+  machine_executor_amd64:
+    machine:
+      image: ubuntu-2204:2022.04.2
+    environment:
+      architecture: "amd64"
+      platform: "linux/amd64"
 
 orbs:
   maven: circleci/[email protected]
@@ -22,6 +25,6 @@ workflows:
   maven_test:
     jobs:
       - maven/test:
-          executor: j17
+          executor: machine_executor_amd64
       - build:
           context: SonarCloud

pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.1</version>
+		<version>2.7.7</version>
 	</parent>
 
 	<groupId>pl.piomin.samples</groupId>
@@ -19,6 +19,7 @@
 		<sonar.projectKey>piomin_sample-spring-boot-on-kubernetes</sonar.projectKey>
 		<sonar.organization>piomin</sonar.organization>
 		<sonar.host.url>https://sonarcloud.io</sonar.host.url>
+		<testcontainers.version>1.17.3</testcontainers.version>
 	</properties>
 
 	<dependencies>
@@ -52,12 +53,35 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>de.flapdoodle.embed</groupId>
-			<artifactId>de.flapdoodle.embed.mongo</artifactId>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>mongodb</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.instancio</groupId>
+			<artifactId>instancio-junit</artifactId>
+			<version>2.3.0</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
 
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.testcontainers</groupId>
+				<artifactId>testcontainers-bom</artifactId>
+				<version>${testcontainers.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
 	<build>
 		<plugins>
 			<plugin>

readme.md

@@ -1,5 +1,12 @@
 # Spring Boot on Kubernetes Demo Project [![Twitter](https://img.shields.io/twitter/follow/piotr_minkowski.svg?style=social&logo=twitter&label=Follow%20Me)](https://twitter.com/piotr_minkowski)
 
+[![CircleCI](https://circleci.com/gh/piomin/sample-spring-on-kubernetes.svg?style=svg)](https://circleci.com/gh/piomin/sample-spring-on-kubernetes)
+
+[![SonarCloud](https://sonarcloud.io/images/project_badges/sonarcloud-black.svg)](https://sonarcloud.io/dashboard?id=piomin_sample-spring-on-kubernetes)
+[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=piomin_sample-spring-on-kubernetes&metric=bugs)](https://sonarcloud.io/dashboard?id=piomin_sample-spring-on-kubernetes)
+[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=piomin_sample-spring-on-kubernetes&metric=coverage)](https://sonarcloud.io/dashboard?id=piomin_sample-spring-on-kubernetes)
+[![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=piomin_sample-spring-on-kubernetes&metric=ncloc)](https://sonarcloud.io/dashboard?id=piomin_sample-spring-on-kubernetes)
+
 In this project I'm demonstrating different mechanisms of deploying application on Kubernetes. The example application application is simple Spring Boot app that exposes some HTTP endpoints for CRUD operations and connects to MongoDB on cluster.
 
 ## Getting Started 

src/test/java/pl/piomin/samples/springboot/kubernetes/PersonControllerTest.java

@@ -1,24 +1,39 @@
 package pl.piomin.samples.springboot.kubernetes;
 
-import org.junit.jupiter.api.*;
-import pl.piomin.samples.springboot.kubernetes.domain.Gender;
-import pl.piomin.samples.springboot.kubernetes.domain.Person;
-
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
+import org.testcontainers.containers.MongoDBContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+import pl.piomin.samples.springboot.kubernetes.domain.Gender;
+import pl.piomin.samples.springboot.kubernetes.domain.Person;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@Testcontainers
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class PersonControllerTest {
 
 	private static String id;
 
-	@LocalServerPort
-	int port;
+	@Container
+	static MongoDBContainer mongodb = new MongoDBContainer("mongo:4.4");
+
+	@DynamicPropertySource
+	static void registerMongoProperties(DynamicPropertyRegistry registry) {
+		String uri = mongodb.getConnectionString() + "/test";
+		registry.add("spring.data.mongodb.uri", () -> uri);
+	}
+
 	@Autowired
 	TestRestTemplate restTemplate;
 

src/test/resources/application.yml

@@ -4,9 +4,6 @@ spring:
   data:
     mongodb:
       uri: mongodb://localhost:27071/test
-  mongodb:
-    embedded:
-      version: 4.0.2
 logging:
   pattern:
     console: "%d{yyyy-MM-dd HH:mm:ss} ${LOG_LEVEL_PATTERN:-%5p} %m%n"