Few more updates for spring 3 upgrade

microservices/course-composite-service/pom.xml

@@ -15,7 +15,7 @@
 	<description>Demo project for Spring Boot</description>
 	<properties>
 		<java.version>17</java.version>
-		<spring-cloud.version>2021.0.1</spring-cloud.version>
+		<spring-cloud.version>2022.0.1</spring-cloud.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -26,15 +26,15 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-webflux</artifactId>
 		</dependency>
-		<dependency>
+		<!--<dependency>
 			<groupId>org.springdoc</groupId>
 			<artifactId>springdoc-openapi-common</artifactId>
-			<version>1.5.10</version>
-		</dependency>
+			<version>2.0.2</version>
+		</dependency>-->
 		<dependency>
 			<groupId>org.springdoc</groupId>
-			<artifactId>springdoc-openapi-webflux-ui</artifactId>
-			<version>1.5.10</version>
+			<artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
+			<version>2.0.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -107,6 +107,11 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<!--<dependency>
+				<groupId>io.github.classgraph</groupId>
+				<artifactId>classgraph</artifactId>
+				<version>4.8.139</version>
+			</dependency>-->
 		</dependencies>
 	</dependencyManagement>
 

microservices/course-service/pom.xml

@@ -16,7 +16,7 @@
 	<properties>
 		<java.version>17</java.version>
 		<testcontainers.version>1.16.2</testcontainers.version>
-		<spring-cloud.version>2021.0.1</spring-cloud.version>
+		<spring-cloud.version>2022.0.1</spring-cloud.version>
 	</properties>
 	<dependencies>
 		<dependency>

microservices/search-service/pom.xml

@@ -16,7 +16,7 @@
 	<properties>
 		<java.version>17</java.version>
 		<testcontainers.version>1.16.2</testcontainers.version>
-		<spring-cloud.version>2021.0.1</spring-cloud.version>
+		<spring-cloud.version>2022.0.1</spring-cloud.version>
 	</properties>
 	<dependencies>
 		<dependency>

microservices/student-service/pom.xml

@@ -16,7 +16,7 @@
 	<properties>
 		<java.version>17</java.version>
 		<testcontainers.version>1.16.2</testcontainers.version>
-		<spring-cloud.version>2021.0.1</spring-cloud.version>
+		<spring-cloud.version>2022.0.1</spring-cloud.version>
 	</properties>
 	<dependencies>
 		<dependency>

microservices/vote-service/pom.xml

@@ -16,7 +16,7 @@
 	<properties>
 		<java.version>17</java.version>
 		<testcontainers.version>1.16.2</testcontainers.version>
-		<spring-cloud.version>2021.0.1</spring-cloud.version>
+		<spring-cloud.version>2022.0.1</spring-cloud.version>
 	</properties>
 	<dependencies>
 		<dependency>

spring-cloud/eureka-server/src/main/java/io/javatab/springcloud/eurekaserver/configuration/SecurityConfig.java

@@ -1,42 +1,52 @@
 package io.javatab.springcloud.eurekaserver.configuration;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.Customizer;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.crypto.password.NoOpPasswordEncoder;
+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;
 
 @Configuration
 @EnableWebSecurity
 public class SecurityConfig {
 
-    @Value("${app.eureka-username}")
-    private String username;
+    private final String username;
+    private final String password;
 
-    @Value("${app.eureka-password}")
-    private String password;
+    @Autowired
+    public SecurityConfig(
+            @Value("${app.eureka-username}") String username,
+            @Value("${app.eureka-password}") String password
+    ) {
+        this.username = username;
+        this.password = password;
+    }
 
-    public void configure(AuthenticationManagerBuilder auth) throws Exception {
-        auth.inMemoryAuthentication()
-                .passwordEncoder(NoOpPasswordEncoder.getInstance())
-                .withUser(username).password(password)
-                .authorities("USER");
+    @Bean
+    public InMemoryUserDetailsManager userDetailsService() {
+        UserDetails user = User.withDefaultPasswordEncoder()
+                .username(username)
+                .password(password)
+                .roles("USER")
+                .build();
+        return new InMemoryUserDetailsManager(user);
     }
 
-    protected void configure(HttpSecurity http) throws Exception {
+    @Bean
+    public SecurityFilterChain configure(HttpSecurity http) throws Exception {
         http
-                // Disable CSRF to allow services to register themselves with Eureka
+                // Disable CRCF to allow services to register themselves with Eureka
                 .csrf()
                 .disable()
-                .authorizeHttpRequests(authorizationManagerRequestMatcherRegistry -> {
-                    try {
-                        authorizationManagerRequestMatcherRegistry
-                                .anyRequest().authenticated().and().httpBasic(Customizer.withDefaults());
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                });
+                .authorizeRequests()
+                .anyRequest().authenticated()
+                .and()
+                .httpBasic();
+        return http.build();
     }
 }

spring-cloud/gateway/src/main/java/io/javatab/springcloud/gateway/configuration/SecurityConfig.java

@@ -3,10 +3,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
 import org.springframework.security.config.web.server.ServerHttpSecurity;
 import org.springframework.security.web.server.SecurityWebFilterChain;
 
+@Configuration
 @EnableWebFluxSecurity
 public class SecurityConfig {
 
@@ -17,18 +19,18 @@ SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) throws
         http
                 .csrf().disable()
                 .authorizeExchange()
-                    .pathMatchers("/config/**").permitAll()
-                    .pathMatchers("/actuator/**").permitAll()
-                    .pathMatchers("/eureka/**").permitAll()
-                    .pathMatchers("/oauth2/**").permitAll()
-                    .pathMatchers("/login/**").permitAll()
-                    .pathMatchers("/error/**").permitAll()
-                    .pathMatchers("/openapi/**").permitAll()
-                    .pathMatchers("/webjars/**").permitAll()
-                    .anyExchange().authenticated()
-                    .and()
+                .pathMatchers("/actuator/**").permitAll()
+                .pathMatchers("/eureka/**").permitAll()
+                .pathMatchers("/oauth2/**").permitAll()
+                .pathMatchers("/login/**").permitAll()
+                .pathMatchers("/error/**").permitAll()
+                .pathMatchers("/openapi/**").permitAll()
+                .pathMatchers("/webjars/**").permitAll()
+                .pathMatchers("/config/**").permitAll()
+                .anyExchange().authenticated()
+                .and()
                 .oauth2ResourceServer()
-                    .jwt();
+                .jwt();
         return http.build();
     }
 

util/src/main/resources/application.properties

@@ -1 +1 @@
-server.port=0
+server.port=0

util/src/test/java/io/javatab/microservices/util/UtilApplicationTests.java

@@ -1,13 +1,10 @@
 package io.javatab.microservices.util;
 
 import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
 class UtilApplicationTests {
 
 	@Test
-	void contextLoads() {
-	}
+	void testFlux() {
 
+	}
 }