From ac92d37d75be92d849fdfad91a8c240ff1447e9f Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Thu, 20 Oct 2016 10:03:25 -0700 Subject: [PATCH] commons-yaml package renames Bring package names inline with project-name --- .../properties/metadata/types/Type.java | 2 +- .../metadata/types/TypedProperty.java | 4 +-- .../{ => commons}/yaml/ast/NodeRef.java | 2 +- .../{ => commons}/yaml/ast/NodeUtil.java | 2 +- .../yaml/ast/YamlASTProvider.java | 2 +- .../{ => commons}/yaml/ast/YamlFileAST.java | 12 ++++----- .../{ => commons}/yaml/ast/YamlParser.java | 2 +- .../completion/AbstractYamlAssistContext.java | 16 ++++++------ .../yaml/completion/CompletionFactory.java | 8 +++--- .../completion/DefaultCompletionFactory.java | 8 +++--- .../SchemaBasedYamlAssistContextProvider.java | 6 ++--- .../completion/TopLevelAssistContext.java | 8 +++--- .../yaml/completion/YTypeAssistContext.java | 26 +++++++++---------- .../yaml/completion/YamlAssistContext.java | 8 +++--- .../completion/YamlAssistContextProvider.java | 4 +-- .../yaml/completion/YamlCompletionEngine.java | 20 +++++++------- .../yaml/completion/YamlPathEdits.java | 22 ++++++++-------- .../{ => commons}/yaml/path/KeyAliases.java | 2 +- .../yaml/path/YamlNavigable.java | 4 +-- .../{ => commons}/yaml/path/YamlPath.java | 14 +++++----- .../yaml/path/YamlPathSegment.java | 2 +- .../SchemaBasedYamlASTReconciler.java | 14 +++++----- .../yaml/reconcile/YamlASTReconciler.java | 7 +++++ .../yaml/reconcile/YamlReconcileEngine.java | 6 ++--- .../YamlSchemaBasedReconcileEngine.java | 6 ++--- .../yaml/reconcile/YamlSchemaProblems.java | 2 +- .../yaml/schema/BasicYValueHint.java | 2 +- .../{ => commons}/yaml/schema/YType.java | 2 +- .../yaml/schema/YTypeFactory.java | 4 +-- .../{ => commons}/yaml/schema/YTypeUtil.java | 2 +- .../yaml/schema/YTypedProperty.java | 2 +- .../{ => commons}/yaml/schema/YValueHint.java | 2 +- .../{ => commons}/yaml/schema/YamlSchema.java | 2 +- .../yaml/structure/YamlDocument.java | 4 +-- .../yaml/structure/YamlStructureParser.java | 12 ++++----- .../yaml/structure/YamlStructureProvider.java | 6 ++--- .../yaml/util/DescriptionProviders.java | 2 +- .../{ => commons}/yaml/util/IOUtil.java | 2 +- .../yaml/util/YamlIndentUtil.java | 4 +-- .../{ => commons}/yaml/util/YamlUtil.java | 2 +- .../yaml/reconcile/YamlASTReconciler.java | 7 ----- .../structure/YamlStructureParserTest.java | 17 +++++++----- .../yaml/ApplicationYamlLanguageServer.java | 4 +-- .../ReplaceDeprecatedYamlQuickfix.java | 18 ++++++------- .../ApplicationYamlASTReconciler.java | 15 ++++++----- .../ApplicationYamlReconcileEngine.java | 4 ++- .../editor/ManifestYamlLanguageServer.java | 18 ++++++------- .../manifest/editor/ManifestYmlSchema.java | 18 ++++++------- .../editor/VscodeCompletionEngineAdapter.java | 4 +-- .../vscode/yaml/ManifestYmlSchemaTest.java | 8 +++--- 50 files changed, 188 insertions(+), 182 deletions(-) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/ast/NodeRef.java (98%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/ast/NodeUtil.java (96%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/ast/YamlASTProvider.java (76%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/ast/YamlFileAST.java (90%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/ast/YamlParser.java (88%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/completion/AbstractYamlAssistContext.java (84%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/completion/CompletionFactory.java (71%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/completion/DefaultCompletionFactory.java (95%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/completion/SchemaBasedYamlAssistContextProvider.java (85%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/completion/TopLevelAssistContext.java (87%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/completion/YTypeAssistContext.java (89%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/completion/YamlAssistContext.java (79%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/completion/YamlAssistContextProvider.java (84%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/completion/YamlCompletionEngine.java (86%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/completion/YamlPathEdits.java (87%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/path/KeyAliases.java (95%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/path/YamlNavigable.java (85%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/path/YamlPath.java (92%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/path/YamlPathSegment.java (98%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/reconcile/SchemaBasedYamlASTReconciler.java (90%) create mode 100644 vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlASTReconciler.java rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/reconcile/YamlReconcileEngine.java (90%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/reconcile/YamlSchemaBasedReconcileEngine.java (80%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/reconcile/YamlSchemaProblems.java (95%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/schema/BasicYValueHint.java (97%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/schema/YType.java (94%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/schema/YTypeFactory.java (98%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/schema/YTypeUtil.java (95%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/schema/YTypedProperty.java (92%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/schema/YValueHint.java (90%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/schema/YamlSchema.java (93%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/structure/YamlDocument.java (96%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/structure/YamlStructureParser.java (97%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/structure/YamlStructureProvider.java (88%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/util/DescriptionProviders.java (97%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/util/IOUtil.java (97%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/util/YamlIndentUtil.java (95%) rename vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/{ => commons}/yaml/util/YamlUtil.java (97%) delete mode 100644 vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/YamlASTReconciler.java diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/Type.java b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/Type.java index 7992fe430..e25bfed30 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/Type.java +++ b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/Type.java @@ -20,7 +20,7 @@ import org.springframework.ide.vscode.commons.util.ArrayUtils; import org.springframework.ide.vscode.commons.util.Assert; import org.springframework.ide.vscode.commons.util.Log; import org.springframework.ide.vscode.commons.util.StringUtil; -import org.springframework.ide.vscode.yaml.schema.YType; +import org.springframework.ide.vscode.commons.yaml.schema.YType; /** * @author Kris De Volder diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/TypedProperty.java b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/TypedProperty.java index 7504117fd..c26c44c3d 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/TypedProperty.java +++ b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/TypedProperty.java @@ -4,8 +4,8 @@ import javax.inject.Provider; import org.springframework.boot.configurationmetadata.Deprecation; import org.springframework.ide.vscode.commons.util.HtmlSnippet; -import org.springframework.ide.vscode.yaml.schema.YTypedProperty; -import org.springframework.ide.vscode.yaml.util.DescriptionProviders; +import org.springframework.ide.vscode.commons.yaml.schema.YTypedProperty; +import org.springframework.ide.vscode.commons.yaml.util.DescriptionProviders; /** * Represents a property on a Type that can be accessed by name. diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/ast/NodeRef.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/NodeRef.java similarity index 98% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/ast/NodeRef.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/NodeRef.java index ac66c83cf..09b14cb1a 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/ast/NodeRef.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/NodeRef.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.yaml.ast; +package org.springframework.ide.vscode.commons.yaml.ast; import org.yaml.snakeyaml.nodes.MappingNode; import org.yaml.snakeyaml.nodes.Node; diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/ast/NodeUtil.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/NodeUtil.java similarity index 96% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/ast/NodeUtil.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/NodeUtil.java index 31451de43..02b06b84a 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/ast/NodeUtil.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/NodeUtil.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.yaml.ast; +package org.springframework.ide.vscode.commons.yaml.ast; import org.yaml.snakeyaml.nodes.Node; import org.yaml.snakeyaml.nodes.NodeId; diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/ast/YamlASTProvider.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/YamlASTProvider.java similarity index 76% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/ast/YamlASTProvider.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/YamlASTProvider.java index abe0be822..2ad617be7 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/ast/YamlASTProvider.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/YamlASTProvider.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.yaml.ast; +package org.springframework.ide.vscode.commons.yaml.ast; import org.springframework.ide.vscode.commons.languageserver.util.IDocument; diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/ast/YamlFileAST.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/YamlFileAST.java similarity index 90% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/ast/YamlFileAST.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/YamlFileAST.java index 21f8aa343..89ee1283a 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/ast/YamlFileAST.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/YamlFileAST.java @@ -1,6 +1,6 @@ -package org.springframework.ide.vscode.yaml.ast; +package org.springframework.ide.vscode.commons.yaml.ast; -import static org.springframework.ide.vscode.yaml.ast.NodeUtil.contains; +import static org.springframework.ide.vscode.commons.yaml.ast.NodeUtil.contains; import java.util.ArrayList; import java.util.Collections; @@ -9,10 +9,10 @@ import java.util.List; import org.springframework.ide.vscode.commons.util.Collector; import org.springframework.ide.vscode.commons.util.IRequestor; import org.springframework.ide.vscode.commons.util.RememberLast; -import org.springframework.ide.vscode.yaml.ast.NodeRef.RootRef; -import org.springframework.ide.vscode.yaml.ast.NodeRef.SeqRef; -import org.springframework.ide.vscode.yaml.ast.NodeRef.TupleKeyRef; -import org.springframework.ide.vscode.yaml.ast.NodeRef.TupleValueRef; +import org.springframework.ide.vscode.commons.yaml.ast.NodeRef.RootRef; +import org.springframework.ide.vscode.commons.yaml.ast.NodeRef.SeqRef; +import org.springframework.ide.vscode.commons.yaml.ast.NodeRef.TupleKeyRef; +import org.springframework.ide.vscode.commons.yaml.ast.NodeRef.TupleValueRef; import org.yaml.snakeyaml.nodes.MappingNode; import org.yaml.snakeyaml.nodes.Node; import org.yaml.snakeyaml.nodes.SequenceNode; diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/ast/YamlParser.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/YamlParser.java similarity index 88% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/ast/YamlParser.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/YamlParser.java index fc4111372..b268901b0 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/ast/YamlParser.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/YamlParser.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.yaml.ast; +package org.springframework.ide.vscode.commons.yaml.ast; import java.io.StringReader; diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/AbstractYamlAssistContext.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/AbstractYamlAssistContext.java similarity index 84% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/AbstractYamlAssistContext.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/AbstractYamlAssistContext.java index 020e6e46a..a24a03bd1 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/AbstractYamlAssistContext.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/AbstractYamlAssistContext.java @@ -8,16 +8,16 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.yaml.completion; +package org.springframework.ide.vscode.commons.yaml.completion; import org.springframework.ide.vscode.commons.languageserver.util.PrefixFinder; -import org.springframework.ide.vscode.yaml.path.YamlPath; -import org.springframework.ide.vscode.yaml.structure.YamlDocument; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SDocNode; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SKeyNode; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SNode; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SNodeType; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SRootNode; +import org.springframework.ide.vscode.commons.yaml.path.YamlPath; +import org.springframework.ide.vscode.commons.yaml.structure.YamlDocument; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SDocNode; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SKeyNode; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SNode; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SNodeType; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SRootNode; /** * @author Kris De Volder diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/CompletionFactory.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/CompletionFactory.java similarity index 71% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/CompletionFactory.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/CompletionFactory.java index 92a34505b..860d72e3d 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/CompletionFactory.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/CompletionFactory.java @@ -1,11 +1,11 @@ -package org.springframework.ide.vscode.yaml.completion; +package org.springframework.ide.vscode.commons.yaml.completion; import org.springframework.ide.vscode.commons.languageserver.completion.DocumentEdits; import org.springframework.ide.vscode.commons.languageserver.completion.ICompletionProposal; import org.springframework.ide.vscode.commons.languageserver.util.IDocument; -import org.springframework.ide.vscode.yaml.schema.YType; -import org.springframework.ide.vscode.yaml.schema.YTypeUtil; -import org.springframework.ide.vscode.yaml.schema.YTypedProperty; +import org.springframework.ide.vscode.commons.yaml.schema.YType; +import org.springframework.ide.vscode.commons.yaml.schema.YTypeUtil; +import org.springframework.ide.vscode.commons.yaml.schema.YTypedProperty; public interface CompletionFactory { diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/DefaultCompletionFactory.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/DefaultCompletionFactory.java similarity index 95% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/DefaultCompletionFactory.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/DefaultCompletionFactory.java index bcf1705b4..0c6c4b20e 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/DefaultCompletionFactory.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/DefaultCompletionFactory.java @@ -1,13 +1,13 @@ -package org.springframework.ide.vscode.yaml.completion; +package org.springframework.ide.vscode.commons.yaml.completion; import java.util.Comparator; import org.springframework.ide.vscode.commons.languageserver.completion.DocumentEdits; import org.springframework.ide.vscode.commons.languageserver.completion.ICompletionProposal; import org.springframework.ide.vscode.commons.languageserver.util.IDocument; -import org.springframework.ide.vscode.yaml.schema.YType; -import org.springframework.ide.vscode.yaml.schema.YTypeUtil; -import org.springframework.ide.vscode.yaml.schema.YTypedProperty; +import org.springframework.ide.vscode.commons.yaml.schema.YType; +import org.springframework.ide.vscode.commons.yaml.schema.YTypeUtil; +import org.springframework.ide.vscode.commons.yaml.schema.YTypedProperty; import io.typefox.lsapi.CompletionItemKind; diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/SchemaBasedYamlAssistContextProvider.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/SchemaBasedYamlAssistContextProvider.java similarity index 85% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/SchemaBasedYamlAssistContextProvider.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/SchemaBasedYamlAssistContextProvider.java index 999eec940..1b732b474 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/SchemaBasedYamlAssistContextProvider.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/SchemaBasedYamlAssistContextProvider.java @@ -8,10 +8,10 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.yaml.completion; +package org.springframework.ide.vscode.commons.yaml.completion; -import org.springframework.ide.vscode.yaml.schema.YamlSchema; -import org.springframework.ide.vscode.yaml.structure.YamlDocument; +import org.springframework.ide.vscode.commons.yaml.schema.YamlSchema; +import org.springframework.ide.vscode.commons.yaml.structure.YamlDocument; /** * A {@link YamlAssistContextProvider} that creates {@link YamlAssistContext}s from {@link YamlSchema} diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/TopLevelAssistContext.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/TopLevelAssistContext.java similarity index 87% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/TopLevelAssistContext.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/TopLevelAssistContext.java index 503ffdf64..5af1466d1 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/TopLevelAssistContext.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/TopLevelAssistContext.java @@ -8,15 +8,15 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.yaml.completion; +package org.springframework.ide.vscode.commons.yaml.completion; import java.util.Collection; import java.util.Collections; import org.springframework.ide.vscode.commons.languageserver.completion.ICompletionProposal; -import org.springframework.ide.vscode.yaml.path.YamlPathSegment; -import org.springframework.ide.vscode.yaml.structure.YamlDocument; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SNode; +import org.springframework.ide.vscode.commons.yaml.path.YamlPathSegment; +import org.springframework.ide.vscode.commons.yaml.structure.YamlDocument; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SNode; /** * Abstract YamlAssistContext for the toplevel of a YamlDocument. diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/YTypeAssistContext.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YTypeAssistContext.java similarity index 89% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/YTypeAssistContext.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YTypeAssistContext.java index 3e67c1cda..54b1e361b 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/YTypeAssistContext.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YTypeAssistContext.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.yaml.completion; +package org.springframework.ide.vscode.commons.yaml.completion; import java.util.ArrayList; import java.util.Collection; @@ -24,18 +24,18 @@ import org.springframework.ide.vscode.commons.languageserver.completion.Document import org.springframework.ide.vscode.commons.languageserver.completion.ICompletionProposal; import org.springframework.ide.vscode.commons.util.CollectionUtil; import org.springframework.ide.vscode.commons.util.FuzzyMatcher; -import org.springframework.ide.vscode.yaml.path.YamlPath; -import org.springframework.ide.vscode.yaml.path.YamlPathSegment; -import org.springframework.ide.vscode.yaml.path.YamlPathSegment.YamlPathSegmentType; -import org.springframework.ide.vscode.yaml.schema.YType; -import org.springframework.ide.vscode.yaml.schema.YTypeUtil; -import org.springframework.ide.vscode.yaml.schema.YTypedProperty; -import org.springframework.ide.vscode.yaml.schema.YValueHint; -import org.springframework.ide.vscode.yaml.structure.YamlDocument; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SChildBearingNode; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SKeyNode; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SNode; -import org.springframework.ide.vscode.yaml.util.YamlIndentUtil; +import org.springframework.ide.vscode.commons.yaml.path.YamlPath; +import org.springframework.ide.vscode.commons.yaml.path.YamlPathSegment; +import org.springframework.ide.vscode.commons.yaml.path.YamlPathSegment.YamlPathSegmentType; +import org.springframework.ide.vscode.commons.yaml.schema.YType; +import org.springframework.ide.vscode.commons.yaml.schema.YTypeUtil; +import org.springframework.ide.vscode.commons.yaml.schema.YTypedProperty; +import org.springframework.ide.vscode.commons.yaml.schema.YValueHint; +import org.springframework.ide.vscode.commons.yaml.structure.YamlDocument; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SChildBearingNode; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SKeyNode; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SNode; +import org.springframework.ide.vscode.commons.yaml.util.YamlIndentUtil; public class YTypeAssistContext extends AbstractYamlAssistContext { diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/YamlAssistContext.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YamlAssistContext.java similarity index 79% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/YamlAssistContext.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YamlAssistContext.java index 9f3c2ee5d..afc5a0a52 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/YamlAssistContext.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YamlAssistContext.java @@ -8,14 +8,14 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.yaml.completion; +package org.springframework.ide.vscode.commons.yaml.completion; import java.util.Collection; import org.springframework.ide.vscode.commons.languageserver.completion.ICompletionProposal; -import org.springframework.ide.vscode.yaml.path.YamlNavigable; -import org.springframework.ide.vscode.yaml.structure.YamlDocument; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SNode; +import org.springframework.ide.vscode.commons.yaml.path.YamlNavigable; +import org.springframework.ide.vscode.commons.yaml.structure.YamlDocument; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SNode; /** * @author Kris De Volder diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/YamlAssistContextProvider.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YamlAssistContextProvider.java similarity index 84% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/YamlAssistContextProvider.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YamlAssistContextProvider.java index de06c694d..d5bbd29fb 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/YamlAssistContextProvider.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YamlAssistContextProvider.java @@ -8,9 +8,9 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.yaml.completion; +package org.springframework.ide.vscode.commons.yaml.completion; -import org.springframework.ide.vscode.yaml.structure.YamlDocument; +import org.springframework.ide.vscode.commons.yaml.structure.YamlDocument; /** * Defines a way to obtain a 'toplevel' {@link YamlAssistContext} for a given {@link YamlDocument} diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/YamlCompletionEngine.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YamlCompletionEngine.java similarity index 86% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/YamlCompletionEngine.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YamlCompletionEngine.java index 16eaff95b..1e2ca714a 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/YamlCompletionEngine.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YamlCompletionEngine.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.yaml.completion; +package org.springframework.ide.vscode.commons.yaml.completion; import java.util.Collection; import java.util.Collections; @@ -19,15 +19,15 @@ import org.springframework.ide.vscode.commons.languageserver.completion.IComplet import org.springframework.ide.vscode.commons.languageserver.completion.ICompletionProposal; import org.springframework.ide.vscode.commons.languageserver.util.IDocument; import org.springframework.ide.vscode.commons.util.Assert; -import org.springframework.ide.vscode.yaml.path.YamlPath; -import org.springframework.ide.vscode.yaml.structure.YamlDocument; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SKeyNode; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SNode; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SNodeType; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SRootNode; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SSeqNode; -import org.springframework.ide.vscode.yaml.structure.YamlStructureProvider; -import org.springframework.ide.vscode.yaml.util.YamlIndentUtil; +import org.springframework.ide.vscode.commons.yaml.path.YamlPath; +import org.springframework.ide.vscode.commons.yaml.structure.YamlDocument; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureProvider; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SKeyNode; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SNode; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SNodeType; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SRootNode; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SSeqNode; +import org.springframework.ide.vscode.commons.yaml.util.YamlIndentUtil; /** * Implements {@link ICompletionEngine} for .yml file, based on a YamlAssistContextProvider diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/YamlPathEdits.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YamlPathEdits.java similarity index 87% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/YamlPathEdits.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YamlPathEdits.java index 1ab25e3d0..f4577d3f2 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/YamlPathEdits.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YamlPathEdits.java @@ -8,21 +8,21 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.yaml.completion; +package org.springframework.ide.vscode.commons.yaml.completion; import org.springframework.ide.vscode.commons.languageserver.completion.DocumentEdits; import org.springframework.ide.vscode.commons.languageserver.util.IRegion; import org.springframework.ide.vscode.commons.util.Assert; -import org.springframework.ide.vscode.yaml.path.YamlPath; -import org.springframework.ide.vscode.yaml.path.YamlPathSegment; -import org.springframework.ide.vscode.yaml.path.YamlPathSegment.YamlPathSegmentType; -import org.springframework.ide.vscode.yaml.structure.YamlDocument; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SChildBearingNode; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SKeyNode; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SNode; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SNodeType; -import org.springframework.ide.vscode.yaml.util.YamlIndentUtil; -import org.springframework.ide.vscode.yaml.util.YamlUtil; +import org.springframework.ide.vscode.commons.yaml.path.YamlPath; +import org.springframework.ide.vscode.commons.yaml.path.YamlPathSegment; +import org.springframework.ide.vscode.commons.yaml.path.YamlPathSegment.YamlPathSegmentType; +import org.springframework.ide.vscode.commons.yaml.structure.YamlDocument; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SChildBearingNode; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SKeyNode; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SNode; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SNodeType; +import org.springframework.ide.vscode.commons.yaml.util.YamlIndentUtil; +import org.springframework.ide.vscode.commons.yaml.util.YamlUtil; /** * Helper class that provides methods for creating the edits in a YamlDocument that diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/path/KeyAliases.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/KeyAliases.java similarity index 95% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/path/KeyAliases.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/KeyAliases.java index 5bb948d7f..edac970c4 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/path/KeyAliases.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/KeyAliases.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.yaml.path; +package org.springframework.ide.vscode.commons.yaml.path; import java.util.Collections; diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/path/YamlNavigable.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/YamlNavigable.java similarity index 85% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/path/YamlNavigable.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/YamlNavigable.java index e3be2328a..f22d67328 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/path/YamlNavigable.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/YamlNavigable.java @@ -8,9 +8,9 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.yaml.path; +package org.springframework.ide.vscode.commons.yaml.path; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SNode; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SNode; /** * Different types of things (e.g. {@link ApplicationYamlAssistContext}, {@link SNode} ...) can diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/path/YamlPath.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/YamlPath.java similarity index 92% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/path/YamlPath.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/YamlPath.java index 5cbe2aea7..98618518a 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/path/YamlPath.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/YamlPath.java @@ -8,18 +8,18 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.yaml.path; +package org.springframework.ide.vscode.commons.yaml.path; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.springframework.ide.vscode.yaml.ast.NodeRef; -import org.springframework.ide.vscode.yaml.ast.NodeRef.RootRef; -import org.springframework.ide.vscode.yaml.ast.NodeRef.SeqRef; -import org.springframework.ide.vscode.yaml.ast.NodeRef.TupleValueRef; -import org.springframework.ide.vscode.yaml.ast.NodeUtil; -import org.springframework.ide.vscode.yaml.path.YamlPathSegment.YamlPathSegmentType; +import org.springframework.ide.vscode.commons.yaml.ast.NodeRef; +import org.springframework.ide.vscode.commons.yaml.ast.NodeUtil; +import org.springframework.ide.vscode.commons.yaml.ast.NodeRef.RootRef; +import org.springframework.ide.vscode.commons.yaml.ast.NodeRef.SeqRef; +import org.springframework.ide.vscode.commons.yaml.ast.NodeRef.TupleValueRef; +import org.springframework.ide.vscode.commons.yaml.path.YamlPathSegment.YamlPathSegmentType; /** * @author Kris De Volder diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/path/YamlPathSegment.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/YamlPathSegment.java similarity index 98% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/path/YamlPathSegment.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/YamlPathSegment.java index aa5ee75da..18b66755e 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/path/YamlPathSegment.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/YamlPathSegment.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.yaml.path; +package org.springframework.ide.vscode.commons.yaml.path; /** * A YamlPathSegment is a 'primitive' NodeNavigator operation. diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/SchemaBasedYamlASTReconciler.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/SchemaBasedYamlASTReconciler.java similarity index 90% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/SchemaBasedYamlASTReconciler.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/SchemaBasedYamlASTReconciler.java index d3a8d2f15..ecd3e0121 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/SchemaBasedYamlASTReconciler.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/SchemaBasedYamlASTReconciler.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.yaml.reconcile; +package org.springframework.ide.vscode.commons.yaml.reconcile; import java.util.ArrayList; import java.util.List; @@ -8,12 +8,12 @@ import org.springframework.ide.vscode.commons.languageserver.reconcile.IProblemC import org.springframework.ide.vscode.commons.util.ExceptionUtil; import org.springframework.ide.vscode.commons.util.StringUtil; import org.springframework.ide.vscode.commons.util.ValueParser; -import org.springframework.ide.vscode.yaml.ast.NodeUtil; -import org.springframework.ide.vscode.yaml.ast.YamlFileAST; -import org.springframework.ide.vscode.yaml.schema.YType; -import org.springframework.ide.vscode.yaml.schema.YTypeUtil; -import org.springframework.ide.vscode.yaml.schema.YTypedProperty; -import org.springframework.ide.vscode.yaml.schema.YamlSchema; +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.schema.YType; +import org.springframework.ide.vscode.commons.yaml.schema.YTypeUtil; +import org.springframework.ide.vscode.commons.yaml.schema.YTypedProperty; +import org.springframework.ide.vscode.commons.yaml.schema.YamlSchema; import org.yaml.snakeyaml.nodes.MappingNode; import org.yaml.snakeyaml.nodes.Node; import org.yaml.snakeyaml.nodes.NodeTuple; diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlASTReconciler.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlASTReconciler.java new file mode 100644 index 000000000..d6242f905 --- /dev/null +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlASTReconciler.java @@ -0,0 +1,7 @@ +package org.springframework.ide.vscode.commons.yaml.reconcile; + +import org.springframework.ide.vscode.commons.yaml.ast.YamlFileAST; + +public interface YamlASTReconciler { + void reconcile(YamlFileAST ast); +} diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/YamlReconcileEngine.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlReconcileEngine.java similarity index 90% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/YamlReconcileEngine.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlReconcileEngine.java index 51f9bb980..56cd0f227 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/YamlReconcileEngine.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlReconcileEngine.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.yaml.reconcile; +package org.springframework.ide.vscode.commons.yaml.reconcile; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -6,8 +6,8 @@ import org.springframework.ide.vscode.commons.languageserver.reconcile.IProblemC import org.springframework.ide.vscode.commons.languageserver.reconcile.IReconcileEngine; import org.springframework.ide.vscode.commons.languageserver.reconcile.ReconcileProblem; import org.springframework.ide.vscode.commons.languageserver.util.IDocument; -import org.springframework.ide.vscode.yaml.ast.YamlASTProvider; -import org.springframework.ide.vscode.yaml.ast.YamlFileAST; +import org.springframework.ide.vscode.commons.yaml.ast.YamlASTProvider; +import org.springframework.ide.vscode.commons.yaml.ast.YamlFileAST; import org.yaml.snakeyaml.error.Mark; import org.yaml.snakeyaml.parser.ParserException; import org.yaml.snakeyaml.scanner.ScannerException; diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/YamlSchemaBasedReconcileEngine.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlSchemaBasedReconcileEngine.java similarity index 80% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/YamlSchemaBasedReconcileEngine.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlSchemaBasedReconcileEngine.java index 76fbea103..acaade9f5 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/YamlSchemaBasedReconcileEngine.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlSchemaBasedReconcileEngine.java @@ -1,10 +1,10 @@ -package org.springframework.ide.vscode.yaml.reconcile; +package org.springframework.ide.vscode.commons.yaml.reconcile; import org.springframework.ide.vscode.commons.languageserver.reconcile.IProblemCollector; import org.springframework.ide.vscode.commons.languageserver.reconcile.ReconcileProblem; import org.springframework.ide.vscode.commons.languageserver.util.IDocument; -import org.springframework.ide.vscode.yaml.ast.YamlASTProvider; -import org.springframework.ide.vscode.yaml.schema.YamlSchema; +import org.springframework.ide.vscode.commons.yaml.ast.YamlASTProvider; +import org.springframework.ide.vscode.commons.yaml.schema.YamlSchema; /** * @author Kris De Volder diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/YamlSchemaProblems.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlSchemaProblems.java similarity index 95% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/YamlSchemaProblems.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlSchemaProblems.java index dd95c339a..4630beaad 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/YamlSchemaProblems.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlSchemaProblems.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.yaml.reconcile; +package org.springframework.ide.vscode.commons.yaml.reconcile; import org.springframework.ide.vscode.commons.languageserver.reconcile.ProblemSeverity; import org.springframework.ide.vscode.commons.languageserver.reconcile.ProblemType; diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/BasicYValueHint.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/BasicYValueHint.java similarity index 97% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/BasicYValueHint.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/BasicYValueHint.java index f5f89eee4..af70c3f91 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/BasicYValueHint.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/BasicYValueHint.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.yaml.schema; +package org.springframework.ide.vscode.commons.yaml.schema; public class BasicYValueHint implements YValueHint { diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YType.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YType.java similarity index 94% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YType.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YType.java index 7dd565c83..ff345aece 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YType.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YType.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.yaml.schema; +package org.springframework.ide.vscode.commons.yaml.schema; /** * Marker interface for objects that carry 'type information'. diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YTypeFactory.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypeFactory.java similarity index 98% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YTypeFactory.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypeFactory.java index b013e2e9c..3eeb9dbbd 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YTypeFactory.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypeFactory.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.yaml.schema; +package org.springframework.ide.vscode.commons.yaml.schema; import java.util.ArrayList; import java.util.Collection; @@ -24,7 +24,7 @@ import javax.inject.Provider; import org.springframework.ide.vscode.commons.util.EnumValueParser; import org.springframework.ide.vscode.commons.util.HtmlSnippet; import org.springframework.ide.vscode.commons.util.ValueParser; -import org.springframework.ide.vscode.yaml.util.DescriptionProviders; +import org.springframework.ide.vscode.commons.yaml.util.DescriptionProviders; /** * Static utility method for creating YType objects representing either diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YTypeUtil.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypeUtil.java similarity index 95% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YTypeUtil.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypeUtil.java index cc5b92fcb..cb200b437 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YTypeUtil.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypeUtil.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.yaml.schema; +package org.springframework.ide.vscode.commons.yaml.schema; import java.util.List; import java.util.Map; diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YTypedProperty.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypedProperty.java similarity index 92% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YTypedProperty.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypedProperty.java index 69df068e3..3efd9c2eb 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YTypedProperty.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypedProperty.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.yaml.schema; +package org.springframework.ide.vscode.commons.yaml.schema; import org.springframework.ide.vscode.commons.util.HtmlSnippet; diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YValueHint.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YValueHint.java similarity index 90% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YValueHint.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YValueHint.java index bac9d7f9c..fb69503d7 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YValueHint.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YValueHint.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.yaml.schema; +package org.springframework.ide.vscode.commons.yaml.schema; public interface YValueHint { diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YamlSchema.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YamlSchema.java similarity index 93% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YamlSchema.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YamlSchema.java index 47717841b..e05dcf7f3 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YamlSchema.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YamlSchema.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.yaml.schema; +package org.springframework.ide.vscode.commons.yaml.schema; /** * A 'schema' provides a toplevel type, which dictates the valid structure of a diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/structure/YamlDocument.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/structure/YamlDocument.java similarity index 96% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/structure/YamlDocument.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/structure/YamlDocument.java index 7ce9c0d20..2d0ce8b73 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/structure/YamlDocument.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/structure/YamlDocument.java @@ -8,13 +8,13 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.yaml.structure; +package org.springframework.ide.vscode.commons.yaml.structure; import org.springframework.ide.vscode.commons.languageserver.util.BadLocationException; import org.springframework.ide.vscode.commons.languageserver.util.DocumentUtil; import org.springframework.ide.vscode.commons.languageserver.util.IDocument; import org.springframework.ide.vscode.commons.languageserver.util.IRegion; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SRootNode; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SRootNode; /** * Wraps around a IDocument which is presumed to contain YML content and provides diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/structure/YamlStructureParser.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/structure/YamlStructureParser.java similarity index 97% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/structure/YamlStructureParser.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/structure/YamlStructureParser.java index eb9aa5a9f..30d2beacb 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/structure/YamlStructureParser.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/structure/YamlStructureParser.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.yaml.structure; +package org.springframework.ide.vscode.commons.yaml.structure; import java.io.StringWriter; import java.io.Writer; @@ -14,11 +14,11 @@ import org.springframework.ide.vscode.commons.languageserver.util.IRegion; import org.springframework.ide.vscode.commons.util.Assert; import org.springframework.ide.vscode.commons.util.CollectionUtil; import org.springframework.ide.vscode.commons.util.StringUtil; -import org.springframework.ide.vscode.yaml.path.KeyAliases; -import org.springframework.ide.vscode.yaml.path.YamlNavigable; -import org.springframework.ide.vscode.yaml.path.YamlPath; -import org.springframework.ide.vscode.yaml.path.YamlPathSegment; -import org.springframework.ide.vscode.yaml.util.YamlIndentUtil; +import org.springframework.ide.vscode.commons.yaml.path.KeyAliases; +import org.springframework.ide.vscode.commons.yaml.path.YamlNavigable; +import org.springframework.ide.vscode.commons.yaml.path.YamlPath; +import org.springframework.ide.vscode.commons.yaml.path.YamlPathSegment; +import org.springframework.ide.vscode.commons.yaml.util.YamlIndentUtil; /** * A robust, coarse-grained parser that guesses the structure of a diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/structure/YamlStructureProvider.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/structure/YamlStructureProvider.java similarity index 88% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/structure/YamlStructureProvider.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/structure/YamlStructureProvider.java index 86effd4c8..e0ae66c33 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/structure/YamlStructureProvider.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/structure/YamlStructureProvider.java @@ -8,10 +8,10 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.yaml.structure; +package org.springframework.ide.vscode.commons.yaml.structure; -import org.springframework.ide.vscode.yaml.path.KeyAliases; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SRootNode; +import org.springframework.ide.vscode.commons.yaml.path.KeyAliases; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SRootNode; /** * @author Kris De Volder diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/util/DescriptionProviders.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/util/DescriptionProviders.java similarity index 97% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/util/DescriptionProviders.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/util/DescriptionProviders.java index 3a4a491d3..166d14cc0 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/util/DescriptionProviders.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/util/DescriptionProviders.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.yaml.util; +package org.springframework.ide.vscode.commons.yaml.util; import static org.springframework.ide.vscode.commons.util.HtmlSnippet.*; diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/util/IOUtil.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/util/IOUtil.java similarity index 97% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/util/IOUtil.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/util/IOUtil.java index ac4fc12d7..bb0161cec 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/util/IOUtil.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/util/IOUtil.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal Software, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.yaml.util; +package org.springframework.ide.vscode.commons.yaml.util; import java.io.BufferedOutputStream; import java.io.ByteArrayOutputStream; diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/util/YamlIndentUtil.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/util/YamlIndentUtil.java similarity index 95% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/util/YamlIndentUtil.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/util/YamlIndentUtil.java index 8419a1f05..369de08fe 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/util/YamlIndentUtil.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/util/YamlIndentUtil.java @@ -8,10 +8,10 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.yaml.util; +package org.springframework.ide.vscode.commons.yaml.util; import org.springframework.ide.vscode.commons.util.Assert; -import org.springframework.ide.vscode.yaml.structure.YamlDocument; +import org.springframework.ide.vscode.commons.yaml.structure.YamlDocument; import com.google.common.base.Strings; diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/util/YamlUtil.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/util/YamlUtil.java similarity index 97% rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/util/YamlUtil.java rename to vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/util/YamlUtil.java index 0c291cdd7..f1947ca87 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/util/YamlUtil.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/util/YamlUtil.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.yaml.util; +package org.springframework.ide.vscode.commons.yaml.util; /** * @author Kris De Volder diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/YamlASTReconciler.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/YamlASTReconciler.java deleted file mode 100644 index 89372f362..000000000 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/YamlASTReconciler.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.springframework.ide.vscode.yaml.reconcile; - -import org.springframework.ide.vscode.yaml.ast.YamlFileAST; - -public interface YamlASTReconciler { - void reconcile(YamlFileAST ast); -} diff --git a/vscode-extensions/commons/commons-yaml/src/test/java/org/springframework/ide/vscode/yaml/structure/YamlStructureParserTest.java b/vscode-extensions/commons/commons-yaml/src/test/java/org/springframework/ide/vscode/yaml/structure/YamlStructureParserTest.java index 5ac7a2b12..2288a819e 100644 --- a/vscode-extensions/commons/commons-yaml/src/test/java/org/springframework/ide/vscode/yaml/structure/YamlStructureParserTest.java +++ b/vscode-extensions/commons/commons-yaml/src/test/java/org/springframework/ide/vscode/yaml/structure/YamlStructureParserTest.java @@ -22,13 +22,16 @@ import java.util.regex.Pattern; import org.junit.Test; import org.springframework.ide.vscode.commons.languageserver.util.TextDocument; -import org.springframework.ide.vscode.yaml.path.YamlPath; -import org.springframework.ide.vscode.yaml.path.YamlPathSegment; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SChildBearingNode; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SDocNode; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SKeyNode; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SNode; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SRootNode; +import org.springframework.ide.vscode.commons.yaml.path.YamlPath; +import org.springframework.ide.vscode.commons.yaml.path.YamlPathSegment; +import org.springframework.ide.vscode.commons.yaml.structure.YamlDocument; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureProvider; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SChildBearingNode; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SDocNode; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SKeyNode; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SNode; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SRootNode; public class YamlStructureParserTest { diff --git a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/ApplicationYamlLanguageServer.java b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/ApplicationYamlLanguageServer.java index 17a5de486..dbfaa5940 100644 --- a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/ApplicationYamlLanguageServer.java +++ b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/ApplicationYamlLanguageServer.java @@ -11,8 +11,8 @@ import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguage import org.springframework.ide.vscode.commons.languageserver.util.SimpleTextDocumentService; import org.springframework.ide.vscode.commons.languageserver.util.TextDocument; import org.springframework.ide.vscode.commons.util.Futures; -import org.springframework.ide.vscode.yaml.ast.YamlASTProvider; -import org.springframework.ide.vscode.yaml.ast.YamlParser; +import org.springframework.ide.vscode.commons.yaml.ast.YamlASTProvider; +import org.springframework.ide.vscode.commons.yaml.ast.YamlParser; import org.springframework.ide.vscode.yaml.reconcile.ApplicationYamlReconcileEngine; import org.yaml.snakeyaml.Yaml; diff --git a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/quickfix/ReplaceDeprecatedYamlQuickfix.java b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/quickfix/ReplaceDeprecatedYamlQuickfix.java index 326781581..4257d56e7 100644 --- a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/quickfix/ReplaceDeprecatedYamlQuickfix.java +++ b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/quickfix/ReplaceDeprecatedYamlQuickfix.java @@ -20,16 +20,16 @@ import org.springframework.ide.vscode.commons.languageserver.quickfix.ProblemFix import org.springframework.ide.vscode.commons.languageserver.quickfix.QuickfixContext; import org.springframework.ide.vscode.commons.languageserver.util.IDocument; import org.springframework.ide.vscode.commons.util.Log; -import org.springframework.ide.vscode.yaml.completion.YamlPathEdits; -import org.springframework.ide.vscode.yaml.path.YamlPath; +import org.springframework.ide.vscode.commons.yaml.completion.YamlPathEdits; +import org.springframework.ide.vscode.commons.yaml.path.YamlPath; +import org.springframework.ide.vscode.commons.yaml.structure.YamlDocument; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureProvider; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SChildBearingNode; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SDocNode; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SKeyNode; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SNode; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SNodeType; import org.springframework.ide.vscode.yaml.reconcile.SpringPropertyProblem; -import org.springframework.ide.vscode.yaml.structure.YamlDocument; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SChildBearingNode; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SDocNode; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SKeyNode; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SNode; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SNodeType; -import org.springframework.ide.vscode.yaml.structure.YamlStructureProvider; import io.typefox.lsapi.CompletionItemKind; diff --git a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/ApplicationYamlASTReconciler.java b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/ApplicationYamlASTReconciler.java index a863ec490..4cc142882 100644 --- a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/ApplicationYamlASTReconciler.java +++ b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/ApplicationYamlASTReconciler.java @@ -1,7 +1,7 @@ package org.springframework.ide.vscode.yaml.reconcile; -import static org.springframework.ide.vscode.yaml.ast.NodeUtil.asScalar; -import static org.springframework.ide.vscode.yaml.ast.YamlFileAST.getChildren; +import static org.springframework.ide.vscode.commons.yaml.ast.NodeUtil.asScalar; +import static org.springframework.ide.vscode.commons.yaml.ast.YamlFileAST.getChildren; import static org.springframework.ide.vscode.yaml.reconcile.SpringPropertiesProblemType.YAML_DEPRECATED; import static org.springframework.ide.vscode.yaml.reconcile.SpringPropertiesProblemType.YAML_DUPLICATE_KEY; @@ -21,11 +21,12 @@ import org.springframework.ide.vscode.application.properties.metadata.types.Type import org.springframework.ide.vscode.commons.languageserver.reconcile.IProblemCollector; import org.springframework.ide.vscode.commons.util.StringUtil; import org.springframework.ide.vscode.commons.util.ValueParser; -import org.springframework.ide.vscode.yaml.ast.NodeRef; -import org.springframework.ide.vscode.yaml.ast.NodeRef.Kind; -import org.springframework.ide.vscode.yaml.ast.NodeRef.TupleValueRef; -import org.springframework.ide.vscode.yaml.ast.NodeUtil; -import org.springframework.ide.vscode.yaml.ast.YamlFileAST; +import org.springframework.ide.vscode.commons.yaml.ast.NodeRef; +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.ast.NodeRef.Kind; +import org.springframework.ide.vscode.commons.yaml.ast.NodeRef.TupleValueRef; +import org.springframework.ide.vscode.commons.yaml.reconcile.YamlASTReconciler; import org.springframework.ide.vscode.yaml.quickfix.ReplaceDeprecatedYamlQuickfix; import org.yaml.snakeyaml.nodes.MappingNode; import org.yaml.snakeyaml.nodes.Node; diff --git a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/ApplicationYamlReconcileEngine.java b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/ApplicationYamlReconcileEngine.java index cfff0bc09..7defadb37 100644 --- a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/ApplicationYamlReconcileEngine.java +++ b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/ApplicationYamlReconcileEngine.java @@ -20,8 +20,10 @@ import org.springframework.ide.vscode.application.properties.metadata.util.Fuzzy import org.springframework.ide.vscode.commons.languageserver.reconcile.IProblemCollector; import org.springframework.ide.vscode.commons.languageserver.reconcile.ReconcileProblem; import org.springframework.ide.vscode.commons.languageserver.util.IDocument; +import org.springframework.ide.vscode.commons.yaml.ast.YamlASTProvider; +import org.springframework.ide.vscode.commons.yaml.reconcile.YamlASTReconciler; +import org.springframework.ide.vscode.commons.yaml.reconcile.YamlReconcileEngine; import org.springframework.ide.vscode.yaml.ApplicationYamlProblems; -import org.springframework.ide.vscode.yaml.ast.YamlASTProvider; public class ApplicationYamlReconcileEngine extends YamlReconcileEngine { diff --git a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/ManifestYamlLanguageServer.java b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/ManifestYamlLanguageServer.java index ce442d132..25cf580ec 100644 --- a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/ManifestYamlLanguageServer.java +++ b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/ManifestYamlLanguageServer.java @@ -8,15 +8,15 @@ import org.springframework.ide.vscode.commons.languageserver.reconcile.IReconcil import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer; import org.springframework.ide.vscode.commons.languageserver.util.SimpleTextDocumentService; import org.springframework.ide.vscode.commons.languageserver.util.TextDocument; -import org.springframework.ide.vscode.yaml.ast.YamlASTProvider; -import org.springframework.ide.vscode.yaml.ast.YamlParser; -import org.springframework.ide.vscode.yaml.completion.SchemaBasedYamlAssistContextProvider; -import org.springframework.ide.vscode.yaml.completion.YamlAssistContextProvider; -import org.springframework.ide.vscode.yaml.completion.YamlCompletionEngine; -import org.springframework.ide.vscode.yaml.reconcile.YamlSchemaBasedReconcileEngine; -import org.springframework.ide.vscode.yaml.schema.YValueHint; -import org.springframework.ide.vscode.yaml.schema.YamlSchema; -import org.springframework.ide.vscode.yaml.structure.YamlStructureProvider; +import org.springframework.ide.vscode.commons.yaml.ast.YamlASTProvider; +import org.springframework.ide.vscode.commons.yaml.ast.YamlParser; +import org.springframework.ide.vscode.commons.yaml.completion.SchemaBasedYamlAssistContextProvider; +import org.springframework.ide.vscode.commons.yaml.completion.YamlAssistContextProvider; +import org.springframework.ide.vscode.commons.yaml.completion.YamlCompletionEngine; +import org.springframework.ide.vscode.commons.yaml.reconcile.YamlSchemaBasedReconcileEngine; +import org.springframework.ide.vscode.commons.yaml.schema.YValueHint; +import org.springframework.ide.vscode.commons.yaml.schema.YamlSchema; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureProvider; import org.yaml.snakeyaml.Yaml; import com.google.common.collect.ImmutableList; diff --git a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/ManifestYmlSchema.java b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/ManifestYmlSchema.java index 8fe5c54f4..7b04e9bfc 100644 --- a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/ManifestYmlSchema.java +++ b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/ManifestYmlSchema.java @@ -16,15 +16,15 @@ import java.util.Set; import javax.inject.Provider; import org.springframework.ide.vscode.commons.util.HtmlSnippet; -import org.springframework.ide.vscode.yaml.schema.YType; -import org.springframework.ide.vscode.yaml.schema.YTypeFactory; -import org.springframework.ide.vscode.yaml.schema.YTypeFactory.YAtomicType; -import org.springframework.ide.vscode.yaml.schema.YTypeFactory.YBeanType; -import org.springframework.ide.vscode.yaml.schema.YTypeFactory.YTypedPropertyImpl; -import org.springframework.ide.vscode.yaml.schema.YTypeUtil; -import org.springframework.ide.vscode.yaml.schema.YValueHint; -import org.springframework.ide.vscode.yaml.schema.YamlSchema; -import org.springframework.ide.vscode.yaml.util.DescriptionProviders; +import org.springframework.ide.vscode.commons.yaml.schema.YType; +import org.springframework.ide.vscode.commons.yaml.schema.YTypeFactory; +import org.springframework.ide.vscode.commons.yaml.schema.YTypeUtil; +import org.springframework.ide.vscode.commons.yaml.schema.YValueHint; +import org.springframework.ide.vscode.commons.yaml.schema.YamlSchema; +import org.springframework.ide.vscode.commons.yaml.schema.YTypeFactory.YAtomicType; +import org.springframework.ide.vscode.commons.yaml.schema.YTypeFactory.YBeanType; +import org.springframework.ide.vscode.commons.yaml.schema.YTypeFactory.YTypedPropertyImpl; +import org.springframework.ide.vscode.commons.yaml.util.DescriptionProviders; import com.google.common.collect.ImmutableSet; diff --git a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/VscodeCompletionEngineAdapter.java b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/VscodeCompletionEngineAdapter.java index 65ab82459..b3a553c71 100644 --- a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/VscodeCompletionEngineAdapter.java +++ b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/VscodeCompletionEngineAdapter.java @@ -15,8 +15,8 @@ import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguage import org.springframework.ide.vscode.commons.languageserver.util.SimpleTextDocumentService; import org.springframework.ide.vscode.commons.languageserver.util.TextDocument; import org.springframework.ide.vscode.commons.util.Futures; -import org.springframework.ide.vscode.yaml.completion.DefaultCompletionFactory; -import org.springframework.ide.vscode.yaml.structure.YamlStructureParser; +import org.springframework.ide.vscode.commons.yaml.completion.DefaultCompletionFactory; +import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser; import io.typefox.lsapi.CompletionItem; import io.typefox.lsapi.CompletionList; diff --git a/vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/yaml/ManifestYmlSchemaTest.java b/vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/yaml/ManifestYmlSchemaTest.java index 2808c4718..34ff652e7 100644 --- a/vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/yaml/ManifestYmlSchemaTest.java +++ b/vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/yaml/ManifestYmlSchemaTest.java @@ -21,10 +21,10 @@ import java.util.Map; import org.junit.Test; import org.springframework.ide.vscode.cloudfoundry.manifest.editor.ManifestYmlSchema; import org.springframework.ide.vscode.commons.util.StringUtil; -import org.springframework.ide.vscode.yaml.schema.YTypeFactory.YBeanType; -import org.springframework.ide.vscode.yaml.schema.YTypeFactory.YSeqType; -import org.springframework.ide.vscode.yaml.schema.YTypedProperty; -import org.springframework.ide.vscode.yaml.util.DescriptionProviders; +import org.springframework.ide.vscode.commons.yaml.schema.YTypedProperty; +import org.springframework.ide.vscode.commons.yaml.schema.YTypeFactory.YBeanType; +import org.springframework.ide.vscode.commons.yaml.schema.YTypeFactory.YSeqType; +import org.springframework.ide.vscode.commons.yaml.util.DescriptionProviders; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet.Builder;