Upgrade to spring-javaformat 0.0.6

Author: philwebb

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -56,9 +56,9 @@ public class AuditEvent implements Serializable {
 
 	/**
 	 * Create a new audit event for the current time.
-	 * @param principal The user principal responsible
+	 * @param principal the user principal responsible
 	 * @param type the event type
-	 * @param data The event data
+	 * @param data the event data
 	 */
 	public AuditEvent(String principal, String type, Map<String, Object> data) {
 		this(new Date(), principal, type, data);
@@ -67,27 +67,27 @@ public AuditEvent(String principal, String type, Map<String, Object> data) {
 	/**
 	 * Create a new audit event for the current time from data provided as name-value
 	 * pairs.
-	 * @param principal The user principal responsible
+	 * @param principal the user principal responsible
 	 * @param type the event type
-	 * @param data The event data in the form 'key=value' or simply 'key'
+	 * @param data the event data in the form 'key=value' or simply 'key'
 	 */
 	public AuditEvent(String principal, String type, String... data) {
 		this(new Date(), principal, type, convert(data));
 	}
 
 	/**
 	 * Create a new audit event.
-	 * @param timestamp The date/time of the event
-	 * @param principal The user principal responsible
+	 * @param timestamp the date/time of the event
+	 * @param principal the user principal responsible
 	 * @param type the event type
-	 * @param data The event data
+	 * @param data the event data
 	 */
 	public AuditEvent(Date timestamp, String principal, String type,
 			Map<String, Object> data) {
 		Assert.notNull(timestamp, "Timestamp must not be null");
 		Assert.notNull(type, "Type must not be null");
 		this.timestamp = timestamp;
-		this.principal = (principal != null ? principal : "");
+		this.principal = (principal != null) ? principal : "";
 		this.type = type;
 		this.data = Collections.unmodifiableMap(data);
 	}

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfiguration.java

@@ -114,11 +114,10 @@ public EnvironmentEndpoint environmentEndpoint() {
 	@Bean
 	@ConditionalOnMissingBean
 	public HealthEndpoint healthEndpoint() {
-		HealthAggregator healthAggregator = (this.healthAggregator != null
-				? this.healthAggregator : new OrderedHealthAggregator());
-		Map<String, HealthIndicator> healthIndicators = (this.healthIndicators != null
-				? this.healthIndicators
-				: Collections.<String, HealthIndicator>emptyMap());
+		HealthAggregator healthAggregator = (this.healthAggregator != null)
+				? this.healthAggregator : new OrderedHealthAggregator();
+		Map<String, HealthIndicator> healthIndicators = (this.healthIndicators != null)
+				? this.healthIndicators : Collections.<String, HealthIndicator>emptyMap();
 		return new HealthEndpoint(healthAggregator, healthIndicators);
 	}
 
@@ -131,7 +130,7 @@ public BeansEndpoint beansEndpoint() {
 	@Bean
 	@ConditionalOnMissingBean
 	public InfoEndpoint infoEndpoint() throws Exception {
-		return new InfoEndpoint(this.infoContributors != null ? this.infoContributors
+		return new InfoEndpoint((this.infoContributors != null) ? this.infoContributors
 				: Collections.<InfoContributor>emptyList());
 	}
 
@@ -156,7 +155,7 @@ public MetricsEndpoint metricsEndpoint() {
 	@Bean
 	@ConditionalOnMissingBean
 	public TraceEndpoint traceEndpoint() {
-		return new TraceEndpoint(this.traceRepository != null ? this.traceRepository
+		return new TraceEndpoint((this.traceRepository != null) ? this.traceRepository
 				: new InMemoryTraceRepository());
 	}
 

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -376,8 +376,8 @@ public static ManagementServerPort get(Environment environment,
 			}
 			return ((managementPort == null)
 					|| (serverPort == null && managementPort.equals(8080))
-					|| (managementPort != 0 && managementPort.equals(serverPort)) ? SAME
-							: DIFFERENT);
+					|| (managementPort != 0) && managementPort.equals(serverPort)) ? SAME
+							: DIFFERENT;
 		}
 
 		private static <T> T getTemporaryBean(BeanFactory beanFactory, Class<T> type) {

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcHypermediaManagementContextConfiguration.java

@@ -340,7 +340,7 @@ private boolean isHypermediaDisabled(MethodParameter returnType) {
 		private String getPath(ServletServerHttpRequest request) {
 			String path = (String) request.getServletRequest()
 					.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE);
-			return (path != null ? path : "");
+			return (path != null) ? path : "";
 		}
 
 	}
@@ -355,8 +355,9 @@ private static class EndpointResource extends ResourceSupport {
 
 		@SuppressWarnings("unchecked")
 		EndpointResource(Object content, String path) {
-			this.content = (content instanceof Map ? null : content);
-			this.embedded = (Map<String, Object>) (this.content != null ? null : content);
+			this.content = (content instanceof Map) ? null : content;
+			this.embedded = (Map<String, Object>) ((this.content != null) ? null
+					: content);
 			add(linkTo(Object.class).slash(path).withSelfRel());
 		}
 

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcManagementContextConfiguration.java

@@ -89,8 +89,8 @@ public EndpointWebMvcManagementContextConfiguration(
 		this.corsProperties = corsProperties;
 		List<EndpointHandlerMappingCustomizer> providedCustomizers = mappingCustomizers
 				.getIfAvailable();
-		this.mappingCustomizers = (providedCustomizers != null ? providedCustomizers
-				: Collections.<EndpointHandlerMappingCustomizer>emptyList());
+		this.mappingCustomizers = (providedCustomizers != null) ? providedCustomizers
+				: Collections.<EndpointHandlerMappingCustomizer>emptyList();
 	}
 
 	@Bean

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java

@@ -231,7 +231,7 @@ protected DataSourceHealthIndicator createHealthIndicator(DataSource source) {
 		private String getValidationQuery(DataSource source) {
 			DataSourcePoolMetadata poolMetadata = this.poolMetadataProvider
 					.getDataSourcePoolMetadata(source);
-			return (poolMetadata != null ? poolMetadata.getValidationQuery() : null);
+			return (poolMetadata != null) ? poolMetadata.getValidationQuery() : null;
 		}
 
 	}

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/LinksEnhancer.java

@@ -74,7 +74,7 @@ private String getRel(MvcEndpoint endpoint) {
 	private void addEndpointLink(ResourceSupport resource, MvcEndpoint endpoint,
 			String rel) {
 		Class<?> type = endpoint.getEndpointType();
-		type = (type != null ? type : Object.class);
+		type = (type != null) ? type : Object.class;
 		if (StringUtils.hasText(rel)) {
 			String href = this.rootPath + endpoint.getPath();
 			resource.add(linkTo(type).slash(href).withRel(rel));

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementContextConfigurationsImportSelector.java

@@ -111,9 +111,9 @@ private static final class ManagementConfiguration implements Ordered {
 		private int readOrder(AnnotationMetadata annotationMetadata) {
 			Map<String, Object> attributes = annotationMetadata
 					.getAnnotationAttributes(Order.class.getName());
-			Integer order = (attributes != null ? (Integer) attributes.get("value")
-					: null);
-			return (order != null ? order : Ordered.LOWEST_PRECEDENCE);
+			Integer order = (attributes != null) ? (Integer) attributes.get("value")
+					: null;
+			return (order != null) ? order : Ordered.LOWEST_PRECEDENCE;
 		}
 
 		public String getClassName() {

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricExportAutoConfiguration.java

@@ -95,7 +95,7 @@ public SchedulingConfigurer metricWritersMetricExporter(
 			exporters.setReader(reader);
 			exporters.setWriters(writers);
 		}
-		exporters.setExporters(this.exporters != null ? this.exporters
+		exporters.setExporters((this.exporters != null) ? this.exporters
 				: Collections.<String, Exporter>emptyMap());
 		return exporters;
 	}
@@ -128,7 +128,7 @@ protected static class MetricExportPropertiesConfiguration {
 		public MetricExportProperties metricExportProperties() {
 			MetricExportProperties export = new MetricExportProperties();
 			export.getRedis().setPrefix("spring.metrics"
-					+ (this.prefix.length() > 0 ? "." : "") + this.prefix);
+					+ ((this.prefix.length() > 0) ? "." : "") + this.prefix);
 			export.getAggregate().setPrefix(this.prefix);
 			export.getAggregate().setKeyPattern(this.aggregateKeyPattern);
 			return export;

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/PublicMetricsAutoConfiguration.java

@@ -89,9 +89,9 @@ public SystemPublicMetrics systemPublicMetrics() {
 
 	@Bean
 	public MetricReaderPublicMetrics metricReaderPublicMetrics() {
-		MetricReader[] readers = (this.metricReaders != null
+		MetricReader[] readers = (this.metricReaders != null)
 				? this.metricReaders.toArray(new MetricReader[this.metricReaders.size()])
-				: new MetricReader[0]);
+				: new MetricReader[0];
 		return new MetricReaderPublicMetrics(new CompositeMetricReader(readers));
 	}