diff --git a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServer.java b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServer.java index acdd00a4c..a0f2e33ef 100644 --- a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServer.java +++ b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServer.java @@ -40,6 +40,7 @@ import org.springframework.ide.vscode.boot.java.handlers.SymbolProvider; import org.springframework.ide.vscode.boot.java.livehover.ActiveProfilesProvider; import org.springframework.ide.vscode.boot.java.livehover.BeanInjectedIntoHoverProvider; import org.springframework.ide.vscode.boot.java.livehover.ComponentInjectionsHoverProvider; +import org.springframework.ide.vscode.boot.java.metadata.SpringPropertyIndexProvider; import org.springframework.ide.vscode.boot.java.requestmapping.LiveAppURLSymbolProvider; import org.springframework.ide.vscode.boot.java.requestmapping.RequestMappingHoverProvider; import org.springframework.ide.vscode.boot.java.requestmapping.RequestMappingSymbolProvider; @@ -53,7 +54,6 @@ import org.springframework.ide.vscode.boot.java.utils.SpringLiveHoverWatchdog; import org.springframework.ide.vscode.boot.java.value.ValueCompletionProcessor; import org.springframework.ide.vscode.boot.java.value.ValueHoverProvider; import org.springframework.ide.vscode.boot.java.value.ValuePropertyReferencesProvider; -import org.springframework.ide.vscode.boot.metadata.SpringPropertyIndexProvider; import org.springframework.ide.vscode.commons.languageserver.HighlightParams; import org.springframework.ide.vscode.commons.languageserver.completion.ICompletionEngine; import org.springframework.ide.vscode.commons.languageserver.completion.VscodeCompletionEngineAdapter; diff --git a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServerParams.java b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServerParams.java index cb61deece..07aba4ebc 100644 --- a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServerParams.java +++ b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServerParams.java @@ -15,9 +15,9 @@ import java.time.Duration; import java.util.Arrays; import org.springframework.ide.vscode.boot.java.handlers.RunningAppProvider; +import org.springframework.ide.vscode.boot.java.metadata.DefaultSpringPropertyIndexProvider; +import org.springframework.ide.vscode.boot.java.metadata.SpringPropertyIndexProvider; import org.springframework.ide.vscode.boot.java.utils.SpringLiveHoverWatchdog; -import org.springframework.ide.vscode.boot.metadata.DefaultSpringPropertyIndexProvider; -import org.springframework.ide.vscode.boot.metadata.SpringPropertyIndexProvider; import org.springframework.ide.vscode.commons.gradle.GradleCore; import org.springframework.ide.vscode.commons.gradle.GradleProjectCache; import org.springframework.ide.vscode.commons.gradle.GradleProjectFinder; diff --git a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/DefaultSpringPropertyIndexProvider.java b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/metadata/DefaultSpringPropertyIndexProvider.java similarity index 97% rename from headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/DefaultSpringPropertyIndexProvider.java rename to headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/metadata/DefaultSpringPropertyIndexProvider.java index 179e896c3..751778c95 100644 --- a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/DefaultSpringPropertyIndexProvider.java +++ b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/metadata/DefaultSpringPropertyIndexProvider.java @@ -9,7 +9,7 @@ * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.metadata; +package org.springframework.ide.vscode.boot.java.metadata; import java.util.Optional; diff --git a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/PropertiesLoader.java b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/metadata/PropertiesLoader.java similarity index 98% rename from headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/PropertiesLoader.java rename to headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/metadata/PropertiesLoader.java index 79779f133..9ad0b7d69 100644 --- a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/PropertiesLoader.java +++ b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/metadata/PropertiesLoader.java @@ -9,7 +9,7 @@ * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.metadata; +package org.springframework.ide.vscode.boot.java.metadata; import java.io.File; import java.io.IOException; diff --git a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertiesIndexManager.java b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/metadata/SpringPropertiesIndexManager.java similarity index 98% rename from headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertiesIndexManager.java rename to headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/metadata/SpringPropertiesIndexManager.java index 5c39c90b6..953812ba1 100644 --- a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertiesIndexManager.java +++ b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/metadata/SpringPropertiesIndexManager.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.metadata; +package org.springframework.ide.vscode.boot.java.metadata; import java.util.HashMap; import java.util.Map; diff --git a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertyIndex.java b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/metadata/SpringPropertyIndex.java similarity index 96% rename from headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertyIndex.java rename to headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/metadata/SpringPropertyIndex.java index 91b209aa8..f2b4185a9 100644 --- a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertyIndex.java +++ b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/metadata/SpringPropertyIndex.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.metadata; +package org.springframework.ide.vscode.boot.java.metadata; import java.util.Collection; diff --git a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertyIndexProvider.java b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/metadata/SpringPropertyIndexProvider.java similarity index 93% rename from headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertyIndexProvider.java rename to headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/metadata/SpringPropertyIndexProvider.java index 7bd2ee815..309ea8788 100644 --- a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertyIndexProvider.java +++ b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/metadata/SpringPropertyIndexProvider.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.metadata; +package org.springframework.ide.vscode.boot.java.metadata; import org.springframework.boot.configurationmetadata.ConfigurationMetadataProperty; import org.springframework.ide.vscode.commons.util.FuzzyMap; diff --git a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/value/ValueCompletionProcessor.java b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/value/ValueCompletionProcessor.java index 81a41255a..0067dd821 100644 --- a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/value/ValueCompletionProcessor.java +++ b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/value/ValueCompletionProcessor.java @@ -24,7 +24,7 @@ import org.eclipse.jdt.core.dom.SimpleName; import org.eclipse.jdt.core.dom.StringLiteral; import org.springframework.boot.configurationmetadata.ConfigurationMetadataProperty; import org.springframework.ide.vscode.boot.java.handlers.CompletionProvider; -import org.springframework.ide.vscode.boot.metadata.SpringPropertyIndexProvider; +import org.springframework.ide.vscode.boot.java.metadata.SpringPropertyIndexProvider; import org.springframework.ide.vscode.commons.languageserver.completion.DocumentEdits; import org.springframework.ide.vscode.commons.languageserver.completion.ICompletionProposal; import org.springframework.ide.vscode.commons.util.BadLocationException; diff --git a/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringPropertyIndexTest.java b/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringPropertyIndexTest.java index 00ef3c865..c97423fce 100644 --- a/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringPropertyIndexTest.java +++ b/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringPropertyIndexTest.java @@ -21,7 +21,7 @@ import java.io.File; import org.junit.Before; import org.junit.Test; import org.springframework.ide.vscode.boot.java.BootJavaLanguageServer; -import org.springframework.ide.vscode.boot.metadata.DefaultSpringPropertyIndexProvider; +import org.springframework.ide.vscode.boot.java.metadata.DefaultSpringPropertyIndexProvider; import org.springframework.ide.vscode.commons.languageserver.ProgressService; import org.springframework.ide.vscode.commons.maven.MavenCore; import org.springframework.ide.vscode.commons.util.text.LanguageId; diff --git a/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/project/harness/BootLanguageServerHarness.java b/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/project/harness/BootLanguageServerHarness.java index 997df25de..484eae35b 100644 --- a/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/project/harness/BootLanguageServerHarness.java +++ b/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/project/harness/BootLanguageServerHarness.java @@ -17,7 +17,7 @@ import org.junit.Assert; import org.springframework.ide.vscode.boot.java.BootJavaLanguageServer; import org.springframework.ide.vscode.boot.java.BootJavaLanguageServerParams; import org.springframework.ide.vscode.boot.java.handlers.RunningAppProvider; -import org.springframework.ide.vscode.boot.metadata.SpringPropertyIndexProvider; +import org.springframework.ide.vscode.boot.java.metadata.SpringPropertyIndexProvider; import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder; import org.springframework.ide.vscode.commons.languageserver.java.ProjectObserver; diff --git a/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/project/harness/PropertyIndexHarness.java b/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/project/harness/PropertyIndexHarness.java index e2da59642..85fe58fee 100644 --- a/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/project/harness/PropertyIndexHarness.java +++ b/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/project/harness/PropertyIndexHarness.java @@ -19,8 +19,8 @@ import org.springframework.boot.configurationmetadata.ConfigurationMetadataPrope import org.springframework.boot.configurationmetadata.Deprecation; import org.springframework.boot.configurationmetadata.ValueHint; import org.springframework.boot.configurationmetadata.ValueProvider; -import org.springframework.ide.vscode.boot.metadata.SpringPropertyIndex; -import org.springframework.ide.vscode.boot.metadata.SpringPropertyIndexProvider; +import org.springframework.ide.vscode.boot.java.metadata.SpringPropertyIndex; +import org.springframework.ide.vscode.boot.java.metadata.SpringPropertyIndexProvider; import org.springframework.ide.vscode.commons.java.IClasspath; import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder; diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/common/InformationTemplates.java b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/common/InformationTemplates.java index f1557646a..2b028c9e4 100644 --- a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/common/InformationTemplates.java +++ b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/common/InformationTemplates.java @@ -22,7 +22,7 @@ import static org.springframework.ide.vscode.commons.util.Renderables.text; import java.util.Collection; -import org.springframework.boot.configurationmetadata.Deprecation; +import org.springframework.ide.vscode.boot.configurationmetadata.Deprecation; import org.springframework.ide.vscode.boot.metadata.PropertyInfo; import org.springframework.ide.vscode.commons.util.Renderable; import org.springframework.ide.vscode.commons.util.Renderables; diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataGroup.java b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataGroup.java similarity index 97% rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataGroup.java rename to headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataGroup.java index ea6428e85..34cc31ac6 100644 --- a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataGroup.java +++ b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataGroup.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.configurationmetadata; +package org.springframework.ide.vscode.boot.configurationmetadata; import java.io.Serializable; import java.util.HashMap; diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataHint.java b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataHint.java similarity index 96% rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataHint.java rename to headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataHint.java index 9f5e1f204..7f4a2b426 100644 --- a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataHint.java +++ b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataHint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.configurationmetadata; +package org.springframework.ide.vscode.boot.configurationmetadata; import java.util.ArrayList; import java.util.List; diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataItem.java b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataItem.java similarity index 96% rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataItem.java rename to headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataItem.java index 4001c4da1..6167202a3 100644 --- a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataItem.java +++ b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.configurationmetadata; +package org.springframework.ide.vscode.boot.configurationmetadata; /** * An extension of {@link ConfigurationMetadataProperty} that provides a reference to its diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataProperty.java b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataProperty.java similarity index 98% rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataProperty.java rename to headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataProperty.java index 997746490..268cce488 100644 --- a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataProperty.java +++ b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataProperty.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.configurationmetadata; +package org.springframework.ide.vscode.boot.configurationmetadata; import java.io.Serializable; import java.util.List; diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataRepository.java b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataRepository.java similarity index 95% rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataRepository.java rename to headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataRepository.java index 95122ac2a..733a765e9 100644 --- a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataRepository.java +++ b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.configurationmetadata; +package org.springframework.ide.vscode.boot.configurationmetadata; import java.util.Map; diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilder.java b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilder.java similarity index 99% rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilder.java rename to headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilder.java index b7d096fd8..3e52ce0c5 100644 --- a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilder.java +++ b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.configurationmetadata; +package org.springframework.ide.vscode.boot.configurationmetadata; import java.io.IOException; import java.io.InputStream; diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataSource.java b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataSource.java similarity index 97% rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataSource.java rename to headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataSource.java index 9c1dad953..631f0f24f 100644 --- a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataSource.java +++ b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataSource.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.configurationmetadata; +package org.springframework.ide.vscode.boot.configurationmetadata; import java.io.Serializable; import java.util.HashMap; diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/Deprecation.java b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/Deprecation.java similarity index 96% rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/Deprecation.java rename to headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/Deprecation.java index 8261a2a85..df3c306e3 100644 --- a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/Deprecation.java +++ b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/Deprecation.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.configurationmetadata; +package org.springframework.ide.vscode.boot.configurationmetadata; import java.io.Serializable; diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/DescriptionExtractor.java b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/DescriptionExtractor.java similarity index 96% rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/DescriptionExtractor.java rename to headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/DescriptionExtractor.java index 81a9ff9b4..510630d67 100644 --- a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/DescriptionExtractor.java +++ b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/DescriptionExtractor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.configurationmetadata; +package org.springframework.ide.vscode.boot.configurationmetadata; import java.text.BreakIterator; import java.util.Locale; diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/Hints.java b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/Hints.java similarity index 97% rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/Hints.java rename to headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/Hints.java index 26bdcb69d..1a08918d7 100644 --- a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/Hints.java +++ b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/Hints.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.configurationmetadata; +package org.springframework.ide.vscode.boot.configurationmetadata; import java.util.ArrayList; import java.util.List; diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/JsonReader.java b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/JsonReader.java similarity index 99% rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/JsonReader.java rename to headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/JsonReader.java index 4d73902c9..5eab27d8d 100644 --- a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/JsonReader.java +++ b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/JsonReader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.configurationmetadata; +package org.springframework.ide.vscode.boot.configurationmetadata; import java.io.IOException; import java.io.InputStream; diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/README.txt b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/README.txt similarity index 100% rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/README.txt rename to headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/README.txt diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/RawConfigurationMetadata.java b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/RawConfigurationMetadata.java similarity index 97% rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/RawConfigurationMetadata.java rename to headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/RawConfigurationMetadata.java index a264b1e9b..a60fca24f 100644 --- a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/RawConfigurationMetadata.java +++ b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/RawConfigurationMetadata.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.configurationmetadata; +package org.springframework.ide.vscode.boot.configurationmetadata; import java.util.ArrayList; import java.util.List; diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/SimpleConfigurationMetadataRepository.java b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/SimpleConfigurationMetadataRepository.java similarity index 98% rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/SimpleConfigurationMetadataRepository.java rename to headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/SimpleConfigurationMetadataRepository.java index e12ec4479..199c0e5d5 100644 --- a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/SimpleConfigurationMetadataRepository.java +++ b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/SimpleConfigurationMetadataRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.configurationmetadata; +package org.springframework.ide.vscode.boot.configurationmetadata; import java.io.Serializable; import java.util.Collection; diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/ValueHint.java b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ValueHint.java similarity index 97% rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/ValueHint.java rename to headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ValueHint.java index 043fc10dc..73d8150a2 100644 --- a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/ValueHint.java +++ b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ValueHint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.configurationmetadata; +package org.springframework.ide.vscode.boot.configurationmetadata; import java.io.Serializable; diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/ValueProvider.java b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ValueProvider.java similarity index 96% rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/ValueProvider.java rename to headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ValueProvider.java index 550181ee9..f0a67f365 100644 --- a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/ValueProvider.java +++ b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ValueProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.configurationmetadata; +package org.springframework.ide.vscode.boot.configurationmetadata; import java.io.Serializable; import java.util.LinkedHashMap; diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/package-info.java b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/package-info.java similarity index 90% rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/package-info.java rename to headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/package-info.java index e25ef89eb..daaa449c2 100644 --- a/headless-services/boot-properties-language-server/src/main/java/org/springframework/boot/configurationmetadata/package-info.java +++ b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/package-info.java @@ -17,4 +17,4 @@ /** * Spring Boot configuration meta-data parser. */ -package org.springframework.boot.configurationmetadata; +package org.springframework.ide.vscode.boot.configurationmetadata; diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/PropertiesLoader.java b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/PropertiesLoader.java index 5b82af3f9..40dc5fa0c 100644 --- a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/PropertiesLoader.java +++ b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/PropertiesLoader.java @@ -22,8 +22,8 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.zip.ZipEntry; -import org.springframework.boot.configurationmetadata.ConfigurationMetadataRepository; -import org.springframework.boot.configurationmetadata.ConfigurationMetadataRepositoryJsonBuilder; +import org.springframework.ide.vscode.boot.configurationmetadata.ConfigurationMetadataRepository; +import org.springframework.ide.vscode.boot.configurationmetadata.ConfigurationMetadataRepositoryJsonBuilder; import org.springframework.ide.vscode.commons.java.IClasspath; import org.springframework.ide.vscode.commons.util.Log; diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/PropertyInfo.java b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/PropertyInfo.java index 9e2c8731c..3a49aafc7 100644 --- a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/PropertyInfo.java +++ b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/PropertyInfo.java @@ -14,11 +14,11 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.springframework.boot.configurationmetadata.ConfigurationMetadataProperty; -import org.springframework.boot.configurationmetadata.ConfigurationMetadataSource; -import org.springframework.boot.configurationmetadata.Deprecation; -import org.springframework.boot.configurationmetadata.ValueHint; -import org.springframework.boot.configurationmetadata.ValueProvider; +import org.springframework.ide.vscode.boot.configurationmetadata.ConfigurationMetadataProperty; +import org.springframework.ide.vscode.boot.configurationmetadata.ConfigurationMetadataSource; +import org.springframework.ide.vscode.boot.configurationmetadata.Deprecation; +import org.springframework.ide.vscode.boot.configurationmetadata.ValueHint; +import org.springframework.ide.vscode.boot.configurationmetadata.ValueProvider; import org.springframework.ide.vscode.boot.metadata.ValueProviderRegistry.ValueProviderStrategy; import org.springframework.ide.vscode.boot.metadata.hints.HintProvider; import org.springframework.ide.vscode.boot.metadata.hints.HintProviders; diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertyIndex.java b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertyIndex.java index cc6f74e01..a153a105c 100644 --- a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertyIndex.java +++ b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertyIndex.java @@ -13,10 +13,10 @@ package org.springframework.ide.vscode.boot.metadata; import java.util.Collection; import java.util.List; -import org.springframework.boot.configurationmetadata.ConfigurationMetadataGroup; -import org.springframework.boot.configurationmetadata.ConfigurationMetadataProperty; -import org.springframework.boot.configurationmetadata.ConfigurationMetadataRepository; -import org.springframework.boot.configurationmetadata.ConfigurationMetadataSource; +import org.springframework.ide.vscode.boot.configurationmetadata.ConfigurationMetadataGroup; +import org.springframework.ide.vscode.boot.configurationmetadata.ConfigurationMetadataProperty; +import org.springframework.ide.vscode.boot.configurationmetadata.ConfigurationMetadataRepository; +import org.springframework.ide.vscode.boot.configurationmetadata.ConfigurationMetadataSource; import org.springframework.ide.vscode.commons.java.IClasspath; import org.springframework.ide.vscode.commons.util.FuzzyMap; import org.springframework.ide.vscode.commons.util.StringUtil; diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/ValueProviderRegistry.java b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/ValueProviderRegistry.java index c7032b3de..a244f6c26 100644 --- a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/ValueProviderRegistry.java +++ b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/ValueProviderRegistry.java @@ -16,7 +16,7 @@ import java.util.List; import java.util.Map; import java.util.function.Function; -import org.springframework.boot.configurationmetadata.ValueProvider; +import org.springframework.ide.vscode.boot.configurationmetadata.ValueProvider; import org.springframework.ide.vscode.boot.metadata.hints.StsValueHint; import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.util.CollectionUtil; diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/BasicHintProvider.java b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/BasicHintProvider.java index 993b95dd0..4a80bc98b 100644 --- a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/BasicHintProvider.java +++ b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/BasicHintProvider.java @@ -13,7 +13,7 @@ package org.springframework.ide.vscode.boot.metadata.hints; import java.util.Collection; import java.util.List; -import org.springframework.boot.configurationmetadata.ValueHint; +import org.springframework.ide.vscode.boot.configurationmetadata.ValueHint; import org.springframework.ide.vscode.boot.metadata.ValueProviderRegistry.ValueProviderStrategy; import org.springframework.ide.vscode.boot.metadata.types.TypedProperty; import org.springframework.ide.vscode.commons.java.IJavaProject; diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/HintProviders.java b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/HintProviders.java index 37df439eb..2ec635b56 100644 --- a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/HintProviders.java +++ b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/HintProviders.java @@ -13,7 +13,7 @@ package org.springframework.ide.vscode.boot.metadata.hints; import java.util.ArrayList; import java.util.List; -import org.springframework.boot.configurationmetadata.ValueHint; +import org.springframework.ide.vscode.boot.configurationmetadata.ValueHint; import org.springframework.ide.vscode.boot.metadata.ValueProviderRegistry.ValueProviderStrategy; import org.springframework.ide.vscode.boot.metadata.types.Type; import org.springframework.ide.vscode.boot.metadata.types.TypedProperty; diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/StsValueHint.java b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/StsValueHint.java index 8845e0013..8b5aa0ecd 100644 --- a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/StsValueHint.java +++ b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/StsValueHint.java @@ -11,8 +11,8 @@ package org.springframework.ide.vscode.boot.metadata.hints; -import org.springframework.boot.configurationmetadata.Deprecation; -import org.springframework.boot.configurationmetadata.ValueHint; +import org.springframework.ide.vscode.boot.configurationmetadata.Deprecation; +import org.springframework.ide.vscode.boot.configurationmetadata.ValueHint; import org.springframework.ide.vscode.boot.metadata.types.TypeUtil; import org.springframework.ide.vscode.boot.metadata.util.DeprecationUtil; import org.springframework.ide.vscode.commons.java.IJavaElement; diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtil.java b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtil.java index 641d4b0a9..7e2635f14 100644 --- a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtil.java +++ b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtil.java @@ -34,7 +34,7 @@ import java.util.stream.Stream; import javax.inject.Provider; -import org.springframework.boot.configurationmetadata.Deprecation; +import org.springframework.ide.vscode.boot.configurationmetadata.Deprecation; import org.springframework.ide.vscode.boot.metadata.ResourceHintProvider; import org.springframework.ide.vscode.boot.metadata.ValueProviderRegistry.ValueProviderStrategy; import org.springframework.ide.vscode.boot.metadata.hints.StsValueHint; diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypedProperty.java b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypedProperty.java index ae834f5e9..4c912b78d 100644 --- a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypedProperty.java +++ b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypedProperty.java @@ -11,7 +11,7 @@ package org.springframework.ide.vscode.boot.metadata.types; -import org.springframework.boot.configurationmetadata.Deprecation; +import org.springframework.ide.vscode.boot.configurationmetadata.Deprecation; import org.springframework.ide.vscode.commons.util.Renderable; import org.springframework.ide.vscode.commons.util.Renderables; import org.springframework.ide.vscode.commons.yaml.schema.YTypedProperty; diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/util/DeprecationUtil.java b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/util/DeprecationUtil.java index 9d9cd78b3..b13da1235 100644 --- a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/util/DeprecationUtil.java +++ b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/util/DeprecationUtil.java @@ -12,7 +12,7 @@ package org.springframework.ide.vscode.boot.metadata.util; import java.util.Optional; -import org.springframework.boot.configurationmetadata.Deprecation; +import org.springframework.ide.vscode.boot.configurationmetadata.Deprecation; import org.springframework.ide.vscode.commons.java.IAnnotatable; import org.springframework.ide.vscode.commons.java.IJavaElement; diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/completions/ApplicationYamlAssistContext.java b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/completions/ApplicationYamlAssistContext.java index 3a6d4fb48..432d33a18 100644 --- a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/completions/ApplicationYamlAssistContext.java +++ b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/completions/ApplicationYamlAssistContext.java @@ -18,10 +18,10 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.springframework.boot.configurationmetadata.Deprecation; import org.springframework.ide.vscode.boot.common.InformationTemplates; import org.springframework.ide.vscode.boot.common.PropertyCompletionFactory; import org.springframework.ide.vscode.boot.common.RelaxedNameConfig; +import org.springframework.ide.vscode.boot.configurationmetadata.Deprecation; import org.springframework.ide.vscode.boot.metadata.IndexNavigator; import org.springframework.ide.vscode.boot.metadata.PropertyInfo; import org.springframework.ide.vscode.boot.metadata.hints.HintProvider; diff --git a/headless-services/boot-properties-language-server/src/test/java/org/springframework/ide/vscode/boot/editor/harness/PropertyIndexHarness.java b/headless-services/boot-properties-language-server/src/test/java/org/springframework/ide/vscode/boot/editor/harness/PropertyIndexHarness.java index 4b74d7e51..f758db046 100644 --- a/headless-services/boot-properties-language-server/src/test/java/org/springframework/ide/vscode/boot/editor/harness/PropertyIndexHarness.java +++ b/headless-services/boot-properties-language-server/src/test/java/org/springframework/ide/vscode/boot/editor/harness/PropertyIndexHarness.java @@ -14,10 +14,10 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.springframework.boot.configurationmetadata.ConfigurationMetadataProperty; -import org.springframework.boot.configurationmetadata.Deprecation; -import org.springframework.boot.configurationmetadata.ValueHint; -import org.springframework.boot.configurationmetadata.ValueProvider; +import org.springframework.ide.vscode.boot.configurationmetadata.ConfigurationMetadataProperty; +import org.springframework.ide.vscode.boot.configurationmetadata.Deprecation; +import org.springframework.ide.vscode.boot.configurationmetadata.ValueHint; +import org.springframework.ide.vscode.boot.configurationmetadata.ValueProvider; import org.springframework.ide.vscode.boot.metadata.PropertyInfo; import org.springframework.ide.vscode.boot.metadata.SpringPropertyIndex; import org.springframework.ide.vscode.boot.metadata.SpringPropertyIndexProvider;