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

Cloudconfig editor: verify 'at least one of' constraints in schema

Browse Source
This commit is contained in:
Kris De Volder
2017-08-09 16:26:47 -07:00
parent ec1dbc5e9f
commit 6dfd56d67f
3 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypeFactory.java
View File

@@ -25,6 +25,7 @@ import java.util.concurrent.Callable;
import java.util.function.BiFunction;
import java.util.stream.Collectors;
import org.springframework.ide.vscode.commons.languageserver.reconcile.IProblemCollector;
import org.springframework.ide.vscode.commons.languageserver.reconcile.ReconcileException;
import org.springframework.ide.vscode.commons.languageserver.reconcile.ReplacementQuickfix;
import org.springframework.ide.vscode.commons.util.Assert;
@@ -38,6 +39,8 @@ import org.springframework.ide.vscode.commons.yaml.reconcile.YamlSchemaProblems;
import org.springframework.ide.vscode.commons.yaml.schema.constraints.Constraint;
import org.springframework.ide.vscode.commons.yaml.schema.constraints.Constraints;
import org.springframework.ide.vscode.commons.yaml.snippet.TypeBasedSnippetProvider;
import org.yaml.snakeyaml.nodes.Node;
import org.yaml.snakeyaml.nodes.SequenceNode;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableList.Builder;
@@ -601,6 +604,16 @@ public class YTypeFactory {
public YType getDomainType() {
return el;
}
public YSeqType notEmpty() {
require((DynamicSchemaContext dc, Node parent, Node node, YType type, IProblemCollector problems) -> {
SequenceNode seq = (SequenceNode) node;
if (seq.getValue().size()==0) {
problems.accept(YamlSchemaProblems.schemaProblem("At least one '"+el+"' is required", node));
}
});
return this;
}
}
public static class YBeanType extends AbstractType {