diff --git a/pom.xml b/pom.xml index 1c3ff22..6415a4a 100644 --- a/pom.xml +++ b/pom.xml @@ -176,7 +176,7 @@ org.springframework.shell spring-shell-starter - 2.1.0-M3 + 2.1.0 me.tongfei diff --git a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/JobCommand.java b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/JobCommand.java index 9a121e5..6b092c3 100644 --- a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/JobCommand.java +++ b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/JobCommand.java @@ -24,7 +24,7 @@ import org.springframework.shell.CompletionProposal; import org.springframework.shell.standard.ShellComponent; import org.springframework.shell.standard.ShellMethod; import org.springframework.shell.standard.ShellOption; -import org.springframework.shell.standard.ValueProviderSupport; +import org.springframework.shell.standard.ValueProvider; import org.springframework.shell.table.BorderStyle; import org.springframework.shell.table.TableBuilder; import org.springframework.shell.table.TableModelBuilder; @@ -194,9 +194,9 @@ public class JobCommand { ACCT_ITEM, } - public static final class TableTypeValueProvider extends ValueProviderSupport { + public static final class TableTypeValueProvider implements ValueProvider { @Override - public List complete(MethodParameter parameter, CompletionContext context, String[] hints) { + public List complete(CompletionContext context) { return ListUtil.of( new CompletionProposal("SMALL"), new CompletionProposal("BIG"), @@ -206,9 +206,9 @@ public class JobCommand { } } - public static final class DatabaseTypeValueProvider extends ValueProviderSupport { + public static final class DatabaseTypeValueProvider implements ValueProvider { @Override - public List complete(MethodParameter parameter, CompletionContext completionContext, String[] hints) { + public List complete(CompletionContext completionContext) { return ListUtil.of( new CompletionProposal("UDAL"), new CompletionProposal("TELEPG") diff --git a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/provider/AliasProvider.java b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/provider/AliasProvider.java index 1304b1b..bbe8d28 100644 --- a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/provider/AliasProvider.java +++ b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/provider/AliasProvider.java @@ -3,7 +3,6 @@ package com.lanyuanxiaoyao.service.command.provider; import com.lanyuanxiaoyao.service.forest.service.InfoService; import java.util.List; import java.util.Optional; -import org.springframework.core.MethodParameter; import org.springframework.shell.CompletionContext; import org.springframework.shell.CompletionProposal; import org.springframework.stereotype.Component; @@ -24,7 +23,7 @@ public class AliasProvider extends BaseValueProvider { } @Override - public List complete(MethodParameter parameter, CompletionContext completionContext, String[] hints) { + public List complete(CompletionContext completionContext) { Optional field = getField(completionContext.getWords(), "--flink-job-id"); return field.map(id -> infoService.simpleTableMetas(Long.parseLong(id)) .collect(info -> new CompletionProposal(info.getAlias()).description(info.getSchema())) diff --git a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/provider/BaseValueProvider.java b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/provider/BaseValueProvider.java index a45e8b8..c869e6b 100644 --- a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/provider/BaseValueProvider.java +++ b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/provider/BaseValueProvider.java @@ -2,13 +2,13 @@ package com.lanyuanxiaoyao.service.command.provider; import java.util.List; import java.util.Optional; -import org.springframework.shell.standard.ValueProviderSupport; +import org.springframework.shell.standard.ValueProvider; /** * @author ZhangJiacheng * @date 2022-05-30 */ -public abstract class BaseValueProvider extends ValueProviderSupport { +public abstract class BaseValueProvider implements ValueProvider { protected Optional getField(List words, String fieldName) { boolean hasField = words.stream().anyMatch(word -> word.contains(fieldName)); if (hasField) { diff --git a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/provider/FlinkJobIdProvider.java b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/provider/FlinkJobIdProvider.java index c293691..59035fc 100644 --- a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/provider/FlinkJobIdProvider.java +++ b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/provider/FlinkJobIdProvider.java @@ -3,7 +3,6 @@ package com.lanyuanxiaoyao.service.command.provider; import com.lanyuanxiaoyao.service.forest.service.InfoService; import java.util.List; import java.util.Optional; -import org.springframework.core.MethodParameter; import org.springframework.shell.CompletionContext; import org.springframework.shell.CompletionProposal; import org.springframework.stereotype.Component; @@ -24,7 +23,7 @@ public class FlinkJobIdProvider extends BaseValueProvider { } @Override - public List complete(MethodParameter parameter, CompletionContext completionContext, String[] hints) { + public List complete(CompletionContext completionContext) { Optional field = getField(completionContext.getWords(), "--table"); return field.map(id -> infoService.simpleTableMetas(field.get()) .collect(info -> new CompletionProposal(info.getFlinkJobId().toString()).description(info.getSchema())) diff --git a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/provider/SearchTypeValueProvider.java b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/provider/SearchTypeValueProvider.java index 24f5e70..6c56bc0 100644 --- a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/provider/SearchTypeValueProvider.java +++ b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/provider/SearchTypeValueProvider.java @@ -4,7 +4,6 @@ import com.lanyuanxiaoyao.service.command.utils.SearchUtils; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import org.springframework.core.MethodParameter; import org.springframework.shell.CompletionContext; import org.springframework.shell.CompletionProposal; @@ -14,7 +13,7 @@ import org.springframework.shell.CompletionProposal; */ public class SearchTypeValueProvider extends BaseValueProvider { @Override - public List complete(MethodParameter parameter, CompletionContext completionContext, String[] hints) { + public List complete(CompletionContext completionContext) { return Arrays.stream(SearchUtils.Type.values()) .map(type -> new CompletionProposal(type.name())) .collect(Collectors.toList());