Merge pull request #383 from yidongnan/feature/graalvm/part1

Change auto configs to use `@Configuration(proxyBeanMethods = false)`

Author: yidongnan

examples/cloud-grpc-client/src/main/java/net/devh/boot/grpc/examples/cloud/client/GlobalClientInterceptorConfiguration.java

@@ -25,7 +25,7 @@
 import net.devh.boot.grpc.client.interceptor.GlobalClientInterceptorConfigurer;
 
 @Order(Ordered.LOWEST_PRECEDENCE)
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class GlobalClientInterceptorConfiguration {
 
     @Bean

examples/cloud-grpc-server/src/main/java/net/devh/boot/grpc/examples/cloud/server/GlobalInterceptorConfiguration.java

@@ -22,7 +22,7 @@
 
 import net.devh.boot.grpc.server.interceptor.GlobalServerInterceptorConfigurer;
 
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class GlobalInterceptorConfiguration {
 
     @Bean

examples/local-grpc-client/src/main/java/net/devh/boot/grpc/examples/local/client/GlobalClientInterceptorConfiguration.java

@@ -25,7 +25,7 @@
 import net.devh.boot.grpc.client.interceptor.GlobalClientInterceptorConfigurer;
 
 @Order(Ordered.LOWEST_PRECEDENCE)
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class GlobalClientInterceptorConfiguration {
 
     @Bean

examples/local-grpc-server/src/main/java/net/devh/boot/grpc/examples/local/server/GlobalInterceptorConfiguration.java

@@ -23,7 +23,7 @@
 import net.devh.boot.grpc.server.interceptor.GlobalServerInterceptorConfigurer;
 import net.devh.boot.grpc.server.interceptor.GlobalServerInterceptorRegistry;
 
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class GlobalInterceptorConfiguration {
 
     @Bean

examples/security-grpc-bearerAuth-client/src/main/java/net/devh/boot/grpc/examples/security/client/SecurityConfiguration.java

@@ -28,7 +28,7 @@
  *
  * @author Gregor Eeckels ([email protected])
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class SecurityConfiguration {
 
     // This token will usually be created by a login endpoint (e.g. from Keycloak).

examples/security-grpc-bearerAuth-server/src/main/java/net/devh/boot/grpc/examples/security/server/SecurityConfiguration.java

@@ -40,7 +40,7 @@
  *
  * @author Gregor Eeckels ([email protected])
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 // proxyTargetClass is required, if you use annotation driven security!
 // However, you will receive a warning that GrpcServerService#bindService() method is final.
 // You cannot avoid that warning (without massive amount of work), but it is safe to ignore it.
@@ -51,9 +51,11 @@
 public class SecurityConfiguration {
 
     @Bean
-    JwtAuthenticationConverter jwtAuthenticationConverter() {
+    JwtAuthenticationConverter jwtAuthenticationConverter(
+            final KeyCloakGrantedAuthoritiesConverter keyCloakGrantedAuthoritiesConverter) {
+
         final JwtAuthenticationConverter converter = new JwtAuthenticationConverter();
-        converter.setJwtGrantedAuthoritiesConverter(keyCloakGrantedAuthoritiesConverter());
+        converter.setJwtGrantedAuthoritiesConverter(keyCloakGrantedAuthoritiesConverter);
         return converter;
     }
 
@@ -63,26 +65,26 @@ KeyCloakGrantedAuthoritiesConverter keyCloakGrantedAuthoritiesConverter() {
     }
 
     @Bean
-    JwtAuthenticationProvider jwtAuthenticationProvider() {
+    JwtAuthenticationProvider jwtAuthenticationProvider(final JwtAuthenticationConverter jwtAuthenticationConverter) {
         final JwtAuthenticationProvider provider = new JwtAuthenticationProvider(jwtDecoder());
-        provider.setJwtAuthenticationConverter(jwtAuthenticationConverter());
+        provider.setJwtAuthenticationConverter(jwtAuthenticationConverter);
         return provider;
     }
 
     @Bean
     /*
      * Add the authentication providers to the manager.
      */
-    AuthenticationManager authenticationManager() {
+    AuthenticationManager authenticationManager(final JwtAuthenticationProvider jwtAuthenticationProvider) {
         final List<AuthenticationProvider> providers = new ArrayList<>();
-        providers.add(jwtAuthenticationProvider());
+        providers.add(jwtAuthenticationProvider);
         return new ProviderManager(providers);
     }
 
     @Bean
     // Configure which authentication types you support.
     GrpcAuthenticationReader authenticationReader() {
-        return new BearerAuthenticationReader(accessToken -> new BearerTokenAuthenticationToken(accessToken));
+        return new BearerAuthenticationReader(BearerTokenAuthenticationToken::new);
     }
 
     @Bean

examples/security-grpc-client/src/main/java/net/devh/boot/grpc/examples/security/client/SecurityConfiguration.java

@@ -32,7 +32,7 @@
  * @author Daniel Theuke ([email protected])
  * @see CallCredentialsHelper
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class SecurityConfiguration {
 
     @Value("${auth.username}")

examples/security-grpc-server/src/main/java/net/devh/boot/grpc/examples/security/server/SecurityConfiguration.java

@@ -46,7 +46,7 @@
  *
  * @author Daniel Theuke ([email protected])
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 // proxyTargetClass is required, if you use annotation driven security!
 // However, you will receive a warning that GrpcServerService#bindService() method is final.
 // You cannot avoid that warning (without massive amount of work), but it is safe to ignore it.
@@ -65,17 +65,17 @@ PasswordEncoder passwordEncoder() {
 
     @Bean
     // This could be your database lookup. There are some complete implementations in spring-security-web.
-    UserDetailsService userDetailsService() {
+    UserDetailsService userDetailsService(final PasswordEncoder passwordEncoder) {
         return username -> {
             log.debug("Searching user: {}", username);
             switch (username) {
                 case "guest": {
-                    return new User(username, passwordEncoder().encode(username + "Password"), Collections.emptyList());
+                    return new User(username, passwordEncoder.encode(username + "Password"), Collections.emptyList());
                 }
                 case "user": {
                     final List<SimpleGrantedAuthority> authorities =
                             Arrays.asList(new SimpleGrantedAuthority("ROLE_GREET"));
-                    return new User(username, passwordEncoder().encode(username + "Password"), authorities);
+                    return new User(username, passwordEncoder.encode(username + "Password"), authorities);
                 }
                 default: {
                     throw new UsernameNotFoundException("Could not find user!");
@@ -87,18 +87,21 @@ UserDetailsService userDetailsService() {
     @Bean
     // One of your authentication providers.
     // They ensure that the credentials are valid and populate the user's authorities.
-    DaoAuthenticationProvider daoAuthenticationProvider() {
+    DaoAuthenticationProvider daoAuthenticationProvider(
+            final UserDetailsService userDetailsService,
+            final PasswordEncoder passwordEncoder) {
+
         final DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        provider.setUserDetailsService(userDetailsService());
-        provider.setPasswordEncoder(passwordEncoder());
+        provider.setUserDetailsService(userDetailsService);
+        provider.setPasswordEncoder(passwordEncoder);
         return provider;
     }
 
     @Bean
     // Add the authentication providers to the manager.
-    AuthenticationManager authenticationManager() {
+    AuthenticationManager authenticationManager(final DaoAuthenticationProvider daoAuthenticationProvider) {
         final List<AuthenticationProvider> providers = new ArrayList<>();
-        providers.add(daoAuthenticationProvider());
+        providers.add(daoAuthenticationProvider);
         return new ProviderManager(providers);
     }
 

grpc-client-spring-boot-autoconfigure/src/main/java/net/devh/boot/grpc/client/autoconfigure/GrpcClientAutoConfiguration.java

@@ -57,7 +57,7 @@
  * @author Michael ([email protected])
  * @since 5/17/16
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties
 @AutoConfigureAfter(name = "org.springframework.cloud.client.CommonsClientAutoConfiguration",
         value = GrpcCommonCodecAutoConfiguration.class)

grpc-client-spring-boot-autoconfigure/src/main/java/net/devh/boot/grpc/client/autoconfigure/GrpcClientHealthAutoConfiguration.java

@@ -35,7 +35,7 @@
  *
  * @author Daniel Theuke ([email protected])
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @AutoConfigureAfter(GrpcClientAutoConfiguration.class)
 @ConditionalOnClass(name = "org.springframework.boot.actuate.health.HealthIndicator")
 public class GrpcClientHealthAutoConfiguration {