diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/IndexNavigator.java b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/IndexNavigator.java index be8e040fb..20c632c53 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/IndexNavigator.java +++ b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/IndexNavigator.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.springframework.ide.vscode.application.properties.metadata; -import static org.springframework.ide.vscode.util.StringUtil.*; +import static org.springframework.ide.vscode.commons.util.StringUtil.*; import java.util.ArrayList; import java.util.Collections; @@ -18,7 +18,7 @@ import java.util.List; 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; +import org.springframework.ide.vscode.commons.util.StringUtil; /** * An index navigator allows selecting subset of a property index as if diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/ValueProviderRegistry.java b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/ValueProviderRegistry.java index 0ab3b9f07..7c24b6324 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/ValueProviderRegistry.java +++ b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/ValueProviderRegistry.java @@ -19,7 +19,7 @@ import java.util.function.Function; import org.springframework.boot.configurationmetadata.ValueProvider; import org.springframework.ide.vscode.application.properties.metadata.types.StsValueHint; import org.springframework.ide.vscode.commons.java.IJavaProject; -import org.springframework.ide.vscode.util.CollectionUtil; +import org.springframework.ide.vscode.commons.util.CollectionUtil; import reactor.core.publisher.Flux; diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/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 index 7f5bf2085..cd325ad4a 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/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 @@ -10,10 +10,10 @@ import org.springframework.ide.vscode.application.properties.metadata.util.Depre import org.springframework.ide.vscode.commons.java.IJavaElement; import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.java.IType; -import org.springframework.ide.vscode.util.Assert; -import org.springframework.ide.vscode.util.HtmlSnippet; -import org.springframework.ide.vscode.util.Log; -import org.springframework.ide.vscode.util.StringUtil; +import org.springframework.ide.vscode.commons.util.Assert; +import org.springframework.ide.vscode.commons.util.HtmlSnippet; +import org.springframework.ide.vscode.commons.util.Log; +import org.springframework.ide.vscode.commons.util.StringUtil; /** * Sts version of {@link ValueHint} contains similar data, but accomoates diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/Type.java b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/Type.java index f7bee9770..7992fe430 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/Type.java +++ b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/Type.java @@ -16,10 +16,10 @@ import java.util.Map; import org.springframework.ide.vscode.commons.java.IType; import org.springframework.ide.vscode.commons.java.Signature; -import org.springframework.ide.vscode.util.ArrayUtils; -import org.springframework.ide.vscode.util.Assert; -import org.springframework.ide.vscode.util.Log; -import org.springframework.ide.vscode.util.StringUtil; +import org.springframework.ide.vscode.commons.util.ArrayUtils; +import org.springframework.ide.vscode.commons.util.Assert; +import org.springframework.ide.vscode.commons.util.Log; +import org.springframework.ide.vscode.commons.util.StringUtil; import org.springframework.ide.vscode.yaml.schema.YType; /** diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/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 index 5da54de7b..e3c3f5eb7 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/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 @@ -3,7 +3,7 @@ package org.springframework.ide.vscode.application.properties.metadata.types; import java.util.ArrayList; import java.util.StringTokenizer; -import org.springframework.ide.vscode.util.StringUtil; +import org.springframework.ide.vscode.commons.util.StringUtil; /** * Converts types in notation used by spring properties metadata into a 'Structured' form diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/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 index 2b371d24d..f432aa4c0 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/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,7 +1,7 @@ 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; +import static org.springframework.ide.vscode.commons.util.ArrayUtils.firstElement; +import static org.springframework.ide.vscode.commons.util.ArrayUtils.lastElement; import java.lang.reflect.Field; import java.net.InetAddress; @@ -33,16 +33,16 @@ import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.java.IMethod; import org.springframework.ide.vscode.commons.java.IType; import org.springframework.ide.vscode.commons.java.Signature; -import org.springframework.ide.vscode.util.AlwaysFailingParser; -import org.springframework.ide.vscode.util.ArrayUtils; -import org.springframework.ide.vscode.util.Assert; -import org.springframework.ide.vscode.util.CollectionUtil; -import org.springframework.ide.vscode.util.EnumValueParser; -import org.springframework.ide.vscode.util.HtmlSnippet; -import org.springframework.ide.vscode.util.LazyProvider; -import org.springframework.ide.vscode.util.Log; -import org.springframework.ide.vscode.util.StringUtil; -import org.springframework.ide.vscode.util.ValueParser; +import org.springframework.ide.vscode.commons.util.AlwaysFailingParser; +import org.springframework.ide.vscode.commons.util.ArrayUtils; +import org.springframework.ide.vscode.commons.util.Assert; +import org.springframework.ide.vscode.commons.util.CollectionUtil; +import org.springframework.ide.vscode.commons.util.EnumValueParser; +import org.springframework.ide.vscode.commons.util.HtmlSnippet; +import org.springframework.ide.vscode.commons.util.LazyProvider; +import org.springframework.ide.vscode.commons.util.Log; +import org.springframework.ide.vscode.commons.util.StringUtil; +import org.springframework.ide.vscode.commons.util.ValueParser; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/TypedProperty.java b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/TypedProperty.java index 601b52d15..7504117fd 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/TypedProperty.java +++ b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/TypedProperty.java @@ -3,7 +3,7 @@ package org.springframework.ide.vscode.application.properties.metadata.types; import javax.inject.Provider; import org.springframework.boot.configurationmetadata.Deprecation; -import org.springframework.ide.vscode.util.HtmlSnippet; +import org.springframework.ide.vscode.commons.util.HtmlSnippet; import org.springframework.ide.vscode.yaml.schema.YTypedProperty; import org.springframework.ide.vscode.yaml.util.DescriptionProviders; diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/util/DeprecationUtil.java b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/util/DeprecationUtil.java index a92e77317..617a0513b 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/util/DeprecationUtil.java +++ b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/util/DeprecationUtil.java @@ -15,7 +15,7 @@ import org.springframework.ide.vscode.commons.java.IAnnotatable; import org.springframework.ide.vscode.commons.java.IAnnotation; import org.springframework.ide.vscode.commons.java.IJavaElement; import org.springframework.ide.vscode.commons.java.IMemberValuePair; -import org.springframework.ide.vscode.util.Log; +import org.springframework.ide.vscode.commons.util.Log; import com.google.common.collect.ImmutableSet; diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/util/FuzzyMap.java b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/util/FuzzyMap.java index e8a119b20..a551d4d3a 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/util/FuzzyMap.java +++ b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/util/FuzzyMap.java @@ -18,8 +18,8 @@ import java.util.Map.Entry; import java.util.TreeMap; import java.util.logging.Logger; -import org.springframework.ide.vscode.util.FuzzyMatcher; -import org.springframework.ide.vscode.util.StringUtil; +import org.springframework.ide.vscode.commons.util.FuzzyMatcher; +import org.springframework.ide.vscode.commons.util.StringUtil; /** * A collection of data that can be searched with a simple 'fuzzy' string diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/util/ListenerManager.java b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/util/ListenerManager.java index 45d578834..d7cb85d06 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/util/ListenerManager.java +++ b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/util/ListenerManager.java @@ -12,7 +12,7 @@ package org.springframework.ide.vscode.application.properties.metadata.util; import java.util.Arrays; -import org.springframework.ide.vscode.util.ListenerList; +import org.springframework.ide.vscode.commons.util.ListenerList; public class ListenerManager { 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 db43acd40..a0242c459 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 @@ -19,7 +19,7 @@ import java.util.List; import org.junit.Test; 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; +import org.springframework.ide.vscode.commons.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 90bafbd87..bc5d85bf5 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 @@ -24,8 +24,8 @@ import org.springframework.ide.vscode.application.properties.metadata.PropertyIn 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; +import org.springframework.ide.vscode.commons.util.ExternalCommand; +import org.springframework.ide.vscode.commons.util.ExternalProcess; /** * Sanity test the boot properties index diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IJavaElement.java b/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IJavaElement.java index 9e10a21b6..387253e79 100644 --- a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IJavaElement.java +++ b/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IJavaElement.java @@ -1,6 +1,6 @@ package org.springframework.ide.vscode.commons.java; -import org.springframework.ide.vscode.util.HtmlSnippet; +import org.springframework.ide.vscode.commons.util.HtmlSnippet; public interface IJavaElement { String getElementName(); diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/DocumentEdits.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/DocumentEdits.java index 79540717e..876b7b720 100644 --- a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/DocumentEdits.java +++ b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/DocumentEdits.java @@ -16,7 +16,7 @@ import org.springframework.ide.vscode.commons.languageserver.util.BadLocationExc import org.springframework.ide.vscode.commons.languageserver.util.IDocument; import org.springframework.ide.vscode.commons.languageserver.util.IRegion; import org.springframework.ide.vscode.commons.languageserver.util.Region; -import org.springframework.ide.vscode.util.Assert; +import org.springframework.ide.vscode.commons.util.Assert; import io.typefox.lsapi.TextEdit; diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/DefaultJavaProjectFinder.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/DefaultJavaProjectFinder.java index 82e7dd221..38aead3ab 100644 --- a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/DefaultJavaProjectFinder.java +++ b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/DefaultJavaProjectFinder.java @@ -8,8 +8,8 @@ import java.nio.file.Path; import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.java.IType; import org.springframework.ide.vscode.commons.languageserver.util.IDocument; -import org.springframework.ide.vscode.util.HtmlSnippet; -import org.springframework.ide.vscode.util.StringUtil; +import org.springframework.ide.vscode.commons.util.HtmlSnippet; +import org.springframework.ide.vscode.commons.util.StringUtil; public class DefaultJavaProjectFinder implements JavaProjectFinder { diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/DocumentUtil.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/DocumentUtil.java index fb9a6cd5b..afcd63676 100644 --- a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/DocumentUtil.java +++ b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/DocumentUtil.java @@ -1,6 +1,6 @@ package org.springframework.ide.vscode.commons.languageserver.util; -import org.springframework.ide.vscode.util.Assert; +import org.springframework.ide.vscode.commons.util.Assert; public class DocumentUtil { diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleTextDocumentService.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleTextDocumentService.java index e4519b924..686413344 100644 --- a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleTextDocumentService.java +++ b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleTextDocumentService.java @@ -10,8 +10,8 @@ import java.util.concurrent.CompletableFuture; import java.util.function.Consumer; import java.util.logging.Logger; -import org.springframework.ide.vscode.util.Assert; -import org.springframework.ide.vscode.util.Futures; +import org.springframework.ide.vscode.commons.util.Assert; +import org.springframework.ide.vscode.commons.util.Futures; import io.typefox.lsapi.CodeActionParams; import io.typefox.lsapi.CodeLens; diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/AlwaysFailingParser.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/AlwaysFailingParser.java similarity index 94% rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/AlwaysFailingParser.java rename to vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/AlwaysFailingParser.java index cee2ae16a..41d4904f8 100644 --- a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/AlwaysFailingParser.java +++ b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/AlwaysFailingParser.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.util; +package org.springframework.ide.vscode.commons.util; /** * Parser that always fails, regardless of the input. Used for types who's value cannot be diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/ArrayUtils.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ArrayUtils.java similarity index 96% rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/ArrayUtils.java rename to vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ArrayUtils.java index e34e39f63..ae50e3580 100644 --- a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/ArrayUtils.java +++ b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ArrayUtils.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.util; +package org.springframework.ide.vscode.commons.util; import java.lang.reflect.Array; import java.util.ArrayList; diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/Assert.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Assert.java similarity index 89% rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/Assert.java rename to vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Assert.java index 8d42941a2..9adce62e2 100644 --- a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/Assert.java +++ b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Assert.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.util; +package org.springframework.ide.vscode.commons.util; public class Assert { diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/CollectionUtil.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/CollectionUtil.java similarity index 78% rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/CollectionUtil.java rename to vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/CollectionUtil.java index 0cac56565..b62840261 100644 --- a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/CollectionUtil.java +++ b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/CollectionUtil.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.util; +package org.springframework.ide.vscode.commons.util; import java.util.Collection; diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/Collector.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Collector.java similarity index 90% rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/Collector.java rename to vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Collector.java index c961c509f..705237313 100644 --- a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/Collector.java +++ b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Collector.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.util; +package org.springframework.ide.vscode.commons.util; import java.util.ArrayList; import java.util.Collections; diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/EnumValueParser.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/EnumValueParser.java similarity index 95% rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/EnumValueParser.java rename to vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/EnumValueParser.java index ee1cc76ab..212a3c5e8 100644 --- a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/EnumValueParser.java +++ b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/EnumValueParser.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.util; +package org.springframework.ide.vscode.commons.util; import java.util.Collection; import java.util.Set; diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/ExceptionUtil.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ExceptionUtil.java similarity index 96% rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/ExceptionUtil.java rename to vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ExceptionUtil.java index 3922208bf..74ac8c66c 100644 --- a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/ExceptionUtil.java +++ b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ExceptionUtil.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.util; +package org.springframework.ide.vscode.commons.util; import java.io.ByteArrayOutputStream; import java.io.PrintStream; diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/ExternalCommand.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ExternalCommand.java similarity index 97% rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/ExternalCommand.java rename to vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ExternalCommand.java index b693ef566..39895018d 100644 --- a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/ExternalCommand.java +++ b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ExternalCommand.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal Software, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.util; +package org.springframework.ide.vscode.commons.util; import java.io.File; import java.io.IOException; diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/ExternalProcess.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ExternalProcess.java similarity index 98% rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/ExternalProcess.java rename to vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ExternalProcess.java index 68c0b6030..a5ee4d077 100644 --- a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/ExternalProcess.java +++ b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ExternalProcess.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal Software, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.util; +package org.springframework.ide.vscode.commons.util; import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/Futures.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Futures.java similarity index 80% rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/Futures.java rename to vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Futures.java index 5ba42866b..305c6f495 100644 --- a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/Futures.java +++ b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Futures.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.util; +package org.springframework.ide.vscode.commons.util; import java.util.concurrent.CompletableFuture; diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/FuzzyMatcher.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/FuzzyMatcher.java similarity index 98% rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/FuzzyMatcher.java rename to vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/FuzzyMatcher.java index 7e354b931..5fb77b6e8 100644 --- a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/FuzzyMatcher.java +++ b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/FuzzyMatcher.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.util; +package org.springframework.ide.vscode.commons.util; /** * @author Kris De Volder diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/HtmlBuffer.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/HtmlBuffer.java similarity index 98% rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/HtmlBuffer.java rename to vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/HtmlBuffer.java index 8ac3f5a07..69a4cca6e 100644 --- a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/HtmlBuffer.java +++ b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/HtmlBuffer.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.util; +package org.springframework.ide.vscode.commons.util; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/HtmlSnippet.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/HtmlSnippet.java similarity index 96% rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/HtmlSnippet.java rename to vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/HtmlSnippet.java index 6c10308e5..dd107040f 100644 --- a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/HtmlSnippet.java +++ b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/HtmlSnippet.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.util; +package org.springframework.ide.vscode.commons.util; /** * A snippet that can be rendered into html. diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/IRequestor.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/IRequestor.java similarity index 52% rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/IRequestor.java rename to vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/IRequestor.java index 4e7bb38a5..547750a1e 100644 --- a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/IRequestor.java +++ b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/IRequestor.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.util; +package org.springframework.ide.vscode.commons.util; public interface IRequestor { void accept(T node); diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/LazyProvider.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/LazyProvider.java similarity index 90% rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/LazyProvider.java rename to vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/LazyProvider.java index a77fcc6c3..032fe488a 100644 --- a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/LazyProvider.java +++ b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/LazyProvider.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.util; +package org.springframework.ide.vscode.commons.util; import javax.inject.Provider; diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/ListenerList.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ListenerList.java similarity index 99% rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/ListenerList.java rename to vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ListenerList.java index d5f380dde..b60290050 100644 --- a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/ListenerList.java +++ b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ListenerList.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.util; +package org.springframework.ide.vscode.commons.util; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/Log.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Log.java similarity index 88% rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/Log.java rename to vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Log.java index c5119fe30..109e664bf 100644 --- a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/Log.java +++ b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Log.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.util; +package org.springframework.ide.vscode.commons.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/RememberLast.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/RememberLast.java similarity index 87% rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/RememberLast.java rename to vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/RememberLast.java index 746697625..8c4c1a779 100644 --- a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/RememberLast.java +++ b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/RememberLast.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.util; +package org.springframework.ide.vscode.commons.util; /** * Requestor that remembers only the last item received. diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/StringUtil.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/StringUtil.java similarity index 98% rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/StringUtil.java rename to vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/StringUtil.java index 806d69e66..7583d37a1 100644 --- a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/StringUtil.java +++ b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/StringUtil.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.util; +package org.springframework.ide.vscode.commons.util; import java.text.SimpleDateFormat; import java.util.Arrays; diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/ValueParser.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ValueParser.java similarity index 94% rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/ValueParser.java rename to vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ValueParser.java index 50806b806..1ee05bb02 100644 --- a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/ValueParser.java +++ b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ValueParser.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.util; +package org.springframework.ide.vscode.commons.util; /** * A ValueParser provides the means to Strings into some kind of diff --git a/vscode-extensions/commons/commons-util/src/test/java/org/springframework/ide/vscode/util/StringUtilTest.java b/vscode-extensions/commons/commons-util/src/test/java/org/springframework/ide/vscode/commons/util/StringUtilTest.java similarity index 96% rename from vscode-extensions/commons/commons-util/src/test/java/org/springframework/ide/vscode/util/StringUtilTest.java rename to vscode-extensions/commons/commons-util/src/test/java/org/springframework/ide/vscode/commons/util/StringUtilTest.java index 70f8cccdc..0ab9be08f 100644 --- a/vscode-extensions/commons/commons-util/src/test/java/org/springframework/ide/vscode/util/StringUtilTest.java +++ b/vscode-extensions/commons/commons-util/src/test/java/org/springframework/ide/vscode/commons/util/StringUtilTest.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.util; +package org.springframework.ide.vscode.commons.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -16,7 +16,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.springframework.ide.vscode.util.StringUtil; +import org.springframework.ide.vscode.commons.util.StringUtil; /** * @author Kris De Volder diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/ast/YamlFileAST.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/ast/YamlFileAST.java index 1a0accf52..21f8aa343 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/ast/YamlFileAST.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/ast/YamlFileAST.java @@ -6,9 +6,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.springframework.ide.vscode.util.Collector; -import org.springframework.ide.vscode.util.IRequestor; -import org.springframework.ide.vscode.util.RememberLast; +import org.springframework.ide.vscode.commons.util.Collector; +import org.springframework.ide.vscode.commons.util.IRequestor; +import org.springframework.ide.vscode.commons.util.RememberLast; import org.springframework.ide.vscode.yaml.ast.NodeRef.RootRef; import org.springframework.ide.vscode.yaml.ast.NodeRef.SeqRef; import org.springframework.ide.vscode.yaml.ast.NodeRef.TupleKeyRef; diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/YTypeAssistContext.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/YTypeAssistContext.java index 5e42c2bef..3e67c1cda 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/YTypeAssistContext.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/YTypeAssistContext.java @@ -22,8 +22,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.ide.vscode.commons.languageserver.completion.DocumentEdits; import org.springframework.ide.vscode.commons.languageserver.completion.ICompletionProposal; -import org.springframework.ide.vscode.util.CollectionUtil; -import org.springframework.ide.vscode.util.FuzzyMatcher; +import org.springframework.ide.vscode.commons.util.CollectionUtil; +import org.springframework.ide.vscode.commons.util.FuzzyMatcher; import org.springframework.ide.vscode.yaml.path.YamlPath; import org.springframework.ide.vscode.yaml.path.YamlPathSegment; import org.springframework.ide.vscode.yaml.path.YamlPathSegment.YamlPathSegmentType; diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/YamlCompletionEngine.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/YamlCompletionEngine.java index bb3d77551..16eaff95b 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/YamlCompletionEngine.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/YamlCompletionEngine.java @@ -18,7 +18,7 @@ import org.slf4j.LoggerFactory; import org.springframework.ide.vscode.commons.languageserver.completion.ICompletionEngine; import org.springframework.ide.vscode.commons.languageserver.completion.ICompletionProposal; import org.springframework.ide.vscode.commons.languageserver.util.IDocument; -import org.springframework.ide.vscode.util.Assert; +import org.springframework.ide.vscode.commons.util.Assert; import org.springframework.ide.vscode.yaml.path.YamlPath; import org.springframework.ide.vscode.yaml.structure.YamlDocument; import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SKeyNode; diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/YamlPathEdits.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/YamlPathEdits.java index 341356e1b..1ab25e3d0 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/YamlPathEdits.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/YamlPathEdits.java @@ -12,7 +12,7 @@ package org.springframework.ide.vscode.yaml.completion; import org.springframework.ide.vscode.commons.languageserver.completion.DocumentEdits; import org.springframework.ide.vscode.commons.languageserver.util.IRegion; -import org.springframework.ide.vscode.util.Assert; +import org.springframework.ide.vscode.commons.util.Assert; import org.springframework.ide.vscode.yaml.path.YamlPath; import org.springframework.ide.vscode.yaml.path.YamlPathSegment; import org.springframework.ide.vscode.yaml.path.YamlPathSegment.YamlPathSegmentType; diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/SchemaBasedYamlASTReconciler.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/SchemaBasedYamlASTReconciler.java index 8ae578f3d..d3a8d2f15 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/SchemaBasedYamlASTReconciler.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/SchemaBasedYamlASTReconciler.java @@ -5,9 +5,9 @@ import java.util.List; import java.util.Map; import org.springframework.ide.vscode.commons.languageserver.reconcile.IProblemCollector; -import org.springframework.ide.vscode.util.ExceptionUtil; -import org.springframework.ide.vscode.util.StringUtil; -import org.springframework.ide.vscode.util.ValueParser; +import org.springframework.ide.vscode.commons.util.ExceptionUtil; +import org.springframework.ide.vscode.commons.util.StringUtil; +import org.springframework.ide.vscode.commons.util.ValueParser; import org.springframework.ide.vscode.yaml.ast.NodeUtil; import org.springframework.ide.vscode.yaml.ast.YamlFileAST; import org.springframework.ide.vscode.yaml.schema.YType; diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YTypeFactory.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YTypeFactory.java index a8ff3e14d..b013e2e9c 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YTypeFactory.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YTypeFactory.java @@ -21,9 +21,9 @@ import java.util.Set; import javax.inject.Provider; -import org.springframework.ide.vscode.util.EnumValueParser; -import org.springframework.ide.vscode.util.HtmlSnippet; -import org.springframework.ide.vscode.util.ValueParser; +import org.springframework.ide.vscode.commons.util.EnumValueParser; +import org.springframework.ide.vscode.commons.util.HtmlSnippet; +import org.springframework.ide.vscode.commons.util.ValueParser; import org.springframework.ide.vscode.yaml.util.DescriptionProviders; /** diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YTypeUtil.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YTypeUtil.java index 1b922cce1..cc5b92fcb 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YTypeUtil.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YTypeUtil.java @@ -13,7 +13,7 @@ package org.springframework.ide.vscode.yaml.schema; import java.util.List; import java.util.Map; -import org.springframework.ide.vscode.util.ValueParser; +import org.springframework.ide.vscode.commons.util.ValueParser; /** * An implementation of YTypeUtil provides implementations of various diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YTypedProperty.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YTypedProperty.java index e8ffb0650..69df068e3 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YTypedProperty.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YTypedProperty.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.springframework.ide.vscode.yaml.schema; -import org.springframework.ide.vscode.util.HtmlSnippet; +import org.springframework.ide.vscode.commons.util.HtmlSnippet; /** * @author Kris De Volder diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/structure/YamlStructureParser.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/structure/YamlStructureParser.java index 666f94fb8..eb9aa5a9f 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/structure/YamlStructureParser.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/structure/YamlStructureParser.java @@ -11,9 +11,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.springframework.ide.vscode.commons.languageserver.util.IRegion; -import org.springframework.ide.vscode.util.Assert; -import org.springframework.ide.vscode.util.CollectionUtil; -import org.springframework.ide.vscode.util.StringUtil; +import org.springframework.ide.vscode.commons.util.Assert; +import org.springframework.ide.vscode.commons.util.CollectionUtil; +import org.springframework.ide.vscode.commons.util.StringUtil; import org.springframework.ide.vscode.yaml.path.KeyAliases; import org.springframework.ide.vscode.yaml.path.YamlNavigable; import org.springframework.ide.vscode.yaml.path.YamlPath; diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/util/DescriptionProviders.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/util/DescriptionProviders.java index 30168713b..3a4a491d3 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/util/DescriptionProviders.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/util/DescriptionProviders.java @@ -10,15 +10,15 @@ *******************************************************************************/ package org.springframework.ide.vscode.yaml.util; +import static org.springframework.ide.vscode.commons.util.HtmlSnippet.*; + import java.io.InputStream; import javax.inject.Provider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.ide.vscode.util.HtmlSnippet; - -import static org.springframework.ide.vscode.util.HtmlSnippet.*; +import org.springframework.ide.vscode.commons.util.HtmlSnippet; /** * Static methods and convenience constants for creating some 'description providers'. diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/util/YamlIndentUtil.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/util/YamlIndentUtil.java index f4f95f4ba..8419a1f05 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/util/YamlIndentUtil.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/util/YamlIndentUtil.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.springframework.ide.vscode.yaml.util; -import org.springframework.ide.vscode.util.Assert; +import org.springframework.ide.vscode.commons.util.Assert; import org.springframework.ide.vscode.yaml.structure.YamlDocument; import com.google.common.base.Strings; diff --git a/vscode-extensions/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/testharness/TestProjectHarness.java b/vscode-extensions/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/testharness/TestProjectHarness.java index dd23c26d5..0bd64caf4 100644 --- a/vscode-extensions/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/testharness/TestProjectHarness.java +++ b/vscode-extensions/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/testharness/TestProjectHarness.java @@ -8,9 +8,9 @@ import java.nio.file.Paths; import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.java.IType; -import org.springframework.ide.vscode.util.ExternalCommand; -import org.springframework.ide.vscode.util.ExternalProcess; -import org.springframework.ide.vscode.util.HtmlSnippet; +import org.springframework.ide.vscode.commons.util.ExternalCommand; +import org.springframework.ide.vscode.commons.util.ExternalProcess; +import org.springframework.ide.vscode.commons.util.HtmlSnippet; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; 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 c286196f1..17a5de486 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 @@ -10,7 +10,7 @@ import org.springframework.ide.vscode.commons.languageserver.reconcile.IReconcil import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer; import org.springframework.ide.vscode.commons.languageserver.util.SimpleTextDocumentService; import org.springframework.ide.vscode.commons.languageserver.util.TextDocument; -import org.springframework.ide.vscode.util.Futures; +import org.springframework.ide.vscode.commons.util.Futures; import org.springframework.ide.vscode.yaml.ast.YamlASTProvider; import org.springframework.ide.vscode.yaml.ast.YamlParser; import org.springframework.ide.vscode.yaml.reconcile.ApplicationYamlReconcileEngine; diff --git a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/quickfix/ReplaceDeprecatedYamlQuickfix.java b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/quickfix/ReplaceDeprecatedYamlQuickfix.java index 5e60c2e4b..326781581 100644 --- a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/quickfix/ReplaceDeprecatedYamlQuickfix.java +++ b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/quickfix/ReplaceDeprecatedYamlQuickfix.java @@ -19,7 +19,7 @@ import org.springframework.ide.vscode.commons.languageserver.completion.Proposal import org.springframework.ide.vscode.commons.languageserver.quickfix.ProblemFixer; import org.springframework.ide.vscode.commons.languageserver.quickfix.QuickfixContext; import org.springframework.ide.vscode.commons.languageserver.util.IDocument; -import org.springframework.ide.vscode.util.Log; +import org.springframework.ide.vscode.commons.util.Log; import org.springframework.ide.vscode.yaml.completion.YamlPathEdits; import org.springframework.ide.vscode.yaml.path.YamlPath; import org.springframework.ide.vscode.yaml.reconcile.SpringPropertyProblem; 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 d1dafa5fe..a863ec490 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 @@ -19,8 +19,8 @@ import org.springframework.ide.vscode.application.properties.metadata.types.Type 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.util.StringUtil; -import org.springframework.ide.vscode.util.ValueParser; +import org.springframework.ide.vscode.commons.util.StringUtil; +import org.springframework.ide.vscode.commons.util.ValueParser; import org.springframework.ide.vscode.yaml.ast.NodeRef; import org.springframework.ide.vscode.yaml.ast.NodeRef.Kind; import org.springframework.ide.vscode.yaml.ast.NodeRef.TupleValueRef; 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 c5ffd6675..70b52b12c 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 @@ -21,8 +21,8 @@ import org.junit.Test; import org.springframework.ide.vscode.application.properties.metadata.CachingValueProvider; import org.springframework.ide.vscode.application.properties.metadata.PropertyInfo; import org.springframework.ide.vscode.commons.java.IJavaProject; +import org.springframework.ide.vscode.commons.util.StringUtil; import org.springframework.ide.vscode.testharness.Editor; -import org.springframework.ide.vscode.util.StringUtil; import io.typefox.lsapi.CompletionItem; import io.typefox.lsapi.Diagnostic; diff --git a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/ManifestYmlSchema.java b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/ManifestYmlSchema.java index 9be4e6e28..8fe5c54f4 100644 --- a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/ManifestYmlSchema.java +++ b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/ManifestYmlSchema.java @@ -15,7 +15,7 @@ import java.util.Set; import javax.inject.Provider; -import org.springframework.ide.vscode.util.HtmlSnippet; +import org.springframework.ide.vscode.commons.util.HtmlSnippet; import org.springframework.ide.vscode.yaml.schema.YType; import org.springframework.ide.vscode.yaml.schema.YTypeFactory; import org.springframework.ide.vscode.yaml.schema.YTypeFactory.YAtomicType; diff --git a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/ManifestYmlValueParsers.java b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/ManifestYmlValueParsers.java index 171a392aa..e4bd4c2bb 100644 --- a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/ManifestYmlValueParsers.java +++ b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/ManifestYmlValueParsers.java @@ -12,8 +12,8 @@ package org.springframework.ide.vscode.cloudfoundry.manifest.editor; import java.util.Set; -import org.springframework.ide.vscode.util.Assert; -import org.springframework.ide.vscode.util.ValueParser; +import org.springframework.ide.vscode.commons.util.Assert; +import org.springframework.ide.vscode.commons.util.ValueParser; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; diff --git a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/VscodeCompletionEngineAdapter.java b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/VscodeCompletionEngineAdapter.java index bb6e401fe..65ab82459 100644 --- a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/VscodeCompletionEngineAdapter.java +++ b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/VscodeCompletionEngineAdapter.java @@ -14,7 +14,7 @@ import org.springframework.ide.vscode.commons.languageserver.completion.Document import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer; import org.springframework.ide.vscode.commons.languageserver.util.SimpleTextDocumentService; import org.springframework.ide.vscode.commons.languageserver.util.TextDocument; -import org.springframework.ide.vscode.util.Futures; +import org.springframework.ide.vscode.commons.util.Futures; import org.springframework.ide.vscode.yaml.completion.DefaultCompletionFactory; import org.springframework.ide.vscode.yaml.structure.YamlStructureParser; diff --git a/vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/yaml/ManifestYmlSchemaTest.java b/vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/yaml/ManifestYmlSchemaTest.java index 00b5db39b..2808c4718 100644 --- a/vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/yaml/ManifestYmlSchemaTest.java +++ b/vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/yaml/ManifestYmlSchemaTest.java @@ -20,7 +20,7 @@ import java.util.Map; import org.junit.Test; import org.springframework.ide.vscode.cloudfoundry.manifest.editor.ManifestYmlSchema; -import org.springframework.ide.vscode.util.StringUtil; +import org.springframework.ide.vscode.commons.util.StringUtil; import org.springframework.ide.vscode.yaml.schema.YTypeFactory.YBeanType; import org.springframework.ide.vscode.yaml.schema.YTypeFactory.YSeqType; import org.springframework.ide.vscode.yaml.schema.YTypedProperty;