Polish

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryHealthMvcEndpoint.java

@@ -38,7 +38,8 @@ class CloudFoundryHealthMvcEndpoint extends HealthMvcEndpoint {
 	}
 
 	@Override
-	protected boolean exposeHealthDetails(HttpServletRequest request, Principal principal) {
+	protected boolean exposeHealthDetails(HttpServletRequest request,
+			Principal principal) {
 		return true;
 	}
 

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

@@ -183,7 +183,8 @@ public class HealthMvcEndpoint extends AbstractEndpointMvcAdapter<HealthEndpoint
 		return (accessTime - this.lastAccess) >= getDelegate().getTimeToLive();
 	}
 
-	protected boolean exposeHealthDetails(HttpServletRequest request, Principal principal) {
+	protected boolean exposeHealthDetails(HttpServletRequest request,
+			Principal principal) {
 		if (!this.secure) {
 			return true;
 		}
@@ -192,7 +193,7 @@ public class HealthMvcEndpoint extends AbstractEndpointMvcAdapter<HealthEndpoint
 			if (request.isUserInRole(role)) {
 				return true;
 			}
-			if (isSpringSecurityAuthentication(principal))  {
+			if (isSpringSecurityAuthentication(principal)) {
 				Authentication authentication = (Authentication) principal;
 				for (GrantedAuthority authority : authentication.getAuthorities()) {
 					String name = authority.getAuthority();
@@ -217,7 +218,7 @@ public class HealthMvcEndpoint extends AbstractEndpointMvcAdapter<HealthEndpoint
 
 	private boolean isSpringSecurityAuthentication(Principal principal) {
 		return ClassUtils.isPresent("org.springframework.security.core.Authentication",
-				null) && (principal instanceof Authentication);
+				null) && principal instanceof Authentication;
 	}
 
 }

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

@@ -1,5 +1,5 @@
 /*
- * 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-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryHealthMvcEndpointTests.java

@@ -1,5 +1,5 @@
 /*
- * 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-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpointTests.java

@@ -167,7 +167,8 @@ public class HealthMvcEndpointTests {
 	public void rightAuthorityPresentShouldExposeDetails() throws Exception {
 		this.environment.getPropertySources().addLast(SECURITY_ROLES);
 		Authentication principal = mock(Authentication.class);
-		Set<SimpleGrantedAuthority> authorities = Collections.singleton(new SimpleGrantedAuthority("HERO"));
+		Set<SimpleGrantedAuthority> authorities = Collections
+				.singleton(new SimpleGrantedAuthority("HERO"));
 		doReturn(authorities).when(principal).getAuthorities();
 		given(this.endpoint.invoke())
 				.willReturn(new Health.Builder().up().withDetail("foo", "bar").build());

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

@@ -68,13 +68,15 @@ public class NoSpringSecurityHealthMvcEndpointIntegrationTests {
 	}
 
 	@Test
-	public void healthWhenRightRoleNotPresentShouldExposeHealthDetails() throws Exception {
+	public void healthWhenRightRoleNotPresentShouldExposeHealthDetails()
+			throws Exception {
 		this.context = new AnnotationConfigWebApplicationContext();
 		this.context.setServletContext(new MockServletContext());
 		this.context.register(TestConfiguration.class);
 		this.context.refresh();
 		MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(this.context).build();
-		mockMvc.perform(get("/health").with(getRequestPostProcessor())).andExpect(status().isOk())
+		mockMvc.perform(get("/health").with(getRequestPostProcessor()))
+				.andExpect(status().isOk())
 				.andExpect(content().string(containsString("\"status\":\"UP\"")));
 	}
 
@@ -94,12 +96,15 @@ public class NoSpringSecurityHealthMvcEndpointIntegrationTests {
 
 	private RequestPostProcessor getRequestPostProcessor() {
 		return new RequestPostProcessor() {
+
 			@Override
-			public MockHttpServletRequest postProcessRequest(MockHttpServletRequest request) {
+			public MockHttpServletRequest postProcessRequest(
+					MockHttpServletRequest request) {
 				Principal principal = mock(Principal.class);
 				request.setUserPrincipal(principal);
 				return request;
 			}
+
 		};
 	}
 
@@ -119,6 +124,7 @@ public class NoSpringSecurityHealthMvcEndpointIntegrationTests {
 				public Health health() {
 					return Health.up().withDetail("hello", "world").build();
 				}
+
 			};
 		}
 

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java

@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -227,8 +227,7 @@ public class MongoProperties {
 			options = MongoClientOptions.builder().build();
 		}
 		String host = this.host == null ? "localhost" : this.host;
-		return new MongoClient(
+		return new MongoClient(Collections.singletonList(new ServerAddress(host, port)),
-				Collections.singletonList(new ServerAddress(host, port)),
 				Collections.<MongoCredential>emptyList(), options);
 	}
 
@@ -245,14 +244,14 @@ public class MongoProperties {
 			if (hasCustomCredentials()) {
 				String database = this.authenticationDatabase == null
 						? getMongoClientDatabase() : this.authenticationDatabase;
-				credentials.add(MongoCredential.createCredential(this.username,
+				credentials.add(MongoCredential.createCredential(this.username, database,
-						database, this.password));
+						this.password));
 			}
 			String host = this.host == null ? "localhost" : this.host;
 			int port = this.port != null ? this.port : DEFAULT_PORT;
 			return new MongoClient(
-					Collections.singletonList(new ServerAddress(host, port)),
+					Collections.singletonList(new ServerAddress(host, port)), credentials,
-					credentials, options);
+					options);
 		}
 		// The options and credentials are in the URI
 		return new MongoClient(new MongoClientURI(determineUri(), builder(options)));

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesTests.java

@@ -1,5 +1,5 @@
 /*
- * 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/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java

@@ -1,5 +1,5 @@
 /*
- * 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.