From 2413650b1a8a42e5db5692a2bb36ce72fce544a8 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Fri, 9 Feb 2018 13:59:21 -0800 Subject: [PATCH] Fixups to remove one of two different ConfigurationMetadata implementations --- .../metadata/DefaultSpringPropertyIndexProvider.java | 2 +- .../vscode/boot/java/metadata/PropertiesLoader.java | 12 ++++++------ .../java/metadata/SpringPropertiesIndexManager.java | 2 +- .../boot/java/metadata/SpringPropertyIndex.java | 4 ++-- .../java/metadata/SpringPropertyIndexProvider.java | 2 +- .../boot/java/value/ValueCompletionProcessor.java | 2 +- .../vscode/project/harness/PropertyIndexHarness.java | 8 ++++---- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/metadata/DefaultSpringPropertyIndexProvider.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/metadata/DefaultSpringPropertyIndexProvider.java index 751778c95..647dff5d6 100644 --- a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/metadata/DefaultSpringPropertyIndexProvider.java +++ b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/metadata/DefaultSpringPropertyIndexProvider.java @@ -14,7 +14,7 @@ package org.springframework.ide.vscode.boot.java.metadata; import java.util.Optional; import org.eclipse.lsp4j.TextDocumentIdentifier; -import org.springframework.boot.configurationmetadata.ConfigurationMetadataProperty; +import org.springframework.ide.vscode.boot.configurationmetadata.ConfigurationMetadataProperty; import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.languageserver.ProgressService; import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder; diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/metadata/PropertiesLoader.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/metadata/PropertiesLoader.java index 9ad0b7d69..6c497064e 100644 --- a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/metadata/PropertiesLoader.java +++ b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/metadata/PropertiesLoader.java @@ -22,8 +22,8 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.zip.ZipEntry; -import org.springframework.boot.configurationmetadata.ConfigurationMetadataRepository; -import org.springframework.boot.configurationmetadata.ConfigurationMetadataRepositoryJsonBuilder; +import org.springframework.ide.vscode.boot.configurationmetadata.ConfigurationMetadataRepository; +import org.springframework.ide.vscode.boot.configurationmetadata.ConfigurationMetadataRepositoryJsonBuilder; import org.springframework.ide.vscode.commons.java.IClasspath; public class PropertiesLoader { @@ -84,7 +84,7 @@ public class PropertiesLoader { InputStream is = null; try { is = Files.newInputStream(mdf); - loadFromInputStream(is); + loadFromInputStream(mdf, is); } catch (Exception e) { LOG.log(Level.SEVERE, "Error loading file '" + mdf + "'", e); } finally { @@ -127,7 +127,7 @@ public class PropertiesLoader { InputStream is = null; try { is = jarFile.getInputStream(ze); - loadFromInputStream(is); + loadFromInputStream(jarFile, is); } catch (Throwable e) { LOG.log(Level.SEVERE, "Error loading JAR file", e); } finally { @@ -140,8 +140,8 @@ public class PropertiesLoader { } } - private void loadFromInputStream(InputStream is) throws IOException { - builder.withJsonResource(is); + private void loadFromInputStream(Object origin, InputStream is) throws IOException { + builder.withJsonResource(origin, is); } } diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/metadata/SpringPropertiesIndexManager.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/metadata/SpringPropertiesIndexManager.java index 953812ba1..8fa3e1787 100644 --- a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/metadata/SpringPropertiesIndexManager.java +++ b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/metadata/SpringPropertiesIndexManager.java @@ -13,7 +13,7 @@ package org.springframework.ide.vscode.boot.java.metadata; import java.util.HashMap; import java.util.Map; -import org.springframework.boot.configurationmetadata.ConfigurationMetadataProperty; +import org.springframework.ide.vscode.boot.configurationmetadata.ConfigurationMetadataProperty; import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.languageserver.ProgressService; import org.springframework.ide.vscode.commons.languageserver.java.ProjectObserver; diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/metadata/SpringPropertyIndex.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/metadata/SpringPropertyIndex.java index f2b4185a9..b0d004619 100644 --- a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/metadata/SpringPropertyIndex.java +++ b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/metadata/SpringPropertyIndex.java @@ -12,8 +12,8 @@ package org.springframework.ide.vscode.boot.java.metadata; import java.util.Collection; -import org.springframework.boot.configurationmetadata.ConfigurationMetadataProperty; -import org.springframework.boot.configurationmetadata.ConfigurationMetadataRepository; +import org.springframework.ide.vscode.boot.configurationmetadata.ConfigurationMetadataProperty; +import org.springframework.ide.vscode.boot.configurationmetadata.ConfigurationMetadataRepository; import org.springframework.ide.vscode.commons.java.IClasspath; import org.springframework.ide.vscode.commons.util.FuzzyMap; diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/metadata/SpringPropertyIndexProvider.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/metadata/SpringPropertyIndexProvider.java index 309ea8788..f476d5467 100644 --- a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/metadata/SpringPropertyIndexProvider.java +++ b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/metadata/SpringPropertyIndexProvider.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.springframework.ide.vscode.boot.java.metadata; -import org.springframework.boot.configurationmetadata.ConfigurationMetadataProperty; +import org.springframework.ide.vscode.boot.configurationmetadata.ConfigurationMetadataProperty; import org.springframework.ide.vscode.commons.util.FuzzyMap; import org.springframework.ide.vscode.commons.util.text.IDocument; diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/value/ValueCompletionProcessor.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/value/ValueCompletionProcessor.java index 0067dd821..2ec61f78b 100644 --- a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/value/ValueCompletionProcessor.java +++ b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/value/ValueCompletionProcessor.java @@ -22,7 +22,7 @@ import org.eclipse.jdt.core.dom.ITypeBinding; import org.eclipse.jdt.core.dom.MemberValuePair; import org.eclipse.jdt.core.dom.SimpleName; import org.eclipse.jdt.core.dom.StringLiteral; -import org.springframework.boot.configurationmetadata.ConfigurationMetadataProperty; +import org.springframework.ide.vscode.boot.configurationmetadata.ConfigurationMetadataProperty; import org.springframework.ide.vscode.boot.java.handlers.CompletionProvider; import org.springframework.ide.vscode.boot.java.metadata.SpringPropertyIndexProvider; import org.springframework.ide.vscode.commons.languageserver.completion.DocumentEdits; diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/project/harness/PropertyIndexHarness.java b/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/project/harness/PropertyIndexHarness.java index 85fe58fee..4702f9a97 100644 --- a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/project/harness/PropertyIndexHarness.java +++ b/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/project/harness/PropertyIndexHarness.java @@ -15,10 +15,10 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import org.springframework.boot.configurationmetadata.ConfigurationMetadataProperty; -import org.springframework.boot.configurationmetadata.Deprecation; -import org.springframework.boot.configurationmetadata.ValueHint; -import org.springframework.boot.configurationmetadata.ValueProvider; +import org.springframework.ide.vscode.boot.configurationmetadata.ConfigurationMetadataProperty; +import org.springframework.ide.vscode.boot.configurationmetadata.Deprecation; +import org.springframework.ide.vscode.boot.configurationmetadata.ValueHint; +import org.springframework.ide.vscode.boot.configurationmetadata.ValueProvider; import org.springframework.ide.vscode.boot.java.metadata.SpringPropertyIndex; import org.springframework.ide.vscode.boot.java.metadata.SpringPropertyIndexProvider; import org.springframework.ide.vscode.commons.java.IClasspath;