Merge remote-tracking branch 'upstream/master'

# Conflicts: # pom.xml # spring-cloud/spring-cloud-bootstrap/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/SecurityConfig.java # spring-cloud/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SecurityConfig.java # spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/SecurityConfig.java # spring-cloud/spring-cloud-bootstrap/resource/src/main/java/com/baeldung/spring/cloud/bootstrap/resource/SecurityConfig.java
2016-11-05 10:06:53 -06:00
parent 8564e482e4 c29601db41
commit 826c536d0d
685 changed files with 9025 additions and 3364 deletions
@@ -11,23 +11,27 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur
@Configuration
 public class SecurityConfig extends WebSecurityConfigurerAdapter {

-        @Autowired
-        public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-                auth.inMemoryAuthentication()
-                        .withUser("user").password("password").roles("USER").and()
-                        .withUser("admin").password("admin").roles("ADMIN");
-        }
+    @Autowired
+    public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
+        auth.inMemoryAuthentication()
+            .withUser("user").password("password").roles("USER")
+                .and()
+            .withUser("admin").password("admin").roles("ADMIN");
+    }

-        @Override
-        protected void configure(HttpSecurity http) throws Exception {
-                http
-                        .authorizeRequests()
-                                .antMatchers("/resource/hello/cloud").permitAll()
-                                .antMatchers("/eureka/**").hasRole("ADMIN")
-                                .anyRequest().authenticated().and()
-                        .formLogin().and()
-                        .logout().permitAll()
-                        .logoutSuccessUrl("/resource/hello/cloud").permitAll().and()
-                        .csrf().disable();
-        }
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        http.authorizeRequests()
+            .antMatchers("/resource/hello/cloud").permitAll()
+            .antMatchers("/eureka/**").hasRole("ADMIN")
+            .anyRequest().authenticated()
+            .and()
+        .formLogin()
+            .and()
+        .logout().permitAll()
+            .logoutSuccessUrl("/resource/hello/cloud").permitAll()
+            .and()
+        .csrf()
+            .disable();
+    }
 }