root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Apply project formatting rules for ternary operator 

Discovered via RegEx: ^\s+\?
This commit is contained in:
Sam Brannen 2022-11-29 17:51:13 +01:00
parent 61d8774da0
commit a88dbbec98
12 changed files with 27 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-beans/src/main/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGenerator.java
View File

@ -288,9 +288,9 @@ class InstanceSupplierCodeGenerator {
}
private CodeBlock generateWithGeneratorCode(boolean hasArguments, CodeBlock newInstance) {
CodeBlock lambdaArguments = (hasArguments
? CodeBlock.of("($L, $L)", REGISTERED_BEAN_PARAMETER_NAME, ARGS_PARAMETER_NAME)
: CodeBlock.of("($L)", REGISTERED_BEAN_PARAMETER_NAME));
CodeBlock lambdaArguments = (hasArguments ?
CodeBlock.of("($L, $L)", REGISTERED_BEAN_PARAMETER_NAME, ARGS_PARAMETER_NAME) :
CodeBlock.of("($L)", REGISTERED_BEAN_PARAMETER_NAME));
Builder code = CodeBlock.builder();
code.add("\n");
code.indent().indent();

7
spring-beans/src/test/java/org/springframework/beans/factory/aot/AotServicesTests.java
View File

@ -238,10 +238,9 @@ class AotServicesTests {
@Override
public Enumeration<URL> getResources(String name) throws IOException {
return (!"META-INF/spring/aot.factories".equals(name))
? super.getResources(name)
: super.getResources("org/springframework/beans/factory/aot/"
+ this.factoriesName);
return (!"META-INF/spring/aot.factories".equals(name) ?
super.getResources(name) :
super.getResources("org/springframework/beans/factory/aot/" + this.factoriesName));
}
}

5
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
View File

@ -147,9 +147,8 @@ class ConfigurationClassParser {
this.problemReporter = problemReporter;
this.environment = environment;
this.resourceLoader = resourceLoader;
this.propertySourceRegistry = (this.environment instanceof ConfigurableEnvironment ce
? new PropertySourceRegistry(new PropertySourceProcessor(ce, this.resourceLoader))
: null);
this.propertySourceRegistry = (this.environment instanceof ConfigurableEnvironment ce ?
new PropertySourceRegistry(new PropertySourceProcessor(ce, this.resourceLoader)) : null);
this.registry = registry;
this.componentScanParser = new ComponentScanAnnotationParser(
environment, resourceLoader, componentScanBeanNameGenerator, registry);

5
spring-core-test/src/main/java/org/springframework/core/test/tools/SourceFile.java
View File

@ -180,9 +180,8 @@ public final class SourceFile extends DynamicFile implements AssertProvider<Sour
}
Assert.state(javaSource.getClasses().size() == 1, "Source must define a single class");
JavaClass javaClass = javaSource.getClasses().get(0);
return (javaSource.getPackage() != null)
? javaSource.getPackageName() + "." + javaClass.getName()
: javaClass.getName();
return (javaSource.getPackage() != null) ?
(javaSource.getPackageName() + "." + javaClass.getName()) : javaClass.getName();
}
catch (Exception ex) {
throw new IllegalStateException(

5
spring-core/src/main/java/org/springframework/aot/generate/DefaultMethodReference.java
View File

@ -128,9 +128,8 @@ public class DefaultMethodReference implements MethodReference {
return this.declaringClass + "::" + methodName;
}
else {
return ((this.declaringClass != null)
? "<" + this.declaringClass + ">" : "<instance>")
+ "::" + methodName;
return ((this.declaringClass != null) ?
"<" + this.declaringClass + ">" : "<instance>") + "::" + methodName;
}
}

4
spring-core/src/main/java/org/springframework/aot/generate/MethodReference.java
View File

@ -94,8 +94,8 @@ public interface MethodReference {
* @return a new {@link ArgumentCodeGenerator} instance
*/
static ArgumentCodeGenerator of(Class<?> argumentType, String argumentCode) {
return from(candidateType -> (candidateType.equals(ClassName.get(argumentType))
? CodeBlock.of(argumentCode) : null));
return from(candidateType -> candidateType.equals(ClassName.get(argumentType)) ?
CodeBlock.of(argumentCode) : null);
}
/**

5
spring-core/src/main/java/org/springframework/aot/hint/AbstractTypeReference.java
View File

@ -47,9 +47,8 @@ public abstract class AbstractTypeReference implements TypeReference {
public String getName() {
TypeReference enclosingType = getEnclosingType();
String simpleName = getSimpleName();
return (enclosingType != null
? (enclosingType.getName() + '$' + simpleName)
: addPackageIfNecessary(simpleName));
return (enclosingType != null ? (enclosingType.getName() + '$' + simpleName) :
addPackageIfNecessary(simpleName));
}
@Override

5
spring-core/src/main/java/org/springframework/aot/hint/ReflectionTypeReference.java
View File

@ -35,9 +35,8 @@ final class ReflectionTypeReference extends AbstractTypeReference {
@Nullable
private static TypeReference getEnclosingClass(Class<?> type) {
Class<?> candidate = (type.isArray()
? type.getComponentType().getEnclosingClass()
: type.getEnclosingClass());
Class<?> candidate = (type.isArray() ? type.getComponentType().getEnclosingClass() :
type.getEnclosingClass());
return (candidate != null ? new ReflectionTypeReference(candidate) : null);
}

5
spring-core/src/main/java/org/springframework/core/io/support/PropertySourceProcessor.java
View File

@ -77,9 +77,8 @@ public class PropertySourceProcessor {
List<String> locations = descriptor.locations();
Assert.isTrue(locations.size() > 0, "At least one @PropertySource(value) location is required");
boolean ignoreResourceNotFound = descriptor.ignoreResourceNotFound();
PropertySourceFactory factory = (descriptor.propertySourceFactory() != null
? instantiateClass(descriptor.propertySourceFactory())
: DEFAULT_PROPERTY_SOURCE_FACTORY);
PropertySourceFactory factory = (descriptor.propertySourceFactory() != null ?
instantiateClass(descriptor.propertySourceFactory()) : DEFAULT_PROPERTY_SOURCE_FACTORY);
for (String location : locations) {
try {

6
spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsComposedOnSingleAnnotatedElementTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2022 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.
@ -180,9 +180,7 @@ class MergedAnnotationsComposedOnSingleAnnotatedElementTests {
methods.add(method);
}
});
Method bridgeMethod = methods.get(0).getReturnType().equals(Object.class)
? methods.get(0)
: methods.get(1);
Method bridgeMethod = methods.get(0).getReturnType() == Object.class ? methods.get(0) : methods.get(1);
assertThat(bridgeMethod.isBridge()).isTrue();
return bridgeMethod;
}

6
spring-jms/src/main/java/org/springframework/jms/listener/adapter/AbstractAdaptableMessageListener.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2022 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.
@ -303,8 +303,8 @@ public abstract class AbstractAdaptableMessageListener
* @see #setMessageConverter
*/
protected Message buildMessage(Session session, Object result) throws JMSException {
Object content = preProcessResponse(result instanceof JmsResponse
? ((JmsResponse<?>) result).getResponse() : result);
Object content = preProcessResponse(result instanceof JmsResponse<?> jmsResponse ?
jmsResponse.getResponse() : result);
MessageConverter converter = getMessageConverter();
if (converter != null) {

4
spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethod.java
View File

@ -170,8 +170,8 @@ public class InvocableHandlerMethod extends HandlerMethod {
}
catch (IllegalArgumentException ex) {
assertTargetBean(getBridgedMethod(), getBean(), args);
String text = (ex.getMessage() == null || ex.getCause() instanceof NullPointerException)
? "Illegal argument": ex.getMessage();
String text = (ex.getMessage() == null || ex.getCause() instanceof NullPointerException) ?
"Illegal argument": ex.getMessage();
throw new IllegalStateException(formatInvokeError(text, args), ex);
}
catch (InvocationTargetException ex) {