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

Don't include java.lang.Object in supertypes serialization

Browse Source 
Signed-off-by: aboyko <alex.boyko@broadcom.com>
This commit is contained in:
aboyko
2025-04-16 23:47:58 -04:00
parent c56fc65532
commit 6cc3086b0e
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
headless-services/commons/commons-lsp-extensions/src/main/java/org/springframework/ide/vscode/commons/protocol/spring/Bean.java
View File

@@ -11,11 +11,13 @@
package org.springframework.ide.vscode.commons.protocol.spring;
import java.util.Set;
import java.util.stream.Collectors;
import org.eclipse.lsp4j.DocumentSymbol;
import org.eclipse.lsp4j.Location;
import org.eclipse.lsp4j.SymbolKind;
import com.google.common.collect.ImmutableSet;
import com.google.gson.Gson;
public class Bean extends AbstractSpringIndexElement implements SymbolElement {
@@ -28,6 +30,7 @@ public class Bean extends AbstractSpringIndexElement implements SymbolElement {
private final AnnotationMetadata[] annotations;
private final boolean isConfiguration;
private final String symbolLabel;
private final boolean isInterface;
public Bean(
String name,
@@ -44,6 +47,7 @@ public class Bean extends AbstractSpringIndexElement implements SymbolElement {
this.location = location;
this.isConfiguration = isConfiguration;
this.symbolLabel = symbolLabel;
this.isInterface = supertypes == null || !supertypes.contains(Object.class.getName());
if (injectionPoints != null && injectionPoints.length == 0) {
this.injectionPoints = null;
@@ -52,11 +56,12 @@ public class Bean extends AbstractSpringIndexElement implements SymbolElement {
this.injectionPoints = injectionPoints;
}
if (supertypes != null && supertypes.size() == 0) {
Set<String> sanitizedSuperTypes = supertypes == null ? null : supertypes.stream().filter(t -> !t.equals(Object.class.getName())).collect(Collectors.toUnmodifiableSet());
if (sanitizedSuperTypes != null && sanitizedSuperTypes.size() == 0) {
this.supertypes = null;
}
else {
this.supertypes = supertypes;
this.supertypes = sanitizedSuperTypes;
}
if (annotations != null && annotations.length == 0) {
@@ -84,7 +89,7 @@ public class Bean extends AbstractSpringIndexElement implements SymbolElement {
}
public boolean isTypeCompatibleWith(String type) {
return type != null && ((this.type != null && this.type.equals(type)) || (getSupertypes().contains(type)));
return type != null && ((this.type != null && this.type.equals(type)) || (supertypes != null && supertypes.contains(type)) || (Object.class.getName().equals(type) && !isInterface));
}
public AnnotationMetadata[] getAnnotations() {
@@ -96,7 +101,11 @@ public class Bean extends AbstractSpringIndexElement implements SymbolElement {
}
public Set<String> getSupertypes() {
return supertypes == null ? DefaultValues.EMPTY_SUPERTYPES : supertypes;
if (supertypes == null) {
return isInterface ? DefaultValues.EMPTY_SUPERTYPES : DefaultValues.OBJECT_SUPERTYPE;
} else {
return isInterface ? supertypes : ImmutableSet.<String>builder().addAll(supertypes).add(Object.class.getName()).build();
}
}
public String getSymbolLabel() {