WIP: fixing unit tests

Author: BoykoAlex

headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/SchemaBasedYamlASTReconciler.java

@@ -100,21 +100,23 @@ public void reconcile(YamlFileAST ast) {
 		slowDelayedConstraints.clear();
 		try {
 			List<Node> nodes = ast.getNodes();
+			boolean emptyDoc = isEmptyDoc(ast);
 			IntegerRange expectedDocs = schema.expectedNumberOfDocuments();
-			if (!expectedDocs.isInRange(nodes.size())) {
+			int numberOfDocs = emptyDoc ? 0 : nodes.size();
+			if (!expectedDocs.isInRange(numberOfDocs)) {
 				//wrong number of documents in the file. Figure out a good error message.
-				if (nodes.isEmpty()) {
+				if (emptyDoc) {
 					problem(allOf(ast.getDocument()), "'"+schema.getName()+"' must have at least some Yaml content");
-				} else if (expectedDocs.isTooLarge(nodes.size())) {
+				} else if (expectedDocs.isTooLarge(numberOfDocs)) {
 					int upperBound = expectedDocs.getUpperBound();
 					Node extraNode = nodes.get(upperBound);
 					problem(dashesAtStartOf(ast, extraNode), "'"+schema.getName()+"' should not have more than "+upperBound+" Yaml Documents");
-				} else if (expectedDocs.isTooSmall(nodes.size())) {
+				} else if (expectedDocs.isTooSmall(numberOfDocs)) {
 					int lowerBound = expectedDocs.getLowerBound();
 					problem(endOf(ast.getDocument()), "'"+schema.getName()+"' should have at least "+lowerBound+" Yaml Documents");
 				}
 			}
-			if (nodes!=null && !nodes.isEmpty()) {
+			if (!emptyDoc && nodes!=null && !nodes.isEmpty()) {
 				for (int i = 0; i < nodes.size(); i++) {
 					Node node = nodes.get(i);
 					reconcile(ast, new YamlPath(YamlPathSegment.valueAt(i)), /*parent*/null, node, schema.getTopLevelType());
@@ -127,6 +129,21 @@ public void reconcile(YamlFileAST ast) {
 			verifyDelayedConstraints();
 		}
 	}
+	
+	private static boolean isEmptyDoc(YamlFileAST ast) {
+		List<Node> nodes = ast.getNodes();
+		if (nodes != null && !nodes.isEmpty()) {
+			if (nodes.size() == 1) {
+				Node n = nodes.get(0);
+				if (n instanceof MappingNode) {
+					MappingNode mn = (MappingNode) n;
+					return mn.getValue().isEmpty();
+				}
+			}
+			return false;
+		}
+		return true;
+	}
 
 	private DocumentRegion dashesAtStartOf(YamlFileAST ast, Node node) {
 		try {
@@ -241,7 +258,7 @@ private void parse(YamlFileAST ast, Node node, YType type, ValueParser parser) {
 			}
 		} catch (Exception e) {
 			// check for YTT
-			if (isYttUsed(node)) {
+			if (!isYttUsed(node)) {
 				ProblemType problemType = getProblemType(e);
 				DocumentRegion region = getRegion(e, ast.getDocument(), node);
 				String msg = getMessage(e);
@@ -250,9 +267,9 @@ private void parse(YamlFileAST ast, Node node, YType type, ValueParser parser) {
 		}
 	}
 
-	private boolean isYttUsed(Node node) {
+	private static boolean isYttUsed(Node node) {
 		if (node.getBlockComments() != null) {
-			return node.getBlockComments().stream().anyMatch(cl -> cl.getValue().startsWith("@"));
+			return node.getBlockComments().stream().anyMatch(cl -> cl.getValue().trim().startsWith("@"));
 		}
 		return false;
 	}