Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish "Wrap ternary operator within parentheses"

Browse Source 
See gh-31076
This commit is contained in:
Stephane Nicoll
2023-08-22 15:36:30 +02:00
parent 6712c044b1
commit 2b76c4d847
36 changed files with 62 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-context/src/main/java/org/springframework/context/support/DelegatingMessageSource.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2023 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.
@@ -95,7 +95,7 @@ public class DelegatingMessageSource extends MessageSourceSupport implements Hie
@Override
public String toString() {
return this.parentMessageSource != null ? this.parentMessageSource.toString() : "Empty MessageSource";
return (this.parentMessageSource != null ? this.parentMessageSource.toString() : "Empty MessageSource");
}
}

6
spring-context/src/main/java/org/springframework/scheduling/TriggerContext.java
View File

@@ -52,7 +52,7 @@ public interface TriggerContext {
@Deprecated(since = "6.0")
default Date lastScheduledExecutionTime() {
Instant instant = lastScheduledExecution();
return instant != null ? Date.from(instant) : null;
return (instant != null ? Date.from(instant) : null);
}
/**
@@ -73,7 +73,7 @@ public interface TriggerContext {
@Deprecated(since = "6.0")
default Date lastActualExecutionTime() {
Instant instant = lastActualExecution();
return instant != null ? Date.from(instant) : null;
return (instant != null ? Date.from(instant) : null);
}
/**
@@ -94,7 +94,7 @@ public interface TriggerContext {
@Nullable
default Date lastCompletionTime() {
Instant instant = lastCompletion();
return instant != null ? Date.from(instant) : null;
return (instant != null ? Date.from(instant) : null);
}
/**

4
spring-context/src/main/java/org/springframework/scheduling/support/SimpleTriggerContext.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 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.
@@ -68,7 +68,7 @@ public class SimpleTriggerContext implements TriggerContext {
@Nullable
private static Instant toInstant(@Nullable Date date) {
return date != null ? date.toInstant() : null;
return (date != null ? date.toInstant() : null);
}
/**

4
spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationAdapter.java
View File

@@ -225,7 +225,7 @@ public class MethodValidationAdapter implements MethodValidator {
}
return adaptViolations(target, method, violations,
i -> parameters != null ? parameters[i] : initMethodParameter(method, i),
i -> (parameters != null ? parameters[i] : initMethodParameter(method, i)),
i -> arguments[i]);
}
@@ -263,7 +263,7 @@ public class MethodValidationAdapter implements MethodValidator {
}
return adaptViolations(target, method, violations,
i -> returnType != null ? returnType : initMethodParameter(method, -1),
i -> (returnType != null ? returnType : initMethodParameter(method, -1)),
i -> returnValue);
}

2
spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java
View File

@@ -260,7 +260,7 @@ final class TestNamespaceHandler extends NamespaceHandlerSupport {
Element element = (Element) node;
BeanDefinition def = definition.getBeanDefinition();
MutablePropertyValues mpvs = (def.getPropertyValues() == null) ? new MutablePropertyValues() : def.getPropertyValues();
MutablePropertyValues mpvs = (def.getPropertyValues() == null ? new MutablePropertyValues() : def.getPropertyValues());
mpvs.add("name", element.getAttribute("name"));
mpvs.add("age", element.getAttribute("age"));

4
spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheTests.java vendored
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 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.
@@ -63,7 +63,7 @@ public class ConcurrentMapCacheTests extends AbstractValueAdaptingCacheTests<Con
@Override
protected ConcurrentMapCache getCache(boolean allowNull) {
return allowNull ? this.cache : this.cacheNoNull;
return (allowNull ? this.cache : this.cacheNoNull);
}
@Override

2
spring-context/src/test/java/org/springframework/context/annotation/Spr8954Tests.java
View File

@@ -128,7 +128,7 @@ public class Spr8954Tests {
@Override
public Class<?> predictBeanType(Class<?> beanClass, String beanName) {
return FactoryBean.class.isAssignableFrom(beanClass) ? PredictedType.class : null;
return (FactoryBean.class.isAssignableFrom(beanClass) ? PredictedType.class : null);
}
@Override

2
spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
View File

@@ -131,7 +131,7 @@ public class ApplicationContextEventTests extends AbstractApplicationEventListen
else {
smc.multicastEvent(event);
}
int invocation = match ? 1 : 0;
int invocation = (match ? 1 : 0);
verify(listener, times(invocation)).onApplicationEvent(event);
}

2
spring-context/src/test/java/org/springframework/context/support/ResourceBundleMessageSourceTests.java
View File

@@ -132,7 +132,7 @@ class ResourceBundleMessageSourceTests {
Locale.setDefault(expectGermanFallback ? Locale.GERMAN : Locale.CANADA);
assertThat(ac.getMessage("code1", null, Locale.ENGLISH)).isEqualTo("message1");
Object expected = fallbackToSystemLocale && expectGermanFallback ? "nachricht2" : "message2";
Object expected = (fallbackToSystemLocale && expectGermanFallback ? "nachricht2" : "message2");
assertThat(ac.getMessage("code2", null, Locale.ENGLISH)).isEqualTo(expected);
assertThat(ac.getMessage("code2", null, Locale.GERMAN)).isEqualTo("nachricht2");

2
spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormatterFactoryTests.java
View File

@@ -41,7 +41,7 @@ public class DateTimeFormatterFactoryTests {
private static final TimeZone NEW_YORK = TimeZone.getTimeZone("America/New_York");
// Ensure that we are testing against a timezone other than the default.
private static final TimeZone TEST_TIMEZONE = ZURICH.equals(TimeZone.getDefault()) ? NEW_YORK : ZURICH;
private static final TimeZone TEST_TIMEZONE = (ZURICH.equals(TimeZone.getDefault()) ? NEW_YORK : ZURICH);
private DateTimeFormatterFactory factory = new DateTimeFormatterFactory();

4
spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 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.
@@ -468,7 +468,7 @@ public class NotificationListenerTests extends AbstractMBeanServerTests {
public int getCount(String attribute) {
Integer count = (Integer) this.attributeCounts.get(attribute);
return (count == null) ? 0 : count;
return (count == null ? 0 : count);
}
public Object getLastHandback(String attributeName) {