From b72f84eedd7be67a5152b2321ee905c1b470b838 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Thu, 4 May 2017 10:56:19 -0700 Subject: [PATCH 1/2] Don't allow defining 'routes' toplevel Doesn't make much sense to deploy more than one app with the same route (this will result in an error, you can only bind one thing to a route / host). --- .../ide/vscode/manifest/yaml/ManifestYmlSchema.java | 2 +- .../ide/vscode/manifest/yaml/ManifestYamlEditorTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlSchema.java b/headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlSchema.java index 241c42215..3bf3bde01 100644 --- a/headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlSchema.java +++ b/headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlSchema.java @@ -52,7 +52,7 @@ public class ManifestYmlSchema implements YamlSchema { public final AbstractType t_route_string; private static final Set TOPLEVEL_EXCLUDED = ImmutableSet.of( - "name", "host", "hosts" + "name", "host", "hosts", "routes" ); @Override diff --git a/headless-services/manifest-yaml-language-server/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlEditorTest.java b/headless-services/manifest-yaml-language-server/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlEditorTest.java index 79abdc17d..0bc27aaa1 100644 --- a/headless-services/manifest-yaml-language-server/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlEditorTest.java +++ b/headless-services/manifest-yaml-language-server/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlEditorTest.java @@ -291,8 +291,8 @@ public class ManifestYamlEditorTest { // --------------- "random-route: <*>", // --------------- - "routes:\n"+ - "- route: <*>", +// "routes:\n"+ +// "- route: <*>", // --------------- "services:\n"+ "- <*>", From dab8b8c5206d921e2ba5328dd63993a3d818e64b Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Thu, 4 May 2017 11:00:35 -0700 Subject: [PATCH 2/2] Fix test failure --- .../ide/vscode/manifest/yaml/ManifestYmlSchemaTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/headless-services/manifest-yaml-language-server/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlSchemaTest.java b/headless-services/manifest-yaml-language-server/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlSchemaTest.java index 31ca4e5ff..d6c0ab5ef 100644 --- a/headless-services/manifest-yaml-language-server/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlSchemaTest.java +++ b/headless-services/manifest-yaml-language-server/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlSchemaTest.java @@ -82,7 +82,7 @@ public class ManifestYmlSchemaTest { "no-route", "path", "random-route", - "routes", +// "routes", "services", "stack", "timeout"