Polish ternary expressions

Consistently format ternary expressions and always favor `!=` as the
the check.

Author: philwebb

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

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

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,8 @@ 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 ? content : null);
+			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,9 +89,8 @@ public EndpointWebMvcManagementContextConfiguration(
 		this.corsProperties = corsProperties;
 		List<EndpointHandlerMappingCustomizer> providedCustomizers = mappingCustomizers
 				.getIfAvailable();
-		this.mappingCustomizers = providedCustomizers == null
-				? Collections.<EndpointHandlerMappingCustomizer>emptyList()
-				: providedCustomizers;
+		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 ? null : poolMetadata.getValidationQuery());
+			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 ? Object.class : type);
+		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 ? null
-					: (Integer) attributes.get("value"));
-			return (order == null ? Ordered.LOWEST_PRECEDENCE : order);
+			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,8 +95,8 @@ public SchedulingConfigurer metricWritersMetricExporter(
 			exporters.setReader(reader);
 			exporters.setWriters(writers);
 		}
-		exporters.setExporters(this.exporters == null
-				? Collections.<String, Exporter>emptyMap() : this.exporters);
+		exporters.setExporters(this.exporters != null ? this.exporters
+				: Collections.<String, Exporter>emptyMap());
 		return exporters;
 	}
 

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

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

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/AbstractJmxCacheStatisticsProvider.java

@@ -56,7 +56,7 @@ public abstract class AbstractJmxCacheStatisticsProvider<C extends Cache>
 	public CacheStatistics getCacheStatistics(CacheManager cacheManager, C cache) {
 		try {
 			ObjectName objectName = internalGetObjectName(cache);
-			return (objectName == null ? null : getCacheStatistics(objectName));
+			return (objectName != null ? getCacheStatistics(objectName) : null);
 		}
 		catch (MalformedObjectNameException ex) {
 			throw new IllegalStateException(ex);

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

@@ -89,8 +89,8 @@ private CloudFoundrySecurityService getCloudFoundrySecurityService(
 		String cloudControllerUrl = environment.getProperty("vcap.application.cf_api");
 		boolean skipSslValidation = cloudFoundryProperties
 				.getProperty("skip-ssl-validation", Boolean.class, false);
-		return cloudControllerUrl == null ? null : new CloudFoundrySecurityService(
-				restTemplateBuilder, cloudControllerUrl, skipSslValidation);
+		return (cloudControllerUrl != null ? new CloudFoundrySecurityService(
+				restTemplateBuilder, cloudControllerUrl, skipSslValidation) : null);
 	}
 
 	private CorsConfiguration getCorsConfiguration() {