Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove some deprecated classes and deprecated api usages

Browse Source
This commit is contained in:
aboyko
2024-07-18 11:13:23 -04:00
parent c24362af84
commit e3a4d69694
33 changed files with 143 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/common/CommonLanguageTools.java
View File

@@ -18,6 +18,8 @@ import java.util.Collection;
import java.util.List;
import java.util.regex.Pattern;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.ide.vscode.boot.metadata.PropertyInfo;
import org.springframework.ide.vscode.boot.metadata.hints.HintProvider;
import org.springframework.ide.vscode.boot.metadata.hints.HintProviders;
@@ -29,13 +31,15 @@ import org.springframework.ide.vscode.boot.metadata.types.TypeUtil.EnumCaseMode;
import org.springframework.ide.vscode.boot.properties.reconcile.PropertyNavigator;
import org.springframework.ide.vscode.commons.util.CollectionUtil;
import org.springframework.ide.vscode.commons.util.FuzzyMap;
import org.springframework.ide.vscode.commons.util.Log;
import org.springframework.ide.vscode.commons.util.text.DocumentRegion;
import org.springframework.ide.vscode.commons.util.text.LanguageId;
import org.springframework.ide.vscode.commons.util.text.TextDocument;
import org.springframework.ide.vscode.commons.yaml.path.YamlPathSegment;
public class CommonLanguageTools {
private static final Logger log = LoggerFactory.getLogger(CommonLanguageTools.class);
public static final Pattern SPACES = Pattern.compile(
"(\\s|\\\\\\s)*"
@@ -63,7 +67,7 @@ public class CommonLanguageTools {
}
}
} catch (Exception e) {
Log.log(e);
log.error("", e);
}
return null;
}
@@ -91,7 +95,7 @@ public class CommonLanguageTools {
try {
hintProvider = hintProvider.traverse(YamlPathSegment.valueAt(0));
} catch (Exception e) {
Log.log(e);
log.error("", e);
}
}
if (!HintProviders.isNull(hintProvider)) {

7
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/WordHighlighter.java
View File

@@ -14,9 +14,10 @@ import java.util.List;
import java.util.function.Function;
import org.eclipse.lsp4j.Range;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer;
import org.springframework.ide.vscode.commons.util.BadLocationException;
import org.springframework.ide.vscode.commons.util.Log;
import org.springframework.ide.vscode.commons.util.text.TextDocument;
import com.google.common.collect.ImmutableList;
@@ -29,6 +30,8 @@ import com.google.common.collect.ImmutableList;
* @author Kris De Volder
*/
public class WordHighlighter implements Function<TextDocument, List<Range>> {
private static final Logger log = LoggerFactory.getLogger(WordHighlighter.class);
private final String word;
@@ -46,7 +49,7 @@ public class WordHighlighter implements Function<TextDocument, List<Range>> {
try {
highlights.add(doc.toRange(wordStart, word.length()));
} catch (BadLocationException e) {
Log.log(e);
log.error("", e);
}
wordStart = text.indexOf(word, wordStart+word.length());
}

3
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/CompilationUnitCache.java
View File

@@ -12,6 +12,7 @@ package org.springframework.ide.vscode.boot.java.utils;
import java.io.File;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -381,7 +382,7 @@ public final class CompilationUnitCache implements DocumentContentProvider {
return document.get();
}
}
return IOUtils.toString(uri);
return IOUtils.toString(uri, StandardCharsets.UTF_8);
}
}

2
headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/editor/harness/AbstractPropsEditorTest.java
View File

@@ -127,7 +127,7 @@ public abstract class AbstractPropsEditorTest {
editor.assertCompletionDetails(expectLabel, expectDetail, expectDocumenation);
}
public void assertCompletionDetailsWithDeprecation(String editorText, String expectLabel, String expectDetail, String expectDocumenation, Boolean deprecated) throws Exception {
public void assertCompletionDetailsWithDeprecation(String editorText, String expectLabel, String expectDetail, String expectDocumenation, boolean deprecated) throws Exception {
Editor editor = newEditor(editorText);
editor.assertCompletionDetailsWithDeprecation(expectLabel, expectDetail, expectDocumenation, deprecated);
}

10
headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java
View File

@@ -1307,14 +1307,14 @@ public class ApplicationPropertiesEditorTest extends AbstractPropsEditorTest {
"error.path : String"
);
//TODO: could we check that 'deprecated' completions are formatted with 'strikethrough font?
assertCompletionDetailsWithDeprecation("error.pa<*>", "server.error.path", "String", null, null);
assertCompletionDetailsWithDeprecation("error.pa<*>", "server.error.path", "String", null, false);
assertCompletionDetailsWithDeprecation("error.pa<*>", "error.path", "String",
"~~error.path~~ \u2192 server.error.path \n" +
"\n" +
"Path of the error controller.\n" +
"\n" +
"**Deprecated:** This is old",
Boolean.TRUE);
true);
}
@Test
@@ -1395,9 +1395,9 @@ public class ApplicationPropertiesEditorTest extends AbstractPropsEditorTest {
useProject(p);
data("foo", "demo.Deprecater", null, "A Bean with deprecated properties");
assertCompletionDetailsWithDeprecation("foo.nam<*>", "new-name", "String", null, null);
assertCompletionDetailsWithDeprecation("foo.nam<*>", "name", "String", null, Boolean.TRUE);
assertCompletionDetailsWithDeprecation("foo.nam<*>", "alt-name", "String", null, Boolean.TRUE);
assertCompletionDetailsWithDeprecation("foo.nam<*>", "new-name", "String", null, false);
assertCompletionDetailsWithDeprecation("foo.nam<*>", "name", "String", null, true);
assertCompletionDetailsWithDeprecation("foo.nam<*>", "alt-name", "String", null, true);
}
@Test

10
headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationYamlEditorTest.java
View File

@@ -3413,14 +3413,14 @@ public class ApplicationYamlEditorTest extends AbstractPropsEditorTest {
"server.error.path : String", // should be first because it is not deprecated, even though it is not as good a pattern match
"error.path : String"
);
assertCompletionDetailsWithDeprecation("error.pa<*>", "server.error.path", "String", null, null);
assertCompletionDetailsWithDeprecation("error.pa<*>", "server.error.path", "String", null, false);
assertCompletionDetailsWithDeprecation("error.pa<*>", "error.path", "String",
"~~error.path~~ \u2192 server.error.path \n" +
"\n" +
"Path of the error controller.\n" +
"\n" +
"**Deprecated:** This is old",
Boolean.TRUE);
true);
}
@Test
@@ -3501,9 +3501,9 @@ public class ApplicationYamlEditorTest extends AbstractPropsEditorTest {
useProject(jp);
data("foo", "demo.Deprecater", null, "A Bean with deprecated properties");
assertCompletionDetailsWithDeprecation("foo:\n nam<*>", "new-name", "String", null, null);
assertCompletionDetailsWithDeprecation("foo:\n nam<*>", "name", "String", null, Boolean.TRUE);
assertCompletionDetailsWithDeprecation("foo:\n nam<*>", "alt-name", "String", null, Boolean.TRUE);
assertCompletionDetailsWithDeprecation("foo:\n nam<*>", "new-name", "String", null, false);
assertCompletionDetailsWithDeprecation("foo:\n nam<*>", "name", "String", null, true);
assertCompletionDetailsWithDeprecation("foo:\n nam<*>", "alt-name", "String", null, true);
}
@Test