JAVA-32053 Upgrade spring-mvc-basics-3 to Spring Boot 3 (#16231)

Co-authored-by: timis1 <noreplay@yahoo.com>

spring-web-modules/spring-mvc-basics-3/pom.xml

@@ -10,9 +10,9 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
+        <artifactId>parent-boot-3</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-2</relativePath>
+        <relativePath>../../parent-boot-3</relativePath>
     </parent>
 
     <dependencies>
@@ -51,18 +51,13 @@
             <artifactId>h2</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>javax.persistence-api</artifactId>
-            <version>${jpa.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
             <version>${guava.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.subethamail</groupId>
+            <groupId>com.github.davidmoten</groupId>
             <artifactId>subethasmtp</artifactId>
             <version>${subethasmtp.version}</version>
             <scope>test</scope>
@@ -130,7 +125,7 @@
         <jquery.version>3.1.1</jquery.version>
         <bootstrap.version>3.3.7-1</bootstrap.version>
         <jpa.version>2.2</jpa.version>
-        <subethasmtp.version>3.1.7</subethasmtp.version>
+        <subethasmtp.version>7.0.2</subethasmtp.version>
         <httpclient.version>4.5.8</httpclient.version>
     </properties>
 

spring-web-modules/spring-mvc-basics-3/src/main/java/com/baeldung/boot/Application.java

@@ -2,13 +2,11 @@ package com.baeldung.boot;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ApplicationContext;
 
 @SpringBootApplication
 public class Application {
-    private static ApplicationContext applicationContext;
 
     public static void main(String[] args) {
-        applicationContext = SpringApplication.run(Application.class, args);
+        SpringApplication.run(Application.class, args);
     }
 }

spring-web-modules/spring-mvc-basics-3/src/main/java/com/baeldung/boot/controller/GenericEntityController.java

@@ -53,6 +53,6 @@ public class GenericEntityController {
 
     @GetMapping("/entity/findbyversion")
     public ResponseEntity findByVersion(@Version String version) {
-        return version != null ? new ResponseEntity(entityList.stream().findFirst().get(), HttpStatus.OK) : new ResponseEntity(HttpStatus.NOT_FOUND);
+        return version != null ? new ResponseEntity<>(entityList.stream().findFirst().get(), HttpStatus.OK) : new ResponseEntity<>(HttpStatus.NOT_FOUND);
     }
 }

spring-web-modules/spring-mvc-basics-3/src/main/java/com/baeldung/boot/converter/GenericBigDecimalConverter.java

@@ -27,7 +27,7 @@ public class GenericBigDecimalConverter implements GenericConverter {
             return new BigDecimal(number);
         } else {
             Number number = (Number) source;
-            BigDecimal converted = new BigDecimal(number.doubleValue());
+            BigDecimal converted = BigDecimal.valueOf(number.doubleValue());
             return converted.setScale(2, BigDecimal.ROUND_HALF_EVEN);
         }
     }

spring-web-modules/spring-mvc-basics-3/src/main/java/com/baeldung/boot/domain/Employee.java

@@ -1,7 +1,7 @@
 package com.baeldung.boot.domain;
 
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
 
 @Entity
 public class Employee {

spring-web-modules/spring-mvc-basics-3/src/main/java/com/baeldung/boot/domain/Foo.java

@@ -1,6 +1,7 @@
 package com.baeldung.boot.domain;
 
-import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric;
+import static org.thymeleaf.util.StringUtils.randomAlphanumeric;
+
 public class Foo extends AbstractEntity {
 
     private String name;

spring-web-modules/spring-mvc-basics-3/src/main/java/com/baeldung/boot/domain/GenericEntity.java

@@ -1,9 +1,9 @@
 package com.baeldung.boot.domain;
 
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
 
 @Entity
 public class GenericEntity {

spring-web-modules/spring-mvc-basics-3/src/main/java/com/baeldung/boot/web/resolver/HeaderVersionArgumentResolver.java

@@ -7,7 +7,7 @@ import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 @Component
 public class HeaderVersionArgumentResolver implements HandlerMethodArgumentResolver {

spring-web-modules/spring-mvc-basics-3/src/main/java/com/baeldung/cachedrequest/CachedBodyHttpServletRequest.java

@@ -6,9 +6,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
-import javax.servlet.ServletInputStream;
+import jakarta.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletRequestWrapper;
 
 import org.springframework.util.StreamUtils;
 

spring-web-modules/spring-mvc-basics-3/src/main/java/com/baeldung/cachedrequest/CachedBodyServletInputStream.java

@@ -4,8 +4,8 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import javax.servlet.ReadListener;
+import jakarta.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
+import jakarta.servlet.ServletInputStream;
 
 public class CachedBodyServletInputStream extends ServletInputStream {
 

spring-web-modules/spring-mvc-basics-3/src/main/java/com/baeldung/cachedrequest/ContentCachingFilter.java

@@ -2,11 +2,11 @@ package com.baeldung.cachedrequest;
 
 import java.io.IOException;
 
-import javax.servlet.FilterChain;
+import jakarta.servlet.FilterChain;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
-import javax.servlet.annotation.WebFilter;
+import jakarta.servlet.annotation.WebFilter;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;

spring-web-modules/spring-mvc-basics-3/src/main/java/com/baeldung/cachedrequest/HttpRequestDemoConfig.java

@@ -5,10 +5,8 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 /**
- * To initialize the WebApplication, Please see
+ * To initialize the WebApplication
- * {@link com.baeldung.spring.config.MainWebAppInitializer}
  */
-
 @EnableWebMvc
 @Configuration
 @ComponentScan(basePackages = "com.baeldung.cachedrequest")

spring-web-modules/spring-mvc-basics-3/src/main/java/com/baeldung/cachedrequest/PrintRequestContentFilter.java

@@ -4,19 +4,18 @@ package com.baeldung.cachedrequest;
 import java.io.IOException;
 import java.io.InputStream;
 
-import javax.servlet.FilterChain;
+import jakarta.servlet.FilterChain;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
-import javax.servlet.annotation.WebFilter;
+import jakarta.servlet.annotation.WebFilter;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
-import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StreamUtils;
 import org.springframework.web.filter.OncePerRequestFilter;
 
-@Order(Ordered.LOWEST_PRECEDENCE)
+@Order
 @Component
 @WebFilter(filterName = "printRequestContentFilter", urlPatterns = "/*")
 public class PrintRequestContentFilter extends OncePerRequestFilter {

spring-web-modules/spring-mvc-basics-3/src/main/java/com/baeldung/customvalidator/ContactNumberConstraint.java

@@ -6,8 +6,8 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.validation.Constraint;
+import jakarta.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Payload;
 
 @Documented
 @Constraint(validatedBy = ContactNumberValidator.class)

spring-web-modules/spring-mvc-basics-3/src/main/java/com/baeldung/customvalidator/ContactNumberValidator.java

@@ -1,7 +1,7 @@
 package com.baeldung.customvalidator;
 
-import javax.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidatorContext;
 
 public class ContactNumberValidator implements ConstraintValidator<ContactNumberConstraint, String> {
 

spring-web-modules/spring-mvc-basics-3/src/main/java/com/baeldung/customvalidator/FieldsValueMatch.java

@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.validation.Constraint;
+import jakarta.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Payload;
 
 @Constraint(validatedBy = FieldsValueMatchValidator.class)
 @Target({ ElementType.TYPE })

spring-web-modules/spring-mvc-basics-3/src/main/java/com/baeldung/customvalidator/FieldsValueMatchValidator.java

@@ -1,7 +1,7 @@
 package com.baeldung.customvalidator;
 
-import javax.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidatorContext;
 
 import org.springframework.beans.BeanWrapperImpl;
 

spring-web-modules/spring-mvc-basics-3/src/main/java/com/baeldung/customvalidator/NewUserController.java

@@ -1,6 +1,6 @@
 package com.baeldung.customvalidator;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;

spring-web-modules/spring-mvc-basics-3/src/main/java/com/baeldung/customvalidator/ValidatedPhoneController.java

@@ -1,6 +1,6 @@
 package com.baeldung.customvalidator;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;

spring-web-modules/spring-mvc-basics-3/src/main/java/com/baeldung/flash_attributes/controllers/PoemSubmission.java

@@ -11,7 +11,7 @@ import org.springframework.web.servlet.support.RequestContextUtils;
 import org.springframework.web.servlet.view.RedirectView;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 @Controller
 public class PoemSubmission {

spring-web-modules/spring-mvc-basics-3/src/main/java/com/baeldung/interpolation/MyMessageInterpolator.java

@@ -1,14 +1,10 @@
 package com.baeldung.interpolation;
 
-import org.slf4j.Logger;
+import jakarta.validation.MessageInterpolator;
-import org.slf4j.LoggerFactory;
-import javax.validation.MessageInterpolator;
 import java.util.Locale;
 
 public class MyMessageInterpolator implements MessageInterpolator {
 
-    private static Logger logger = LoggerFactory.getLogger(MyMessageInterpolator.class);
-
     private final MessageInterpolator defaultInterpolator;
 
     public MyMessageInterpolator(MessageInterpolator interpolator) {

spring-web-modules/spring-mvc-basics-3/src/main/java/com/baeldung/interpolation/NotNullRequest.java

@@ -1,6 +1,6 @@
 package com.baeldung.interpolation;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 public class NotNullRequest {
 

spring-web-modules/spring-mvc-basics-3/src/main/java/com/baeldung/interpolation/ValidationController.java

@@ -1,6 +1,6 @@
 package com.baeldung.interpolation;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;

spring-web-modules/spring-mvc-basics-3/src/main/java/com/baeldung/interpolation/ValidationExamples.java

@@ -1,14 +1,11 @@
 package com.baeldung.interpolation;
 
-import java.util.Formatter;
+import jakarta.validation.constraints.DecimalMin;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Min;
-import javax.validation.constraints.Min;
+import jakarta.validation.constraints.Size;
-import javax.validation.constraints.DecimalMin;
 
 public class ValidationExamples {
 
-    private static final Formatter formatter = new Formatter();
-
     @Size(
       min = 5,
       max = 14,

spring-web-modules/spring-mvc-basics-3/src/main/java/com/baeldung/spring/headers/controller/ReadHeaderRestController.java

@@ -22,7 +22,7 @@ public class ReadHeaderRestController {
     
     @GetMapping("/")
     public ResponseEntity<String> index() {
-        return new ResponseEntity<String>("Index", HttpStatus.OK);
+        return new ResponseEntity<>("Index", HttpStatus.OK);
     }
 
     @GetMapping("/greeting")
@@ -46,12 +46,12 @@ public class ReadHeaderRestController {
             break;
         }
 
-        return new ResponseEntity<String>(greeting, HttpStatus.OK);
+        return new ResponseEntity<>(greeting, HttpStatus.OK);
     }
 
     @GetMapping("/double")
     public ResponseEntity<String> doubleNumber(@RequestHeader("my-number") int myNumber) {
-        return new ResponseEntity<String>(
+        return new ResponseEntity<>(
             String.format("%d * 2 = %d", myNumber, (myNumber * 2)), 
             HttpStatus.OK);
     }
@@ -59,34 +59,30 @@ public class ReadHeaderRestController {
     @GetMapping("/listHeaders")
     public ResponseEntity<String> listAllHeaders(@RequestHeader Map<String, String> headers) {
 
-        headers.forEach((key, value) -> {
+        headers.forEach((key, value) -> LOG.info(String.format("Header '%s' = %s", key, value)));
-            LOG.info(String.format("Header '%s' = %s", key, value));
-        });
 
-        return new ResponseEntity<String>(String.format("Listed %d headers", headers.size()), HttpStatus.OK);
+        return new ResponseEntity<>(String.format("Listed %d headers", headers.size()), HttpStatus.OK);
     }
     
     @GetMapping("/multiValue")
     public ResponseEntity<String> multiValue(@RequestHeader MultiValueMap<String, String> headers) {
-        headers.forEach((key, value) -> {
+        headers.forEach((key, value) -> LOG.info(String.format("Header '%s' = %s", key, String.join("|", value))));
-            LOG.info(String.format("Header '%s' = %s", key, value.stream().collect(Collectors.joining("|"))));
-        });
         
-        return new ResponseEntity<String>(String.format("Listed %d headers", headers.size()), HttpStatus.OK);
+        return new ResponseEntity<>(String.format("Listed %d headers", headers.size()), HttpStatus.OK);
     }
 
     @GetMapping("/getBaseUrl")
     public ResponseEntity<String> getBaseUrl(@RequestHeader HttpHeaders headers) {
         InetSocketAddress host = headers.getHost();
         String url = "http://" + host.getHostName() + ":" + host.getPort();
-        return new ResponseEntity<String>(String.format("Base URL = %s", url), HttpStatus.OK);
+        return new ResponseEntity<>(String.format("Base URL = %s", url), HttpStatus.OK);
     }
 
     @GetMapping("/nonRequiredHeader")
     public ResponseEntity<String> evaluateNonRequiredHeader(
         @RequestHeader(value = "optional-header", required = false) String optionalHeader) {
 
-        return new ResponseEntity<String>(
+        return new ResponseEntity<>(
             String.format("Was the optional header present? %s!", (optionalHeader == null ? "No" : "Yes")), 
             HttpStatus.OK);
     }
@@ -95,6 +91,6 @@ public class ReadHeaderRestController {
     public ResponseEntity<String> evaluateDefaultHeaderValue(
         @RequestHeader(value = "optional-header", defaultValue = "3600") int optionalHeader) {
 
-        return new ResponseEntity<String>(String.format("Optional Header is %d", optionalHeader), HttpStatus.OK);
+        return new ResponseEntity<>(String.format("Optional Header is %d", optionalHeader), HttpStatus.OK);
     }
 }

spring-web-modules/spring-mvc-basics-3/src/test/java/com/baeldung/SpringBootMailIntegrationTest.java

@@ -13,7 +13,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.subethamail.wiser.Wiser;
 import org.subethamail.wiser.WiserMessage;
 
-import javax.mail.MessagingException;
+import jakarta.mail.MessagingException;
 import java.io.IOException;
 import java.util.List;
 
@@ -29,20 +29,20 @@ public class SpringBootMailIntegrationTest {
 
     private Wiser wiser;
 
-    private String userTo = "user2@localhost";
+    private final String userTo = "user2@localhost";
-    private String userFrom = "user1@localhost";
+    private final String userFrom = "user1@localhost";
-    private String subject = "Test subject";
+    private final String subject = "Test subject";
-    private String textMail = "Text subject mail";
+    private final String textMail = "Text subject mail";
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         final int TEST_PORT = 8025;
-        wiser = new Wiser(TEST_PORT);
+        wiser = Wiser.port(TEST_PORT);
         wiser.start();
     }
 
     @After
-    public void tearDown() throws Exception {
+    public void tearDown() {
         wiser.stop();
     }
 

spring-web-modules/spring-mvc-basics-3/src/test/java/com/baeldung/cachedrequest/CachedBodyServletInputStreamUnitTest.java

@@ -3,7 +3,7 @@ package com.baeldung.cachedrequest;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-import javax.servlet.ReadListener;
+import jakarta.servlet.ReadListener;
 
 import org.junit.After;
 import org.junit.Test;
@@ -54,7 +54,7 @@ public class CachedBodyServletInputStreamUnitTest extends TestCase {
     }
 
     @Test
-    public void testGivenServletInputStreamCreatedAndBodyRead_whenCalledIsReady_ThenTrue() throws IOException {
+    public void testGivenServletInputStreamCreatedAndBodyRead_whenCalledIsReady_ThenTrue() {
         // Given
         byte[] cachedBody = "{\"firstName\" :\"abc\",\"lastName\" : \"xyz\",\"age\" : 30\"}".getBytes();
         servletInputStream = new CachedBodyServletInputStream(cachedBody);
@@ -85,7 +85,7 @@ public class CachedBodyServletInputStreamUnitTest extends TestCase {
     }
 
     @Test(expected = UnsupportedOperationException.class)
-    public void testGivenServletInputStreamCreated_whenCalledIsRead_ThenThrowsException() throws IOException {
+    public void testGivenServletInputStreamCreated_whenCalledIsRead_ThenThrowsException() {
         // Given
         byte[] cachedBody = "{\"firstName\" :\"abc\",\"lastName\" : \"xyz\",\"age\" : 30\"}".getBytes();
         servletInputStream = new CachedBodyServletInputStream(cachedBody);

spring-web-modules/spring-mvc-basics-3/src/test/java/com/baeldung/cachedrequest/ContentCachingFilterUnitTest.java

@@ -2,8 +2,8 @@ package com.baeldung.cachedrequest;
 
 import java.io.IOException;
 
-import javax.servlet.FilterChain;
+import jakarta.servlet.FilterChain;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

spring-web-modules/spring-mvc-basics-3/src/test/java/com/baeldung/cachedrequest/PrintRequestContentFilterUnitTest.java

@@ -2,8 +2,8 @@ package com.baeldung.cachedrequest;
 
 import java.io.IOException;
 
-import javax.servlet.FilterChain;
+import jakarta.servlet.FilterChain;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;