diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/CachingValueProvider.java b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/CachingValueProvider.java similarity index 96% rename from vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/CachingValueProvider.java rename to vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/CachingValueProvider.java index b3ecc5caa..c959dbaae 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/CachingValueProvider.java +++ b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/CachingValueProvider.java @@ -8,11 +8,11 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.properties.metadata; +package org.springframework.ide.vscode.application.properties.metadata; import java.time.Duration; -import org.springframework.ide.vscode.boot.properties.metadata.ValueProviderRegistry.ValueProviderStrategy; +import org.springframework.ide.vscode.application.properties.metadata.ValueProviderRegistry.ValueProviderStrategy; /** * A abstract {@link ValueProviderStrategy} that is mean to help speedup successive invocations of diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/IndexNavigator.java b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/IndexNavigator.java similarity index 93% rename from vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/IndexNavigator.java rename to vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/IndexNavigator.java index bc0d24c09..be8e040fb 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/IndexNavigator.java +++ b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/IndexNavigator.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.properties.metadata; +package org.springframework.ide.vscode.application.properties.metadata; import static org.springframework.ide.vscode.util.StringUtil.*; @@ -16,8 +16,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.springframework.ide.vscode.boot.properties.util.FuzzyMap; -import org.springframework.ide.vscode.boot.properties.util.FuzzyMap.Match; +import org.springframework.ide.vscode.application.properties.metadata.util.FuzzyMap; +import org.springframework.ide.vscode.application.properties.metadata.util.FuzzyMap.Match; import org.springframework.ide.vscode.util.StringUtil; /** diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/PropertiesLoader.java b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/PropertiesLoader.java similarity index 98% rename from vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/PropertiesLoader.java rename to vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/PropertiesLoader.java index c2dbe1969..26384054d 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/PropertiesLoader.java +++ b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/PropertiesLoader.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.boot.properties.metadata; +package org.springframework.ide.vscode.application.properties.metadata; import java.io.BufferedReader; import java.io.File; diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/PropertyInfo.java b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/PropertyInfo.java similarity index 97% rename from vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/PropertyInfo.java rename to vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/PropertyInfo.java index e6fd06fbe..53a3a1ded 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/PropertyInfo.java +++ b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/PropertyInfo.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.properties.metadata; +package org.springframework.ide.vscode.application.properties.metadata; import java.util.ArrayList; import java.util.Collections; @@ -19,7 +19,7 @@ import org.springframework.boot.configurationmetadata.ConfigurationMetadataSourc import org.springframework.boot.configurationmetadata.Deprecation; import org.springframework.boot.configurationmetadata.ValueHint; import org.springframework.boot.configurationmetadata.ValueProvider; -import org.springframework.ide.vscode.boot.properties.metadata.ValueProviderRegistry.ValueProviderStrategy; +import org.springframework.ide.vscode.application.properties.metadata.ValueProviderRegistry.ValueProviderStrategy; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList.Builder; diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/SpringPropertiesIndexManager.java b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/SpringPropertiesIndexManager.java similarity index 84% rename from vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/SpringPropertiesIndexManager.java rename to vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/SpringPropertiesIndexManager.java index a142d65fc..d6f0252cd 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/SpringPropertiesIndexManager.java +++ b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/SpringPropertiesIndexManager.java @@ -8,15 +8,15 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.properties.metadata; +package org.springframework.ide.vscode.application.properties.metadata; import java.nio.file.Path; import java.util.HashMap; import java.util.Map; -import org.springframework.ide.vscode.boot.properties.util.FuzzyMap; -import org.springframework.ide.vscode.boot.properties.util.Listener; -import org.springframework.ide.vscode.boot.properties.util.ListenerManager; +import org.springframework.ide.vscode.application.properties.metadata.util.FuzzyMap; +import org.springframework.ide.vscode.application.properties.metadata.util.Listener; +import org.springframework.ide.vscode.application.properties.metadata.util.ListenerManager; /** * Support for Reconciling, Content Assist and Hover Text in spring properties diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/SpringPropertyIndex.java b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/SpringPropertyIndex.java similarity index 96% rename from vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/SpringPropertyIndex.java rename to vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/SpringPropertyIndex.java index 5930b16de..756e7fabd 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/SpringPropertyIndex.java +++ b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/SpringPropertyIndex.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.properties.metadata; +package org.springframework.ide.vscode.application.properties.metadata; import java.nio.file.Path; import java.util.Collection; @@ -18,7 +18,7 @@ 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.properties.util.FuzzyMap; +import org.springframework.ide.vscode.application.properties.metadata.util.FuzzyMap; public class SpringPropertyIndex extends FuzzyMap { diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/SpringPropertyIndexProvider.java b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/SpringPropertyIndexProvider.java similarity index 82% rename from vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/SpringPropertyIndexProvider.java rename to vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/SpringPropertyIndexProvider.java index 73b8e88d2..2dd098839 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/SpringPropertyIndexProvider.java +++ b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/SpringPropertyIndexProvider.java @@ -8,9 +8,9 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.properties.metadata; +package org.springframework.ide.vscode.application.properties.metadata; -import org.springframework.ide.vscode.boot.properties.util.FuzzyMap; +import org.springframework.ide.vscode.application.properties.metadata.util.FuzzyMap; import org.springframework.ide.vscode.commons.languageserver.util.IDocument; diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/ValueProviderRegistry.java b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/ValueProviderRegistry.java similarity index 95% rename from vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/ValueProviderRegistry.java rename to vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/ValueProviderRegistry.java index 6f3d7a708..b5956c2b4 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/ValueProviderRegistry.java +++ b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/ValueProviderRegistry.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.properties.metadata; +package org.springframework.ide.vscode.application.properties.metadata; import java.util.Collection; import java.util.HashMap; @@ -17,7 +17,7 @@ import java.util.Map; import java.util.function.Function; import org.springframework.boot.configurationmetadata.ValueProvider; -import org.springframework.ide.vscode.boot.properties.metadata.types.StsValueHint; +import org.springframework.ide.vscode.application.properties.metadata.types.StsValueHint; import org.springframework.ide.vscode.java.IJavaProject; import org.springframework.ide.vscode.util.CollectionUtil; diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/types/StsValueHint.java b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/StsValueHint.java similarity index 93% rename from vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/types/StsValueHint.java rename to vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/StsValueHint.java index 8ab138fb6..2be186ff5 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/types/StsValueHint.java +++ b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/StsValueHint.java @@ -1,12 +1,12 @@ -package org.springframework.ide.vscode.boot.properties.metadata.types; +package org.springframework.ide.vscode.application.properties.metadata.types; -import static org.springframework.ide.vscode.boot.properties.util.DeprecationUtil.*; +import static org.springframework.ide.vscode.application.properties.metadata.util.DeprecationUtil.*; import javax.inject.Provider; import org.springframework.boot.configurationmetadata.Deprecation; import org.springframework.boot.configurationmetadata.ValueHint; -import org.springframework.ide.vscode.boot.properties.util.DeprecationUtil; +import org.springframework.ide.vscode.application.properties.metadata.util.DeprecationUtil; import org.springframework.ide.vscode.java.IJavaElement; import org.springframework.ide.vscode.java.IJavaProject; import org.springframework.ide.vscode.java.IType; diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/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 similarity index 97% rename from vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/types/Type.java rename to vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/Type.java index 377ade78a..12eb077c0 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/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 @@ -8,12 +8,13 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.properties.metadata.types; +package org.springframework.ide.vscode.application.properties.metadata.types; import java.util.Arrays; import java.util.HashMap; import java.util.Map; +import org.springframework.ide.vscode.boot.properties.metadata.types.Signature; import org.springframework.ide.vscode.java.IType; import org.springframework.ide.vscode.util.ArrayUtils; import org.springframework.ide.vscode.util.Assert; diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/types/TypeParser.java b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/TypeParser.java similarity index 97% rename from vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/types/TypeParser.java rename to vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/TypeParser.java index d2b2bd744..5da54de7b 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/types/TypeParser.java +++ b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/TypeParser.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.boot.properties.metadata.types; +package org.springframework.ide.vscode.application.properties.metadata.types; import java.util.ArrayList; import java.util.StringTokenizer; diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/types/TypeUtil.java b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/TypeUtil.java similarity index 98% rename from vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/types/TypeUtil.java rename to vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/TypeUtil.java index a66b3ff85..f570974de 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/types/TypeUtil.java +++ b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/TypeUtil.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.boot.properties.metadata.types; +package org.springframework.ide.vscode.application.properties.metadata.types; import static org.springframework.ide.vscode.util.ArrayUtils.firstElement; import static org.springframework.ide.vscode.util.ArrayUtils.lastElement; @@ -24,8 +24,9 @@ import java.util.stream.Collectors; import javax.inject.Provider; import org.springframework.boot.configurationmetadata.Deprecation; -import org.springframework.ide.vscode.boot.properties.metadata.ValueProviderRegistry.ValueProviderStrategy; -import org.springframework.ide.vscode.boot.properties.util.DeprecationUtil; +import org.springframework.ide.vscode.application.properties.metadata.ValueProviderRegistry.ValueProviderStrategy; +import org.springframework.ide.vscode.application.properties.metadata.util.DeprecationUtil; +import org.springframework.ide.vscode.boot.properties.metadata.types.Signature; import org.springframework.ide.vscode.java.Flags; import org.springframework.ide.vscode.java.IField; import org.springframework.ide.vscode.java.IJavaElement; diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/types/TypeUtilProvider.java b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/TypeUtilProvider.java similarity index 69% rename from vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/types/TypeUtilProvider.java rename to vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/TypeUtilProvider.java index f1c2a4bd0..de04facfe 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/types/TypeUtilProvider.java +++ b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/TypeUtilProvider.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.boot.properties.metadata.types; +package org.springframework.ide.vscode.application.properties.metadata.types; import org.springframework.ide.vscode.commons.languageserver.util.IDocument; diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/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 similarity index 96% rename from vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/metadata/types/TypedProperty.java rename to vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/TypedProperty.java index 69356bda3..601b52d15 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/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 @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.boot.properties.metadata.types; +package org.springframework.ide.vscode.application.properties.metadata.types; import javax.inject.Provider; diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/util/DeprecationUtil.java b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/util/DeprecationUtil.java similarity index 96% rename from vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/util/DeprecationUtil.java rename to vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/util/DeprecationUtil.java index 4f9e336d1..69e4a4de9 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/util/DeprecationUtil.java +++ b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/util/DeprecationUtil.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.properties.util; +package org.springframework.ide.vscode.application.properties.metadata.util; import org.springframework.boot.configurationmetadata.Deprecation; import org.springframework.ide.vscode.java.IAnnotatable; diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/util/FuzzyMap.java b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/util/FuzzyMap.java similarity index 98% rename from vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/util/FuzzyMap.java rename to vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/util/FuzzyMap.java index 78d5a33c1..e8a119b20 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/util/FuzzyMap.java +++ b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/util/FuzzyMap.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.properties.util; +package org.springframework.ide.vscode.application.properties.metadata.util; import java.util.ArrayList; import java.util.Collection; diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/util/Listener.java b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/util/Listener.java similarity index 88% rename from vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/util/Listener.java rename to vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/util/Listener.java index ba1ae5621..c3573e714 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/util/Listener.java +++ b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/util/Listener.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.properties.util; +package org.springframework.ide.vscode.application.properties.metadata.util; /** * @author Kris De Volder diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/util/ListenerManager.java b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/util/ListenerManager.java similarity index 92% rename from vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/util/ListenerManager.java rename to vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/util/ListenerManager.java index 2a4bf5c94..45d578834 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/boot/properties/util/ListenerManager.java +++ b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/util/ListenerManager.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.properties.util; +package org.springframework.ide.vscode.application.properties.metadata.util; import java.util.Arrays; diff --git a/vscode-extensions/commons/application-properties-metadata/src/test/java/org/springframework/ide/vscode/boot/properties/metadata/FuzzyMapTest.java b/vscode-extensions/commons/application-properties-metadata/src/test/java/org/springframework/ide/vscode/boot/properties/metadata/FuzzyMapTest.java index 3d114a0c2..db43acd40 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/test/java/org/springframework/ide/vscode/boot/properties/metadata/FuzzyMapTest.java +++ b/vscode-extensions/commons/application-properties-metadata/src/test/java/org/springframework/ide/vscode/boot/properties/metadata/FuzzyMapTest.java @@ -17,8 +17,8 @@ import java.util.Comparator; import java.util.List; import org.junit.Test; -import org.springframework.ide.vscode.boot.properties.util.FuzzyMap; -import org.springframework.ide.vscode.boot.properties.util.FuzzyMap.Match; +import org.springframework.ide.vscode.application.properties.metadata.util.FuzzyMap; +import org.springframework.ide.vscode.application.properties.metadata.util.FuzzyMap.Match; import org.springframework.ide.vscode.util.FuzzyMatcher; public class FuzzyMapTest { diff --git a/vscode-extensions/commons/application-properties-metadata/src/test/java/org/springframework/ide/vscode/boot/properties/metadata/PropertiesIndexTest.java b/vscode-extensions/commons/application-properties-metadata/src/test/java/org/springframework/ide/vscode/boot/properties/metadata/PropertiesIndexTest.java index 289072cad..90bafbd87 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/test/java/org/springframework/ide/vscode/boot/properties/metadata/PropertiesIndexTest.java +++ b/vscode-extensions/commons/application-properties-metadata/src/test/java/org/springframework/ide/vscode/boot/properties/metadata/PropertiesIndexTest.java @@ -20,7 +20,10 @@ import java.nio.file.Paths; import org.junit.BeforeClass; import org.junit.Test; -import org.springframework.ide.vscode.boot.properties.util.FuzzyMap; +import org.springframework.ide.vscode.application.properties.metadata.PropertyInfo; +import org.springframework.ide.vscode.application.properties.metadata.SpringPropertiesIndexManager; +import org.springframework.ide.vscode.application.properties.metadata.ValueProviderRegistry; +import org.springframework.ide.vscode.application.properties.metadata.util.FuzzyMap; import org.springframework.ide.vscode.util.ExternalCommand; import org.springframework.ide.vscode.util.ExternalProcess; 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 88889cd53..c286196f1 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 @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.CompletableFuture; -import org.springframework.ide.vscode.boot.properties.metadata.SpringPropertyIndexProvider; -import org.springframework.ide.vscode.boot.properties.metadata.types.TypeUtilProvider; +import org.springframework.ide.vscode.application.properties.metadata.SpringPropertyIndexProvider; +import org.springframework.ide.vscode.application.properties.metadata.types.TypeUtilProvider; import org.springframework.ide.vscode.commons.languageserver.reconcile.IReconcileEngine; import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer; import org.springframework.ide.vscode.commons.languageserver.util.SimpleTextDocumentService; diff --git a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/DefaultSpringPropertyIndexProvider.java b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/DefaultSpringPropertyIndexProvider.java index a001c9443..3a44eedf3 100644 --- a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/DefaultSpringPropertyIndexProvider.java +++ b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/DefaultSpringPropertyIndexProvider.java @@ -2,11 +2,11 @@ package org.springframework.ide.vscode.yaml; import java.nio.file.Path; -import org.springframework.ide.vscode.boot.properties.metadata.PropertyInfo; -import org.springframework.ide.vscode.boot.properties.metadata.SpringPropertiesIndexManager; -import org.springframework.ide.vscode.boot.properties.metadata.SpringPropertyIndexProvider; -import org.springframework.ide.vscode.boot.properties.metadata.ValueProviderRegistry; -import org.springframework.ide.vscode.boot.properties.util.FuzzyMap; +import org.springframework.ide.vscode.application.properties.metadata.PropertyInfo; +import org.springframework.ide.vscode.application.properties.metadata.SpringPropertiesIndexManager; +import org.springframework.ide.vscode.application.properties.metadata.SpringPropertyIndexProvider; +import org.springframework.ide.vscode.application.properties.metadata.ValueProviderRegistry; +import org.springframework.ide.vscode.application.properties.metadata.util.FuzzyMap; import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder; import org.springframework.ide.vscode.commons.languageserver.util.IDocument; import org.springframework.ide.vscode.java.IJavaProject; diff --git a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/Main.java b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/Main.java index 4c92da780..51585d3ed 100644 --- a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/Main.java +++ b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/Main.java @@ -9,9 +9,9 @@ import java.net.Socket; import java.util.logging.Level; import java.util.logging.Logger; -import org.springframework.ide.vscode.boot.properties.metadata.SpringPropertyIndexProvider; -import org.springframework.ide.vscode.boot.properties.metadata.types.TypeUtil; -import org.springframework.ide.vscode.boot.properties.metadata.types.TypeUtilProvider; +import org.springframework.ide.vscode.application.properties.metadata.SpringPropertyIndexProvider; +import org.springframework.ide.vscode.application.properties.metadata.types.TypeUtil; +import org.springframework.ide.vscode.application.properties.metadata.types.TypeUtilProvider; import org.springframework.ide.vscode.commons.languageserver.util.IDocument; import org.springframework.ide.vscode.commons.languageserver.util.LoggingFormat; 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 a34f6213d..d1dafa5fe 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 @@ -10,15 +10,15 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.springframework.ide.vscode.boot.properties.metadata.IndexNavigator; -import org.springframework.ide.vscode.boot.properties.metadata.PropertyInfo; -import org.springframework.ide.vscode.boot.properties.metadata.types.Type; -import org.springframework.ide.vscode.boot.properties.metadata.types.TypeParser; -import org.springframework.ide.vscode.boot.properties.metadata.types.TypeUtil; -import org.springframework.ide.vscode.boot.properties.metadata.types.TypeUtil.BeanPropertyNameMode; -import org.springframework.ide.vscode.boot.properties.metadata.types.TypeUtil.EnumCaseMode; +import org.springframework.ide.vscode.application.properties.metadata.IndexNavigator; +import org.springframework.ide.vscode.application.properties.metadata.PropertyInfo; +import org.springframework.ide.vscode.application.properties.metadata.types.Type; +import org.springframework.ide.vscode.application.properties.metadata.types.TypeParser; +import org.springframework.ide.vscode.application.properties.metadata.types.TypeUtil; +import org.springframework.ide.vscode.application.properties.metadata.types.TypeUtil.BeanPropertyNameMode; +import org.springframework.ide.vscode.application.properties.metadata.types.TypeUtil.EnumCaseMode; +import org.springframework.ide.vscode.application.properties.metadata.types.TypedProperty; import org.springframework.ide.vscode.commons.languageserver.reconcile.IProblemCollector; -import org.springframework.ide.vscode.boot.properties.metadata.types.TypedProperty; import org.springframework.ide.vscode.util.StringUtil; import org.springframework.ide.vscode.util.ValueParser; import org.springframework.ide.vscode.yaml.ast.NodeRef; 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 3d7ee2dbf..cfff0bc09 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 @@ -12,11 +12,11 @@ package org.springframework.ide.vscode.yaml.reconcile; import static org.springframework.ide.vscode.yaml.ApplicationYamlProblems.Type.YAML_SYNTAX_ERROR; -import org.springframework.ide.vscode.boot.properties.metadata.IndexNavigator; -import org.springframework.ide.vscode.boot.properties.metadata.PropertyInfo; -import org.springframework.ide.vscode.boot.properties.metadata.SpringPropertyIndexProvider; -import org.springframework.ide.vscode.boot.properties.metadata.types.TypeUtilProvider; -import org.springframework.ide.vscode.boot.properties.util.FuzzyMap; +import org.springframework.ide.vscode.application.properties.metadata.IndexNavigator; +import org.springframework.ide.vscode.application.properties.metadata.PropertyInfo; +import org.springframework.ide.vscode.application.properties.metadata.SpringPropertyIndexProvider; +import org.springframework.ide.vscode.application.properties.metadata.types.TypeUtilProvider; +import org.springframework.ide.vscode.application.properties.metadata.util.FuzzyMap; 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; diff --git a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/SpringPropertyProblem.java b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/SpringPropertyProblem.java index 53ac32be7..456887403 100644 --- a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/SpringPropertyProblem.java +++ b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/SpringPropertyProblem.java @@ -1,6 +1,6 @@ package org.springframework.ide.vscode.yaml.reconcile; -import org.springframework.ide.vscode.boot.properties.metadata.PropertyInfo; +import org.springframework.ide.vscode.application.properties.metadata.PropertyInfo; import org.springframework.ide.vscode.commons.languageserver.quickfix.ProblemFixer; import org.springframework.ide.vscode.commons.languageserver.reconcile.ProblemType; import org.springframework.ide.vscode.commons.languageserver.reconcile.ReconcileProblemImpl; diff --git a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/AbstractPropsEditorTest.java b/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/AbstractPropsEditorTest.java index 69e34e137..e7fb4fa3e 100644 --- a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/AbstractPropsEditorTest.java +++ b/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/AbstractPropsEditorTest.java @@ -10,9 +10,9 @@ import java.util.List; import java.util.Set; import org.junit.Before; -import org.springframework.ide.vscode.boot.properties.metadata.SpringPropertyIndexProvider; -import org.springframework.ide.vscode.boot.properties.metadata.types.TypeUtil; -import org.springframework.ide.vscode.boot.properties.metadata.types.TypeUtilProvider; +import org.springframework.ide.vscode.application.properties.metadata.SpringPropertyIndexProvider; +import org.springframework.ide.vscode.application.properties.metadata.types.TypeUtil; +import org.springframework.ide.vscode.application.properties.metadata.types.TypeUtilProvider; import org.springframework.ide.vscode.commons.languageserver.util.IDocument; import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer; import org.springframework.ide.vscode.java.IJavaProject; diff --git a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/ApplicationYamlEditorTest.java b/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/ApplicationYamlEditorTest.java index 62fa611a5..716506204 100644 --- a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/ApplicationYamlEditorTest.java +++ b/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/ApplicationYamlEditorTest.java @@ -18,8 +18,8 @@ import java.time.Duration; import org.junit.Ignore; import org.junit.Test; -import org.springframework.ide.vscode.boot.properties.metadata.CachingValueProvider; -import org.springframework.ide.vscode.boot.properties.metadata.PropertyInfo; +import org.springframework.ide.vscode.application.properties.metadata.CachingValueProvider; +import org.springframework.ide.vscode.application.properties.metadata.PropertyInfo; import org.springframework.ide.vscode.java.IJavaProject; import org.springframework.ide.vscode.testharness.Editor; import org.springframework.ide.vscode.util.StringUtil; diff --git a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/PropertyIndexHarness.java b/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/PropertyIndexHarness.java index 717e3dedd..f599431a7 100644 --- a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/PropertyIndexHarness.java +++ b/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/PropertyIndexHarness.java @@ -9,11 +9,11 @@ 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.properties.metadata.PropertyInfo; -import org.springframework.ide.vscode.boot.properties.metadata.SpringPropertyIndex; -import org.springframework.ide.vscode.boot.properties.metadata.SpringPropertyIndexProvider; -import org.springframework.ide.vscode.boot.properties.metadata.ValueProviderRegistry; -import org.springframework.ide.vscode.boot.properties.util.FuzzyMap; +import org.springframework.ide.vscode.application.properties.metadata.PropertyInfo; +import org.springframework.ide.vscode.application.properties.metadata.SpringPropertyIndex; +import org.springframework.ide.vscode.application.properties.metadata.SpringPropertyIndexProvider; +import org.springframework.ide.vscode.application.properties.metadata.ValueProviderRegistry; +import org.springframework.ide.vscode.application.properties.metadata.util.FuzzyMap; import org.springframework.ide.vscode.commons.languageserver.util.IDocument; import org.springframework.ide.vscode.java.IJavaProject;