Skip to content

Commit 58ee5ae

Browse files
committed
Merge branch 'main' of https://github.com/spring-projects/sts4 into main
2 parents 05cb65e + 8adb263 commit 58ee5ae

File tree

61 files changed

+166
-262
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+166
-262
lines changed

eclipse-distribution/org.springframework.boot.ide.branding/about.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Version: @QUALIFIER@\n\
1010
Build Id: @BUILD_ID@\n\
1111
Revision: @REVISION@\n\
1212
\n\
13-
Copyright (c) 2007 - 2024 Broadcom\n\
13+
Copyright (c) 2007 - 2025 Broadcom\n\
1414
All rights reserved. Visit https://spring.io/tools\n\
1515
\n\
1616
This product includes software developed by the\n\

eclipse-distribution/org.springframework.boot.ide.branding/plugin.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Version: @QUALIFIER@\n\
88
Build Id: @BUILD_ID@\n\
99
Revision: @REVISION@\n\
1010
\n\
11-
Copyright (c) 2007 - 2024 Broadcom\n\
11+
Copyright (c) 2007 - 2025 Broadcom\n\
1212
All rights reserved. Visit https://spring.io/tools\n\
1313
\n\
1414
This product includes software developed by the\n\

eclipse-extensions/org.springframework.boot.ide.main.feature/feature.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This feature contains the Eclipse-UI-specific STS 4 components
44

55
# "copyright" property - text of the Copyright
66
copyright=\
7-
Copyright (c) 2024 Broadcom
7+
Copyright (c) 2025 Broadcom
88

99
################ end of copyright property ####################################
1010

eclipse-language-servers/org.springframework.tooling.boot.ls.feature/feature.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Spring Boot Language Server
44

55
# "copyright" property - text of the Copyright
66
copyright=\
7-
Copyright (c) 2024 Broadcom
7+
Copyright (c) 2025 Broadcom
88

99
################ end of copyright property ####################################
1010

eclipse-language-servers/org.springframework.tooling.bosh.ls.feature/feature.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ BOSH Manifest Language Server
44

55
# "copyright" property - text of the Copyright
66
copyright=\
7-
Copyright (c) 2024 Broadcom
7+
Copyright (c) 2025 Broadcom
88

99
################ end of copyright property ####################################
1010

eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/feature.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description=\
55
This feature provides the language server to support editing cloud foundry manifest files
66

77
copyright=\
8-
Copyright (c) 2024 Broadcom
8+
Copyright (c) 2025 Broadcom
99

1010
################ end of copyright property ####################################
1111

eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature/feature.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Integeation of the Cloud Foundry Manifest Language Server Extension into the Gen
44

55
# "copyright" property - text of the Copyright
66
copyright=\
7-
Copyright (c) 2024 Broadcom
7+
Copyright (c) 2025 Broadcom
88

99
################ end of copyright property ####################################
1010

eclipse-language-servers/org.springframework.tooling.concourse.ls.feature/feature.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Concourse Pipeline and Task Language Server
44

55
# "copyright" property - text of the Copyright
66
copyright=\
7-
Copyright (c) 2024 Broadcom
7+
Copyright (c) 2025 Broadcom
88

99
################ end of copyright property ####################################
1010

headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/JdtConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2023, 2024 VMware, Inc.
2+
* Copyright (c) 2023, 2025 VMware, 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

headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/SpringSymbolIndex.java

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2017, 2024 Pivotal, Inc.
2+
* Copyright (c) 2017, 2025 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
@@ -25,7 +25,6 @@
2525
import java.util.Iterator;
2626
import java.util.List;
2727
import java.util.Map;
28-
import java.util.Objects;
2928
import java.util.Optional;
3029
import java.util.Set;
3130
import java.util.concurrent.CompletableFuture;
@@ -57,7 +56,6 @@
5756
import org.springframework.ide.vscode.boot.java.BootJavaLanguageServerComponents;
5857
import org.springframework.ide.vscode.boot.java.annotations.AnnotationHierarchyAwareLookup;
5958
import org.springframework.ide.vscode.boot.java.handlers.EnhancedSymbolInformation;
60-
import org.springframework.ide.vscode.boot.java.handlers.SymbolAddOnInformation;
6159
import org.springframework.ide.vscode.boot.java.handlers.SymbolProvider;
6260
import org.springframework.ide.vscode.boot.java.reconcilers.JdtReconciler;
6361
import org.springframework.ide.vscode.boot.java.utils.CompilationUnitCache;
@@ -747,42 +745,6 @@ public List<? extends WorkspaceSymbol> getSymbols(String docURI) {
747745
}
748746
}
749747

750-
public List<SymbolAddOnInformation> getAllAdditionalInformation(Predicate<SymbolAddOnInformation> filter) {
751-
if (filter != null) {
752-
synchronized(symbols) {
753-
return symbols.stream()
754-
.map(s -> s.getAdditionalInformation())
755-
.filter(Objects::nonNull)
756-
.flatMap(i -> Arrays.stream(i))
757-
.filter(filter)
758-
.collect(Collectors.toList());
759-
}
760-
}
761-
else {
762-
return Collections.emptyList();
763-
}
764-
}
765-
766-
public List<? extends SymbolAddOnInformation> getAdditonalInformation(String docURI) {
767-
List<EnhancedSymbolInformation> info = this.symbolsByDoc.get(docURI);
768-
769-
if (info != null) {
770-
synchronized(info) {
771-
ImmutableList.Builder<SymbolAddOnInformation> builder = ImmutableList.builder();
772-
for (EnhancedSymbolInformation enhanced : info) {
773-
SymbolAddOnInformation[] additionalInformation = enhanced.getAdditionalInformation();
774-
if (additionalInformation != null) {
775-
builder.add(additionalInformation);
776-
}
777-
}
778-
return builder.build();
779-
}
780-
}
781-
else {
782-
return Collections.emptyList();
783-
}
784-
}
785-
786748
@Override
787749
public CompletableFuture<List<Bean>> beans(BeansParams params) {
788750
String projectName = params.getProjectName();

0 commit comments

Comments
 (0)