From 3385b72fb5bdd24d944149c153cc2f9afadc0f49 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 22 Oct 2023 22:06:49 -0700
Subject: [PATCH] Reworked to use the Spring Guides' Spring Boot web
 application example

---
 .idea/misc.xml                                |  1 -
 .idea/runConfigurations/Run Tests.xml         |  9 -----
 .vscode/launch.json                           |  2 +-
 bld                                           |  2 +-
 bld.bat                                       |  2 +-
 .../example/demo/DemoApplicationBuild.java    | 34 -----------------
 .../example/springboot/ApplicationBuild.java  | 37 +++++++++++++++++++
 .../com/example/demo/DemoApplication.java     | 11 ------
 .../com/example/springboot/Application.java   | 33 +++++++++++++++++
 .../example/springboot/HelloController.java   | 14 +++++++
 src/main/resources/application.properties     |  1 -
 .../com/example/demo/DemoApplicationTest.java | 13 -------
 .../example/springboot/HelloControllerIT.java | 27 ++++++++++++++
 .../springboot/HelloControllerTest.java       | 29 +++++++++++++++
 14 files changed, 143 insertions(+), 72 deletions(-)
 delete mode 100644 .idea/runConfigurations/Run Tests.xml
 delete mode 100644 src/bld/java/com/example/demo/DemoApplicationBuild.java
 create mode 100644 src/bld/java/com/example/springboot/ApplicationBuild.java
 delete mode 100644 src/main/java/com/example/demo/DemoApplication.java
 create mode 100644 src/main/java/com/example/springboot/Application.java
 create mode 100644 src/main/java/com/example/springboot/HelloController.java
 delete mode 100644 src/main/resources/application.properties
 delete mode 100644 src/test/java/com/example/demo/DemoApplicationTest.java
 create mode 100644 src/test/java/com/example/springboot/HelloControllerIT.java
 create mode 100644 src/test/java/com/example/springboot/HelloControllerTest.java

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 542659b..8678395 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="PDMPlugin">
     <option name="skipTestSources" value="false" />
diff --git a/.idea/runConfigurations/Run Tests.xml b/.idea/runConfigurations/Run Tests.xml
deleted file mode 100644
index fd31723..0000000
--- a/.idea/runConfigurations/Run Tests.xml	
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run Tests" type="Application" factoryName="Application" nameIsGenerated="true">
-    <option name="MAIN_CLASS_NAME" value="com.example.demo.DemoApplicationTest" />
-    <module name="app" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 21e1794..cc60f4a 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -5,7 +5,7 @@
             "type": "java",
             "name": "Run Tests",
             "request": "launch",
-            "mainClass": "com.example.demo.DemoApplicationTest"
+            "mainClass": "com.example.springboot.DemoApplicationTests"
         }
     ]
 }
diff --git a/bld b/bld
index 504dae1..dfb26b6 100755
--- a/bld
+++ b/bld
@@ -1,2 +1,2 @@
 #!/usr/bin/env sh
-java -jar "$(dirname "$0")/lib/bld/bld-wrapper.jar" "$0" --build com.example.demo.DemoApplicationBuild "$@"
\ No newline at end of file
+java -jar "$(dirname "$0")/lib/bld/bld-wrapper.jar" "$0" --build com.example.springboot.ApplicationBuild "$@"
\ No newline at end of file
diff --git a/bld.bat b/bld.bat
index dfe3524..abef9c6 100644
--- a/bld.bat
+++ b/bld.bat
@@ -1,4 +1,4 @@
 @echo off
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
-java -jar "%DIRNAME%/lib/bld/bld-wrapper.jar" "%0" --build com.example.demo.DemoApplicationBuild %*
\ No newline at end of file
+java -jar "%DIRNAME%/lib/bld/bld-wrapper.jar" "%0" --build com.example.springboot.ApplicationBuild %*
\ No newline at end of file
diff --git a/src/bld/java/com/example/demo/DemoApplicationBuild.java b/src/bld/java/com/example/demo/DemoApplicationBuild.java
deleted file mode 100644
index c0a89bc..0000000
--- a/src/bld/java/com/example/demo/DemoApplicationBuild.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.example.demo;
-
-import rife.bld.BaseProject;
-
-import java.util.List;
-
-import static rife.bld.dependencies.Repository.*;
-import static rife.bld.dependencies.Scope.compile;
-import static rife.bld.dependencies.Scope.test;
-
-public class DemoApplicationBuild extends BaseProject {
-    public DemoApplicationBuild() {
-        pkg = "com.example.demo";
-        name = "DemoApplication";
-        mainClass = "com.example.demo.DemoApplication";
-        version = version(0,1,0);
-
-        repositories = List.of(MAVEN_CENTRAL);
-
-        scope(compile)
-                .include(dependency("org.springframework.boot", "spring-boot-starter",
-                        version(3,1,5)));
-        scope(test)
-                .include(dependency("org.springframework.boot", "spring-boot-starter-test",
-                        version(3,1,5)))
-                .include(dependency("org.junit.jupiter", "junit-jupiter",
-                        version(5,10,0)));
-
-        testOperation().mainClass("com.example.demo.DemoApplicationTest");
-    }
-    public static void main(String[] args) {
-        new DemoApplicationBuild().start(args);
-    }
-}
\ No newline at end of file
diff --git a/src/bld/java/com/example/springboot/ApplicationBuild.java b/src/bld/java/com/example/springboot/ApplicationBuild.java
new file mode 100644
index 0000000..5f1a237
--- /dev/null
+++ b/src/bld/java/com/example/springboot/ApplicationBuild.java
@@ -0,0 +1,37 @@
+package com.example.springboot;
+
+import rife.bld.BaseProject;
+
+import java.util.List;
+
+import static rife.bld.dependencies.Repository.MAVEN_CENTRAL;
+import static rife.bld.dependencies.Scope.compile;
+import static rife.bld.dependencies.Scope.test;
+
+public class ApplicationBuild extends BaseProject {
+    public ApplicationBuild() {
+        pkg = "com.example.demo";
+        name = "DemoApplication";
+        mainClass = "com.example.springboot.Application";
+        version = version(0, 1, 0);
+
+        repositories = List.of(MAVEN_CENTRAL);
+
+        scope(compile)
+                .include(dependency("org.springframework.boot", "spring-boot-starter",
+                        version(3, 1, 5)))
+                .include(dependency("org.springframework.boot", "spring-boot-starter-actuator",
+                        version(3, 1, 5)))
+                .include(dependency("org.springframework.boot", "spring-boot-starter-web",
+                        version(3, 1, 5)));
+        scope(test)
+                .include(dependency("org.springframework.boot", "spring-boot-starter-test",
+                        version(3, 1, 5)));
+
+        testOperation().mainClass("com.example.springboot.HelloControllerIT");
+    }
+
+    public static void main(String[] args) {
+        new ApplicationBuild().start(args);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/example/demo/DemoApplication.java b/src/main/java/com/example/demo/DemoApplication.java
deleted file mode 100644
index 1bc9554..0000000
--- a/src/main/java/com/example/demo/DemoApplication.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.example.demo;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class DemoApplication {
-    public static void main(String[] args) {
-        SpringApplication.run(DemoApplication.class, args);
-    }
-}
diff --git a/src/main/java/com/example/springboot/Application.java b/src/main/java/com/example/springboot/Application.java
new file mode 100644
index 0000000..42b3689
--- /dev/null
+++ b/src/main/java/com/example/springboot/Application.java
@@ -0,0 +1,33 @@
+package com.example.springboot;
+
+import java.util.Arrays;
+
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+
+@SpringBootApplication
+public class Application {
+
+	public static void main(String[] args) {
+		SpringApplication.run(Application.class, args);
+	}
+
+	@Bean
+	public CommandLineRunner commandLineRunner(ApplicationContext ctx) {
+		return args -> {
+
+			System.out.println("Let's inspect the beans provided by Spring Boot:");
+
+			String[] beanNames = ctx.getBeanDefinitionNames();
+			Arrays.sort(beanNames);
+			for (String beanName : beanNames) {
+				System.out.println(beanName);
+			}
+
+		};
+	}
+
+}
diff --git a/src/main/java/com/example/springboot/HelloController.java b/src/main/java/com/example/springboot/HelloController.java
new file mode 100644
index 0000000..e4677a0
--- /dev/null
+++ b/src/main/java/com/example/springboot/HelloController.java
@@ -0,0 +1,14 @@
+package com.example.springboot;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class HelloController {
+
+	@GetMapping("/")
+	public String index() {
+		return "Greetings from Spring Boot!";
+	}
+
+}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
deleted file mode 100644
index 8b13789..0000000
--- a/src/main/resources/application.properties
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/test/java/com/example/demo/DemoApplicationTest.java b/src/test/java/com/example/demo/DemoApplicationTest.java
deleted file mode 100644
index 70d2a34..0000000
--- a/src/test/java/com/example/demo/DemoApplicationTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.example.demo;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class DemoApplicationTest {
-
-	@Test
-	void contextLoads() {
-	}
-}
diff --git a/src/test/java/com/example/springboot/HelloControllerIT.java b/src/test/java/com/example/springboot/HelloControllerIT.java
new file mode 100644
index 0000000..496700c
--- /dev/null
+++ b/src/test/java/com/example/springboot/HelloControllerIT.java
@@ -0,0 +1,27 @@
+package com.example.springboot;
+
+import org.junit.jupiter.api.Test;
+
+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.http.ResponseEntity;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+public class HelloControllerIT {
+
+	@Autowired
+	private TestRestTemplate template;
+
+    @Test
+    public void getHello() throws Exception {
+        ResponseEntity<String> response = template.getForEntity("/", String.class);
+        assertThat(response.getBody()).isEqualTo("Greetings from Spring Boot!");
+    }
+
+    public static void main(String[] args) throws Exception {
+        new HelloControllerIT().getHello();
+    }
+}
diff --git a/src/test/java/com/example/springboot/HelloControllerTest.java b/src/test/java/com/example/springboot/HelloControllerTest.java
new file mode 100644
index 0000000..81262f4
--- /dev/null
+++ b/src/test/java/com/example/springboot/HelloControllerTest.java
@@ -0,0 +1,29 @@
+package com.example.springboot;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+
+@SpringBootTest
+@AutoConfigureMockMvc
+public class HelloControllerTest {
+
+	@Autowired
+	private MockMvc mvc;
+
+	@Test
+	public void getHello() throws Exception {
+		mvc.perform(MockMvcRequestBuilders.get("/").accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().string(equalTo("Greetings from Spring Boot!")));
+	}
+}