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

Apply SingleSpaceSeparator Checkstyle module

Browse Source 
This commit also fixes its violations.

Closes gh-31469
This commit is contained in:
Johnny Lim
2023-10-22 00:10:45 +09:00
committed by Sam Brannen
parent 8a05661707
commit 64e9fcad53
164 changed files with 229 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java
View File

@@ -129,7 +129,7 @@ public enum SpelMessage {
PROBLEM_LOCATING_METHOD(Kind.ERROR, 1031,
"Problem locating method {0} on type {1}"),
SETVALUE_NOT_SUPPORTED( Kind.ERROR, 1032,
SETVALUE_NOT_SUPPORTED(Kind.ERROR, 1032,
"setValue(ExpressionState, Object) not supported for ''{0}''"),
MULTIPLE_POSSIBLE_METHODS(Kind.ERROR, 1033,

2
spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineMap.java
View File

@@ -134,7 +134,7 @@ public class InlineMap extends SpelNodeImpl {
key = keyChild.getValue(expressionState);
}
Object value = getChild(c).getValue(expressionState);
returnValue.put(key, value);
returnValue.put(key, value);
}
return new TypedValue(returnValue);
}

2
spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java
View File

@@ -74,7 +74,7 @@ public abstract class ReflectionHelper {
match = null;
}
}
else if (!expectedArg.equals(suppliedArg)) {
else if (!expectedArg.equals(suppliedArg)) {
if (suppliedArg.isAssignableTo(expectedArg)) {
if (match != ArgumentsMatchKind.REQUIRES_CONVERSION) {
match = ArgumentsMatchKind.CLOSE;

2
spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java
View File

@@ -570,7 +570,7 @@ public class ReflectivePropertyAccessor implements PropertyAccessor {
private static boolean isKotlinProperty(Method method, String methodSuffix) {
Class<?> clazz = method.getDeclaringClass();
return KotlinDetector.isKotlinReflectPresent() &&
KotlinDetector.isKotlinType(clazz) &&
KotlinDetector.isKotlinType(clazz) &&
KotlinDelegate.isKotlinProperty(method, methodSuffix);
}

20
spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java
View File

@@ -359,7 +359,7 @@ class EvaluationTests extends AbstractExpressionTests {
// Add a new element to the list
StandardEvaluationContext ctx = new StandardEvaluationContext(instance);
ExpressionParser parser = new SpelExpressionParser(new SpelParserConfiguration(true, true));
Expression e = parser.parseExpression("listOfStrings[++index3]='def'");
Expression e = parser.parseExpression("listOfStrings[++index3]='def'");
e.getValue(ctx);
assertThat(instance.listOfStrings).hasSize(2);
assertThat(instance.listOfStrings.get(1)).isEqualTo("def");
@@ -367,13 +367,13 @@ class EvaluationTests extends AbstractExpressionTests {
// Check reference beyond end of collection
ctx = new StandardEvaluationContext(instance);
parser = new SpelExpressionParser(new SpelParserConfiguration(true, true));
e = parser.parseExpression("listOfStrings[0]");
e = parser.parseExpression("listOfStrings[0]");
String value = e.getValue(ctx, String.class);
assertThat(value).isEqualTo("abc");
e = parser.parseExpression("listOfStrings[1]");
e = parser.parseExpression("listOfStrings[1]");
value = e.getValue(ctx, String.class);
assertThat(value).isEqualTo("def");
e = parser.parseExpression("listOfStrings[2]");
e = parser.parseExpression("listOfStrings[2]");
value = e.getValue(ctx, String.class);
assertThat(value).isEmpty();
@@ -858,7 +858,7 @@ class EvaluationTests extends AbstractExpressionTests {
Integer i = 42;
StandardEvaluationContext ctx = new StandardEvaluationContext(i);
ExpressionParser parser = new SpelExpressionParser(new SpelParserConfiguration(true, true));
Expression e = parser.parseExpression("#this++");
Expression e = parser.parseExpression("#this++");
assertThat(i).isEqualTo(42);
assertThatExceptionOfType(SpelEvaluationException.class).isThrownBy(() ->
e.getValue(ctx, Integer.class))
@@ -993,11 +993,11 @@ class EvaluationTests extends AbstractExpressionTests {
Integer i = 42;
StandardEvaluationContext ctx = new StandardEvaluationContext(i);
ExpressionParser parser = new SpelExpressionParser(new SpelParserConfiguration(true, true));
Expression e1 = parser.parseExpression("++1");
Expression e1 = parser.parseExpression("++1");
assertThatExceptionOfType(SpelEvaluationException.class).isThrownBy(() ->
e1.getValue(ctx, Double.TYPE))
.satisfies(ex -> assertThat(ex.getMessageCode()).isEqualTo(SpelMessage.NOT_ASSIGNABLE));
Expression e2 = parser.parseExpression("1++");
Expression e2 = parser.parseExpression("1++");
assertThatExceptionOfType(SpelEvaluationException.class).isThrownBy(() ->
e2.getValue(ctx, Double.TYPE))
.satisfies(ex -> assertThat(ex.getMessageCode()).isEqualTo(SpelMessage.NOT_ASSIGNABLE));
@@ -1008,7 +1008,7 @@ class EvaluationTests extends AbstractExpressionTests {
Integer i = 42;
StandardEvaluationContext ctx = new StandardEvaluationContext(i);
ExpressionParser parser = new SpelExpressionParser(new SpelParserConfiguration(true, true));
Expression e = parser.parseExpression("#this--");
Expression e = parser.parseExpression("#this--");
assertThat(i).isEqualTo(42);
assertThatExceptionOfType(SpelEvaluationException.class).isThrownBy(() ->
e.getValue(ctx, Integer.class))
@@ -1169,13 +1169,13 @@ class EvaluationTests extends AbstractExpressionTests {
assertThat(helper.intArray[2]).isEqualTo(4);
// index1 is 3 intArray[3] is 4
e = parser.parseExpression("intArray[#root.index1++]--");
e = parser.parseExpression("intArray[#root.index1++]--");
assertThat(e.getValue(ctx, Integer.class)).isEqualTo(4);
assertThat(helper.index1).isEqualTo(4);
assertThat(helper.intArray[3]).isEqualTo(3);
// index1 is 4, intArray[3] is 3
e = parser.parseExpression("intArray[--#root.index1]++");
e = parser.parseExpression("intArray[--#root.index1]++");
assertThat(e.getValue(ctx, Integer.class)).isEqualTo(3);
assertThat(helper.index1).isEqualTo(3);
assertThat(helper.intArray[3]).isEqualTo(4);

6
spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java
View File

@@ -6372,7 +6372,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
private Float _valueF,_valueF2;
public Reg(int v) {
this._value = v;
this._value = v;
this._valueL = (long) v;
this._valueD = (double) v;
this._valueF = (float) v;
@@ -6411,14 +6411,14 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
}
public void setValue(Integer value) {
_value = value;
_value = value;
_valueL = value==null?null:Long.valueOf(value);
_valueD = value==null?null:Double.valueOf(value);
_valueF = value==null?null:Float.valueOf(value);
}
public void setValue2(Integer value) {
_value2 = value;
_value2 = value;
_valueL2 = value==null?null:Long.valueOf(value);
_valueD2 = value==null?null:Double.valueOf(value);
_valueF2 = value==null?null:Float.valueOf(value);

16
spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java
View File

@@ -130,7 +130,7 @@ class SpelDocumentationTests extends AbstractExpressionTests {
String helloWorld = (String) parser.parseExpression("'Hello World'").getValue(); // evals to "Hello World"
assertThat(helloWorld).isEqualTo("Hello World");
double avogadrosNumber = (Double) parser.parseExpression("6.0221415E+23").getValue();
double avogadrosNumber = (Double) parser.parseExpression("6.0221415E+23").getValue();
assertThat(avogadrosNumber).isCloseTo(6.0221415E+23, within((double) 0));
int maxValue = (Integer) parser.parseExpression("0x7FFFFFFF").getValue(); // evals to 2147483647
@@ -263,7 +263,7 @@ class SpelDocumentationTests extends AbstractExpressionTests {
boolean falseValue = parser.parseExpression("true and false").getValue(Boolean.class);
assertThat(falseValue).isFalse();
// evaluates to true
String expression = "isMember('Nikola Tesla') and isMember('Mihajlo Pupin')";
String expression = "isMember('Nikola Tesla') and isMember('Mihajlo Pupin')";
boolean trueValue = parser.parseExpression(expression).getValue(societyContext, Boolean.class);
// -- OR --
@@ -273,7 +273,7 @@ class SpelDocumentationTests extends AbstractExpressionTests {
assertThat(trueValue).isTrue();
// evaluates to true
expression = "isMember('Nikola Tesla') or isMember('Albert Einstien')";
expression = "isMember('Nikola Tesla') or isMember('Albert Einstien')";
trueValue = parser.parseExpression(expression).getValue(societyContext, Boolean.class);
assertThat(trueValue).isTrue();
@@ -285,7 +285,7 @@ class SpelDocumentationTests extends AbstractExpressionTests {
// -- AND and NOT --
expression = "isMember('Nikola Tesla') and !isMember('Mihajlo Pupin')";
expression = "isMember('Nikola Tesla') and !isMember('Mihajlo Pupin')";
falseValue = parser.parseExpression(expression).getValue(societyContext, Boolean.class);
assertThat(falseValue).isFalse();
}
@@ -302,28 +302,28 @@ class SpelDocumentationTests extends AbstractExpressionTests {
assertThat(testString).isEqualTo("test string");
// Subtraction
int four = parser.parseExpression("1 - -3").getValue(Integer.class); // 4
int four = parser.parseExpression("1 - -3").getValue(Integer.class); // 4
assertThat(four).isEqualTo(4);
double d = parser.parseExpression("1000.00 - 1e4").getValue(Double.class); // -9000
assertThat(d).isCloseTo(-9000.0d, within((double) 0));
// Multiplication
int six = parser.parseExpression("-2 * -3").getValue(Integer.class); // 6
int six = parser.parseExpression("-2 * -3").getValue(Integer.class); // 6
assertThat(six).isEqualTo(6);
double twentyFour = parser.parseExpression("2.0 * 3e0 * 4").getValue(Double.class); // 24.0
assertThat(twentyFour).isCloseTo(24.0d, within((double) 0));
// Division
int minusTwo = parser.parseExpression("6 / -3").getValue(Integer.class); // -2
int minusTwo = parser.parseExpression("6 / -3").getValue(Integer.class); // -2
assertThat(minusTwo).isEqualTo(-2);
double one = parser.parseExpression("8.0 / 4e0 / 2").getValue(Double.class); // 1.0
assertThat(one).isCloseTo(1.0d, within((double) 0));
// Modulus
int three = parser.parseExpression("7 % 4").getValue(Integer.class); // 3
int three = parser.parseExpression("7 % 4").getValue(Integer.class); // 3
assertThat(three).isEqualTo(3);
int oneInt = parser.parseExpression("8 / 5 % 2").getValue(Integer.class); // 1