diff --git a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/src/org/springframework/tooling/jdt/ls/commons/java/JavaData.java b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/src/org/springframework/tooling/jdt/ls/commons/java/JavaData.java
index 8b80817d2..2dc194cd4 100644
--- a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/src/org/springframework/tooling/jdt/ls/commons/java/JavaData.java
+++ b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/src/org/springframework/tooling/jdt/ls/commons/java/JavaData.java
@@ -365,15 +365,18 @@ public class JavaData {
 	
 	private void fillAnnotationData(IType type, IAnnotation annotation, AnnotationData data) {
 		fillJavaElementData(annotation, data);
+		
 		Map<String, Object> pairs = new HashMap<>();
 		try {
 			data.setFqName(resolveFQName(type, annotation.getElementName()));
+
 			for (IMemberValuePair pair : annotation.getMemberValuePairs()) {
-				pairs.put(pair.getMemberName(), pair.getValue());
+				pairs.put(pair.getMemberName(), pair.getValue().toString());
 			}
 		} catch (JavaModelException e) {
 			logger.log(e);
 		}
+
 		data.setValuePairs(pairs);
 	}