Browse Source

Fix checkstyle violations

pull/13266/merge
Phillip Webb 8 years ago
parent
commit
68ffbafbae
  1. 4
      spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/client/WebClientExchangeTags.java
  2. 2
      spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/HealthWebEndpointResponseMapperTests.java
  3. 2
      spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfigurationTests.java
  4. 4
      spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java

4
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/client/WebClientExchangeTags.java

@ -67,7 +67,7 @@ public final class WebClientExchangeTags { @@ -67,7 +67,7 @@ public final class WebClientExchangeTags {
private static String extractPath(String url) {
String path = url.replaceFirst("^https?://[^/]+/", "");
return path.startsWith("/") ? path : "/" + path;
return (path.startsWith("/") ? path : "/" + path);
}
/**
@ -87,7 +87,7 @@ public final class WebClientExchangeTags { @@ -87,7 +87,7 @@ public final class WebClientExchangeTags {
* @return the status tag
*/
public static Tag status(Throwable throwable) {
return throwable instanceof IOException ? IO_ERROR : CLIENT_ERROR;
return (throwable instanceof IOException ? IO_ERROR : CLIENT_ERROR);
}
/**

2
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/HealthWebEndpointResponseMapperTests.java

@ -113,7 +113,7 @@ public class HealthWebEndpointResponseMapperTests { @@ -113,7 +113,7 @@ public class HealthWebEndpointResponseMapperTests {
SecurityContext securityContext = mock(SecurityContext.class);
given(securityContext.getPrincipal()).willReturn(mock(Principal.class));
given(securityContext.isUserInRole(anyString()))
.will((Answer<Boolean>) invocation -> {
.will((Answer<Boolean>) (invocation) -> {
String expectedRole = invocation.getArgument(0);
return associatedRoles.contains(expectedRole);
});

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfigurationTests.java

@ -108,7 +108,7 @@ public class LdapAutoConfigurationTests { @@ -108,7 +108,7 @@ public class LdapAutoConfigurationTests {
@Test
public void templateExists() {
this.contextRunner.withPropertyValues("spring.ldap.urls:ldap://localhost:389")
.run(context -> assertThat(context).hasSingleBean(LdapTemplate.class));
.run((context) -> assertThat(context).hasSingleBean(LdapTemplate.class));
}
@Test

4
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java

@ -345,8 +345,8 @@ public class RepackageMojo extends AbstractDependencyFilterMojo { @@ -345,8 +345,8 @@ public class RepackageMojo extends AbstractDependencyFilterMojo {
this.classifier, target);
}
else {
String artifactId = this.classifier != null
? "artifact with classifier " + this.classifier : "main artifact";
String artifactId = (this.classifier != null
? "artifact with classifier " + this.classifier : "main artifact");
getLog().info(String.format("Replacing %s %s", artifactId, source.getFile()));
source.setFile(target);
}

Loading…
Cancel
Save