Browse Source

Delete unused code

pull/30478/head
Sam Brannen 3 years ago
parent
commit
e51c71bcd6
  1. 11
      spring-core/src/test/java/org/springframework/core/codec/StringDecoderTests.java
  2. 3
      spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java

11
spring-core/src/test/java/org/springframework/core/codec/StringDecoderTests.java

@ -25,8 +25,6 @@ import java.util.Collections; @@ -25,8 +25,6 @@ import java.util.Collections;
import java.util.List;
import org.junit.jupiter.api.Test;
import org.reactivestreams.Subscription;
import reactor.core.publisher.BaseSubscriber;
import reactor.core.publisher.Flux;
import reactor.test.StepVerifier;
@ -268,13 +266,4 @@ class StringDecoderTests extends AbstractDecoderTests<StringDecoder> { @@ -268,13 +266,4 @@ class StringDecoderTests extends AbstractDecoderTests<StringDecoder> {
return buffer;
}
private static class SingleRequestSubscriber extends BaseSubscriber<String> {
@Override
protected void hookOnSubscribe(Subscription subscription) {
subscription.request(1);
}
}
}

3
spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java

@ -199,8 +199,7 @@ public class FunctionReference extends SpelNodeImpl { @@ -199,8 +199,7 @@ public class FunctionReference extends SpelNodeImpl {
varArgPosition = declaredParamCount - 1;
}
TypeConverter converter = state.getEvaluationContext().getTypeConverter();
boolean conversionOccurred = ReflectionHelper.convertAllMethodHandleArguments(converter,
functionArgs, methodHandle, varArgPosition);
ReflectionHelper.convertAllMethodHandleArguments(converter, functionArgs, methodHandle, varArgPosition);
if (isSuspectedVarargs && declaredParamCount == 1) {
//we only repack the varargs if it is the ONLY argument

Loading…
Cancel
Save