feat(command): 调整spring-shell版本
使用一个正式版
This commit is contained in:
2
pom.xml
2
pom.xml
@@ -176,7 +176,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.shell</groupId>
|
<groupId>org.springframework.shell</groupId>
|
||||||
<artifactId>spring-shell-starter</artifactId>
|
<artifactId>spring-shell-starter</artifactId>
|
||||||
<version>2.1.0-M3</version>
|
<version>2.1.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>me.tongfei</groupId>
|
<groupId>me.tongfei</groupId>
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ import org.springframework.shell.CompletionProposal;
|
|||||||
import org.springframework.shell.standard.ShellComponent;
|
import org.springframework.shell.standard.ShellComponent;
|
||||||
import org.springframework.shell.standard.ShellMethod;
|
import org.springframework.shell.standard.ShellMethod;
|
||||||
import org.springframework.shell.standard.ShellOption;
|
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.BorderStyle;
|
||||||
import org.springframework.shell.table.TableBuilder;
|
import org.springframework.shell.table.TableBuilder;
|
||||||
import org.springframework.shell.table.TableModelBuilder;
|
import org.springframework.shell.table.TableModelBuilder;
|
||||||
@@ -194,9 +194,9 @@ public class JobCommand {
|
|||||||
ACCT_ITEM,
|
ACCT_ITEM,
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final class TableTypeValueProvider extends ValueProviderSupport {
|
public static final class TableTypeValueProvider implements ValueProvider {
|
||||||
@Override
|
@Override
|
||||||
public List<CompletionProposal> complete(MethodParameter parameter, CompletionContext context, String[] hints) {
|
public List<CompletionProposal> complete(CompletionContext context) {
|
||||||
return ListUtil.of(
|
return ListUtil.of(
|
||||||
new CompletionProposal("SMALL"),
|
new CompletionProposal("SMALL"),
|
||||||
new CompletionProposal("BIG"),
|
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
|
@Override
|
||||||
public List<CompletionProposal> complete(MethodParameter parameter, CompletionContext completionContext, String[] hints) {
|
public List<CompletionProposal> complete(CompletionContext completionContext) {
|
||||||
return ListUtil.of(
|
return ListUtil.of(
|
||||||
new CompletionProposal("UDAL"),
|
new CompletionProposal("UDAL"),
|
||||||
new CompletionProposal("TELEPG")
|
new CompletionProposal("TELEPG")
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package com.lanyuanxiaoyao.service.command.provider;
|
|||||||
import com.lanyuanxiaoyao.service.forest.service.InfoService;
|
import com.lanyuanxiaoyao.service.forest.service.InfoService;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import org.springframework.core.MethodParameter;
|
|
||||||
import org.springframework.shell.CompletionContext;
|
import org.springframework.shell.CompletionContext;
|
||||||
import org.springframework.shell.CompletionProposal;
|
import org.springframework.shell.CompletionProposal;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
@@ -24,7 +23,7 @@ public class AliasProvider extends BaseValueProvider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<CompletionProposal> complete(MethodParameter parameter, CompletionContext completionContext, String[] hints) {
|
public List<CompletionProposal> complete(CompletionContext completionContext) {
|
||||||
Optional<String> field = getField(completionContext.getWords(), "--flink-job-id");
|
Optional<String> field = getField(completionContext.getWords(), "--flink-job-id");
|
||||||
return field.map(id -> infoService.simpleTableMetas(Long.parseLong(id))
|
return field.map(id -> infoService.simpleTableMetas(Long.parseLong(id))
|
||||||
.collect(info -> new CompletionProposal(info.getAlias()).description(info.getSchema()))
|
.collect(info -> new CompletionProposal(info.getAlias()).description(info.getSchema()))
|
||||||
|
|||||||
@@ -2,13 +2,13 @@ package com.lanyuanxiaoyao.service.command.provider;
|
|||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import org.springframework.shell.standard.ValueProviderSupport;
|
import org.springframework.shell.standard.ValueProvider;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author ZhangJiacheng
|
* @author ZhangJiacheng
|
||||||
* @date 2022-05-30
|
* @date 2022-05-30
|
||||||
*/
|
*/
|
||||||
public abstract class BaseValueProvider extends ValueProviderSupport {
|
public abstract class BaseValueProvider implements ValueProvider {
|
||||||
protected Optional<String> getField(List<String> words, String fieldName) {
|
protected Optional<String> getField(List<String> words, String fieldName) {
|
||||||
boolean hasField = words.stream().anyMatch(word -> word.contains(fieldName));
|
boolean hasField = words.stream().anyMatch(word -> word.contains(fieldName));
|
||||||
if (hasField) {
|
if (hasField) {
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package com.lanyuanxiaoyao.service.command.provider;
|
|||||||
import com.lanyuanxiaoyao.service.forest.service.InfoService;
|
import com.lanyuanxiaoyao.service.forest.service.InfoService;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import org.springframework.core.MethodParameter;
|
|
||||||
import org.springframework.shell.CompletionContext;
|
import org.springframework.shell.CompletionContext;
|
||||||
import org.springframework.shell.CompletionProposal;
|
import org.springframework.shell.CompletionProposal;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
@@ -24,7 +23,7 @@ public class FlinkJobIdProvider extends BaseValueProvider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<CompletionProposal> complete(MethodParameter parameter, CompletionContext completionContext, String[] hints) {
|
public List<CompletionProposal> complete(CompletionContext completionContext) {
|
||||||
Optional<String> field = getField(completionContext.getWords(), "--table");
|
Optional<String> field = getField(completionContext.getWords(), "--table");
|
||||||
return field.map(id -> infoService.simpleTableMetas(field.get())
|
return field.map(id -> infoService.simpleTableMetas(field.get())
|
||||||
.collect(info -> new CompletionProposal(info.getFlinkJobId().toString()).description(info.getSchema()))
|
.collect(info -> new CompletionProposal(info.getFlinkJobId().toString()).description(info.getSchema()))
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import com.lanyuanxiaoyao.service.command.utils.SearchUtils;
|
|||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import org.springframework.core.MethodParameter;
|
|
||||||
import org.springframework.shell.CompletionContext;
|
import org.springframework.shell.CompletionContext;
|
||||||
import org.springframework.shell.CompletionProposal;
|
import org.springframework.shell.CompletionProposal;
|
||||||
|
|
||||||
@@ -14,7 +13,7 @@ import org.springframework.shell.CompletionProposal;
|
|||||||
*/
|
*/
|
||||||
public class SearchTypeValueProvider extends BaseValueProvider {
|
public class SearchTypeValueProvider extends BaseValueProvider {
|
||||||
@Override
|
@Override
|
||||||
public List<CompletionProposal> complete(MethodParameter parameter, CompletionContext completionContext, String[] hints) {
|
public List<CompletionProposal> complete(CompletionContext completionContext) {
|
||||||
return Arrays.stream(SearchUtils.Type.values())
|
return Arrays.stream(SearchUtils.Type.values())
|
||||||
.map(type -> new CompletionProposal(type.name()))
|
.map(type -> new CompletionProposal(type.name()))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|||||||
Reference in New Issue
Block a user