Merge branch '2.0.x'

Author: philwebb

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/condition/ConditionsReportEndpoint.java

@@ -209,7 +209,7 @@ public MessageAndCondition(ConditionAndOutcome conditionAndOutcome) {
 				this.message = outcome.getMessage();
 			}
 			else {
-				this.message = (outcome.isMatch() ? "matched" : "did not match");
+				this.message = outcome.isMatch() ? "matched" : "did not match";
 			}
 		}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/PropertiesMeterFilter.java

@@ -69,7 +69,7 @@ private static MeterFilter createMapFilter(Map<String, String> tags) {
 	@Override
 	public MeterFilterReply accept(Meter.Id id) {
 		boolean enabled = lookup(this.properties.getEnable(), id, true);
-		return (enabled ? MeterFilterReply.NEUTRAL : MeterFilterReply.DENY);
+		return enabled ? MeterFilterReply.NEUTRAL : MeterFilterReply.DENY;
 	}
 
 	@Override

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscoverer.java

@@ -224,7 +224,7 @@ private void addOperations(MultiValueMap<OperationKey, O> indexed, String id,
 	}
 
 	private <T> T getLast(List<T> list) {
-		return (CollectionUtils.isEmpty(list) ? null : list.get(list.size() - 1));
+		return CollectionUtils.isEmpty(list) ? null : list.get(list.size() - 1);
 	}
 
 	private void assertNoDuplicateOperations(EndpointBean endpointBean,

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/ServletEndpointRegistrar.java

@@ -61,7 +61,7 @@ private void register(ServletContext servletContext,
 			ExposableServletEndpoint endpoint) {
 		String name = endpoint.getId() + "-actuator-endpoint";
 		String path = this.basePath + "/" + endpoint.getRootPath();
-		String urlMapping = (path.endsWith("/") ? path + "*" : path + "/*");
+		String urlMapping = path.endsWith("/") ? path + "*" : path + "/*";
 		EndpointServlet endpointServlet = endpoint.getEndpointServlet();
 		Dynamic registration = servletContext.addServlet(name,
 				endpointServlet.getServlet());

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/jersey/JerseyEndpointResourceFactory.java

@@ -188,7 +188,7 @@ private Map<String, Object> extract(
 		private Response convertToJaxRsResponse(Object response, String httpMethod) {
 			if (response == null) {
 				boolean isGet = HttpMethod.GET.equals(httpMethod);
-				Status status = (isGet ? Status.NOT_FOUND : Status.NO_CONTENT);
+				Status status = isGet ? Status.NOT_FOUND : Status.NO_CONTENT;
 				return Response.status(status).build();
 			}
 			try {

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/MetricsEndpoint.java

@@ -132,7 +132,7 @@ private void mergeMeasurements(Map<Statistic, Double> samples, Meter meter) {
 	}
 
 	private BiFunction<Double, Double, Double> mergeFunction(Statistic statistic) {
-		return (Statistic.MAX.equals(statistic) ? Double::max : Double::sum);
+		return Statistic.MAX.equals(statistic) ? Double::max : Double::sum;
 	}
 
 	private Map<String, Set<String>> getAvailableTags(List<Meter> meters) {

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcTags.java

@@ -123,7 +123,7 @@ private static String getMatchingPattern(HttpServletRequest request) {
 
 	private static String getPathInfo(HttpServletRequest request) {
 		String pathInfo = request.getPathInfo();
-		String uri = (StringUtils.hasText(pathInfo) ? pathInfo : "/");
+		String uri = StringUtils.hasText(pathInfo) ? pathInfo : "/";
 		return uri.replaceAll("//+", "/").replaceAll("/$", "");
 	}
 

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/http/HttpExchangeTracer.java

@@ -86,7 +86,7 @@ protected void postProcessRequestHeaders(Map<String, List<String>> headers) {
 	}
 
 	private <T> T getIfIncluded(Include include, Supplier<T> valueSupplier) {
-		return (this.includes.contains(include) ? valueSupplier.get() : null);
+		return this.includes.contains(include) ? valueSupplier.get() : null;
 	}
 
 	private <T> void setIfIncluded(Include include, Supplier<T> supplier,

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java

@@ -260,7 +260,7 @@ public String determineVirtualHost() {
 	}
 
 	public void setVirtualHost(String virtualHost) {
-		this.virtualHost = ("".equals(virtualHost) ? "/" : virtualHost);
+		this.virtualHost = "".equals(virtualHost) ? "/" : virtualHost;
 	}
 
 	public Duration getRequestedHeartbeat() {

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionMessage.java

@@ -48,7 +48,7 @@ private ConditionMessage(String message) {
 	}
 
 	private ConditionMessage(ConditionMessage prior, String message) {
-		this.message = (prior.isEmpty() ? message : prior + "; " + message);
+		this.message = prior.isEmpty() ? message : prior + "; " + message;
 	}
 
 	/**