Fix Checkstyle in OAuth 2.0 MFA Sample

servlet/spring-boot/java/authentication/mfa/oauth2/src/main/java/example/FormLoginOAuth2Application.java

@@ -32,16 +32,6 @@ public class FormLoginOAuth2Application {
 		SpringApplication.run(FormLoginOAuth2Application.class, args);
 	}
 
-	@Controller
-	static class AppController {
-
-		@GetMapping("/profile")
-		String profile() {
-			return "profile";
-		}
-
-	}
-
 	@Bean
 	InMemoryUserDetailsManager userDetailsService() {
 		UserDetails user = User.withDefaultPasswordEncoder()
@@ -52,4 +42,14 @@ public class FormLoginOAuth2Application {
 		return new InMemoryUserDetailsManager(user);
 	}
 
+	@Controller
+	static class AppController {
+
+		@GetMapping("/profile")
+		String profile() {
+			return "profile";
+		}
+
+	}
+
 }

servlet/spring-boot/java/authentication/mfa/oauth2/src/main/java/example/SecurityConfig.java

@@ -47,8 +47,7 @@ class SecurityConfig {
 	static final String SCOPE = "https://www.googleapis.com/auth/gmail.readonly";
 
 	@Bean
-	public SecurityFilterChain securityFilterChain(HttpSecurity http, AuthenticationEntryPoint oauth2)
-			throws Exception {
+	SecurityFilterChain securityFilterChain(HttpSecurity http, AuthenticationEntryPoint oauth2) throws Exception {
 		// @formatter:off
 		http
 			.authorizeHttpRequests((authz) -> authz

servlet/spring-boot/java/authentication/mfa/oauth2/src/test/java/example/FormLoginOAuth2ApplicationTests.java

@@ -24,7 +24,7 @@ import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
 import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.web.servlet.MockMvc;
 
-import static org.hamcrest.core.StringStartsWith.startsWith;
+import static org.hamcrest.Matchers.startsWith;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;