Merge pull request Waffle#2208 from hazendaz/master

[cleanup] Fix up deprecated spring code
hazendaz · Jan 21, 2024 · 52972ec · 52972ec
2 parents c7c02be + 52f485d
commit 52972ec
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/...demo/waffle-spring-boot-filter2/src/main/java/waffle/spring/boot/demo/SecurityConfig.java b/...demo/waffle-spring-boot-filter2/src/main/java/waffle/spring/boot/demo/SecurityConfig.java
@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2010-2023 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+ * Copyright (c) 2010-2024 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -59,9 +59,9 @@ public SecurityConfig(NegotiateSecurityFilter filter, NegotiateSecurityFilterEnt
 
     @Bean
     SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-        http.authorizeHttpRequests().anyRequest().authenticated().and()
-                .addFilterBefore(filter, BasicAuthenticationFilter.class).exceptionHandling()
-                .authenticationEntryPoint(entryPoint);
+        http.authorizeHttpRequests(requests -> requests.anyRequest().authenticated())
+                .addFilterBefore(filter, BasicAuthenticationFilter.class)
+                .exceptionHandling(handling -> handling.authenticationEntryPoint(entryPoint));
         return http.build();
     }
 

diff --git a/...demo/waffle-spring-boot-filter3/src/main/java/waffle/spring/boot/demo/SecurityConfig.java b/...demo/waffle-spring-boot-filter3/src/main/java/waffle/spring/boot/demo/SecurityConfig.java
@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2010-2023 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+ * Copyright (c) 2010-2024 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -59,9 +59,9 @@ public SecurityConfig(NegotiateSecurityFilter filter, NegotiateSecurityFilterEnt
 
     @Bean
     SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-        http.authorizeHttpRequests().anyRequest().authenticated().and()
-                .addFilterBefore(filter, BasicAuthenticationFilter.class).exceptionHandling()
-                .authenticationEntryPoint(entryPoint);
+        http.authorizeHttpRequests(requests -> requests.anyRequest().authenticated())
+                .addFilterBefore(filter, BasicAuthenticationFilter.class)
+                .exceptionHandling(handling -> handling.authenticationEntryPoint(entryPoint));
         return http.build();
     }