Polish

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpointSecurityInterceptor.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -128,7 +128,8 @@ public class MvcEndpointSecurityInterceptor extends HandlerInterceptorAdapter {
 	private class AuthoritiesValidator {
 
 		private boolean hasAuthority(String role) {
-			Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+			Authentication authentication = SecurityContextHolder.getContext()
+					.getAuthentication();
 			if (authentication != null) {
 				for (GrantedAuthority authority : authentication.getAuthorities()) {
 					if (authority.getAuthority().equals(role)) {

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpointSecurityInterceptorTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -130,11 +130,13 @@ public class MvcEndpointSecurityInterceptorTests {
 	}
 
 	@Test
-	public void sensitiveEndpointIfRoleNotCorrectShouldCheckAuthorities() throws Exception {
+	public void sensitiveEndpointIfRoleNotCorrectShouldCheckAuthorities()
+			throws Exception {
 		Principal principal = mock(Principal.class);
 		this.request.setUserPrincipal(principal);
 		Authentication authentication = mock(Authentication.class);
-		Set<SimpleGrantedAuthority> authorities = Collections.singleton(new SimpleGrantedAuthority("SUPER_HERO"));
+		Set<SimpleGrantedAuthority> authorities = Collections
+				.singleton(new SimpleGrantedAuthority("SUPER_HERO"));
 		doReturn(authorities).when(authentication).getAuthorities();
 		SecurityContextHolder.getContext().setAuthentication(authentication);
 		assertThat(this.securityInterceptor.preHandle(this.request, this.response,
@@ -142,11 +144,13 @@ public class MvcEndpointSecurityInterceptorTests {
 	}
 
 	@Test
-	public void sensitiveEndpointIfRoleAndAuthoritiesNotCorrectShouldNotAllowAccess() throws Exception {
+	public void sensitiveEndpointIfRoleAndAuthoritiesNotCorrectShouldNotAllowAccess()
+			throws Exception {
 		Principal principal = mock(Principal.class);
 		this.request.setUserPrincipal(principal);
 		Authentication authentication = mock(Authentication.class);
-		Set<SimpleGrantedAuthority> authorities = Collections.singleton(new SimpleGrantedAuthority("HERO"));
+		Set<SimpleGrantedAuthority> authorities = Collections
+				.singleton(new SimpleGrantedAuthority("HERO"));
 		doReturn(authorities).when(authentication).getAuthorities();
 		SecurityContextHolder.getContext().setAuthentication(authentication);
 		assertThat(this.securityInterceptor.preHandle(this.request, this.response,

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/NoSpringSecurityMvcEndpointSecurityInterceptorTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,6 +39,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
 /**
+ * Tests for {@link MvcEndpointSecurityInterceptor} when Spring Security is not available.
+ *
  * @author Madhura Bhave
  */
 @RunWith(ModifiedClassPathRunner.class)
@@ -77,7 +79,8 @@ public class NoSpringSecurityMvcEndpointSecurityInterceptorTests {
 	}
 
 	@Test
-	public void sensitiveEndpointIfRoleNotPresentShouldNotValidateAuthorities() throws Exception {
+	public void sensitiveEndpointIfRoleNotPresentShouldNotValidateAuthorities()
+			throws Exception {
 		Principal principal = mock(Principal.class);
 		this.request.setUserPrincipal(principal);
 		this.servletContext.declareRoles("HERO");
@@ -105,5 +108,5 @@ public class NoSpringSecurityMvcEndpointSecurityInterceptorTests {
 		}
 
 	}
-}
 
+}

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBeanTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/websocket/WebSocketAutoConfigurationTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/ApplicationBuilder.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractDependencyFilterMojo.java

@@ -16,7 +16,7 @@
 
 package org.springframework.boot.maven;
 
-import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.StringTokenizer;
@@ -87,29 +87,15 @@ public abstract class AbstractDependencyFilterMojo extends AbstractMojo {
 		this.excludeArtifactIds = excludeArtifactIds;
 	}
 
-	@SuppressWarnings("unchecked")
 	protected Set<Artifact> filterDependencies(Set<Artifact> dependencies,
 			FilterArtifacts filters) throws MojoExecutionException {
-		List<ArtifactsFilter> artifactsFilters = filters.getFilters();
 		try {
-			for (ArtifactsFilter filter : artifactsFilters) {
-				Set<Artifact> result = filter.filter(dependencies);
-				applyFiltering(dependencies, result);
-			}
-			return dependencies;
-		}
-		catch (ArtifactFilterException e) {
-			throw new MojoExecutionException(e.getMessage(), e);
+			Set<Artifact> filtered = new LinkedHashSet<Artifact>(dependencies);
+			filtered.retainAll(filters.filter(dependencies));
+			return filtered;
 		}
-	}
-
-	private void applyFiltering(Set<Artifact> original, Set<Artifact> filtered) {
-		Iterator<Artifact> iterator = original.iterator();
-		while (iterator.hasNext()) {
-			Artifact element = iterator.next();
-			if (!filtered.contains(element)) {
-				iterator.remove();
-			}
+		catch (ArtifactFilterException ex) {
+			throw new MojoExecutionException(ex.getMessage(), ex);
 		}
 	}
 

spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/DependencyFilterMojoTests.java

@@ -103,7 +103,7 @@ public class DependencyFilterMojoTests {
 	}
 
 	@Test
-	public void filterExcludeKeepOrder()  throws MojoExecutionException {
+	public void filterExcludeKeepOrder() throws MojoExecutionException {
 		Exclude exclude = new Exclude();
 		exclude.setGroupId("com.bar");
 		exclude.setArtifactId("two");
@@ -121,7 +121,8 @@ public class DependencyFilterMojoTests {
 		return createArtifact(groupId, artifactId, null);
 	}
 
-	private static Artifact createArtifact(String groupId, String artifactId, String scope) {
+	private static Artifact createArtifact(String groupId, String artifactId,
+			String scope) {
 		Artifact a = mock(Artifact.class);
 		given(a.getGroupId()).willReturn(groupId);
 		given(a.getArtifactId()).willReturn(artifactId);