[JAVA-40665] Moving some article links on Github - spring-mvc-basics (#18124)

Author: panos-kakos

spring-web-modules/spring-mvc-basics-2/README.md

@@ -7,7 +7,8 @@ This module contains articles about Spring MVC
 - [Template Engines for Spring](https://www.baeldung.com/spring-template-engines)
 - [Spring and Servlet 4 – The PushBuilder](https://www.baeldung.com/spring-5-push)
 - [Servlet Redirect vs Forward](https://www.baeldung.com/servlet-redirect-forward)
-- [Guide to Spring Email](https://www.baeldung.com/spring-email)
 - [Using ThymeLeaf and FreeMarker Emails Templates with Spring](https://www.baeldung.com/spring-email-templates)
 - [Request Method Not Supported (405) in Spring](https://www.baeldung.com/spring-request-method-not-supported-405)
+- [Using Enums as Request Parameters in Spring](https://www.baeldung.com/spring-enum-request-param)
+- [How to Set JSON Content Type in Spring MVC](https://www.baeldung.com/spring-mvc-set-json-content-type)
 - More articles: [[<-- prev]](../spring-mvc-basics)[[more -->]](../spring-mvc-basics-3)

spring-web-modules/spring-mvc-basics-2/src/main/java/com/baeldung/spring/configuration/ApplicationConfiguration.java

@@ -6,6 +6,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.format.FormatterRegistry;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.http.converter.feed.RssChannelHttpMessageConverter;
@@ -19,6 +20,7 @@
 import org.springframework.web.servlet.view.ContentNegotiatingViewResolver;
 import org.springframework.web.servlet.view.InternalResourceViewResolver;
 
+import com.baeldung.spring.configuration.converter.StringToEnumConverter;
 import com.baeldung.spring.controller.rss.ArticleRssFeedViewResolver;
 import com.baeldung.spring.controller.rss.JsonChannelHttpMessageConverter;
 
@@ -61,4 +63,9 @@ public void configureMessageConverters(List<HttpMessageConverter<?>> converters)
         converters.add(new JsonChannelHttpMessageConverter());
     }
 
+    @Override
+    public void addFormatters(FormatterRegistry registry) {
+        registry.addConverter(new StringToEnumConverter());
+    }
+
 }

spring-web-modules/spring-mvc-basics-3/src/main/java/com/baeldung/spring/config/converter/StringToEnumConverter.java renamed to spring-web-modules/spring-mvc-basics-2/src/main/java/com/baeldung/spring/configuration/converter/StringToEnumConverter.java

@@ -1,4 +1,4 @@
-package com.baeldung.spring.config.converter;
+package com.baeldung.spring.configuration.converter;
 
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.stereotype.Component;

spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/controller/controller/GreetingsController.java renamed to spring-web-modules/spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/GreetingsController.java

@@ -1,4 +1,4 @@
-package com.baeldung.controller.controller;
+package com.baeldung.spring.controller;
 
 import java.util.HashMap;
 import java.util.Map;

spring-web-modules/spring-mvc-basics-3/src/main/java/com/baeldung/spring/enums/EnumController.java renamed to spring-web-modules/spring-mvc-basics-2/src/main/java/com/baeldung/spring/enums/EnumController.java

@@ -1,4 +1,4 @@
-package com.baeldung.spring.exceptions;
+package com.baeldung.spring.exception;
 
 import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.http.HttpStatus;

spring-web-modules/spring-mvc-basics-3/src/main/java/com/baeldung/spring/exceptions/GlobalControllerExceptionHandler.java renamed to spring-web-modules/spring-mvc-basics-2/src/main/java/com/baeldung/spring/exception/GlobalControllerExceptionHandler.java

@@ -0,0 +1,54 @@
+package com.baeldung.controller.contenttype;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.BeforeEach;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+
+import com.baeldung.spring.controller.GreetingsController;
+
+public class GreetingsControllerUnitTest {
+
+    private MockMvc mockMvc;
+
+    @BeforeEach
+    void setUp() {
+        mockMvc = MockMvcBuilders.standaloneSetup(new GreetingsController())
+            .build();
+    }
+
+    @Test
+    public void givenReturnTypeIsString_whenJacksonOnClasspath_thenDefaultContentTypeIsJSON() throws Exception {
+
+        // Given
+        String expectedMimeType = "application/json";
+
+        // Then
+        String actualMimeType = this.mockMvc.perform(MockMvcRequestBuilders.get("/greetings-with-response-body", 1))
+            .andReturn()
+            .getResponse()
+            .getContentType();
+
+        assertEquals(expectedMimeType, actualMimeType);
+
+    }
+
+    @Test
+    public void givenReturnTypeIsResponseEntity_thenDefaultContentTypeIsJSON() throws Exception {
+        
+        // Given
+        String expectedMimeType = "application/json";
+
+        // Then
+        String actualMimeType = this.mockMvc.perform(MockMvcRequestBuilders.get("/greetings-with-response-entity", 1))
+            .andReturn()
+            .getResponse()
+            .getContentType();
+
+        assertEquals(expectedMimeType, actualMimeType);
+    }
+}

spring-web-modules/spring-mvc-basics-3/src/main/java/com/baeldung/spring/model/Modes.java renamed to spring-web-modules/spring-mvc-basics-2/src/main/java/com/baeldung/spring/model/Modes.java

@@ -3,11 +3,11 @@
 This module contains articles about Spring MVC
 
 ## Relevant articles:
-- [How to Read HTTP Headers in Spring REST Controllers](https://www.baeldung.com/spring-rest-http-headers)
 - [A Custom Data Binder in Spring MVC](https://www.baeldung.com/spring-mvc-custom-data-binder)
 - [Spring Validation Message Interpolation](https://www.baeldung.com/spring-validation-message-interpolation)
-- [Spring MVC Custom Validation](https://www.baeldung.com/spring-mvc-custom-validator)
-- [Using Enums as Request Parameters in Spring](https://www.baeldung.com/spring-enum-request-param)
 - [Guide to Flash Attributes in a Spring Web Application](https://www.baeldung.com/spring-web-flash-attributes)
 - [Reading HttpServletRequest Multiple Times in Spring](https://www.baeldung.com/spring-reading-httpservletrequest-multiple-times)
+- [Spring @RequestMapping New Shortcut Annotations](https://www.baeldung.com/spring-new-requestmapping-shortcuts)
+- [Spring MVC Tutorial](https://www.baeldung.com/spring-mvc-tutorial)
+- [An Intro to the Spring DispatcherServlet](https://www.baeldung.com/spring-dispatcherservlet)
 - More articles: [[<-- prev]](../spring-mvc-basics-2)[[more -->]](../spring-mvc-basics-4)

spring-web-modules/spring-mvc-basics-2/src/test/java/com/baeldung/controller/contenttype/GreetingsControllerUnitTest.java

@@ -19,10 +19,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -66,6 +62,10 @@
             <artifactId>httpclient</artifactId>
             <version>${httpclient.version}</version>
         </dependency>
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+        </dependency>
     </dependencies>
 
     <build>