Make classes and methods package-private

Signed-off-by: Josh Cummings <[email protected]>

Author: jzheaux

complete/src/main/java/com/example/securingweb/MvcConfig.java

@@ -5,7 +5,7 @@
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
-public class MvcConfig implements WebMvcConfigurer {
+class MvcConfig implements WebMvcConfigurer {
 
 	@Override
 	public void addViewControllers(ViewControllerRegistry registry) {

complete/src/main/java/com/example/securingweb/SecuringWebApplication.java

@@ -4,7 +4,7 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class SecuringWebApplication {
+class SecuringWebApplication {
 
 	public static void main(String[] args) {
 		SpringApplication.run(SecuringWebApplication.class, args);

complete/src/main/java/com/example/securingweb/WebSecurityConfig.java

@@ -15,10 +15,10 @@
 
 @Configuration
 @EnableWebSecurity
-public class WebSecurityConfig {
+class WebSecurityConfig {
 
 	@Bean
-	public SecurityFilterChain securityFilterChain(HttpSecurity http) {
+	SecurityFilterChain securityFilterChain(HttpSecurity http) {
 		// @formatter:off
 		http
 			.authorizeHttpRequests((requests) -> requests
@@ -36,14 +36,15 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) {
 	}
 
 	@Bean
-	public PasswordEncoder passwordEncoder() {
+	PasswordEncoder passwordEncoder() {
 		return new BCryptPasswordEncoder();
 	}
 
 	@Bean
-	public UserDetailsService userDetailsService(PasswordEncoder encoder) {
+	UserDetailsService userDetailsService(PasswordEncoder encoder) {
 		String password = encoder.encode("password");
 		UserDetails user = User.withUsername("user").password(password).roles("USER").build();
 		return new InMemoryUserDetailsManager(user);
 	}
+
 }

complete/src/test/java/com/example/securingweb/SecuringWebApplicationTests.java

@@ -20,51 +20,41 @@
 
 @SpringBootTest
 @AutoConfigureMockMvc
-public class SecuringWebApplicationTests {
+class SecuringWebApplicationTests {
 
 	@Autowired
 	private MockMvc mockMvc;
 
 	@Test
-	public void loginWithValidUserThenAuthenticated() throws Exception {
-		FormLoginRequestBuilder login = formLogin()
-			.user("user")
-			.password("password");
+	void loginWithValidUserThenAuthenticated() throws Exception {
+		FormLoginRequestBuilder login = formLogin().user("user").password("password");
 
-		mockMvc.perform(login)
-			.andExpect(authenticated().withUsername("user"));
+		mockMvc.perform(login).andExpect(authenticated().withUsername("user"));
 	}
 
 	@Test
-	public void loginWithInvalidUserThenUnauthenticated() throws Exception {
-		FormLoginRequestBuilder login = formLogin()
-			.user("invalid")
-			.password("invalidpassword");
+	void loginWithInvalidUserThenUnauthenticated() throws Exception {
+		FormLoginRequestBuilder login = formLogin().user("invalid").password("invalidpassword");
 
-		mockMvc.perform(login)
-			.andExpect(unauthenticated());
+		mockMvc.perform(login).andExpect(unauthenticated());
 	}
 
 	@Test
-	public void accessUnsecuredResourceThenOk() throws Exception {
-		mockMvc.perform(get("/"))
-			.andExpect(status().isOk());
+	void accessUnsecuredResourceThenOk() throws Exception {
+		mockMvc.perform(get("/")).andExpect(status().isOk());
 	}
 
 	@Test
-	public void accessSecuredResourceUnauthenticatedThenRedirectsToLogin() throws Exception {
-		mockMvc.perform(get("/hello"))
-			.andExpect(status().is3xxRedirection())
-			.andExpect(redirectedUrl("/login"));
+	void accessSecuredResourceUnauthenticatedThenRedirectsToLogin() throws Exception {
+		mockMvc.perform(get("/hello")).andExpect(status().is3xxRedirection()).andExpect(redirectedUrl("/login"));
 	}
 
 	@Test
 	@WithMockUser
-	public void accessSecuredResourceAuthenticatedThenOk() throws Exception {
-		MvcResult mvcResult = mockMvc.perform(get("/hello"))
-				.andExpect(status().isOk())
-				.andReturn();
+	void accessSecuredResourceAuthenticatedThenOk() throws Exception {
+		MvcResult mvcResult = mockMvc.perform(get("/hello")).andExpect(status().isOk()).andReturn();
 
 		assertThat(mvcResult.getResponse().getContentAsString()).contains("Hello user!");
 	}
+
 }

initial/src/main/java/com/example/securingweb/MvcConfig.java

@@ -5,7 +5,7 @@
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
-public class MvcConfig implements WebMvcConfigurer {
+class MvcConfig implements WebMvcConfigurer {
 
 	@Override
 	public void addViewControllers(ViewControllerRegistry registry) {

initial/src/main/java/com/example/securingweb/SecuringWebApplication.java

@@ -4,7 +4,7 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class SecuringWebApplication {
+class SecuringWebApplication {
 
 	public static void main(String[] args) {
 		SpringApplication.run(SecuringWebApplication.class, args);