From 93caf59fe0f4c1aa14d541aedb5e65c6a8825288 Mon Sep 17 00:00:00 2001
From: Martin Lippert <mlippert@pivotal.io>
Date: Fri, 3 May 2019 09:58:33 +0200
Subject: [PATCH] small refactoring, removed duplicated code

---
 .../ide/vscode/boot/java/utils/ASTUtils.java  | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

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
index 801e1b164..d4b4e8ee8 100644
--- 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
@@ -25,6 +25,7 @@ import org.eclipse.jdt.core.dom.ITypeBinding;
 import org.eclipse.jdt.core.dom.IVariableBinding;
 import org.eclipse.jdt.core.dom.MemberValuePair;
 import org.eclipse.jdt.core.dom.MethodDeclaration;
+import org.eclipse.jdt.core.dom.Name;
 import org.eclipse.jdt.core.dom.NormalAnnotation;
 import org.eclipse.jdt.core.dom.QualifiedName;
 import org.eclipse.jdt.core.dom.SimpleName;
@@ -181,8 +182,8 @@ public class ASTUtils {
 	public static String getExpressionValueAsString(Expression exp) {
 		if (exp instanceof StringLiteral) {
 			return getLiteralValue((StringLiteral) exp);
-		} else if (exp instanceof QualifiedName) {
-			IBinding binding = ((QualifiedName) exp).resolveBinding();
+		} else if (exp instanceof Name) {
+			IBinding binding = ((Name) exp).resolveBinding();
 			if (binding != null && binding.getKind() == IBinding.VARIABLE) {
 				IVariableBinding varBinding = (IVariableBinding) binding;
 				Object constValue = varBinding.getConstantValue();
@@ -190,17 +191,15 @@ public class ASTUtils {
 					return constValue.toString();
 				}
 			}
-			return getExpressionValueAsString(((QualifiedName) exp).getName());
-		} else if (exp instanceof SimpleName) {
-			IBinding binding = ((SimpleName) exp).resolveBinding();
-			if (binding != null && binding.getKind() == IBinding.VARIABLE) {
-				IVariableBinding varBinding = (IVariableBinding) binding;
-				Object constValue = varBinding.getConstantValue();
-				if (constValue != null) {
-					return constValue.toString();
-				}
+			if (exp instanceof QualifiedName) {
+				return getExpressionValueAsString(((QualifiedName) exp).getName());
+			}
+			else if (exp instanceof SimpleName) {
+				return ((SimpleName) exp).getIdentifier();
+			}
+			else {
+				return null;
 			}
-			return ((SimpleName) exp).getIdentifier();
 		} else {
 			return null;
 		}