Project update

- Rename WebSecurityConfig to SecurityConfig;
- Remove EnableWebSecurity annotation as it is not needed;
- To create the PasswordEncoder Bean, using PasswordEncoderFactories.createDelegatingPasswordEncoder(); instead of new BCryptPasswordEncoder();
- Remove Actuator dependency;
- Remove public keyword from Beans.

Author: Ivan Franchin

bitcoin-api/pom.xml

@@ -29,10 +29,6 @@
         <spring-cloud.version>2024.0.0</spring-cloud.version>
     </properties>
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>

bitcoin-api/src/main/java/com/ivanfranchin/bitcoinapi/config/SwaggerConfig.java

@@ -15,17 +15,12 @@ public class SwaggerConfig {
     private String applicationName;
 
     @Bean
-    public OpenAPI customOpenAPI() {
+    OpenAPI customOpenAPI() {
         return new OpenAPI().components(new Components()).info(new Info().title(applicationName));
     }
 
     @Bean
-    public GroupedOpenApi customApi() {
+    GroupedOpenApi customApi() {
         return GroupedOpenApi.builder().group("api").pathsToMatch("/api/**").build();
     }
-
-    @Bean
-    public GroupedOpenApi actuatorApi() {
-        return GroupedOpenApi.builder().group("actuator").pathsToMatch("/actuator/**").build();
-    }
 }

bitcoin-api/src/main/resources/application.yml

@@ -17,16 +17,6 @@ spring:
         prices-out-0:
           destination: com.ivanfranchin.bitcoin.api.price
 
-management:
-  endpoints:
-    web:
-      exposure.include: beans, env, health, info, metrics, mappings
-  endpoint:
-    health:
-      show-details: always
-
 springdoc:
-  show-actuator: true
   swagger-ui:
-    groups-order: DESC
     disable-swagger-default-url: true

bitcoin-client/pom.xml

@@ -28,10 +28,6 @@
         <spring-cloud.version>2024.0.0</spring-cloud.version>
     </properties>
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>

bitcoin-client/src/main/java/com/ivanfranchin/bitcoinclient/kafka/PriceStream.java

@@ -21,7 +21,7 @@ public class PriceStream {
     private final SimpMessagingTemplate simpMessagingTemplate;
 
     @Bean
-    public Consumer<Message<PriceMessage>> prices() {
+    Consumer<Message<PriceMessage>> prices() {
         return message -> {
             PriceMessage priceMessage = message.getPayload();
             MessageHeaders messageHeaders = message.getHeaders();

bitcoin-client/src/main/java/com/ivanfranchin/bitcoinclient/security/WebSecurityConfig.java renamed to bitcoin-client/src/main/java/com/ivanfranchin/bitcoinclient/security/SecurityConfig.java

@@ -4,23 +4,21 @@
 import org.springframework.context.annotation.Configuration;
 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.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.factory.PasswordEncoderFactories;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 import org.springframework.security.web.SecurityFilterChain;
 
 @Configuration
-@EnableWebSecurity
-public class WebSecurityConfig {
+public class SecurityConfig {
 
     private static final String USER = "USER";
 
     @Bean
-    public UserDetailsService userDetailsService() {
+    UserDetailsService userDetailsService() {
         UserDetails user1 = User.withUsername("user1")
                 .password(passwordEncoder().encode("123"))
                 .roles(USER).build();
@@ -33,15 +31,15 @@ public UserDetailsService userDetailsService() {
     }
 
     @Bean
-    public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
+    SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
         return http.authorizeHttpRequests(authorizeHttpRequests -> authorizeHttpRequests
                         .anyRequest().authenticated())
                 .formLogin(Customizer.withDefaults())
                 .build();
     }
 
     @Bean
-    public PasswordEncoder passwordEncoder() {
-        return new BCryptPasswordEncoder();
+    PasswordEncoder passwordEncoder() {
+        return PasswordEncoderFactories.createDelegatingPasswordEncoder();
     }
 }

bitcoin-client/src/main/resources/application.yml

@@ -10,11 +10,3 @@ spring:
         prices-in-0:
           destination: com.ivanfranchin.bitcoin.api.price
           group: bitcoinClientGroup
-
-management:
-  endpoints:
-    web:
-      exposure.include: beans, env, health, info, metrics, mappings
-  endpoint:
-    health:
-      show-details: always