Skip to content

Commit e3a4d69

Browse files
BoykoAlexBoykoAlex
committed
Remove some deprecated classes and deprecated api usages
1 parent c24362a commit e3a4d69

File tree

33 files changed

+143
-175
lines changed

33 files changed

+143
-175
lines changed

‎headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/BoshCliConfig.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212

1313
import java.time.Duration;
1414

15+
import org.slf4j.Logger;
16+
import org.slf4j.LoggerFactory;
1517
import org.springframework.ide.vscode.commons.languageserver.util.Settings;
16-
import org.springframework.ide.vscode.commons.util.Log;
1718
import org.springframework.stereotype.Component;
1819

1920
/**
@@ -25,6 +26,8 @@
2526
*/
2627
@Component
2728
public class BoshCliConfig {
29+
30+
private static final Logger log = LoggerFactory.getLogger(BoshCliConfig.class);
2831

2932
/**
3033
* The settings object. This is obtained from 'didChangeConfiguration' events.
@@ -43,7 +46,7 @@ public Duration getTimeout() {
4346
}
4447

4548
public void handleConfigurationChange(Settings newConfig) {
46-
Log.info("Settings received: "+newConfig);
49+
log.info("Settings received: " + newConfig);
4750
this.settings = newConfig;
4851
}
4952
}

‎headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFRouteBuilder.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,14 @@
55
import java.util.stream.Collectors;
66

77
import org.cloudfoundry.operations.routes.Route;
8-
import org.springframework.ide.vscode.commons.util.Log;
8+
import org.slf4j.Logger;
9+
import org.slf4j.LoggerFactory;
910
import org.springframework.ide.vscode.commons.util.StringUtil;
1011

1112
public class CFRouteBuilder {
13+
14+
private static final Logger log = LoggerFactory.getLogger(CFRouteBuilder.class);
15+
1216
private String domain;
1317
private String host;
1418
private String path;
@@ -129,7 +133,7 @@ public CFRouteBuilder from(String desiredUrl, Collection<String> domains) {
129133
this.port = Integer.parseInt(portSegments[1]);
130134
}
131135
} catch (NumberFormatException e) {
132-
Log.log(e);
136+
log.error("", e);
133137
}
134138

135139
this.domain = findDomain(hostAndDomain, domains);

‎headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/ReactorUtils.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import java.util.function.Function;
2323

2424
import org.reactivestreams.Publisher;
25+
import org.slf4j.Logger;
26+
import org.slf4j.LoggerFactory;
2527
import org.springframework.ide.vscode.commons.cloudfoundry.client.v2.CancelationTokens.CancelationToken;
26-
import org.springframework.ide.vscode.commons.util.ExceptionUtil;
27-
import org.springframework.ide.vscode.commons.util.Log;
2828

2929
import reactor.core.publisher.Flux;
3030
import reactor.core.publisher.Mono;
@@ -36,6 +36,8 @@
3636
* @author Kris De Volder
3737
*/
3838
public class ReactorUtils {
39+
40+
private static final Logger log = LoggerFactory.getLogger(ReactorUtils.class);
3941

4042
private static final Duration DEFAULT_TIMEOUT = Duration.ofSeconds(45); // reflects default timeout of Mono.block in reactor 2.x.
4143
public static boolean DUMP_STACK_ON_TIMEOUT = false;
@@ -87,7 +89,7 @@ public static <T> T get(Duration timeout, CancelationToken cancelationToken, Mon
8789
// .otherwise(errorFilter(cancelationToken))
8890
.block(timeout);
8991
} catch (Exception e) {
90-
Log.log(e);
92+
log.error("", e);
9193
throw new IOException(e);
9294
}
9395
}

‎headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleCore.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
package org.springframework.ide.vscode.commons.gradle;
1212

1313
import java.io.File;
14-
import java.net.URI;
1514
import java.util.concurrent.TimeUnit;
1615

1716
import org.gradle.tooling.GradleConnectionException;
@@ -20,8 +19,9 @@
2019
import org.gradle.tooling.internal.consumer.DefaultGradleConnector;
2120
import org.gradle.tooling.model.build.BuildEnvironment;
2221
import org.gradle.tooling.model.eclipse.EclipseProject;
22+
import org.slf4j.Logger;
23+
import org.slf4j.LoggerFactory;
2324
import org.springframework.ide.vscode.commons.util.Assert;
24-
import org.springframework.ide.vscode.commons.util.Log;
2525

2626
/**
2727
* Gradle API tooling utility
@@ -31,6 +31,8 @@
3131
*/
3232
public class GradleCore {
3333

34+
private static final Logger log = LoggerFactory.getLogger(GradleCore.class);
35+
3436
@FunctionalInterface
3537
public interface GradleConfiguration {
3638
void configure(GradleConnector connector);
@@ -81,7 +83,7 @@ public <T> T getModel(File projectDir, Class<T> modelType) throws GradleExceptio
8183
connection = gradleConnector.connect();
8284
return connection.getModel(modelType);
8385
} catch (GradleConnectionException e) {
84-
Log.log(e);
86+
log.error("", e);
8587
throw new GradleException(e);
8688
} finally {
8789
if (connection != null) {

‎headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/ArrayTypeWrapper.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2016-2017 Pivotal, Inc.
2+
* Copyright (c) 2016-2024 Pivotal, Inc.
33
* All rights reserved. This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License v1.0
55
* which accompanies this distribution, and is available at
@@ -35,7 +35,7 @@ public int dimensions() {
3535

3636
@Override
3737
public IJavaType component() {
38-
return wrap(getType().component());
38+
return wrap(getType().elementType());
3939
}
4040

4141
}

‎headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/HtmlJavadocIndex.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,18 @@
1919
import java.util.concurrent.ExecutionException;
2020
import java.util.stream.Collectors;
2121

22+
import org.slf4j.Logger;
23+
import org.slf4j.LoggerFactory;
2224
import org.springframework.ide.vscode.commons.javadoc.internal.JavadocContents;
23-
import org.springframework.ide.vscode.commons.util.Log;
2425

2526
import com.google.common.cache.Cache;
2627
import com.google.common.cache.CacheBuilder;
2728

2829

2930
public interface HtmlJavadocIndex {
3031

32+
static final Logger log = LoggerFactory.getLogger(HtmlJavadocIndex.class);
33+
3134
static JavadocContents NO_HTML_CONTENT = new JavadocContents(null);
3235

3336
public static final HtmlJavadocIndex DEFAULT = new HtmlJavadocIndex() {
@@ -45,7 +48,7 @@ public JavadocContents getHtmlJavadoc(URL url) {
4548
BufferedReader buffer = new BufferedReader(new InputStreamReader(stream));
4649
return new JavadocContents(buffer.lines().collect(Collectors.joining("\n")));
4750
} catch (IOException e) {
48-
Log.log("Cannot load javadoc content from " + url, e);
51+
log.error("Cannot load javadoc content from " + url, e);
4952
return NO_HTML_CONTENT;
5053
} finally {
5154
if (stream != null) {
@@ -55,7 +58,7 @@ public JavadocContents getHtmlJavadoc(URL url) {
5558
});
5659
return content == NO_HTML_CONTENT ? null : content;
5760
} catch (ExecutionException e) {
58-
Log.log(e);
61+
log.error("", e);
5962
return null;
6063
}
6164
}

‎headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/HtmlJavadocProvider.java

+7-4
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,19 @@
1313

1414
import java.net.URL;
1515

16+
import org.slf4j.Logger;
17+
import org.slf4j.LoggerFactory;
1618
import org.springframework.ide.vscode.commons.java.IAnnotation;
1719
import org.springframework.ide.vscode.commons.java.IField;
1820
import org.springframework.ide.vscode.commons.java.IJavadocProvider;
1921
import org.springframework.ide.vscode.commons.java.IMethod;
2022
import org.springframework.ide.vscode.commons.java.IType;
2123
import org.springframework.ide.vscode.commons.javadoc.internal.JavadocContents;
22-
import org.springframework.ide.vscode.commons.util.Log;
2324

2425
public class HtmlJavadocProvider implements IJavadocProvider {
2526

27+
private static final Logger log = LoggerFactory.getLogger(HtmlJavadocProvider.class);
28+
2629
private SourceUrlProvider htmlUrlProvider;
2730

2831
public HtmlJavadocProvider(SourceUrlProvider htmlUrlProvider) {
@@ -36,7 +39,7 @@ public IJavadoc getJavadoc(IType type) {
3639
String html = javadocContents == null ? null : javadocContents.getTypeDoc(type);
3740
return html == null ? null : new HtmlJavadoc(html);
3841
} catch (Exception e) {
39-
Log.log(e);
42+
log.error("", e);
4043
return null;
4144
}
4245
}
@@ -49,7 +52,7 @@ public IJavadoc getJavadoc(IField field) {
4952
String html = javadocContents == null ? null : javadocContents.getFieldDoc(field);
5053
return html == null ? null : new HtmlJavadoc(html);
5154
} catch (Exception e) {
52-
Log.log(e);
55+
log.error("", e);
5356
return null;
5457
}
5558
}
@@ -62,7 +65,7 @@ public IJavadoc getJavadoc(IMethod method) {
6265
String html = javadocContents == null ? null : javadocContents.getMethodDoc(method);
6366
return html == null ? null : new HtmlJavadoc(html);
6467
} catch (Exception e) {
65-
Log.log(e);
68+
log.error("", e);
6669
return null;
6770
}
6871
}

‎headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/FileBasedJavaProjectFinder.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@
1818
import java.util.Optional;
1919

2020
import org.eclipse.lsp4j.TextDocumentIdentifier;
21+
import org.slf4j.Logger;
22+
import org.slf4j.LoggerFactory;
2123
import org.springframework.ide.vscode.commons.java.IJavaProject;
22-
import org.springframework.ide.vscode.commons.util.Log;
2324
import org.springframework.ide.vscode.commons.util.StringUtil;
2425

2526
/**
@@ -32,6 +33,8 @@
3233
* @author Kris De Volder
3334
*/
3435
public abstract class FileBasedJavaProjectFinder implements JavaProjectFinder {
36+
37+
private static final Logger log = LoggerFactory.getLogger(FileBasedJavaProjectFinder.class);
3538

3639
@Override
3740
public final Optional<IJavaProject> find(TextDocumentIdentifier doc) {
@@ -53,14 +56,14 @@ public final Optional<IJavaProject> find(TextDocumentIdentifier doc) {
5356
String projectName = getProjectName(decoded);
5457
return findProjectByName(projectName);
5558
} catch (UnsupportedEncodingException e) {
56-
Log.log(e);
59+
log.error("", e);
5760
}
5861
}
5962
}
6063
}
6164
}
6265
catch (URISyntaxException e) {
63-
Log.log(e);
66+
log.error("", e);
6467
}
6568
return Optional.empty();
6669
}

‎headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/VscodeCompletionEngineAdapter.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.eclipse.lsp4j.ApplyWorkspaceEditParams;
2828
import org.eclipse.lsp4j.Command;
2929
import org.eclipse.lsp4j.CompletionItem;
30+
import org.eclipse.lsp4j.CompletionItemTag;
3031
import org.eclipse.lsp4j.CompletionList;
3132
import org.eclipse.lsp4j.InsertTextFormat;
3233
import org.eclipse.lsp4j.InsertTextMode;
@@ -277,7 +278,7 @@ private CompletionItem adaptItem(TextDocument doc, ICompletionProposal completio
277278
item.setFilterText(completion.getFilterText());
278279
item.setInsertTextMode(InsertTextMode.AsIs);
279280
if (completion.isDeprecated()) {
280-
item.setDeprecated(completion.isDeprecated());
281+
item.setTags(List.of(CompletionItemTag.Deprecated));
281282
}
282283

283284
resolveMainEdit(doc, completion, item);

‎headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/config/LanguageServerInitializer.java

-30
This file was deleted.

‎headless-services/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/MavenBridge.java

-1
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,6 @@ public MavenExecutionResult compileAndGenerateJavadoc(File pom) throws MavenExce
373373
configuration.setValidationLevel(ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL);
374374
configuration.setRepositorySession(createRepositorySession(request));
375375
configuration.setResolveDependencies(true);
376-
configuration.setResolveVersionRanges(true);
377376
request.setGoals(Arrays.asList(new String[] { "compile", "javadoc:javadoc" }));
378377
Properties userProperties = (Properties) request.getUserProperties().clone();
379378
userProperties.put("show", "private");

‎headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/HtmlBuffer.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,17 @@
1313
import java.io.UnsupportedEncodingException;
1414
import java.net.URLEncoder;
1515

16+
import org.slf4j.Logger;
17+
import org.slf4j.LoggerFactory;
18+
1619
/**
1720
* Helper class to make it a little easier to create simple html page.
1821
*
1922
* @author Kris De Volder
2023
*/
2124
public class HtmlBuffer {
25+
26+
private static final Logger log = LoggerFactory.getLogger(HtmlBuffer.class);
2227

2328
private StringBuilder buffer = new StringBuilder();
2429

@@ -44,7 +49,7 @@ public void url(String string) {
4449
try {
4550
raw(URLEncoder.encode(string, "utf8"));
4651
} catch (UnsupportedEncodingException e) {
47-
Log.log(e);
52+
log.error("", e);
4853
}
4954
}
5055

0 commit comments

Comments
 (0)