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

Add support for validation of expected number of documents in a YamlFileAst

Browse Source 
Use it to produce some errors for manifest.yml files.
This commit is contained in:
Kris De Volder
2017-01-20 13:47:15 -08:00
parent d044e5d5a6
commit 6eeeb0bb2a
12 changed files with 375 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/ValueParsers.java → vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/ConcourseValueParsers.java
View File

@@ -27,19 +27,7 @@ import com.google.common.collect.Multiset;
*
* @author Kris De Volder
*/
public class ValueParsers {
//TODO: some of the parsers here are pretty general purpose and could be moved to commons.
public static final ValueParser NE_STRING = (s) -> {
if (StringUtil.hasText(s)) {
return s;
} else {
throw new IllegalArgumentException("String should not be empty");
}
};
public static final ValueParser POS_INTEGER = integerRange(0, null);
public class ConcourseValueParsers {
public static final SchemaContextAware<ValueParser> resourceNameDef(ConcourseModel models) {
return acceptOnlyUniqueNames(models::getResourceNames, "resource name");
@@ -58,38 +46,13 @@ public class ValueParsers {
return (String input) -> {
if (resourceNames.count(input)<=1) {
//okay
return resourceNames;
return resourceNames;
}
throw new IllegalArgumentException("Duplicate "+typeName+" '"+input+"'");
};
};
};
public static ValueParser integerAtLeast(final Integer lowerBound) {
return integerRange(lowerBound, null);
}
public static ValueParser integerRange(final Integer lowerBound, final Integer upperBound) {
Assert.isLegal(lowerBound==null || upperBound==null || lowerBound <= upperBound);
return new ValueParser() {
@Override
public Object parse(String str) {
int value = Integer.parseInt(str);
if (lowerBound!=null && value<lowerBound) {
if (lowerBound==0) {
throw new NumberFormatException("Value must be positive");
} else {
throw new NumberFormatException("Value must be at least "+lowerBound);
}
}
if (upperBound!=null && value>upperBound) {
throw new NumberFormatException("Value must be at most "+upperBound);
}
return value;
}
};
}
public static ValueParser DURATION = new RegexpParser(
"^(([0-9]+(.[0-9]+)?)(ns|us|µs|ms|s|h|m))+$",
"Duration",
@@ -99,7 +62,7 @@ public class ValueParsers {
+ "'m', 'h'."
);
}

7
vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java
View File

@@ -12,6 +12,7 @@ package org.springframework.ide.vscode.concourse;
import org.springframework.ide.vscode.commons.util.Renderable;
import org.springframework.ide.vscode.commons.util.Renderables;
import org.springframework.ide.vscode.commons.util.ValueParsers;
import org.springframework.ide.vscode.commons.yaml.ast.NodeUtil;
import org.springframework.ide.vscode.commons.yaml.ast.YamlFileAST;
import org.springframework.ide.vscode.commons.yaml.path.YamlPath;
@@ -66,7 +67,7 @@ public class PipelineYmlSchema implements YamlSchema {
t_strictly_pos_integer.parseWith(ValueParsers.integerAtLeast(1));
YAtomicType t_duration = f.yatomic("Duration");
t_duration.parseWith(ValueParsers.DURATION);
t_duration.parseWith(ConcourseValueParsers.DURATION);
YAtomicType t_version = f.yatomic("Version");
t_version.addHints("latest", "every");
@@ -121,9 +122,9 @@ public class PipelineYmlSchema implements YamlSchema {
);
YAtomicType resourceNameDef = f.yatomic("Resource Name");
resourceNameDef.parseWith(ValueParsers.resourceNameDef(models));
resourceNameDef.parseWith(ConcourseValueParsers.resourceNameDef(models));
YAtomicType jobNameDef = f.yatomic("Job Name");
jobNameDef.parseWith(ValueParsers.jobNameDef(models));
jobNameDef.parseWith(ConcourseValueParsers.jobNameDef(models));
YBeanType getStep = f.ybean("GetStep");
addProp(getStep, "get", resourceName);