some test more and a service

Author: marco76

README.md

@@ -8,8 +8,8 @@ https://marco.dev/deploy-java-angular-one
 And a demo of the installation in this video:
 https://youtu.be/xCNCCZLvd0Y
 
-To the basic example I added some 'showcase' extra features:
+To the basic example I added some 'showcases' extra features:
 - Test with MockMvc
 - Test with RestTemplateTest
-- OpenApi using Spring Doc (code first). Swagger-ui is accessible here: http://localhost:8080/swagger-ui 
+- OpenApi using Spring Doc (code first). Swagger-ui is accessible here: http://localhost:8080/swagger-ui
 

backend/src/main/java/dev/marco/example/springboot/feature/FeatureController.java

@@ -0,0 +1,36 @@
+package dev.marco.example.springboot.feature;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * The goal of this controller is to show the test of the services and some REST methods
+ */
+@RestController
+@CrossOrigin(origins =  {"${app.dev.frontend.local"})
+public class FeatureController {
+
+    @Autowired
+    FeatureService featureService;
+
+    @GetMapping(value = "/feature", consumes = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<String> getSum(@RequestBody OperationValues operationValues) throws JSONException {
+        Integer sumResult = featureService.getSum(operationValues.getValueA(), operationValues.getValueB());
+        JSONObject result = new JSONObject();
+        result.put("result", sumResult);
+        return ResponseEntity.ok(result.toString());
+    }
+
+    @PostMapping(value = "/feature", consumes = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<String> postSum(@RequestBody OperationValues operationValues) throws JSONException {
+        Integer sumResult = featureService.getSum(operationValues.getValueA(), operationValues.getValueB());
+        JSONObject result = new JSONObject();
+        result.put("result", sumResult);
+        return ResponseEntity.ok(result.toString());
+    }
+
+}

backend/src/main/java/dev/marco/example/springboot/feature/FeatureService.java

@@ -0,0 +1,14 @@
+package dev.marco.example.springboot.feature;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * Simple service for example purposes
+ */
+@Service
+public class FeatureService {
+
+    public Integer getSum(Integer valueA, Integer valueB) {
+        return valueA + valueB;
+    }
+}

backend/src/main/java/dev/marco/example/springboot/feature/OperationValues.java

@@ -0,0 +1,29 @@
+package dev.marco.example.springboot.feature;
+
+public class OperationValues {
+    private Integer valueA;
+    private Integer valueB;
+
+    public OperationValues() {
+    }
+
+    public OperationValues(Integer valueA, Integer valueB) {
+        this.valueA = valueA;
+        this.valueB = valueB;
+    }
+    public Integer getValueA() {
+        return valueA;
+    }
+
+    public Integer getValueB() {
+        return valueB;
+    }
+
+    public void setValueA(Integer valueA) {
+        this.valueA = valueA;
+    }
+
+    public void setValueB(Integer valueB) {
+        this.valueB = valueB;
+    }
+}

backend/src/main/java/dev/marco/example/springboot/HelloController.java renamed to backend/src/main/java/dev/marco/example/springboot/hello/HelloController.java

@@ -1,4 +1,4 @@
-package dev.marco.example.springboot;
+package dev.marco.example.springboot.hello;
 
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.CrossOrigin;

backend/src/test/java/dev/marco/example/springboot/FeatureControllerEmbeddedServerTest.java

@@ -0,0 +1,8 @@
+package dev.marco.example.springboot;
+
+/**
+ *  * We didn't implement the version with the RestTemplate because spring doesn't like GET requests with body.
+ *  * You can find more details about this issue in this post: https://marco.dev/spring-boot-test-get-body
+ */
+public class FeatureControllerEmbeddedServerTest {
+}

backend/src/test/java/dev/marco/example/springboot/FeatureControllerMockMvcTest.java

@@ -0,0 +1,38 @@
+package dev.marco.example.springboot;
+
+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 static org.hamcrest.Matchers.containsString;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+
+/**
+ * The goal of this class is to test the controller using a MockMvc object without embedded server
+ *
+ * We didn't implement the version with the RestTemplate because spring doesn't like GET requests with body.
+ * You can find more details about this issue in this post: https://marco.dev/spring-boot-test-get-body
+ */
+@SpringBootTest
+@AutoConfigureMockMvc // we mock the http request and we don't need a server
+public class FeatureControllerMockMvcTest {
+
+    @Autowired
+    private MockMvc mockMvc; // injected with @AutoConfigureMockMvc
+
+    @Test
+    public void shouldReturnOurText() throws Exception {
+        this.mockMvc
+                .perform(get("/feature")
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .content("{\"valueA\": 5, \"valueB\": 7}"))
+                        .andDo(print()) // we log the result
+                        .andExpect(content().string(("{\"result\":12}")));
+    }
+
+}

backend/src/test/java/dev/marco/example/springboot/HelloControllerEmbeddedServerTest.java

@@ -1,5 +1,6 @@
 package dev.marco.example.springboot;
 
+import dev.marco.example.springboot.hello.HelloController;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;