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

Polish

Browse Source
This commit is contained in:
Janne Valkealahti
2021-12-24 13:54:41 +00:00
parent 05311ffcdc
commit d578f28662
6 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-shell-core/src/main/java/org/springframework/shell/Utils.java
View File

@@ -76,7 +76,7 @@ public class Utils {
if (executable instanceof Method) {
methodParameter = new MethodParameter((Method) executable, i);
} else if (executable instanceof Constructor){
methodParameter = new MethodParameter((Constructor) executable, i);
methodParameter = new MethodParameter((Constructor<?>) executable, i);
} else {
throw new IllegalArgumentException("Unsupported Executable: " + executable);
}

10
spring-shell-core/src/test/java/org/springframework/shell/ShellTest.java
View File

@@ -72,7 +72,7 @@ public class ShellTest {
@Test
public void commandMatch() throws IOException {
when(parameterResolver.supports(any())).thenReturn(true);
when(inputProvider.readInput()).thenReturn(() -> "hello world how are you doing ?", null);
when(inputProvider.readInput()).thenReturn(() -> "hello world how are you doing ?");
valueResult = new ValueResult(null, "test");
when(parameterResolver.resolve(any(), any())).thenReturn(valueResult);
doThrow(new Exit()).when(resultHandlerService).handle(any());
@@ -92,7 +92,7 @@ public class ShellTest {
@Test
public void commandNotFound() throws IOException {
when(inputProvider.readInput()).thenReturn(() -> "hello world how are you doing ?", null);
when(inputProvider.readInput()).thenReturn(() -> "hello world how are you doing ?");
doThrow(new Exit()).when(resultHandlerService).handle(isA(CommandNotFound.class));
shell.methodTargets = Collections.singletonMap("bonjour", MethodTarget.of("helloWorld", this, new Command.Help("Say hello")));
@@ -109,7 +109,7 @@ public class ShellTest {
@Test
// See https://github.com/spring-projects/spring-shell/issues/142
public void commandNotFoundPrefix() throws IOException {
when(inputProvider.readInput()).thenReturn(() -> "helloworld how are you doing ?", null);
when(inputProvider.readInput()).thenReturn(() -> "helloworld how are you doing ?");
doThrow(new Exit()).when(resultHandlerService).handle(isA(CommandNotFound.class));
shell.methodTargets = Collections.singletonMap("hello", MethodTarget.of("helloWorld", this, new Command.Help("Say hello")));
@@ -146,7 +146,7 @@ public class ShellTest {
@Test
public void commandThrowingAnException() throws IOException {
when(inputProvider.readInput()).thenReturn(() -> "fail", null);
when(inputProvider.readInput()).thenReturn(() -> "fail");
doThrow(new Exit()).when(resultHandlerService).handle(isA(SomeException.class));
shell.methodTargets = Collections.singletonMap("fail", MethodTarget.of("failing", this, new Command.Help("Will throw an exception")));
@@ -231,10 +231,12 @@ public class ShellTest {
assertThat(proposals).isEmpty();
}
@SuppressWarnings("unused")
private void helloWorld(String a) {
invoked = true;
}
@SuppressWarnings("unused")
private String failing() {
invoked = true;
throw new SomeException();

2
spring-shell-standard/src/main/java/org/springframework/shell/standard/EnumValueProvider.java
View File

@@ -38,7 +38,7 @@ public class EnumValueProvider implements ValueProvider {
public List<CompletionProposal> complete(MethodParameter parameter, CompletionContext completionContext, String[] hints) {
List<CompletionProposal> result = new ArrayList<>();
for (Object v : parameter.getParameterType().getEnumConstants()) {
Enum e = (Enum) v;
Enum<?> e = (Enum<?>) v;
String prefix = completionContext.currentWordUpToCursor();
if (prefix == null) {
prefix = "";

2
spring-shell-standard/src/main/java/org/springframework/shell/standard/StandardParameterResolver.java
View File

@@ -380,7 +380,7 @@ public class StandardParameterResolver implements ParameterResolver {
List<CompletionProposal> result = new ArrayList<>();
Object value = convertRawValue(parameterRawValue, methodParameter);
if (value instanceof Collection && ((Collection) value).size() == arity
if (value instanceof Collection && ((Collection<?>) value).size() == arity
|| (ObjectUtils.isArray(value) && Array.getLength(value) == arity)) {
// We're done already
return result;

2
spring-shell-standard/src/test/java/org/springframework/shell/standard/CommandValueProviderTest.java
View File

@@ -51,7 +51,7 @@ public class CommandValueProviderTest {
@BeforeEach
public void setUp() {
MockitoAnnotations.initMocks(this);
MockitoAnnotations.openMocks(this);
}
@Test

1
spring-shell-test-samples/src/test/java/com/example/test/BaseCalculatorTest.java
View File

@@ -13,6 +13,7 @@ import org.springframework.shell.MethodTarget;
*/
public class BaseCalculatorTest {
@SuppressWarnings("unchecked")
protected <T> T invoke(final MethodTarget methodTarget, final Object... args) {
return (T) invokeMethod(methodTarget.getMethod(), methodTarget.getBean(), args);
}