GH-1434: wrapped all remaining calls to getLiteralValue via ASTUtils to avoid threading issues

martinlippert · martinlippert · commit 48dbf77fb740 · 2024-12-09T15:36:53.000+01:00
Fixes GH-1434
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/annotations/AnnotationAttributeCompletionProcessor.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/annotations/AnnotationAttributeCompletionProcessor.java
@@ -29,6 +29,7 @@
 import org.eclipse.jdt.core.dom.SimpleName;
 import org.eclipse.jdt.core.dom.StringLiteral;
 import org.springframework.ide.vscode.boot.java.handlers.CompletionProvider;
+import org.springframework.ide.vscode.boot.java.utils.ASTUtils;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
 import org.springframework.ide.vscode.commons.languageserver.completion.DocumentEdits;
 import org.springframework.ide.vscode.commons.languageserver.completion.ICompletionProposal;
@@ -235,8 +236,7 @@ protected Set<String> alreadyMentionedValues(ASTNode node) {
 			List<?> expressions = arrayNode.expressions();
 			for (Object expression : expressions) {
 				if (expression instanceof StringLiteral) {
-					StringLiteral stringExr = (StringLiteral) expression;
-					String value = stringExr.getLiteralValue();
+					String value = ASTUtils.getLiteralValue((StringLiteral) expression);
 					result.add(value);
 				}
 			}
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/DependsOnDefinitionProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/DependsOnDefinitionProvider.java
@@ -52,7 +52,7 @@ public List<LocationLink> getDefinitions(CancelChecker cancelToken, IJavaProject
 				Annotation a = (Annotation) parent;
 				IAnnotationBinding binding = a.resolveAnnotationBinding();
 				if (binding != null && binding.getAnnotationType() != null && Annotations.DEPENDS_ON.equals(binding.getAnnotationType().getQualifiedName())) {
-					String beanName = valueNode.getLiteralValue();
+					String beanName = ASTUtils.getLiteralValue(valueNode);
 					
 					if (beanName != null && beanName.length() > 0) {
 						return findBeansWithName(project, beanName);
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/NamedDefinitionProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/NamedDefinitionProvider.java
@@ -54,7 +54,7 @@ public List<LocationLink> getDefinitions(CancelChecker cancelToken, IJavaProject
 				Annotation a = (Annotation) parent;
 				IAnnotationBinding binding = a.resolveAnnotationBinding();
 				if (binding != null && binding.getAnnotationType() != null && Annotations.NAMED_ANNOTATIONS.contains(binding.getAnnotationType().getQualifiedName())) {
-					String beanName = valueNode.getLiteralValue();
+					String beanName = ASTUtils.getLiteralValue(valueNode);
 					
 					if (beanName != null && beanName.length() > 0) {
 						return findBeansWithName(project, beanName);
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/NamedReferencesProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/NamedReferencesProvider.java
@@ -25,6 +25,7 @@
 import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex;
 import org.springframework.ide.vscode.boot.java.Annotations;
 import org.springframework.ide.vscode.boot.java.handlers.ReferenceProvider;
+import org.springframework.ide.vscode.boot.java.utils.ASTUtils;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
 import org.springframework.ide.vscode.commons.protocol.spring.Bean;
 
@@ -50,14 +51,14 @@ public List<? extends Location> provideReferences(CancelChecker cancelToken, IJa
 			// case: @Value("prefix<*>")
 			if (node instanceof StringLiteral && node.getParent() instanceof Annotation) {
 				if (node.toString().startsWith("\"") && node.toString().endsWith("\"")) {
-					return provideReferences(project, ((StringLiteral) node).getLiteralValue());
+					return provideReferences(project, ASTUtils.getLiteralValue((StringLiteral) node));
 				}
 			}
 			// case: @Value(value="prefix<*>")
 			else if (node instanceof StringLiteral && node.getParent() instanceof MemberValuePair
 					&& "value".equals(((MemberValuePair)node.getParent()).getName().toString())) {
 				if (node.toString().startsWith("\"") && node.toString().endsWith("\"")) {
-					return provideReferences(project, ((StringLiteral) node).getLiteralValue());
+					return provideReferences(project, ASTUtils.getLiteralValue((StringLiteral) node));
 				}
 			}
 		}
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/ProfileReferencesProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/ProfileReferencesProvider.java
@@ -25,6 +25,7 @@
 import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex;
 import org.springframework.ide.vscode.boot.java.Annotations;
 import org.springframework.ide.vscode.boot.java.handlers.ReferenceProvider;
+import org.springframework.ide.vscode.boot.java.utils.ASTUtils;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
 import org.springframework.ide.vscode.commons.protocol.spring.Bean;
 
@@ -48,20 +49,20 @@ public List<? extends Location> provideReferences(CancelChecker cancelToken, IJa
 			// case: @Value("prefix<*>")
 			if (node instanceof StringLiteral && node.getParent() instanceof Annotation) {
 				if (node.toString().startsWith("\"") && node.toString().endsWith("\"")) {
-					return provideReferences(project, ((StringLiteral) node).getLiteralValue());
+					return provideReferences(project, ASTUtils.getLiteralValue((StringLiteral) node));
 				}
 			}
 			// case: @Value(value="prefix<*>")
 			else if (node instanceof StringLiteral && node.getParent() instanceof MemberValuePair
 					&& "value".equals(((MemberValuePair)node.getParent()).getName().toString())) {
 				if (node.toString().startsWith("\"") && node.toString().endsWith("\"")) {
-					return provideReferences(project, ((StringLiteral) node).getLiteralValue());
+					return provideReferences(project, ASTUtils.getLiteralValue((StringLiteral) node));
 				}
 			}
 			// case: @Qualifier({"prefix<*>"})
 			else if (node instanceof StringLiteral && node.getParent() instanceof ArrayInitializer) {
 				if (node.toString().startsWith("\"") && node.toString().endsWith("\"")) {
-					return provideReferences(project, ((StringLiteral) node).getLiteralValue());
+					return provideReferences(project, ASTUtils.getLiteralValue((StringLiteral) node));
 				}
 			}
 		}
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/QualifierDefinitionProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/QualifierDefinitionProvider.java
@@ -52,7 +52,7 @@ public List<LocationLink> getDefinitions(CancelChecker cancelToken, IJavaProject
 				Annotation a = (Annotation) parent;
 				IAnnotationBinding binding = a.resolveAnnotationBinding();
 				if (binding != null && binding.getAnnotationType() != null && Annotations.QUALIFIER.equals(binding.getAnnotationType().getQualifiedName())) {
-					String beanName = valueNode.getLiteralValue();
+					String beanName = ASTUtils.getLiteralValue(valueNode);
 					
 					if (beanName != null && beanName.length() > 0) {
 						return findBeansWithName(project, beanName);
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/QualifierReferencesProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/QualifierReferencesProvider.java
@@ -24,6 +24,7 @@
 import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex;
 import org.springframework.ide.vscode.boot.java.Annotations;
 import org.springframework.ide.vscode.boot.java.handlers.ReferenceProvider;
+import org.springframework.ide.vscode.boot.java.utils.ASTUtils;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
 import org.springframework.ide.vscode.commons.protocol.spring.Bean;
 
@@ -47,14 +48,14 @@ public List<? extends Location> provideReferences(CancelChecker cancelToken, IJa
 			// case: @Value("prefix<*>")
 			if (node instanceof StringLiteral && node.getParent() instanceof Annotation) {
 				if (node.toString().startsWith("\"") && node.toString().endsWith("\"")) {
-					return provideReferences(project, ((StringLiteral) node).getLiteralValue());
+					return provideReferences(project, ASTUtils.getLiteralValue((StringLiteral) node));
 				}
 			}
 			// case: @Value(value="prefix<*>")
 			else if (node instanceof StringLiteral && node.getParent() instanceof MemberValuePair
 					&& "value".equals(((MemberValuePair)node.getParent()).getName().toString())) {
 				if (node.toString().startsWith("\"") && node.toString().endsWith("\"")) {
-					return provideReferences(project, ((StringLiteral) node).getLiteralValue());
+					return provideReferences(project, ASTUtils.getLiteralValue((StringLiteral) node));
 				}
 			}
 		}
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/ResourceDefinitionProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/ResourceDefinitionProvider.java
@@ -54,7 +54,7 @@ public List<LocationLink> getDefinitions(CancelChecker cancelToken, IJavaProject
 				if (binding != null && binding.getAnnotationType() != null
 						&& (Annotations.RESOURCE_JAVAX.equals(binding.getAnnotationType().getQualifiedName())
 							|| Annotations.RESOURCE_JAKARTA.equals(binding.getAnnotationType().getQualifiedName()))) {
-					String beanName = valueNode.getLiteralValue();
+					String beanName = ASTUtils.getLiteralValue(valueNode);
 					
 					if (beanName != null && beanName.length() > 0) {
 						return findBeansWithName(project, beanName);
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalOnBeanDefinitionProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalOnBeanDefinitionProvider.java
@@ -72,7 +72,7 @@ public List<LocationLink> getDefinitions(CancelChecker cancelToken, IJavaProject
     }
 
     private List<LocationLink> getDefinitions(IJavaProject project, StringLiteral valueNode) {
-		String value = valueNode.getLiteralValue();
+		String value = ASTUtils.getLiteralValue(valueNode);
 
 		if (value != null && value.length() > 0) {
 			return getDefinitionsForValue(project, valueNode, value);
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalOnPropertyCompletionProcessor.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalOnPropertyCompletionProcessor.java
@@ -139,7 +139,7 @@ private String getPrefixAttributeValue(ASTNode node) {
 					if (valuePairName != null && "prefix".equals(valuePairName)
 							&& valuePair.getValue() != null && valuePair.getValue() instanceof StringLiteral) {
 						StringLiteral prefixLiteral = (StringLiteral) valuePair.getValue();
-						String valuePairValue = prefixLiteral.getLiteralValue();
+						String valuePairValue = ASTUtils.getLiteralValue(prefixLiteral);
 						return valuePairValue;
 					}
 				}
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalOnResourceDefinitionProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalOnResourceDefinitionProvider.java
@@ -24,6 +24,7 @@
 import org.eclipse.lsp4j.TextDocumentIdentifier;
 import org.eclipse.lsp4j.jsonrpc.CancelChecker;
 import org.springframework.ide.vscode.boot.java.IJavaDefinitionProvider;
+import org.springframework.ide.vscode.boot.java.utils.ASTUtils;
 import org.springframework.ide.vscode.commons.java.IClasspathUtil;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
 
@@ -36,7 +37,7 @@ public List<LocationLink> getDefinitions(CancelChecker cancelToken, IJavaProject
         if (n instanceof StringLiteral) {
             StringLiteral valueNode = (StringLiteral) n;
 
-            String literalValue = valueNode.getLiteralValue();
+            String literalValue = ASTUtils.getLiteralValue(valueNode);
             if (literalValue != null) {
                 if (literalValue.startsWith("classpath")) {
                     return getDefinitionForClasspathResource(project, cu, valueNode, literalValue);
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/contextconfiguration/ContextConfigurationProcessor.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/contextconfiguration/ContextConfigurationProcessor.java
@@ -29,6 +29,7 @@
 import org.springframework.ide.vscode.boot.java.annotations.AnnotationAttributeCompletionProposal;
 import org.springframework.ide.vscode.boot.java.annotations.AnnotationAttributeProposal;
 import org.springframework.ide.vscode.boot.java.handlers.CompletionProvider;
+import org.springframework.ide.vscode.boot.java.utils.ASTUtils;
 import org.springframework.ide.vscode.commons.java.IClasspathUtil;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
 import org.springframework.ide.vscode.commons.languageserver.completion.DocumentEdits;
@@ -143,7 +144,8 @@ private void computeProposalsForStringLiteral(IJavaProject project, StringLitera
         int startOffset = offset - prefix.length();
         int endOffset = offset;
 
-        String unfilteredPrefix = node.getLiteralValue().substring(0, offset - (node.getStartPosition() + 1));
+        String literalValue = ASTUtils.getLiteralValue(node);
+		String unfilteredPrefix = literalValue.substring(0, offset - (node.getStartPosition() + 1));
         addClasspathResourceProposals(project, doc, startOffset, endOffset, unfilteredPrefix, false, completions);
     }
 
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/cron/JdtCronVisitorUtils.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/cron/JdtCronVisitorUtils.java
@@ -19,6 +19,7 @@
 import org.springframework.ide.vscode.boot.java.Annotations;
 import org.springframework.ide.vscode.boot.java.embedded.lang.EmbeddedLangAstUtils;
 import org.springframework.ide.vscode.boot.java.embedded.lang.EmbeddedLanguageSnippet;
+import org.springframework.ide.vscode.boot.java.utils.ASTUtils;
 
 public class JdtCronVisitorUtils {
 	
@@ -48,7 +49,7 @@ public static EmbeddedLanguageSnippet extractCron(NormalAnnotation node) {
 	private static boolean isCronExpression(Expression e) {
 		String value = null;
 		if (e instanceof StringLiteral sl) {
-			value = sl.getLiteralValue();
+			value = ASTUtils.getLiteralValue(sl);
 		} else if (e instanceof TextBlock tb) {
 			value = tb.getLiteralValue();
 		}
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/CopilotCodeLensProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/CopilotCodeLensProvider.java
@@ -41,6 +41,7 @@
 import org.springframework.ide.vscode.boot.java.embedded.lang.EmbeddedLanguageSnippet;
 import org.springframework.ide.vscode.boot.java.spel.AnnotationParamSpelExtractor;
 import org.springframework.ide.vscode.boot.java.spel.SpelSemanticTokens;
+import org.springframework.ide.vscode.boot.java.utils.ASTUtils;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
 import org.springframework.ide.vscode.commons.java.SpringProjectUtil;
 import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder;
@@ -298,7 +299,7 @@ private String extractPointcutReference(org.eclipse.jdt.core.dom.Expression expr
 		} else if (expression instanceof SimpleName) {
 			return ((SimpleName) expression).getIdentifier();
 		} else if (expression instanceof StringLiteral) {
-			String literalValue = ((StringLiteral) expression).getLiteralValue();
+			String literalValue = ASTUtils.getLiteralValue((StringLiteral) expression);
 			StringBuilder pointcuts = new StringBuilder();
 			for (Map.Entry<String, String> entry : pointcutMap.entrySet()) {
 				if (literalValue.contains(entry.getKey())) {
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/reconcilers/ImplicitWebAnnotationNamesReconciler.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/reconcilers/ImplicitWebAnnotationNamesReconciler.java
@@ -31,6 +31,7 @@
 import org.eclipse.jdt.core.dom.StringLiteral;
 import org.openrewrite.marker.Range;
 import org.springframework.ide.vscode.boot.java.Boot2JavaProblemType;
+import org.springframework.ide.vscode.boot.java.utils.ASTUtils;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
 import org.springframework.ide.vscode.commons.languageserver.quickfix.QuickfixRegistry;
 import org.springframework.ide.vscode.commons.languageserver.reconcile.IProblemCollector;
@@ -141,7 +142,7 @@ private static String getAnnotationParameter(Annotation annotation) {
 		}
 		
 		if (value instanceof StringLiteral) {
-			return ((StringLiteral) value).getLiteralValue();
+			return ASTUtils.getLiteralValue((StringLiteral) value);
 		}
 		return null;
 	}
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxPathFinder.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxPathFinder.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018 Pivotal, Inc.
+ * Copyright (c) 2018, 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
@@ -19,6 +19,7 @@
 import org.eclipse.jdt.core.dom.MethodInvocation;
 import org.eclipse.jdt.core.dom.StringLiteral;
 import org.eclipse.lsp4j.Range;
+import org.springframework.ide.vscode.boot.java.utils.ASTUtils;
 import org.springframework.ide.vscode.commons.util.BadLocationException;
 import org.springframework.ide.vscode.commons.util.text.TextDocument;
 
@@ -57,7 +58,7 @@ public boolean visit(MethodInvocation node) {
 						StringLiteral stringLiteral = WebfluxUtils.extractStringLiteralArgument(node);
 						if (stringLiteral != null) {
 							Range range = doc.toRange(stringLiteral.getStartPosition(), stringLiteral.getLength());
-							path.add(new WebfluxRouteElement(stringLiteral.getLiteralValue(), range));
+							path.add(new WebfluxRouteElement(ASTUtils.getLiteralValue(stringLiteral), range));
 						}
 					}
 				}
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxRouterSymbolProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxRouterSymbolProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018, 2023 Pivotal, Inc.
+ * Copyright (c) 2018, 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,6 +35,7 @@
 import org.springframework.ide.vscode.boot.java.handlers.AbstractSymbolProvider;
 import org.springframework.ide.vscode.boot.java.handlers.EnhancedSymbolInformation;
 import org.springframework.ide.vscode.boot.java.handlers.SymbolAddOnInformation;
+import org.springframework.ide.vscode.boot.java.utils.ASTUtils;
 import org.springframework.ide.vscode.boot.java.utils.CachedSymbol;
 import org.springframework.ide.vscode.boot.java.utils.SpringIndexerJava.SCAN_PASS;
 import org.springframework.ide.vscode.boot.java.utils.SpringIndexerJavaContext;
@@ -157,7 +158,7 @@ private WebfluxRouteElement[] extractPath(MethodInvocation routerInvocation, Tex
 					StringLiteral stringLiteral = WebfluxUtils.extractStringLiteralArgument(methodInvocation);
 					if (stringLiteral != null) {
 						Range range = doc.toRange(stringLiteral.getStartPosition(), stringLiteral.getLength());
-						return new WebfluxRouteElement(stringLiteral.getLiteralValue(), range);
+						return new WebfluxRouteElement(ASTUtils.getLiteralValue(stringLiteral), range);
 					}
 				}
 			}
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/ASTUtils.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/ASTUtils.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017, 2023 Pivotal, Inc.
+ * Copyright (c) 2017, 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
@@ -647,7 +647,7 @@ private static AnnotationAttributeValue[] getAnnotationAttributeValues(Expressio
 	private static AnnotationAttributeValue convertExpressionInto(Expression expression, TextDocument doc) throws BadLocationException {
 		if (expression instanceof StringLiteral) {
 			StringLiteral stringLiteral = (StringLiteral) expression;
-			String literalValue = stringLiteral.getLiteralValue();
+			String literalValue = ASTUtils.getLiteralValue(stringLiteral);
 			
 			DocumentRegion region = ASTUtils.nodeRegion(doc, stringLiteral);
 			Range range = doc.toRange(region);
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/value/PropertyExtractor.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/value/PropertyExtractor.java
@@ -22,6 +22,7 @@
 import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
 import org.eclipse.jdt.core.dom.StringLiteral;
 import org.springframework.ide.vscode.boot.java.Annotations;
+import org.springframework.ide.vscode.boot.java.utils.ASTUtils;
 
 public class PropertyExtractor {
 	
@@ -40,27 +41,27 @@ public PropertyExtractor() {
 
 				Annotations.VALUE, (annotation, memberValuePair, stringLiteral) -> {
 					if (annotation.isSingleMemberAnnotation()) {
-						return extractPropertyKey(stringLiteral.getLiteralValue());
+						return extractPropertyKey(ASTUtils.getLiteralValue(stringLiteral));
 					} else if (annotation.isNormalAnnotation() && PARAM_VALUE.equals(memberValuePair.getName().getIdentifier())) {
-						return extractPropertyKey(stringLiteral.getLiteralValue());
+						return extractPropertyKey(ASTUtils.getLiteralValue(stringLiteral));
 					}
 					return null;
 				},
 
 				Annotations.CONDITIONAL_ON_PROPERTY, (annotation, memberValuePair, stringLiteral) -> {
 					if (annotation.isSingleMemberAnnotation()) {
-						return stringLiteral.getLiteralValue();
+						return ASTUtils.getLiteralValue(stringLiteral);
 					} else if (annotation.isNormalAnnotation()) {
 						switch (memberValuePair.getName().getIdentifier()) {
 						case PARAM_VALUE:
-							return stringLiteral.getLiteralValue();
+							return ASTUtils.getLiteralValue(stringLiteral);
 						case PARAM_NAME:
 							String prefix = extractAnnotationParameter(annotation, PARAM_PREFIX);
-							String name = stringLiteral.getLiteralValue();
+							String name = ASTUtils.getLiteralValue(stringLiteral);
 							return prefix != null && !prefix.isBlank() ? prefix + "." + name : name;
 						case PARAM_PREFIX:
 							name = extractAnnotationParameter(annotation, PARAM_NAME);
-							prefix = stringLiteral.getLiteralValue();
+							prefix = ASTUtils.getLiteralValue(stringLiteral);
 							return prefix != null && !prefix.isBlank() ? prefix + "." + name : name;
 						}
 					}
@@ -121,7 +122,7 @@ private static String extractAnnotationParameter(Annotation a, String param) {
 			}
 		}
 		if (value instanceof StringLiteral) {
-			return ((StringLiteral) value).getLiteralValue();
+			return ASTUtils.getLiteralValue((StringLiteral) value);
 		}
 		return null;
 	}
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/value/ValueCompletionProcessor.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/value/ValueCompletionProcessor.java
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/value/ValueDefinitionProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/value/ValueDefinitionProvider.java

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex;`
`26`	`26`	`import org.springframework.ide.vscode.boot.java.Annotations;`
`27`	`27`	`import org.springframework.ide.vscode.boot.java.handlers.ReferenceProvider;`
	`28`	`+import org.springframework.ide.vscode.boot.java.utils.ASTUtils;`
`28`	`29`	`import org.springframework.ide.vscode.commons.java.IJavaProject;`
`29`	`30`	`import org.springframework.ide.vscode.commons.protocol.spring.Bean;`
`30`	`31`
`@@ -50,14 +51,14 @@ public List<? extends Location> provideReferences(CancelChecker cancelToken, IJa`
`50`	`51`	`// case: @Value("prefix<*>")`
`51`	`52`	`if (node instanceof StringLiteral && node.getParent() instanceof Annotation) {`
`52`	`53`	`if (node.toString().startsWith("\"") && node.toString().endsWith("\"")) {`
`53`		`- return provideReferences(project, ((StringLiteral) node).getLiteralValue());`
	`54`	`+ return provideReferences(project, ASTUtils.getLiteralValue((StringLiteral) node));`
`54`	`55`	`}`
`55`	`56`	`}`
`56`	`57`	`// case: @Value(value="prefix<*>")`
`57`	`58`	`else if (node instanceof StringLiteral && node.getParent() instanceof MemberValuePair`
`58`	`59`	`&& "value".equals(((MemberValuePair)node.getParent()).getName().toString())) {`
`59`	`60`	`if (node.toString().startsWith("\"") && node.toString().endsWith("\"")) {`
`60`		`- return provideReferences(project, ((StringLiteral) node).getLiteralValue());`
	`61`	`+ return provideReferences(project, ASTUtils.getLiteralValue((StringLiteral) node));`
`61`	`62`	`}`
`62`	`63`	`}`
`63`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex;`
`25`	`25`	`import org.springframework.ide.vscode.boot.java.Annotations;`
`26`	`26`	`import org.springframework.ide.vscode.boot.java.handlers.ReferenceProvider;`
	`27`	`+import org.springframework.ide.vscode.boot.java.utils.ASTUtils;`
`27`	`28`	`import org.springframework.ide.vscode.commons.java.IJavaProject;`
`28`	`29`	`import org.springframework.ide.vscode.commons.protocol.spring.Bean;`
`29`	`30`
`@@ -47,14 +48,14 @@ public List<? extends Location> provideReferences(CancelChecker cancelToken, IJa`
`47`	`48`	`// case: @Value("prefix<*>")`
`48`	`49`	`if (node instanceof StringLiteral && node.getParent() instanceof Annotation) {`
`49`	`50`	`if (node.toString().startsWith("\"") && node.toString().endsWith("\"")) {`
`50`		`- return provideReferences(project, ((StringLiteral) node).getLiteralValue());`
	`51`	`+ return provideReferences(project, ASTUtils.getLiteralValue((StringLiteral) node));`
`51`	`52`	`}`
`52`	`53`	`}`
`53`	`54`	`// case: @Value(value="prefix<*>")`
`54`	`55`	`else if (node instanceof StringLiteral && node.getParent() instanceof MemberValuePair`
`55`	`56`	`&& "value".equals(((MemberValuePair)node.getParent()).getName().toString())) {`
`56`	`57`	`if (node.toString().startsWith("\"") && node.toString().endsWith("\"")) {`
`57`		`- return provideReferences(project, ((StringLiteral) node).getLiteralValue());`
	`58`	`+ return provideReferences(project, ASTUtils.getLiteralValue((StringLiteral) node));`
`58`	`59`	`}`
`59`	`60`	`}`
`60`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public List<LocationLink> getDefinitions(CancelChecker cancelToken, IJavaProject`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`private List<LocationLink> getDefinitions(IJavaProject project, StringLiteral valueNode) {`
`75`		`- String value = valueNode.getLiteralValue();`
	`75`	`+ String value = ASTUtils.getLiteralValue(valueNode);`
`76`	`76`
`77`	`77`	`if (value != null && value.length() > 0) {`
`78`	`78`	`return getDefinitionsForValue(project, valueNode, value);`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ private String getPrefixAttributeValue(ASTNode node) {`
`139`	`139`	`if (valuePairName != null && "prefix".equals(valuePairName)`
`140`	`140`	`&& valuePair.getValue() != null && valuePair.getValue() instanceof StringLiteral) {`
`141`	`141`	`StringLiteral prefixLiteral = (StringLiteral) valuePair.getValue();`
`142`		`- String valuePairValue = prefixLiteral.getLiteralValue();`
	`142`	`+ String valuePairValue = ASTUtils.getLiteralValue(prefixLiteral);`
`143`	`143`	`return valuePairValue;`
`144`	`144`	`}`
`145`	`145`	`}`