Merge branch 'master' into JAVA-23096

spring-security-modules/spring-security-web-mvc-custom/pom.xml

@@ -172,7 +172,6 @@
 
     <properties>
         <!-- Maven plugins -->
-        <maven-war-plugin.version>3.2.2</maven-war-plugin.version>
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
         <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
     </properties>

spring-security-modules/spring-security-web-rest-custom/src/main/java/com/baeldung/web/controller/GetUserWithAuthenticationController.java

@@ -8,9 +8,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 @Controller
-public class SecurityController3 {
+public class GetUserWithAuthenticationController {
 
-    public SecurityController3() {
+    public GetUserWithAuthenticationController() {
         super();
     }
 

spring-security-modules/spring-security-web-rest-custom/src/main/java/com/baeldung/web/controller/GetUserWithAuthenticationPrincipalAnnotationController.java

@@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-public class SecurityController4 {
+public class GetUserWithAuthenticationPrincipalAnnotationController {
 
     @GetMapping("/user")
     public String getUser(@AuthenticationPrincipal UserDetails userDetails) {

spring-security-modules/spring-security-web-rest-custom/src/main/java/com/baeldung/web/controller/GetUserWithPrincipalController.java

@@ -8,9 +8,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 @Controller
-public class SecurityController {
+public class GetUserWithPrincipalController {
 
-    public SecurityController() {
+    public GetUserWithPrincipalController() {
         super();
     }
 

spring-security-modules/spring-security-web-rest-custom/src/main/java/com/baeldung/web/controller/GetUserWithSecurityContextHolderController.java

@@ -11,12 +11,12 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 @Controller
-public class SecurityController1 {
+public class GetUserWithSecurityContextHolderController {
 
     @Autowired
     private ApplicationEventPublisher eventPublisher;
 
-    public SecurityController1() {
+    public GetUserWithSecurityContextHolderController() {
         super();
     }