Skip to content

Commit 790629e

Browse files
committed
code polish, improve readability
1 parent 2d1a03d commit 790629e

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -53,24 +53,24 @@ public class ValueDefinitionProvider implements IJavaDefinitionProvider {
5353
private static final String PARAM_PREFIX = "prefix";
5454

5555
private Map<String, PropertyKeyExtractor> annotationToPropertyKeyExtractor = Map.of(
56-
Annotations.VALUE, (a, p, v) -> {
57-
if (a.isSingleMemberAnnotation()) {
58-
return extractPropertyKey(v.getLiteralValue());
59-
} else if (a.isNormalAnnotation() && PARAM_VALUE.equals(p.getName().getIdentifier())) {
60-
return extractPropertyKey(v.getLiteralValue());
56+
Annotations.VALUE, (annotation, memberValuePair, stringLiteral) -> {
57+
if (annotation.isSingleMemberAnnotation()) {
58+
return extractPropertyKey(stringLiteral.getLiteralValue());
59+
} else if (annotation.isNormalAnnotation() && PARAM_VALUE.equals(memberValuePair.getName().getIdentifier())) {
60+
return extractPropertyKey(stringLiteral.getLiteralValue());
6161
}
6262
return null;
6363
},
64-
Annotations.CONDITIONAL_ON_PROPERTY, (a, p, v) -> {
65-
if (a.isSingleMemberAnnotation()) {
66-
return v.getLiteralValue();
67-
} else if (a.isNormalAnnotation()) {
68-
switch (p.getName().getIdentifier()) {
64+
Annotations.CONDITIONAL_ON_PROPERTY, (annotation, memberValuePair, stringLiteral) -> {
65+
if (annotation.isSingleMemberAnnotation()) {
66+
return stringLiteral.getLiteralValue();
67+
} else if (annotation.isNormalAnnotation()) {
68+
switch (memberValuePair.getName().getIdentifier()) {
6969
case PARAM_VALUE:
70-
return v.getLiteralValue();
70+
return stringLiteral.getLiteralValue();
7171
case PARAM_NAME:
72-
String prefix = extractAnnotationParameter(a, PARAM_PREFIX);
73-
String name = v.getLiteralValue();
72+
String prefix = extractAnnotationParameter(annotation, PARAM_PREFIX);
73+
String name = stringLiteral.getLiteralValue();
7474
return prefix != null && !prefix.isBlank() ? prefix + "." + name : name;
7575
}
7676
}
@@ -244,7 +244,7 @@ private static String extractPropertyKey(String s) {
244244
}
245245

246246
private interface PropertyKeyExtractor {
247-
String extract(Annotation a, MemberValuePair pair, StringLiteral v);
247+
String extract(Annotation annotation, MemberValuePair memberValuePair, StringLiteral stringLiteral);
248248
}
249249

250250
private List<LocationLink> getDefinitionForClasspathResource(IJavaProject project, CompilationUnit cu, StringLiteral valueNode, String literalValue) {

0 commit comments

Comments
 (0)