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

4
headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/ArrayTypeWrapper.java
View File

@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Pivotal, Inc.
* Copyright (c) 2016-2024 Pivotal, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -35,7 +35,7 @@ final class ArrayTypeWrapper extends TypeWrapper<ArrayType> implements IArrayTyp
@Override
public IJavaType component() {
return wrap(getType().component());
return wrap(getType().elementType());
}
}

9
headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/HtmlJavadocIndex.java
View File

@@ -19,8 +19,9 @@ import java.net.URL;
import java.util.concurrent.ExecutionException;
import java.util.stream.Collectors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.ide.vscode.commons.javadoc.internal.JavadocContents;
import org.springframework.ide.vscode.commons.util.Log;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
@@ -28,6 +29,8 @@ import com.google.common.cache.CacheBuilder;
public interface HtmlJavadocIndex {
static final Logger log = LoggerFactory.getLogger(HtmlJavadocIndex.class);
static JavadocContents NO_HTML_CONTENT = new JavadocContents(null);
public static final HtmlJavadocIndex DEFAULT = new HtmlJavadocIndex() {
@@ -45,7 +48,7 @@ public interface HtmlJavadocIndex {
BufferedReader buffer = new BufferedReader(new InputStreamReader(stream));
return new JavadocContents(buffer.lines().collect(Collectors.joining("\n")));
} catch (IOException e) {
Log.log("Cannot load javadoc content from " + url, e);
log.error("Cannot load javadoc content from " + url, e);
return NO_HTML_CONTENT;
} finally {
if (stream != null) {
@@ -55,7 +58,7 @@ public interface HtmlJavadocIndex {
});
return content == NO_HTML_CONTENT ? null : content;
} catch (ExecutionException e) {
Log.log(e);
log.error("", e);
return null;
}
}

11
headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/HtmlJavadocProvider.java
View File

@@ -13,16 +13,19 @@ package org.springframework.ide.vscode.commons.javadoc;
import java.net.URL;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.ide.vscode.commons.java.IAnnotation;
import org.springframework.ide.vscode.commons.java.IField;
import org.springframework.ide.vscode.commons.java.IJavadocProvider;
import org.springframework.ide.vscode.commons.java.IMethod;
import org.springframework.ide.vscode.commons.java.IType;
import org.springframework.ide.vscode.commons.javadoc.internal.JavadocContents;
import org.springframework.ide.vscode.commons.util.Log;
public class HtmlJavadocProvider implements IJavadocProvider {
private static final Logger log = LoggerFactory.getLogger(HtmlJavadocProvider.class);
private SourceUrlProvider htmlUrlProvider;
public HtmlJavadocProvider(SourceUrlProvider htmlUrlProvider) {
@@ -36,7 +39,7 @@ public class HtmlJavadocProvider implements IJavadocProvider {
String html = javadocContents == null ? null : javadocContents.getTypeDoc(type);
return html == null ? null : new HtmlJavadoc(html);
} catch (Exception e) {
Log.log(e);
log.error("", e);
return null;
}
}
@@ -49,7 +52,7 @@ public class HtmlJavadocProvider implements IJavadocProvider {
String html = javadocContents == null ? null : javadocContents.getFieldDoc(field);
return html == null ? null : new HtmlJavadoc(html);
} catch (Exception e) {
Log.log(e);
log.error("", e);
return null;
}
}
@@ -62,7 +65,7 @@ public class HtmlJavadocProvider implements IJavadocProvider {
String html = javadocContents == null ? null : javadocContents.getMethodDoc(method);
return html == null ? null : new HtmlJavadoc(html);
} catch (Exception e) {
Log.log(e);
log.error("", e);
return null;
}
}

9
headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/FileBasedJavaProjectFinder.java
View File

@@ -18,8 +18,9 @@ import java.net.URLDecoder;
import java.util.Optional;
import org.eclipse.lsp4j.TextDocumentIdentifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.ide.vscode.commons.java.IJavaProject;
import org.springframework.ide.vscode.commons.util.Log;
import org.springframework.ide.vscode.commons.util.StringUtil;
/**
@@ -32,6 +33,8 @@ import org.springframework.ide.vscode.commons.util.StringUtil;
* @author Kris De Volder
*/
public abstract class FileBasedJavaProjectFinder implements JavaProjectFinder {
private static final Logger log = LoggerFactory.getLogger(FileBasedJavaProjectFinder.class);
@Override
public final Optional<IJavaProject> find(TextDocumentIdentifier doc) {
@@ -53,14 +56,14 @@ public abstract class FileBasedJavaProjectFinder implements JavaProjectFinder {
String projectName = getProjectName(decoded);
return findProjectByName(projectName);
} catch (UnsupportedEncodingException e) {
Log.log(e);
log.error("", e);
}
}
}
}
}
catch (URISyntaxException e) {
Log.log(e);
log.error("", e);
}
return Optional.empty();
}