Skip to content

Commit 7f34e20

Browse files
NasruddinNasruddin
committed
Few more updates for spring 3 upgrade
1 parent 49b8267 commit 7f34e20

File tree

9 files changed

+63
-49
lines changed

9 files changed

+63
-49
lines changed

‎microservices/course-composite-service/pom.xml‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<description>Demo project for Spring Boot</description>
1616
<properties>
1717
<java.version>17</java.version>
18-
<spring-cloud.version>2021.0.1</spring-cloud.version>
18+
<spring-cloud.version>2022.0.1</spring-cloud.version>
1919
</properties>
2020
<dependencies>
2121
<dependency>
@@ -26,15 +26,15 @@
2626
<groupId>org.springframework.boot</groupId>
2727
<artifactId>spring-boot-starter-webflux</artifactId>
2828
</dependency>
29-
<dependency>
29+
<!--<dependency>
3030
<groupId>org.springdoc</groupId>
3131
<artifactId>springdoc-openapi-common</artifactId>
32-
<version>1.5.10</version>
33-
</dependency>
32+
<version>2.0.2</version>
33+
</dependency>-->
3434
<dependency>
3535
<groupId>org.springdoc</groupId>
36-
<artifactId>springdoc-openapi-webflux-ui</artifactId>
37-
<version>1.5.10</version>
36+
<artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
37+
<version>2.0.4</version>
3838
</dependency>
3939
<dependency>
4040
<groupId>org.springframework.boot</groupId>
@@ -107,6 +107,11 @@
107107
<type>pom</type>
108108
<scope>import</scope>
109109
</dependency>
110+
<!--<dependency>
111+
<groupId>io.github.classgraph</groupId>
112+
<artifactId>classgraph</artifactId>
113+
<version>4.8.139</version>
114+
</dependency>-->
110115
</dependencies>
111116
</dependencyManagement>
112117

‎microservices/course-service/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<properties>
1717
<java.version>17</java.version>
1818
<testcontainers.version>1.16.2</testcontainers.version>
19-
<spring-cloud.version>2021.0.1</spring-cloud.version>
19+
<spring-cloud.version>2022.0.1</spring-cloud.version>
2020
</properties>
2121
<dependencies>
2222
<dependency>

‎microservices/search-service/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<properties>
1717
<java.version>17</java.version>
1818
<testcontainers.version>1.16.2</testcontainers.version>
19-
<spring-cloud.version>2021.0.1</spring-cloud.version>
19+
<spring-cloud.version>2022.0.1</spring-cloud.version>
2020
</properties>
2121
<dependencies>
2222
<dependency>

‎microservices/student-service/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<properties>
1717
<java.version>17</java.version>
1818
<testcontainers.version>1.16.2</testcontainers.version>
19-
<spring-cloud.version>2021.0.1</spring-cloud.version>
19+
<spring-cloud.version>2022.0.1</spring-cloud.version>
2020
</properties>
2121
<dependencies>
2222
<dependency>

‎microservices/vote-service/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<properties>
1717
<java.version>17</java.version>
1818
<testcontainers.version>1.16.2</testcontainers.version>
19-
<spring-cloud.version>2021.0.1</spring-cloud.version>
19+
<spring-cloud.version>2022.0.1</spring-cloud.version>
2020
</properties>
2121
<dependencies>
2222
<dependency>

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

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,52 @@
11
package io.javatab.springcloud.eurekaserver.configuration;
22

3+
import org.springframework.beans.factory.annotation.Autowired;
34
import org.springframework.beans.factory.annotation.Value;
5+
import org.springframework.context.annotation.Bean;
46
import org.springframework.context.annotation.Configuration;
5-
import org.springframework.security.config.Customizer;
6-
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
77
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
88
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
9-
import org.springframework.security.crypto.password.NoOpPasswordEncoder;
9+
import org.springframework.security.core.userdetails.User;
10+
import org.springframework.security.core.userdetails.UserDetails;
11+
import org.springframework.security.provisioning.InMemoryUserDetailsManager;
12+
import org.springframework.security.web.SecurityFilterChain;
1013

1114
@Configuration
1215
@EnableWebSecurity
1316
public class SecurityConfig {
1417

15-
@Value("${app.eureka-username}")
16-
private String username;
18+
private final String username;
19+
private final String password;
1720

18-
@Value("${app.eureka-password}")
19-
private String password;
21+
@Autowired
22+
public SecurityConfig(
23+
@Value("${app.eureka-username}") String username,
24+
@Value("${app.eureka-password}") String password
25+
) {
26+
this.username = username;
27+
this.password = password;
28+
}
2029

21-
public void configure(AuthenticationManagerBuilder auth) throws Exception {
22-
auth.inMemoryAuthentication()
23-
.passwordEncoder(NoOpPasswordEncoder.getInstance())
24-
.withUser(username).password(password)
25-
.authorities("USER");
30+
@Bean
31+
public InMemoryUserDetailsManager userDetailsService() {
32+
UserDetails user = User.withDefaultPasswordEncoder()
33+
.username(username)
34+
.password(password)
35+
.roles("USER")
36+
.build();
37+
return new InMemoryUserDetailsManager(user);
2638
}
2739

28-
protected void configure(HttpSecurity http) throws Exception {
40+
@Bean
41+
public SecurityFilterChain configure(HttpSecurity http) throws Exception {
2942
http
30-
// Disable CSRF to allow services to register themselves with Eureka
43+
// Disable CRCF to allow services to register themselves with Eureka
3144
.csrf()
3245
.disable()
33-
.authorizeHttpRequests(authorizationManagerRequestMatcherRegistry -> {
34-
try {
35-
authorizationManagerRequestMatcherRegistry
36-
.anyRequest().authenticated().and().httpBasic(Customizer.withDefaults());
37-
} catch (Exception e) {
38-
e.printStackTrace();
39-
}
40-
});
46+
.authorizeRequests()
47+
.anyRequest().authenticated()
48+
.and()
49+
.httpBasic();
50+
return http.build();
4151
}
4252
}

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

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
import org.slf4j.Logger;
44
import org.slf4j.LoggerFactory;
55
import org.springframework.context.annotation.Bean;
6+
import org.springframework.context.annotation.Configuration;
67
import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
78
import org.springframework.security.config.web.server.ServerHttpSecurity;
89
import org.springframework.security.web.server.SecurityWebFilterChain;
910

11+
@Configuration
1012
@EnableWebFluxSecurity
1113
public class SecurityConfig {
1214

@@ -17,18 +19,18 @@ SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) throws
1719
http
1820
.csrf().disable()
1921
.authorizeExchange()
20-
.pathMatchers("/config/**").permitAll()
21-
.pathMatchers("/actuator/**").permitAll()
22-
.pathMatchers("/eureka/**").permitAll()
23-
.pathMatchers("/oauth2/**").permitAll()
24-
.pathMatchers("/login/**").permitAll()
25-
.pathMatchers("/error/**").permitAll()
26-
.pathMatchers("/openapi/**").permitAll()
27-
.pathMatchers("/webjars/**").permitAll()
28-
.anyExchange().authenticated()
29-
.and()
22+
.pathMatchers("/actuator/**").permitAll()
23+
.pathMatchers("/eureka/**").permitAll()
24+
.pathMatchers("/oauth2/**").permitAll()
25+
.pathMatchers("/login/**").permitAll()
26+
.pathMatchers("/error/**").permitAll()
27+
.pathMatchers("/openapi/**").permitAll()
28+
.pathMatchers("/webjars/**").permitAll()
29+
.pathMatchers("/config/**").permitAll()
30+
.anyExchange().authenticated()
31+
.and()
3032
.oauth2ResourceServer()
31-
.jwt();
33+
.jwt();
3234
return http.build();
3335
}
3436

‎util/src/main/resources/application.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
server.port=0
1+
server.port=0

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
package io.javatab.microservices.util;
22

33
import org.junit.jupiter.api.Test;
4-
import org.springframework.boot.test.context.SpringBootTest;
5-
6-
@SpringBootTest
74
class UtilApplicationTests {
85

96
@Test
10-
void contextLoads() {
11-
}
7+
void testFlux() {
128

9+
}
1310
}

0 commit comments

Comments
 (0)