Merge branch 'master' into master

2023-10-06 14:22:48 +03:00
parent a9e906aa69 06f1bfb9df
commit 428ec8cc6f
36 changed files with 544 additions and 93 deletions
@@ -9,9 +9,10 @@
    <description>This is simple boot application for Spring boot actuator test</description>

    <parent>
-        <groupId>com.baeldung.spring-boot-modules</groupId>
-        <artifactId>spring-boot-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-3</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-3</relativePath>
    </parent>

    <dependencies>
@@ -39,16 +40,6 @@
            <groupId>com.h2database</groupId>
            <artifactId>h2</artifactId>
        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-test</artifactId>
@@ -1,36 +1,56 @@
 package com.baeldung.endpoints.enabling;

 import org.springframework.boot.actuate.autoconfigure.security.servlet.EndpointRequest;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.crypto.factory.PasswordEncoderFactories;
-import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.provisioning.InMemoryUserDetailsManager;
+import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.servlet.util.matcher.MvcRequestMatcher;
+import org.springframework.web.servlet.handler.HandlerMappingIntrospector;

-@Configuration
@EnableWebSecurity
-public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+@Configuration
+public class SecurityConfiguration {

-    @Override
-    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-        PasswordEncoder encoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
-        auth.inMemoryAuthentication()
-          .withUser("user")
-          .password(encoder.encode("password"))
-          .roles("USER")
-          .and()
-          .withUser("admin")
-          .password(encoder.encode("admin"))
-          .roles("USER", "ADMIN");
+    @Bean
+    MvcRequestMatcher.Builder mvc(HandlerMappingIntrospector introspector) {
+        return new MvcRequestMatcher.Builder(introspector);
    }

-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http.requestMatcher(EndpointRequest.toAnyEndpoint())
-          .authorizeRequests((requests) -> requests.anyRequest()
-            .hasRole("ADMIN"));
-        http.httpBasic();
+    @Bean
+    public SecurityFilterChain filterChain(HttpSecurity http, MvcRequestMatcher.Builder mvc) throws Exception {
+        http.httpBasic(Customizer.withDefaults());
+        http.securityMatcher(EndpointRequest.toAnyEndpoint());
+        http.authorizeHttpRequests(authz -> {
+                authz.requestMatchers(mvc.pattern("/actuator/**"))
+                    .hasRole("ADMIN")
+                    .anyRequest()
+                    .authenticated();
+            });
+
+        return http.build();
+    }
+
+
+
+    @Bean
+    public InMemoryUserDetailsManager userDetailsService() {
+        UserDetails user =  User.withDefaultPasswordEncoder()
+            .username("user")
+            .password("password")
+            .roles("USER")
+            .build();
+        UserDetails admin =  User.withDefaultPasswordEncoder()
+            .username("admin")
+            .password("password")
+            .roles("USER", "ADMIN")
+            .build();
+        return new InMemoryUserDetailsManager(user, admin);
    }
 }
@@ -1,9 +1,9 @@
 package com.baeldung.endpoints.info;

-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;

@Entity
@Table(name = "users")
@@ -15,7 +15,7 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.context.request.RequestContextListener;

-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;

@EnableScheduling
@ComponentScan("com.baeldung.metrics")
@@ -7,14 +7,14 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;

-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;

@Component
 public class MetricFilter implements Filter {
@@ -13,20 +13,20 @@ import org.springframework.test.web.servlet.MockMvc;

@SpringBootTest
@AutoConfigureMockMvc
-public class EndpointEnablingIntegrationTest {
+class EndpointEnablingIntegrationTest {
    @Autowired
    private MockMvc mockMvc;
    
    @Test
    @WithMockUser(username = "user", password = "password", roles = "USER")
-    public void givenWrongAuthentication_whenCallingActuator_thenReturns401() throws Exception {
+    void givenWrongAuthentication_whenCallingActuator_thenReturns401() throws Exception {
        mockMvc.perform(get("/actuator"))
          .andExpect(status().isForbidden());
    }
    
    @Test
    @WithMockUser(username = "admin", password = "admin", roles = "ADMIN")
-    public void givenProperAuthentication_whenCallingActuator_thenReturnsExpectedEndpoints() throws Exception {
+    void givenProperAuthentication_whenCallingActuator_thenReturnsExpectedEndpoints() throws Exception {
        mockMvc.perform(get("/actuator"))
          .andExpect(jsonPath("$._links").exists())
          .andExpect(jsonPath("$._links.beans").exists())
@@ -9,9 +9,10 @@
    <description>Module For Spring Boot MVC Web</description>

    <parent>
-        <groupId>com.baeldung.spring-boot-modules</groupId>
-        <artifactId>spring-boot-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-3</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-3</relativePath>
    </parent>

    <dependencies>
@@ -4,10 +4,10 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Objects;

-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;

 public class HelloWorldServlet extends HttpServlet {
    private static final long serialVersionUID = 1L;
@@ -4,10 +4,10 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Objects;

-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;

 public class SpringHelloWorldServlet extends HttpServlet {
    private static final long serialVersionUID = 1L;
@@ -2,7 +2,7 @@ package com.baeldung.common.error;

 import org.springframework.boot.web.servlet.ServletRegistrationBean;

-import javax.servlet.Servlet;
+import jakarta.servlet.Servlet;

 public class SpringHelloServletRegistrationBean extends ServletRegistrationBean {

@@ -4,9 +4,9 @@ import org.springframework.web.WebApplicationInitializer;
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
 import org.springframework.web.context.support.XmlWebApplicationContext;
 import org.springframework.web.servlet.DispatcherServlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRegistration;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRegistration;

 public class WebAppInitializer implements WebApplicationInitializer {

@@ -1,9 +1,9 @@
 package com.baeldung.servlets.servlets;

-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;

@@ -1,10 +1,10 @@
 package com.baeldung.servlets.servlets.javaee;

-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;

@WebServlet(name = "AnnotationServlet", description = "Example Servlet Using Annotations", urlPatterns = { "/annotationservlet" })
@@ -1,9 +1,9 @@
 package com.baeldung.servlets.servlets.javaee;

-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;

@@ -1,6 +1,6 @@
 package com.baeldung.utils;

-import javax.annotation.security.RolesAllowed;
+import jakarta.annotation.security.RolesAllowed;

 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -1,6 +1,6 @@
 package com.baeldung.utils.controller;

-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;

 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -1,32 +1,34 @@
 package com.baeldung.utils;

 import com.baeldung.utils.controller.UtilsController;
-import org.junit.Before;
-import org.junit.Test;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
-import org.mockito.MockitoAnnotations;
+
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;

+import static org.mockito.MockitoAnnotations.openMocks;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;

-public class UtilsControllerIntegrationTest {
+class UtilsControllerIntegrationTest {

    @InjectMocks
    private UtilsController utilsController;

    private MockMvc mockMvc;

-    @Before
+    @BeforeEach
    public void setup() {
-        MockitoAnnotations.initMocks(this);
+        openMocks(this);
        this.mockMvc = MockMvcBuilders.standaloneSetup(utilsController).build();

    }

    @Test
-    public void givenParameter_setRequestParam_andSetSessionAttribute() throws Exception {
+    void givenParameter_setRequestParam_andSetSessionAttribute() throws Exception {
        String param = "testparam";
        this.mockMvc.perform(post("/setParam").param("param", param).sessionAttr("parameter", param)).andExpect(status().isOk());
    }