Skip to content

Commit 93f2cf0

Browse files
committed
Rename name to provider
- Align naming in CommandAvailability - Relates #663
1 parent 60126b9 commit 93f2cf0

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

spring-shell-core/src/main/java/org/springframework/shell/command/annotation/CommandAvailability.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
public @interface CommandAvailability {
3535

3636
/**
37-
* Names of supplier beans for {@link Availability}.
37+
* Names of provider beans for {@link Availability}.
3838
*
3939
* @return names of supplier beans
4040
*/
41-
String[] name() default {};
41+
String[] provider() default {};
4242
}

spring-shell-core/src/main/java/org/springframework/shell/command/annotation/support/CommandRegistrationFactoryBean.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@
3939
import org.springframework.messaging.handler.invocation.InvocableHandlerMethod;
4040
import org.springframework.shell.Availability;
4141
import org.springframework.shell.AvailabilityProvider;
42-
import org.springframework.shell.CompletionContext;
43-
import org.springframework.shell.CompletionProposal;
4442
import org.springframework.shell.Utils;
4543
import org.springframework.shell.command.CommandExceptionResolver;
4644
import org.springframework.shell.command.CommandHandlingResult;
@@ -55,7 +53,6 @@
5553
import org.springframework.shell.command.annotation.OptionValues;
5654
import org.springframework.shell.command.invocation.InvocableShellMethod;
5755
import org.springframework.shell.completion.CompletionProvider;
58-
import org.springframework.shell.completion.CompletionResolver;
5956
import org.springframework.shell.context.InteractionMode;
6057
import org.springframework.util.ClassUtils;
6158
import org.springframework.util.ObjectUtils;
@@ -172,7 +169,7 @@ private CommandRegistration buildRegistration() {
172169
MergedAnnotation<CommandAvailability> caAnn = MergedAnnotations.from(method, SearchStrategy.TYPE_HIERARCHY)
173170
.get(CommandAvailability.class);
174171
if (caAnn.isPresent()) {
175-
String[] refs = caAnn.getStringArray("name");
172+
String[] refs = caAnn.getStringArray("provider");
176173
List<AvailabilityProvider> avails = Stream.of(refs)
177174
.map(r -> {
178175
return this.applicationContext.getBean(r, AvailabilityProvider.class);

spring-shell-core/src/test/java/org/springframework/shell/command/annotation/support/CommandRegistrationFactoryBeanTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ void setsAvailabilitySupplier() {
138138
private static class AvailabilityIndicator {
139139

140140
@Command
141-
@CommandAvailability(name = "testAvailability")
141+
@CommandAvailability(provider = "testAvailability")
142142
void command1() {
143143
}
144144

spring-shell-samples/src/main/java/org/springframework/shell/samples/e2e/AvailabilityCommands.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public Availability testAvailability3LegacyAnnotationAvailability3() {
7171
public static class Annotation extends BaseE2ECommands {
7272

7373
@Command(command = "availability-1")
74-
@CommandAvailability(name = "testAvailability1AnnotationAvailability")
74+
@CommandAvailability(provider = "testAvailability1AnnotationAvailability")
7575
public String testAvailability1Annotation(
7676
) {
7777
return "Hello";

0 commit comments

Comments
 (0)