Merge branch '2.0.x'

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryWebEndpointDiscoverer.java

@@ -72,7 +72,7 @@ public class CloudFoundryWebEndpointDiscoverer extends WebEndpointDiscoverer {
 		AnnotationAttributes attributes = AnnotatedElementUtils
 				.getMergedAnnotationAttributes(extensionBean.getClass(),
 						EndpointWebExtension.class);
-		Class<?> endpoint = (attributes == null ? null : attributes.getClass("endpoint"));
+		Class<?> endpoint = (attributes != null ? attributes.getClass("endpoint") : null);
 		return (endpoint != null && HealthEndpoint.class.isAssignableFrom(endpoint));
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfiguration.java

@@ -126,9 +126,8 @@ public class ReactiveCloudFoundryActuatorAutoConfiguration {
 		String cloudControllerUrl = environment.getProperty("vcap.application.cf_api");
 		boolean skipSslValidation = environment.getProperty(
 				"management.cloudfoundry.skip-ssl-validation", Boolean.class, false);
-		return (cloudControllerUrl == null ? null
+		return (cloudControllerUrl != null ? new ReactiveCloudFoundrySecurityService(
-				: new ReactiveCloudFoundrySecurityService(webClientBuilder,
+				webClientBuilder, cloudControllerUrl, skipSslValidation) : null);
-						cloudControllerUrl, skipSslValidation));
 	}
 
 	private CorsConfiguration getCorsConfiguration() {

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

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

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

@@ -125,8 +125,8 @@ public class ConditionsReportEndpoint {
 			this.unconditionalClasses = report.getUnconditionalClasses();
 			report.getConditionAndOutcomesBySource().forEach(
 					(source, conditionAndOutcomes) -> add(source, conditionAndOutcomes));
-			this.parentId = context.getParent() == null ? null
+			this.parentId = (context.getParent() != null ? context.getParent().getId()
-					: context.getParent().getId();
+					: null);
 		}
 
 		private void add(String source, ConditionAndOutcomes conditionAndOutcomes) {

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticsearchHealthIndicatorAutoConfiguration.java

@@ -82,7 +82,7 @@ public class ElasticsearchHealthIndicatorAutoConfiguration {
 		protected ElasticsearchHealthIndicator createHealthIndicator(Client client) {
 			Duration responseTimeout = this.properties.getResponseTimeout();
 			return new ElasticsearchHealthIndicator(client,
-					responseTimeout == null ? 100 : responseTimeout.toMillis(),
+					responseTimeout != null ? responseTimeout.toMillis() : 100,
 					this.properties.getIndices());
 		}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthIndicatorAutoConfiguration.java

@@ -112,7 +112,7 @@ public class DataSourceHealthIndicatorAutoConfiguration extends
 	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-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/PropertiesMeterFilter.java

@@ -68,10 +68,10 @@ public class PropertiesMeterFilter implements MeterFilter {
 	}
 
 	private long[] convertSla(Meter.Type meterType, ServiceLevelAgreementBoundary[] sla) {
-		long[] converted = Arrays.stream(sla == null ? EMPTY_SLA : sla)
+		long[] converted = Arrays.stream(sla != null ? sla : EMPTY_SLA)
 				.map((candidate) -> candidate.getValue(meterType))
 				.filter(Objects::nonNull).mapToLong(Long::longValue).toArray();
-		return (converted.length == 0 ? null : converted);
+		return (converted.length != 0 ? converted : null);
 	}
 
 	private <T> T lookup(Map<String, T> values, Id id, T defaultValue) {
@@ -82,7 +82,7 @@ public class PropertiesMeterFilter implements MeterFilter {
 				return result;
 			}
 			int lastDot = name.lastIndexOf('.');
-			name = lastDot == -1 ? "" : name.substring(0, lastDot);
+			name = (lastDot != -1 ? name.substring(0, lastDot) : "");
 		}
 		return values.getOrDefault("all", defaultValue);
 	}

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontPropertiesConfigAdapter.java

@@ -60,7 +60,7 @@ public class WavefrontPropertiesConfigAdapter
 	}
 
 	private String getUriAsString(WavefrontProperties properties) {
-		return properties.getUri() == null ? null : properties.getUri().toString();
+		return (properties.getUri() != null ? properties.getUri().toString() : null);
 	}
 
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfiguration.java

@@ -47,7 +47,7 @@ public class TomcatMetricsAutoConfiguration {
 	@Bean
 	@ConditionalOnMissingBean
 	public TomcatMetrics tomcatMetrics() {
-		return new TomcatMetrics(this.context == null ? null : this.context.getManager(),
+		return new TomcatMetrics(this.context != null ? this.context.getManager() : null,
 				Collections.emptyList());
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextConfigurationImportSelector.java

@@ -125,8 +125,9 @@ class ManagementContextConfigurationImportSelector
 			Map<String, Object> annotationAttributes = annotationMetadata
 					.getAnnotationAttributes(
 							ManagementContextConfiguration.class.getName());
-			return (annotationAttributes == null ? ManagementContextType.ANY
+			return (annotationAttributes != null
-					: (ManagementContextType) annotationAttributes.get("value"));
+					? (ManagementContextType) annotationAttributes.get("value")
+					: ManagementContextType.ANY);
 		}
 
 		private int readOrder(AnnotationMetadata annotationMetadata) {

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JmxEndpointIntegrationTests.java

@@ -105,7 +105,7 @@ public class JmxEndpointIntegrationTests {
 			getMBeanInfo(mBeanServer, objectName);
 			return true;
 		}
-		catch (InstanceNotFoundException e) {
+		catch (InstanceNotFoundException ex) {
 			return false;
 		}
 	}

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/MockServletWebServerFactory.java

@@ -52,15 +52,17 @@ public class MockServletWebServerFactory extends AbstractServletWebServerFactory
 	}
 
 	public ServletContext getServletContext() {
-		return getWebServer() == null ? null : getWebServer().getServletContext();
+		return (getWebServer() != null ? getWebServer().getServletContext() : null);
 	}
 
 	public RegisteredServlet getRegisteredServlet(int index) {
-		return getWebServer() == null ? null : getWebServer().getRegisteredServlet(index);
+		return (getWebServer() != null ? getWebServer().getRegisteredServlet(index)
+				: null);
 	}
 
 	public RegisteredFilter getRegisteredFilter(int index) {
-		return getWebServer() == null ? null : getWebServer().getRegisteredFilters(index);
+		return (getWebServer() != null ? getWebServer().getRegisteredFilters(index)
+				: null);
 	}
 
 	public static class MockServletWebServer

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

@@ -16,6 +16,7 @@
 
 package org.springframework.boot.actuate.audit;
 
+import java.time.Instant;
 import java.time.OffsetDateTime;
 import java.util.List;
 
@@ -43,8 +44,13 @@ public class AuditEventsEndpoint {
 	@ReadOperation
 	public AuditEventsDescriptor events(@Nullable String principal,
 			@Nullable OffsetDateTime after, @Nullable String type) {
-		return new AuditEventsDescriptor(this.auditEventRepository.find(principal,
+		List<AuditEvent> events = this.auditEventRepository.find(principal,
-				after == null ? null : after.toInstant(), type));
+				getInstant(after), type);
+		return new AuditEventsDescriptor(events);
+	}
+
+	private Instant getInstant(OffsetDateTime offsetDateTime) {
+		return (offsetDateTime != null ? offsetDateTime.toInstant() : null);
 	}
 
 	/**

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/beans/BeansEndpoint.java

@@ -119,7 +119,7 @@ public class BeansEndpoint {
 			}
 			ConfigurableApplicationContext parent = getConfigurableParent(context);
 			return new ContextBeans(describeBeans(context.getBeanFactory()),
-					parent == null ? null : parent.getId());
+					parent != null ? parent.getId() : null);
 		}
 
 		private static Map<String, BeanDescriptor> describeBeans(
@@ -168,8 +168,8 @@ public class BeansEndpoint {
 		private BeanDescriptor(String[] aliases, String scope, Class<?> type,
 				String resource, String[] dependencies) {
 			this.aliases = aliases;
-			this.scope = StringUtils.hasText(scope) ? scope
+			this.scope = (StringUtils.hasText(scope) ? scope
-					: BeanDefinition.SCOPE_SINGLETON;
+					: BeanDefinition.SCOPE_SINGLETON);
 			this.type = type;
 			this.resource = resource;
 			this.dependencies = dependencies;

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java

@@ -118,7 +118,7 @@ public class ConfigurationPropertiesReportEndpoint implements ApplicationContext
 					prefix, sanitize(prefix, safeSerialize(mapper, bean, prefix))));
 		});
 		return new ContextConfigurationProperties(beanDescriptors,
-				context.getParent() == null ? null : context.getParent().getId());
+				context.getParent() != null ? context.getParent().getId() : null);
 	}
 
 	private ConfigurationBeanFactoryMetadata getBeanFactoryMetadata(

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/elasticsearch/ElasticsearchHealthIndicator.java

@@ -55,7 +55,7 @@ public class ElasticsearchHealthIndicator extends AbstractHealthIndicator {
 	public ElasticsearchHealthIndicator(Client client, long responseTimeout,
 			List<String> indices) {
 		this(client, responseTimeout,
-				(indices == null ? null : StringUtils.toStringArray(indices)));
+				(indices != null ? StringUtils.toStringArray(indices) : null));
 	}
 
 	/**

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

@@ -224,7 +224,7 @@ public abstract class EndpointDiscoverer<E extends ExposableEndpoint<O>, O exten
 	}
 
 	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/jmx/JacksonJmxOperationResponseMapper.java

@@ -39,7 +39,7 @@ public class JacksonJmxOperationResponseMapper implements JmxOperationResponseMa
 	private final JavaType mapType;
 
 	public JacksonJmxOperationResponseMapper(ObjectMapper objectMapper) {
-		this.objectMapper = (objectMapper == null ? new ObjectMapper() : objectMapper);
+		this.objectMapper = (objectMapper != null ? objectMapper : new ObjectMapper());
 		this.listType = this.objectMapper.getTypeFactory()
 				.constructParametricType(List.class, Object.class);
 		this.mapType = this.objectMapper.getTypeFactory()

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

@@ -46,7 +46,7 @@ public class PathMappedEndpoints implements Iterable<PathMappedEndpoint> {
 	 */
 	public PathMappedEndpoints(String basePath, EndpointsSupplier<?> supplier) {
 		Assert.notNull(supplier, "Supplier must not be null");
-		this.basePath = (basePath == null ? "" : basePath);
+		this.basePath = (basePath != null ? basePath : "");
 		this.endpoints = getEndpoints(Collections.singleton(supplier));
 	}
 
@@ -58,7 +58,7 @@ public class PathMappedEndpoints implements Iterable<PathMappedEndpoint> {
 	public PathMappedEndpoints(String basePath,
 			Collection<EndpointsSupplier<?>> suppliers) {
 		Assert.notNull(suppliers, "Suppliers must not be null");
-		this.basePath = (basePath == null ? "" : basePath);
+		this.basePath = (basePath != null ? basePath : "");
 		this.endpoints = getEndpoints(suppliers);
 	}
 
@@ -91,7 +91,7 @@ public class PathMappedEndpoints implements Iterable<PathMappedEndpoint> {
 	 */
 	public String getRootPath(String endpointId) {
 		PathMappedEndpoint endpoint = getEndpoint(endpointId);
-		return (endpoint == null ? null : endpoint.getRootPath());
+		return (endpoint != null ? endpoint.getRootPath() : null);
 	}
 
 	/**
@@ -144,7 +144,7 @@ public class PathMappedEndpoints implements Iterable<PathMappedEndpoint> {
 	}
 
 	private String getPath(PathMappedEndpoint endpoint) {
-		return (endpoint == null ? null : this.basePath + "/" + endpoint.getRootPath());
+		return (endpoint != null ? this.basePath + "/" + endpoint.getRootPath() : null);
 	}
 
 	private <T> List<T> asList(Stream<T> stream) {

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

@@ -46,7 +46,7 @@ public class ServletEndpointRegistrar implements ServletContextInitializer {
 	public ServletEndpointRegistrar(String basePath,
 			Collection<ExposableServletEndpoint> servletEndpoints) {
 		Assert.notNull(servletEndpoints, "ServletEndpoints must not be null");
-		this.basePath = (basePath == null ? "" : basePath);
+		this.basePath = (basePath != null ? basePath : "");
 		this.servletEndpoints = servletEndpoints;
 	}
 

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

@@ -179,7 +179,7 @@ public class JerseyEndpointResourceFactory {
 			Map<String, Object> result = new HashMap<>();
 			multivaluedMap.forEach((name, values) -> {
 				if (!CollectionUtils.isEmpty(values)) {
-					result.put(name, values.size() == 1 ? values.get(0) : values);
+					result.put(name, values.size() != 1 ? values : values.get(0));
 				}
 			});
 			return result;

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

@@ -309,7 +309,7 @@ public abstract class AbstractWebFluxEndpointHandlerMapping
 				arguments.putAll(body);
 			}
 			exchange.getRequest().getQueryParams().forEach((name, values) -> arguments
-					.put(name, values.size() == 1 ? values.get(0) : values));
+					.put(name, values.size() != 1 ? values : values.get(0)));
 			return arguments;
 		}
 
@@ -323,8 +323,8 @@ public abstract class AbstractWebFluxEndpointHandlerMapping
 					.onErrorMap(InvalidEndpointRequestException.class,
 							(ex) -> new ResponseStatusException(HttpStatus.BAD_REQUEST,
 									ex.getReason()))
-					.defaultIfEmpty(new ResponseEntity<>(httpMethod == HttpMethod.GET
+					.defaultIfEmpty(new ResponseEntity<>(httpMethod != HttpMethod.GET
-							? HttpStatus.NOT_FOUND : HttpStatus.NO_CONTENT));
+							? HttpStatus.NO_CONTENT : HttpStatus.NOT_FOUND));
 		}
 
 		private ResponseEntity<Object> toResponseEntity(Object response) {

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

@@ -257,7 +257,7 @@ public abstract class AbstractWebMvcEndpointHandlerMapping
 				arguments.putAll(body);
 			}
 			request.getParameterMap().forEach((name, values) -> arguments.put(name,
-					values.length == 1 ? values[0] : Arrays.asList(values)));
+					values.length != 1 ? Arrays.asList(values) : values[0]));
 			return arguments;
 		}
 
@@ -269,8 +269,8 @@ public abstract class AbstractWebMvcEndpointHandlerMapping
 
 		private Object handleResult(Object result, HttpMethod httpMethod) {
 			if (result == null) {
-				return new ResponseEntity<>(httpMethod == HttpMethod.GET
+				return new ResponseEntity<>(httpMethod != HttpMethod.GET
-						? HttpStatus.NOT_FOUND : HttpStatus.NO_CONTENT);
+						? HttpStatus.NO_CONTENT : HttpStatus.NOT_FOUND);
 			}
 			if (!(result instanceof WebEndpointResponse)) {
 				return result;

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/env/EnvironmentEndpoint.java

@@ -34,6 +34,7 @@ import org.springframework.boot.actuate.endpoint.annotation.Selector;
 import org.springframework.boot.context.properties.bind.PlaceholdersResolver;
 import org.springframework.boot.context.properties.bind.PropertySourcesPlaceholdersResolver;
 import org.springframework.boot.context.properties.source.ConfigurationPropertySources;
+import org.springframework.boot.origin.Origin;
 import org.springframework.boot.origin.OriginLookup;
 import org.springframework.core.env.CompositePropertySource;
 import org.springframework.core.env.ConfigurableEnvironment;
@@ -152,11 +153,16 @@ public class EnvironmentEndpoint {
 	private PropertyValueDescriptor describeValueOf(String name, PropertySource<?> source,
 			PlaceholdersResolver resolver) {
 		Object resolved = resolver.resolvePlaceholders(source.getProperty(name));
-		String origin = (source instanceof OriginLookup)
+		String origin = ((source instanceof OriginLookup)
-				? ((OriginLookup<Object>) source).getOrigin(name).toString() : null;
+				? getOrigin((OriginLookup<Object>) source, name) : null);
 		return new PropertyValueDescriptor(sanitize(name, resolved), origin);
 	}
 
+	private String getOrigin(OriginLookup<Object> lookup, String name) {
+		Origin origin = lookup.getOrigin(name);
+		return (origin != null ? origin.toString() : null);
+	}
+
 	private PlaceholdersResolver getResolver() {
 		return new PropertySourcesPlaceholdersSanitizingResolver(getPropertySources(),
 				this.sanitizer);

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/flyway/FlywayEndpoint.java

@@ -59,7 +59,7 @@ public class FlywayEndpoint {
 					.put(name, new FlywayDescriptor(flyway.info().all())));
 			ApplicationContext parent = target.getParent();
 			contextFlywayBeans.put(target.getId(), new ContextFlywayBeans(flywayBeans,
-					parent == null ? null : parent.getId()));
+					parent != null ? parent.getId() : null));
 			target = parent;
 		}
 		return new ApplicationFlywayBeans(contextFlywayBeans);
@@ -170,7 +170,7 @@ public class FlywayEndpoint {
 		}
 
 		private String nullSafeToString(Object obj) {
-			return (obj == null ? null : obj.toString());
+			return (obj != null ? obj.toString() : null);
 		}
 
 		public MigrationType getType() {

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/CompositeReactiveHealthIndicator.java

@@ -57,8 +57,8 @@ public class CompositeReactiveHealthIndicator implements ReactiveHealthIndicator
 		Assert.notNull(indicators, "Indicators must not be null");
 		this.indicators = new LinkedHashMap<>(indicators);
 		this.healthAggregator = healthAggregator;
-		this.timeoutCompose = (mono) -> this.timeout != null ? mono.timeout(
+		this.timeoutCompose = (mono) -> (this.timeout != null ? mono.timeout(
-				Duration.ofMillis(this.timeout), Mono.just(this.timeoutHealth)) : mono;
+				Duration.ofMillis(this.timeout), Mono.just(this.timeoutHealth)) : mono);
 	}
 
 	/**

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/jdbc/DataSourceHealthIndicator.java

@@ -86,7 +86,7 @@ public class DataSourceHealthIndicator extends AbstractHealthIndicator
 		super("DataSource health check failed");
 		this.dataSource = dataSource;
 		this.query = query;
-		this.jdbcTemplate = (dataSource == null ? null : new JdbcTemplate(dataSource));
+		this.jdbcTemplate = (dataSource != null ? new JdbcTemplate(dataSource) : null);
 	}
 
 	@Override

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/liquibase/LiquibaseEndpoint.java

@@ -69,7 +69,7 @@ public class LiquibaseEndpoint {
 							createReport(liquibase, service, factory)));
 			ApplicationContext parent = target.getParent();
 			contextBeans.put(target.getId(), new ContextLiquibaseBeans(liquibaseBeans,
-					parent == null ? null : parent.getId()));
+					parent != null ? parent.getId() : null));
 			target = parent;
 		}
 		return new ApplicationLiquibaseBeans(contextBeans);
@@ -204,8 +204,8 @@ public class LiquibaseEndpoint {
 			this.execType = ranChangeSet.getExecType();
 			this.id = ranChangeSet.getId();
 			this.labels = ranChangeSet.getLabels().getLabels();
-			this.checksum = ranChangeSet.getLastCheckSum() == null ? null
+			this.checksum = (ranChangeSet.getLastCheckSum() != null
-					: ranChangeSet.getLastCheckSum().toString();
+					? ranChangeSet.getLastCheckSum().toString() : null);
 			this.orderExecuted = ranChangeSet.getOrderExecuted();
 			this.tag = ranChangeSet.getTag();
 		}

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/logging/LoggersEndpoint.java

@@ -73,7 +73,7 @@ public class LoggersEndpoint {
 		Assert.notNull(name, "Name must not be null");
 		LoggerConfiguration configuration = this.loggingSystem
 				.getLoggerConfiguration(name);
-		return (configuration == null ? null : new LoggerLevels(configuration));
+		return (configuration != null ? new LoggerLevels(configuration) : null);
 	}
 
 	@WriteOperation

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/management/HeapDumpWebEndpoint.java

@@ -78,7 +78,7 @@ public class HeapDumpWebEndpoint {
 			if (this.lock.tryLock(this.timeout, TimeUnit.MILLISECONDS)) {
 				try {
 					return new WebEndpointResponse<>(
-							dumpHeap(live == null ? true : live));
+							dumpHeap(live != null ? live : true));
 				}
 				finally {
 					this.lock.unlock();

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

@@ -96,10 +96,15 @@ public class MetricsEndpoint {
 	}
 
 	private List<Tag> parseTags(List<String> tags) {
-		return tags == null ? Collections.emptyList() : tags.stream().map((t) -> {
+		if (tags == null) {
-			String[] tagParts = t.split(":", 2);
+			return Collections.emptyList();
-			return Tag.of(tagParts[0], tagParts[1]);
+		}
-		}).collect(Collectors.toList());
+		return tags.stream().map(this::parseTag).collect(Collectors.toList());
+	}
+
+	private Tag parseTag(String tag) {
+		String[] parts = tag.split(":", 2);
+		return Tag.of(parts[0], parts[1]);
 	}
 
 	private void collectMeters(List<Meter> meters, MeterRegistry registry, String name,
@@ -125,7 +130,7 @@ public class MetricsEndpoint {
 	}
 
 	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/export/prometheus/PrometheusScrapeEndpoint.java

@@ -50,10 +50,10 @@ public class PrometheusScrapeEndpoint {
 			TextFormat.write004(writer, this.collectorRegistry.metricFamilySamples());
 			return writer.toString();
 		}
-		catch (IOException e) {
+		catch (IOException ex) {
 			// This actually never happens since StringWriter::write() doesn't throw any
 			// IOException
-			throw new RuntimeException("Writing metrics failed", e);
+			throw new RuntimeException("Writing metrics failed", ex);
 		}
 	}
 

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

@@ -36,9 +36,9 @@ public class DefaultRestTemplateExchangeTagsProvider
 	@Override
 	public Iterable<Tag> getTags(String urlTemplate, HttpRequest request,
 			ClientHttpResponse response) {
-		Tag uriTag = StringUtils.hasText(urlTemplate)
+		Tag uriTag = (StringUtils.hasText(urlTemplate)
 				? RestTemplateExchangeTags.uri(urlTemplate)
-				: RestTemplateExchangeTags.uri(request);
+				: RestTemplateExchangeTags.uri(request));
 		return Arrays.asList(RestTemplateExchangeTags.method(request), uriTag,
 				RestTemplateExchangeTags.status(response),
 				RestTemplateExchangeTags.clientName(request));

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

@@ -64,7 +64,7 @@ public final class RestTemplateExchangeTags {
 	 * @return the uri tag
 	 */
 	public static Tag uri(String uriTemplate) {
-		String uri = StringUtils.hasText(uriTemplate) ? uriTemplate : "none";
+		String uri = (StringUtils.hasText(uriTemplate) ? uriTemplate : "none");
 		return Tag.of("uri", ensureLeadingSlash(stripUri(uri)));
 	}
 

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

@@ -58,7 +58,7 @@ public final class WebMvcTags {
 	 * @return the method tag whose value is a capitalized method (e.g. GET).
 	 */
 	public static Tag method(HttpServletRequest request) {
-		return (request == null ? METHOD_UNKNOWN : Tag.of("method", request.getMethod()));
+		return (request != null ? Tag.of("method", request.getMethod()) : METHOD_UNKNOWN);
 	}
 
 	/**
@@ -67,8 +67,9 @@ public final class WebMvcTags {
 	 * @return the status tag derived from the status of the response
 	 */
 	public static Tag status(HttpServletResponse response) {
-		return (response == null ? STATUS_UNKNOWN :
+		return (response != null
-				Tag.of("status", Integer.toString(response.getStatus())));
+				? Tag.of("status", Integer.toString(response.getStatus()))
+				: STATUS_UNKNOWN);
 	}
 
 	/**

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

@@ -86,7 +86,7 @@ public class HttpExchangeTracer {
 	}
 
 	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-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/MappingsEndpoint.java

@@ -59,8 +59,8 @@ public class MappingsEndpoint {
 		this.descriptionProviders
 				.forEach((provider) -> mappings.put(provider.getMappingName(),
 						provider.describeMappings(applicationContext)));
-		return new ContextMappings(mappings, applicationContext.getParent() == null ? null
+		return new ContextMappings(mappings, applicationContext.getParent() != null
-				: applicationContext.getId());
+				? applicationContext.getId() : null);
 	}
 
 	/**

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/DispatcherServletHandlerMappings.java

@@ -64,7 +64,7 @@ final class DispatcherServletHandlerMappings {
 			initializeDispatcherServletIfPossible();
 			handlerMappings = this.dispatcherServlet.getHandlerMappings();
 		}
-		return handlerMappings == null ? Collections.emptyList() : handlerMappings;
+		return (handlerMappings != null ? handlerMappings : Collections.emptyList());
 	}
 
 	private void initializeDispatcherServletIfPossible() {

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/trace/reactive/HttpTraceWebFilter.java

@@ -73,11 +73,11 @@ public class HttpTraceWebFilter implements WebFilter, Ordered {
 
 	@Override
 	public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
-		Mono<?> principal = this.includes.contains(Include.PRINCIPAL)
+		Mono<?> principal = (this.includes.contains(Include.PRINCIPAL)
 				? exchange.getPrincipal().cast(Object.class).defaultIfEmpty(NONE)
-				: Mono.just(NONE);
+				: Mono.just(NONE));
-		Mono<?> session = this.includes.contains(Include.SESSION_ID)
+		Mono<?> session = (this.includes.contains(Include.SESSION_ID)
-				? exchange.getSession() : Mono.just(NONE);
+				? exchange.getSession() : Mono.just(NONE));
 		return Mono.zip(principal, session)
 				.flatMap((tuple) -> filter(exchange, chain,
 						asType(tuple.getT1(), Principal.class),
@@ -97,17 +97,17 @@ public class HttpTraceWebFilter implements WebFilter, Ordered {
 				exchange);
 		HttpTrace trace = this.tracer.receivedRequest(request);
 		return chain.filter(exchange).doAfterSuccessOrError((aVoid, ex) -> {
-			this.tracer.sendingResponse(trace,
+			TraceableServerHttpResponse response = new TraceableServerHttpResponse(
-					new TraceableServerHttpResponse(ex == null ? exchange.getResponse()
+					(ex != null ? new CustomStatusResponseDecorator(ex,
-							: new CustomStatusResponseDecorator(ex,
+							exchange.getResponse()) : exchange.getResponse()));
-									exchange.getResponse())),
+			this.tracer.sendingResponse(trace, response, () -> principal,
-					() -> principal, () -> getStartedSessionId(session));
+					() -> getStartedSessionId(session));
 			this.repository.add(trace);
 		});
 	}
 
 	private String getStartedSessionId(WebSession session) {
-		return (session != null && session.isStarted()) ? session.getId() : null;
+		return (session != null && session.isStarted() ? session.getId() : null);
 	}
 
 	private static final class CustomStatusResponseDecorator
@@ -117,9 +117,9 @@ public class HttpTraceWebFilter implements WebFilter, Ordered {
 
 		private CustomStatusResponseDecorator(Throwable ex, ServerHttpResponse delegate) {
 			super(delegate);
-			this.status = ex instanceof ResponseStatusException
+			this.status = (ex instanceof ResponseStatusException
 					? ((ResponseStatusException) ex).getStatus()
-					: HttpStatus.INTERNAL_SERVER_ERROR;
+					: HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 
 		@Override

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/trace/reactive/ServerWebExchangeTraceableRequest.java

@@ -45,8 +45,8 @@ class ServerWebExchangeTraceableRequest implements TraceableRequest {
 		this.method = request.getMethodValue();
 		this.headers = request.getHeaders();
 		this.uri = request.getURI();
-		this.remoteAddress = request.getRemoteAddress() == null ? null
+		this.remoteAddress = (request.getRemoteAddress() != null
-				: request.getRemoteAddress().getAddress().toString();
+				? request.getRemoteAddress().getAddress().toString() : null);
 	}
 
 	@Override

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/trace/reactive/TraceableServerHttpResponse.java

@@ -38,8 +38,8 @@ class TraceableServerHttpResponse implements TraceableResponse {
 
 	@Override
 	public int getStatus() {
-		return this.response.getStatusCode() == null ? 200
+		return (this.response.getStatusCode() != null
-				: this.response.getStatusCode().value();
+				? this.response.getStatusCode().value() : 200);
 	}
 
 	@Override

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/trace/servlet/HttpTraceFilter.java

@@ -86,8 +86,9 @@ public class HttpTraceFilter extends OncePerRequestFilter implements Ordered {
 		}
 		finally {
 			TraceableHttpServletResponse traceableResponse = new TraceableHttpServletResponse(
-					status == response.getStatus() ? response
+					status != response.getStatus()
-							: new CustomStatusResponseWrapper(response, status));
+							? new CustomStatusResponseWrapper(response, status)
+							: response);
 			this.tracer.sendingResponse(trace, traceableResponse,
 					request::getUserPrincipal, () -> getSessionId(request));
 			this.repository.add(trace);
@@ -96,7 +97,7 @@ public class HttpTraceFilter extends OncePerRequestFilter implements Ordered {
 
 	private String getSessionId(HttpServletRequest request) {
 		HttpSession session = request.getSession(false);
-		return session == null ? null : session.getId();
+		return (session != null ? session.getId() : null);
 	}
 
 	private static final class CustomStatusResponseWrapper

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointTests.java

@@ -255,7 +255,7 @@ public class ConfigurationPropertiesReportEndpointTests {
 		}
 
 		public boolean isMixedBoolean() {
-			return (this.mixedBoolean == null ? false : this.mixedBoolean);
+			return (this.mixedBoolean != null ? this.mixedBoolean : false);
 		}
 
 		public void setMixedBoolean(Boolean mixedBoolean) {

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/invoke/reflect/ReflectiveOperationInvokerTests.java

@@ -57,7 +57,7 @@ public class ReflectiveOperationInvokerTests {
 				ReflectionUtils.findMethod(Example.class, "reverse", String.class),
 				OperationType.READ);
 		this.parameterValueMapper = (parameter,
-				value) -> (value == null ? null : value.toString());
+				value) -> (value != null ? value.toString() : null);
 	}
 
 	@Test

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/JmxEndpointExporterTests.java

@@ -190,8 +190,9 @@ public class JmxEndpointExporterTests {
 		@Override
 		public ObjectName getObjectName(ExposableJmxEndpoint endpoint)
 				throws MalformedObjectNameException {
-			return (endpoint == null ? null
+			return (endpoint != null
-					: new ObjectName("boot:type=Endpoint,name=" + endpoint.getId()));
+					? new ObjectName("boot:type=Endpoint,name=" + endpoint.getId())
+					: null);
 		}
 
 	}

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/TestJmxOperation.java

@@ -68,8 +68,8 @@ public class TestJmxOperation implements JmxOperation {
 
 	@Override
 	public Object invoke(InvocationContext context) {
-		return (this.invoke == null ? "result"
+		return (this.invoke != null ? this.invoke.apply(context.getArguments())
-				: this.invoke.apply(context.getArguments()));
+				: "result");
 	}
 
 	@Override

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/AbstractWebEndpointIntegrationTests.java

@@ -835,7 +835,7 @@ public abstract class AbstractWebEndpointIntegrationTests<T extends Configurable
 
 		@ReadOperation
 		public String read(@Nullable Principal principal) {
-			return principal == null ? "None" : principal.getName();
+			return (principal != null ? principal.getName() : "None");
 		}
 
 	}
@@ -856,7 +856,7 @@ public abstract class AbstractWebEndpointIntegrationTests<T extends Configurable
 		@ReadOperation
 		public String read(SecurityContext securityContext) {
 			Principal principal = securityContext.getPrincipal();
-			return principal == null ? "None" : principal.getName();
+			return (principal != null ? principal.getName() : "None");
 		}
 
 	}

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilterTests.java

@@ -250,8 +250,8 @@ public class WebMvcMetricsFilterTests {
 				result.set(this.mvc.perform(get("/api/c1/completableFuture/{id}", 1))
 						.andExpect(request().asyncStarted()).andReturn());
 			}
-			catch (Exception e) {
+			catch (Exception ex) {
-				fail("Failed to execute async request", e);
+				fail("Failed to execute async request", ex);
 			}
 		});
 		backgroundRequest.start();

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/http/HttpExchangeTracerTests.java

@@ -326,8 +326,8 @@ public class HttpExchangeTracerTests {
 	private String mixedCase(String input) {
 		StringBuilder output = new StringBuilder();
 		for (int i = 0; i < input.length(); i++) {
-			output.append(i % 2 == 0 ? Character.toLowerCase(input.charAt(i))
+			output.append(i % 2 != 0 ? Character.toUpperCase(input.charAt(i))
-					: Character.toUpperCase(input.charAt(i)));
+					: Character.toLowerCase(input.charAt(i)));
 		}
 		return output.toString();
 	}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java

@@ -157,7 +157,7 @@ public class FlywayAutoConfiguration {
 		private String getProperty(Supplier<String> property,
 				Supplier<String> defaultValue) {
 			String value = property.get();
-			return (value == null ? defaultValue.get() : value);
+			return (value != null ? value : defaultValue.get());
 		}
 
 		private void checkLocationExists(String... locations) {

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationScanRegistrar.java

@@ -56,9 +56,9 @@ class IntegrationAutoConfigurationScanRegistrar extends IntegrationComponentScan
 	@Override
 	protected Collection<String> getBasePackages(
 			AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
-		return AutoConfigurationPackages.has(this.beanFactory)
+		return (AutoConfigurationPackages.has(this.beanFactory)
 				? AutoConfigurationPackages.get(this.beanFactory)
-				: Collections.emptyList();
+				: Collections.emptyList());
 	}
 
 	@IntegrationComponentScan

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java

@@ -234,8 +234,8 @@ public class DataSourceProperties implements BeanClassLoaderAware, InitializingB
 		}
 		if (!StringUtils.hasText(driverClassName)) {
 			throw new DataSourceBeanCreationException(
-					"Failed to determine a suitable driver class",
+					"Failed to determine a suitable driver class", this,
-					this, this.embeddedDatabaseConnection);
+					this.embeddedDatabaseConnection);
 		}
 		return driverClassName;
 	}
@@ -277,12 +277,12 @@ public class DataSourceProperties implements BeanClassLoaderAware, InitializingB
 			return this.url;
 		}
 		String databaseName = determineDatabaseName();
-		String url = (databaseName == null ? null
+		String url = (databaseName != null
-				: this.embeddedDatabaseConnection.getUrl(databaseName));
+				? this.embeddedDatabaseConnection.getUrl(databaseName) : null);
 		if (!StringUtils.hasText(url)) {
 			throw new DataSourceBeanCreationException(
-					"Failed to determine suitable jdbc url",
+					"Failed to determine suitable jdbc url", this,
-					this, this.embeddedDatabaseConnection);
+					this.embeddedDatabaseConnection);
 		}
 		return url;
 	}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java

@@ -168,7 +168,7 @@ public class LiquibaseAutoConfiguration {
 		private String getProperty(Supplier<String> property,
 				Supplier<String> defaultValue) {
 			String value = property.get();
-			return value == null ? defaultValue.get() : value;
+			return (value != null ? value : defaultValue.get());
 		}
 
 	}

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

@@ -81,8 +81,8 @@ public class MongoClientFactory {
 		if (options == null) {
 			options = MongoClientOptions.builder().build();
 		}
-		String host = this.properties.getHost() == null ? "localhost"
+		String host = (this.properties.getHost() != null ? this.properties.getHost()
-				: this.properties.getHost();
+				: "localhost");
 		return new MongoClient(Collections.singletonList(new ServerAddress(host, port)),
 				options);
 	}
@@ -101,8 +101,8 @@ public class MongoClientFactory {
 			int port = getValue(properties.getPort(), MongoProperties.DEFAULT_PORT);
 			List<ServerAddress> seeds = Collections
 					.singletonList(new ServerAddress(host, port));
-			return credentials == null ? new MongoClient(seeds, options)
+			return (credentials != null ? new MongoClient(seeds, credentials, options)
-					: new MongoClient(seeds, credentials, options);
+					: new MongoClient(seeds, options));
 		}
 		return createMongoClient(MongoProperties.DEFAULT_URI, options);
 	}
@@ -112,7 +112,7 @@ public class MongoClientFactory {
 	}
 
 	private <T> T getValue(T value, T fallback) {
-		return (value == null ? fallback : value);
+		return (value != null ? value : fallback);
 	}
 
 	private boolean hasCustomAddress() {

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

@@ -86,8 +86,8 @@ public class ReactiveMongoClientFactory {
 	private MongoClient createEmbeddedMongoClient(MongoClientSettings settings,
 			int port) {
 		Builder builder = builder(settings);
-		String host = this.properties.getHost() == null ? "localhost"
+		String host = (this.properties.getHost() != null ? this.properties.getHost()
-				: this.properties.getHost();
+				: "localhost");
 		ClusterSettings clusterSettings = ClusterSettings.builder()
 				.hosts(Collections.singletonList(new ServerAddress(host, port))).build();
 		builder.clusterSettings(clusterSettings);
@@ -119,16 +119,16 @@ public class ReactiveMongoClientFactory {
 	}
 
 	private void applyCredentials(Builder builder) {
-		String database = this.properties.getAuthenticationDatabase() == null
+		String database = (this.properties.getAuthenticationDatabase() != null
-				? this.properties.getMongoClientDatabase()
+				? this.properties.getAuthenticationDatabase()
-				: this.properties.getAuthenticationDatabase();
+				: this.properties.getMongoClientDatabase());
 		builder.credential((MongoCredential.createCredential(
 				this.properties.getUsername(), database, this.properties.getPassword())));
 
 	}
 
 	private <T> T getOrDefault(T value, T defaultValue) {
-		return (value == null ? defaultValue : value);
+		return (value != null ? value : defaultValue);
 	}
 
 	private MongoClient createMongoClient(Builder builder) {

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DataSourceInitializedPublisher.java

@@ -91,8 +91,8 @@ class DataSourceInitializedPublisher implements BeanPostProcessor {
 		if (this.properties == null) {
 			return true; // better safe than sorry
 		}
-		Supplier<String> defaultDdlAuto = () -> EmbeddedDatabaseConnection
+		Supplier<String> defaultDdlAuto = () -> (EmbeddedDatabaseConnection
-				.isEmbedded(dataSource) ? "create-drop" : "none";
+				.isEmbedded(dataSource) ? "create-drop" : "none");
 		Map<String, Object> hibernate = this.properties
 				.getHibernateProperties(new HibernateSettings().ddlAuto(defaultDdlAuto));
 		if (hibernate.containsKey("hibernate.hbm2ddl.auto")) {

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapter.java

@@ -72,8 +72,8 @@ final class OAuth2ClientPropertiesRegistrationAdapter {
 
 	private static Builder getBuilder(String registrationId, String configuredProviderId,
 			Map<String, Provider> providers) {
-		String providerId = (configuredProviderId == null ? registrationId
+		String providerId = (configuredProviderId != null ? configuredProviderId
-				: configuredProviderId);
+				: registrationId);
 		CommonOAuth2Provider provider = getCommonProvider(providerId);
 		if (provider == null && !providers.containsKey(providerId)) {
 			throw new IllegalStateException(
@@ -89,10 +89,10 @@ final class OAuth2ClientPropertiesRegistrationAdapter {
 
 	private static String getErrorMessage(String configuredProviderId,
 			String registrationId) {
-		return (configuredProviderId == null
+		return (configuredProviderId != null
-				? "Provider ID must be specified for client registration '"
+				? "Unknown provider ID '" + configuredProviderId + "'"
-						+ registrationId + "'"
+				: "Provider ID must be specified for client registration '"
-				: "Unknown provider ID '" + configuredProviderId + "'");
+						+ registrationId + "'");
 	}
 
 	private static Builder getBuilder(Builder builder, Provider provider) {

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionStoreMappings.java

@@ -93,7 +93,7 @@ final class SessionStoreMappings {
 		}
 
 		private String getName(Class<?> configuration) {
-			return (configuration == null ? null : configuration.getName());
+			return (configuration != null ? configuration.getName() : null);
 		}
 
 	}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionManagerCustomizers.java

@@ -36,8 +36,8 @@ public class TransactionManagerCustomizers {
 
 	public TransactionManagerCustomizers(
 			Collection<? extends PlatformTransactionManagerCustomizer<?>> customizers) {
-		this.customizers = (customizers == null ? Collections.emptyList()
+		this.customizers = (customizers != null ? new ArrayList<>(customizers)
-				: new ArrayList<>(customizers));
+				: Collections.emptyList());
 	}
 
 	@SuppressWarnings("unchecked")

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizer.java

@@ -110,9 +110,9 @@ public class TomcatWebServerFactoryCustomizer implements
 	}
 
 	private int determineMaxHttpHeaderSize() {
-		return this.serverProperties.getMaxHttpHeaderSize() > 0
+		return (this.serverProperties.getMaxHttpHeaderSize() > 0
 				? this.serverProperties.getMaxHttpHeaderSize()
-				: this.serverProperties.getTomcat().getMaxHttpHeaderSize();
+				: this.serverProperties.getTomcat().getMaxHttpHeaderSize());
 	}
 
 	private void customizeAcceptCount(ConfigurableTomcatWebServerFactory factory,

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/AbstractErrorWebExceptionHandler.java

@@ -205,7 +205,7 @@ public abstract class AbstractErrorWebExceptionHandler
 	}
 
 	private String htmlEscape(Object input) {
-		return (input == null ? null : HtmlUtils.htmlEscape(input.toString()));
+		return (input != null ? HtmlUtils.htmlEscape(input.toString()) : null);
 	}
 
 	@Override

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java

@@ -338,7 +338,7 @@ public class WebMvcAutoConfiguration {
 		}
 
 		private Integer getSeconds(Duration cachePeriod) {
-			return (cachePeriod == null ? null : (int) cachePeriod.getSeconds());
+			return (cachePeriod != null ? (int) cachePeriod.getSeconds() : null);
 		}
 
 		@Bean

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/WebServicesAutoConfiguration.java

@@ -146,7 +146,7 @@ public class WebServicesAutoConfiguration {
 				return this.applicationContext
 						.getResources(ensureTrailingSlash(location) + pattern);
 			}
-			catch (IOException e) {
+			catch (IOException ex) {
 				return new Resource[0];
 			}
 		}

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastJpaDependencyAutoConfigurationTests.java

@@ -102,7 +102,7 @@ public class HazelcastJpaDependencyAutoConfigurationTests {
 		String[] dependsOn = ((BeanDefinitionRegistry) context
 				.getSourceApplicationContext()).getBeanDefinition("entityManagerFactory")
 						.getDependsOn();
-		return dependsOn != null ? Arrays.asList(dependsOn) : Collections.emptyList();
+		return (dependsOn != null ? Arrays.asList(dependsOn) : Collections.emptyList());
 	}
 
 	@Configuration

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqPropertiesTests.java

@@ -101,7 +101,7 @@ public class JooqPropertiesTests {
 			given(connection.getMetaData()).willReturn(metadata);
 			given(ds.getConnection()).willReturn(connection);
 		}
-		catch (SQLException e) {
+		catch (SQLException ex) {
 			// Do nothing
 		}
 		return ds;

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java

@@ -136,7 +136,7 @@ public class CustomHibernateJpaAutoConfigurationTests {
 				given(dataSource.getConnection().getMetaData())
 						.willReturn(mock(DatabaseMetaData.class));
 			}
-			catch (SQLException e) {
+			catch (SQLException ex) {
 				// Do nothing
 			}
 			return dataSource;

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/JpaPropertiesTests.java

@@ -307,7 +307,7 @@ public class JpaPropertiesTests {
 			given(connection.getMetaData()).willReturn(metadata);
 			given(ds.getConnection()).willReturn(connection);
 		}
-		catch (SQLException e) {
+		catch (SQLException ex) {
 			// Do nothing
 		}
 		return ds;

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/MockServletWebServerFactory.java

@@ -52,15 +52,17 @@ public class MockServletWebServerFactory extends AbstractServletWebServerFactory
 	}
 
 	public ServletContext getServletContext() {
-		return getWebServer() == null ? null : getWebServer().getServletContext();
+		return (getWebServer() != null ? getWebServer().getServletContext() : null);
 	}
 
 	public RegisteredServlet getRegisteredServlet(int index) {
-		return getWebServer() == null ? null : getWebServer().getRegisteredServlet(index);
+		return (getWebServer() != null ? getWebServer().getRegisteredServlet(index)
+				: null);
 	}
 
 	public RegisteredFilter getRegisteredFilter(int index) {
-		return getWebServer() == null ? null : getWebServer().getRegisteredFilters(index);
+		return (getWebServer() != null ? getWebServer().getRegisteredFilters(index)
+				: null);
 	}
 
 	public static class MockServletWebServer

spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/SourceOptions.java

@@ -130,7 +130,7 @@ public class SourceOptions {
 	}
 
 	private String asString(Object arg) {
-		return (arg == null ? null : String.valueOf(arg));
+		return (arg != null ? String.valueOf(arg) : null);
 	}
 
 	public List<String> getSources() {

spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/CliTester.java

@@ -154,7 +154,7 @@ public class CliTester implements TestRule {
 				}
 			}
 			else {
-				sources[i] = new File(arg).isAbsolute() ? arg : this.prefix + arg;
+				sources[i] = (new File(arg).isAbsolute() ? arg : this.prefix + arg);
 			}
 		}
 		return sources;

spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFile.java

@@ -56,7 +56,7 @@ public class ClassLoaderFile implements Serializable {
 	public ClassLoaderFile(Kind kind, long lastModified, byte[] contents) {
 		Assert.notNull(kind, "Kind must not be null");
 		Assert.isTrue(kind != Kind.DELETED ? contents != null : contents == null,
-				() -> "Contents must " + (kind == Kind.DELETED ? "" : "not ")
+				() -> "Contents must " + (kind != Kind.DELETED ? "not " : "")
 						+ "be null");
 		this.kind = kind;
 		this.lastModified = lastModified;

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/test/MockClientHttpRequestFactory.java

@@ -119,7 +119,7 @@ public class MockClientHttpRequestFactory implements ClientHttpRequestFactory {
 
 		public ClientHttpResponse asHttpResponse(AtomicLong seq) {
 			MockClientHttpResponse httpResponse = new MockClientHttpResponse(
-					this.payload == null ? NO_DATA : this.payload, this.status);
+					this.payload != null ? this.payload : NO_DATA, this.status);
 			waitForDelay();
 			if (this.payload != null) {
 				httpResponse.getHeaders().setContentLength(this.payload.length);

spring-boot-project/spring-boot-properties-migrator/src/main/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationReport.java

@@ -148,7 +148,7 @@ class PropertiesMigrationReport {
 		}
 
 		private <T> List<T> asNewList(List<T> source) {
-			return (source == null ? Collections.emptyList() : new ArrayList<>(source));
+			return (source != null ? new ArrayList<>(source) : Collections.emptyList());
 		}
 
 		public List<PropertyMigration> getRenamed() {

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/assertj/ApplicationContextAssert.java

@@ -278,8 +278,8 @@ public class ApplicationContextAssert<C extends ApplicationContext>
 					"%nExpecting:%n <%s>%nsingle bean of type:%n <%s>%nbut found:%n <%s>",
 					getApplicationContext(), type, names));
 		}
-		T bean = (names.length == 0 ? null
+		T bean = (names.length != 0 ? getApplicationContext().getBean(names[0], type)
-				: getApplicationContext().getBean(names[0], type));
+				: null);
 		return Assertions.assertThat(bean).as("Bean of type <%s> from <%s>", type,
 				getApplicationContext());
 	}

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/runner/WebApplicationContextRunner.java

@@ -93,11 +93,11 @@ public final class WebApplicationContextRunner extends
 	 */
 	public static Supplier<ConfigurableWebApplicationContext> withMockServletContext(
 			Supplier<ConfigurableWebApplicationContext> contextFactory) {
-		return (contextFactory == null ? null : () -> {
+		return (contextFactory != null ? () -> {
 			ConfigurableWebApplicationContext context = contextFactory.get();
 			context.setServletContext(new MockServletContext());
 			return context;
-		});
+		} : null);
 	}
 
 }

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/util/TestPropertyValues.java

@@ -235,7 +235,7 @@ public final class TestPropertyValues {
 		}
 
 		protected String applySuffix(String name) {
-			return (this.suffix == null ? name : name + "-" + this.suffix);
+			return (this.suffix != null ? name + "-" + this.suffix : name);
 		}
 
 	}

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java

@@ -130,7 +130,7 @@ public class TestRestTemplate {
 	 */
 	public TestRestTemplate(RestTemplateBuilder restTemplateBuilder, String username,
 			String password, HttpClientOption... httpClientOptions) {
-		this(restTemplateBuilder == null ? null : restTemplateBuilder.build(), username,
+		this(restTemplateBuilder != null ? restTemplateBuilder.build() : null, username,
 				password, httpClientOptions);
 	}
 
@@ -138,8 +138,8 @@ public class TestRestTemplate {
 			HttpClientOption... httpClientOptions) {
 		Assert.notNull(restTemplate, "RestTemplate must not be null");
 		this.httpClientOptions = httpClientOptions;
-		if (getRequestFactoryClass(restTemplate).isAssignableFrom(
+		if (getRequestFactoryClass(restTemplate)
-				HttpComponentsClientHttpRequestFactory.class)) {
+				.isAssignableFrom(HttpComponentsClientHttpRequestFactory.class)) {
 			restTemplate.setRequestFactory(
 					new CustomHttpComponentsClientHttpRequestFactory(httpClientOptions));
 		}

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunnerTests.java

@@ -158,7 +158,7 @@ public abstract class AbstractApplicationContextRunnerTests<T extends AbstractAp
 								context.getClassLoader());
 						fail("Should have thrown a ClassNotFoundException");
 					}
-					catch (ClassNotFoundException e) {
+					catch (ClassNotFoundException ex) {
 						// expected
 					}
 				});

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessor.java

@@ -423,7 +423,7 @@ public class ConfigurationMetadataAnnotationProcessor extends AbstractProcessor
 		this.metadataCollector.add(ItemMetadata.newProperty(endpointKey, "enabled",
 				Boolean.class.getName(), type, null,
 				String.format("Whether to enable the %s endpoint.", endpointId),
-				(enabledByDefault == null ? true : enabledByDefault), null));
+				(enabledByDefault != null ? enabledByDefault : true), null));
 		if (hasMainReadOperation(element)) {
 			this.metadataCollector.add(ItemMetadata.newProperty(endpointKey,
 					"cache.time-to-live", Duration.class.getName(), type, null,

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/javac/JavaCompilerFieldValuesParser.java

@@ -178,7 +178,7 @@ public class JavaCompilerFieldValuesParser implements FieldValuesParser {
 				String type = instance.toString();
 				type = type.substring(DURATION_OF.length(), type.indexOf('('));
 				String suffix = DURATION_SUFFIX.get(type);
-				return (suffix == null ? null : factoryValue + suffix);
+				return (suffix != null ? factoryValue + suffix : null);
 			}
 			return factoryValue;
 		}

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/dsl/SpringBootExtension.java

@@ -119,7 +119,7 @@ public class SpringBootExtension {
 
 	private String determineArtifactBaseName() {
 		Jar artifactTask = findArtifactTask();
-		return (artifactTask == null ? null : artifactTask.getBaseName());
+		return (artifactTask != null ? artifactTask.getBaseName() : null);
 	}
 
 	private Jar findArtifactTask() {

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/JavaPluginAction.java

@@ -162,9 +162,9 @@ final class JavaPluginAction implements PluginApplicationAction {
 	}
 
 	private boolean hasConfigurationProcessorOnClasspath(JavaCompile compile) {
-		Set<File> files = compile.getOptions().getAnnotationProcessorPath() != null
+		Set<File> files = (compile.getOptions().getAnnotationProcessorPath() != null
 				? compile.getOptions().getAnnotationProcessorPath().getFiles()
-				: compile.getClasspath().getFiles();
+				: compile.getClasspath().getFiles());
 		return files.stream().map(File::getName).anyMatch(
 				(name) -> name.startsWith("spring-boot-configuration-processor"));
 	}

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfo.java

@@ -57,9 +57,9 @@ public class BuildInfo extends ConventionTask {
 					new File(getDestinationDir(), "build-info.properties"))
 							.writeBuildProperties(new ProjectDetails(
 									this.properties.getGroup(),
-									this.properties.getArtifact() == null
+									this.properties.getArtifact() != null
-											? "unspecified"
+											? this.properties.getArtifact()
-											: this.properties.getArtifact(),
+											: "unspecified",
 									this.properties.getVersion(),
 									this.properties.getName(), this.properties.getTime(),
 									coerceToStringValues(
@@ -77,8 +77,8 @@ public class BuildInfo extends ConventionTask {
 	 */
 	@OutputDirectory
 	public File getDestinationDir() {
-		return this.destinationDir != null ? this.destinationDir
+		return (this.destinationDir != null ? this.destinationDir
-				: getProject().getBuildDir();
+				: getProject().getBuildDir());
 	}
 
 	/**

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java

@@ -54,8 +54,8 @@ public class BootJar extends Jar implements BootArchive {
 
 	private Action<CopySpec> classpathFiles(Spec<File> filter) {
 		return (copySpec) -> copySpec
-				.from((Callable<Iterable<File>>) () -> this.classpath == null
+				.from((Callable<Iterable<File>>) () -> (this.classpath != null
-						? Collections.emptyList() : this.classpath.filter(filter));
+						? this.classpath.filter(filter) : Collections.emptyList()));
 
 	}
 
@@ -114,7 +114,7 @@ public class BootJar extends Jar implements BootArchive {
 	public void classpath(Object... classpath) {
 		FileCollection existingClasspath = this.classpath;
 		this.classpath = getProject().files(
-				existingClasspath == null ? Collections.emptyList() : existingClasspath,
+				existingClasspath != null ? existingClasspath : Collections.emptyList(),
 				classpath);
 	}
 

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootWar.java

@@ -51,8 +51,8 @@ public class BootWar extends War implements BootArchive {
 	public BootWar() {
 		getWebInf().into("lib-provided",
 				(copySpec) -> copySpec.from(
-						(Callable<Iterable<File>>) () -> this.providedClasspath == null
+						(Callable<Iterable<File>>) () -> (this.providedClasspath != null
-								? Collections.emptyList() : this.providedClasspath));
+								? this.providedClasspath : Collections.emptyList())));
 	}
 
 	@Override
@@ -120,7 +120,7 @@ public class BootWar extends War implements BootArchive {
 	public void providedClasspath(Object... classpath) {
 		FileCollection existingClasspath = this.providedClasspath;
 		this.providedClasspath = getProject().files(
-				existingClasspath == null ? Collections.emptyList() : existingClasspath,
+				existingClasspath != null ? existingClasspath : Collections.emptyList(),
 				classpath);
 	}
 

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootZipCopyAction.java

@@ -284,8 +284,8 @@ class BootZipCopyAction implements CopyAction {
 		}
 
 		private long getTime(FileCopyDetails details) {
-			return this.preserveFileTimestamps ? details.getLastModified()
+			return (this.preserveFileTimestamps ? details.getLastModified()
-					: CONSTANT_TIME_FOR_ZIP_ENTRIES;
+					: CONSTANT_TIME_FOR_ZIP_ENTRIES);
 		}
 
 	}

spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/AsciiBytes.java

@@ -141,7 +141,7 @@ final class AsciiBytes {
 	public boolean matches(CharSequence name, char suffix) {
 		int charIndex = 0;
 		int nameLen = name.length();
-		int totalLen = (nameLen + (suffix == 0 ? 0 : 1));
+		int totalLen = (nameLen + (suffix != 0 ? 1 : 0));
 		for (int i = this.offset; i < this.offset + this.length; i++) {
 			int b = this.bytes[i];
 			int remainingUtfBytes = getNumberOfUtfBytes(b) - 1;
@@ -250,7 +250,7 @@ final class AsciiBytes {
 	}
 
 	public static int hashCode(int hash, char suffix) {
-		return (suffix == 0 ? hash : (31 * hash + suffix));
+		return (suffix != 0 ? (31 * hash + suffix) : hash);
 	}
 
 }

spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java

@@ -120,7 +120,7 @@ public class JarFile extends java.util.jar.JarFile {
 		parser.addVisitor(centralDirectoryVisitor());
 		this.data = parser.parse(data, filter == null);
 		this.type = type;
-		this.manifestSupplier = manifestSupplier != null ? manifestSupplier : () -> {
+		this.manifestSupplier = (manifestSupplier != null ? manifestSupplier : () -> {
 			try (InputStream inputStream = getInputStream(MANIFEST_NAME)) {
 				if (inputStream == null) {
 					return null;
@@ -130,7 +130,7 @@ public class JarFile extends java.util.jar.JarFile {
 			catch (IOException ex) {
 				throw new RuntimeException(ex);
 			}
-		};
+		});
 	}
 
 	private CentralDirectoryVisitor centralDirectoryVisitor() {

spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/StringSequence.java

@@ -36,7 +36,7 @@ final class StringSequence implements CharSequence {
 	private int hash;
 
 	StringSequence(String source) {
-		this(source, 0, (source == null ? -1 : source.length()));
+		this(source, 0, source != null ? source.length() : -1);
 	}
 
 	StringSequence(String source, int start, int end) {

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

@@ -68,7 +68,7 @@ public class PropertiesMergingResourceTransformer implements ResourceTransformer
 
 	private void process(String name, String value) {
 		String existing = this.data.getProperty(name);
-		this.data.setProperty(name, (existing == null ? value : existing + "," + value));
+		this.data.setProperty(name, (existing != null ? existing + "," + value : value));
 	}
 
 	@Override

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/Container.java

@@ -64,7 +64,7 @@ class Container implements TestRule {
 		try {
 			DockerClientFactory.instance().client();
 		}
-		catch (Throwable t) {
+		catch (Throwable ex) {
 			return new SkipStatement();
 		}
 		this.container = this.containerFactory.get();

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/Neo4jContainer.java

@@ -62,8 +62,8 @@ public class Neo4jContainer extends Container {
 				Unreliables.retryUntilTrue((int) this.startupTimeout.getSeconds(),
 						TimeUnit.SECONDS, checkConnection(sessionFactory));
 			}
-			catch (TimeoutException e) {
+			catch (TimeoutException ex) {
-				throw new IllegalStateException();
+				throw new IllegalStateException(ex);
 			}
 		}
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ImageBanner.java

@@ -161,9 +161,9 @@ public class ImageBanner implements Banner {
 		IIOMetadataNode root = (IIOMetadataNode) metadata
 				.getAsTree(metadata.getNativeMetadataFormatName());
 		IIOMetadataNode extension = findNode(root, "GraphicControlExtension");
-		String attribute = (extension == null ? null
+		String attribute = (extension != null ? extension.getAttribute("delayTime")
-				: extension.getAttribute("delayTime"));
+				: null);
-		return (attribute == null ? 0 : Integer.parseInt(attribute) * 10);
+		return (attribute != null ? Integer.parseInt(attribute) * 10 : 0);
 	}
 
 	private static IIOMetadataNode findNode(IIOMetadataNode rootNode, String nodeName) {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java

@@ -961,8 +961,8 @@ public class SpringApplication {
 	 */
 	@Deprecated
 	public void setWebEnvironment(boolean webEnvironment) {
-		this.webApplicationType = webEnvironment ? WebApplicationType.SERVLET
+		this.webApplicationType = (webEnvironment ? WebApplicationType.SERVLET
-				: WebApplicationType.NONE;
+				: WebApplicationType.NONE);
 	}
 
 	/**

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/ContextIdApplicationContextInitializer.java

@@ -66,7 +66,7 @@ public class ContextIdApplicationContextInitializer implements
 
 	private String getApplicationId(ConfigurableEnvironment environment) {
 		String name = environment.getProperty("spring.application.name");
-		return StringUtils.hasText(name) ? name : "application";
+		return (StringUtils.hasText(name) ? name : "application");
 	}
 
 	/**

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java

@@ -313,8 +313,8 @@ public class ConfigFileApplicationListener
 
 		Loader(ConfigurableEnvironment environment, ResourceLoader resourceLoader) {
 			this.environment = environment;
-			this.resourceLoader = resourceLoader == null ? new DefaultResourceLoader()
+			this.resourceLoader = (resourceLoader != null ? resourceLoader
-					: resourceLoader;
+					: new DefaultResourceLoader());
 			this.propertySourceLoaders = SpringFactoriesLoader.loadFactories(
 					PropertySourceLoader.class, getClass().getClassLoader());
 		}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessor.java

@@ -98,8 +98,9 @@ public class ConfigurationPropertiesBindingPostProcessor implements BeanPostProc
 	private void bind(Object bean, String beanName, ConfigurationProperties annotation) {
 		ResolvableType type = getBeanType(bean, beanName);
 		Validated validated = getAnnotation(bean, beanName, Validated.class);
-		Annotation[] annotations = (validated == null ? new Annotation[] { annotation }
+		Annotation[] annotations = (validated != null
-				: new Annotation[] { annotation, validated });
+				? new Annotation[] { annotation, validated }
+				: new Annotation[] { annotation });
 		Bindable<?> target = Bindable.of(type).withExistingValue(bean)
 				.withAnnotations(annotations);
 		try {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesImportSelector.java

@@ -75,8 +75,8 @@ class EnableConfigurationPropertiesImportSelector implements ImportSelector {
 			MultiValueMap<String, Object> attributes = metadata
 					.getAllAnnotationAttributes(
 							EnableConfigurationProperties.class.getName(), false);
-			return collectClasses(attributes == null ? Collections.emptyList()
+			return collectClasses(attributes != null ? attributes.get("value")
-					: attributes.get("value"));
+					: Collections.emptyList());
 		}
 
 		private List<Class<?>> collectClasses(List<?> values) {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/BindException.java

@@ -77,7 +77,7 @@ public class BindException extends RuntimeException implements OriginProvider {
 			Bindable<?> target) {
 		StringBuilder message = new StringBuilder();
 		message.append("Failed to bind properties");
-		message.append(name == null ? "" : " under '" + name + "'");
+		message.append(name != null ? " under '" + name + "'" : "");
 		message.append(" to ").append(target.getType());
 		return message.toString();
 	}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/BindResult.java

@@ -89,7 +89,7 @@ public final class BindResult<T> {
 	 */
 	public <U> BindResult<U> map(Function<? super T, ? extends U> mapper) {
 		Assert.notNull(mapper, "Mapper must not be null");
-		return of(this.value == null ? null : mapper.apply(this.value));
+		return of(this.value != null ? mapper.apply(this.value) : null);
 	}
 
 	/**