Introduce BootEnumValueParser

Signed-off-by: BoykoAlex <[email protected]>

Author: BoykoAlex

headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/EnumValueParser.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014, 2025 Pivotal, Inc.
+ * Copyright (c) 2014-2017 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
@@ -11,11 +11,10 @@
 package org.springframework.ide.vscode.commons.util;
 
 import java.util.Collection;
-import java.util.Set;
+import java.util.Collections;
 import java.util.TreeSet;
 import java.util.concurrent.Callable;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 
 import com.google.common.collect.ImmutableSet;
 
@@ -31,7 +30,6 @@ public class EnumValueParser implements ValueParser {
 	private Supplier<PartialCollection<String>> values;
     private final boolean longRunning;
 
-    private transient Set<String> _canonicalValues;
 
 	public EnumValueParser(String typeName, String... values) {
 		this(typeName, ImmutableSet.copyOf(values));
@@ -72,14 +70,24 @@ public Object parse(String str) throws Exception {
 			throw errorOnBlank(createBlankTextErrorMessage());
 		}
 
-		Set<String> canonicalValues = getCanonicalValues();
-		
-		if (canonicalValues == null || canonicalValues.contains(getCanonicalName(str))) {
+		PartialCollection<String> values = this.values.get();
+
+		// If values is not fully known then just assume the str is acceptable.
+		if (values == null || !values.isComplete() || hasMatchingValue(str, values.getElements())) {
 			return str;
 		} else {
-			throw errorOnParse(createErrorMessage(str, this.values.get().getElements()));
+			throw errorOnParse(createErrorMessage(str, values.getElements()));
 		}
 	}
+	
+	protected final Collection<String> getAllKnownValues() {
+		PartialCollection<String> partialCollection = this.values.get();
+		return partialCollection == null ? Collections.emptyList() : this.values.get().getElements();
+	}
+
+	protected boolean hasMatchingValue(String str, Collection<String> values) {
+		return values.contains(str);
+	}
 
 	protected String createBlankTextErrorMessage() {
 		return "'" + typeName + "'" + " cannot be blank.";
@@ -100,21 +108,4 @@ protected Exception errorOnBlank(String message) {
 	public boolean longRunning() {
 		return this.longRunning ;
 	}
-	
-	private Set<String> getCanonicalValues() {
-		PartialCollection<String> partialCollection = this.values.get();
-		if (partialCollection != null) {
-			_canonicalValues = partialCollection.getElements().stream().map(EnumValueParser::getCanonicalName).collect(Collectors.toSet());
-		}
-		return _canonicalValues;
-	}
-	
-	static String getCanonicalName(String name) {
-		StringBuilder canonicalName = new StringBuilder(name.length());
-		name.chars()
-			.filter(Character::isLetterOrDigit)
-			.map(Character::toLowerCase)
-			.forEach((c) -> canonicalName.append((char) c));
-		return canonicalName.toString();
-	}
 }

headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtil.java

@@ -44,6 +44,7 @@
 import org.springframework.ide.vscode.boot.metadata.hints.StsValueHint;
 import org.springframework.ide.vscode.boot.metadata.util.DeprecationUtil;
 import org.springframework.ide.vscode.boot.metadata.util.PropertyDocUtils;
+import org.springframework.ide.vscode.boot.properties.reconcile.BootEnumValueParser;
 import org.springframework.ide.vscode.commons.java.Flags;
 import org.springframework.ide.vscode.commons.java.IField;
 import org.springframework.ide.vscode.commons.java.IJavaElement;
@@ -55,7 +56,6 @@
 import org.springframework.ide.vscode.commons.util.ArrayUtils;
 import org.springframework.ide.vscode.commons.util.Assert;
 import org.springframework.ide.vscode.commons.util.CollectionUtil;
-import org.springframework.ide.vscode.commons.util.EnumValueParser;
 import org.springframework.ide.vscode.commons.util.LazyProvider;
 import org.springframework.ide.vscode.commons.util.MimeTypes;
 import org.springframework.ide.vscode.commons.util.Renderables;
@@ -272,7 +272,7 @@ public ValueParser getValueParser(Type type) {
 				//Note, technically if 'enumValues is empty array' this means something different
 				// from when it is null. An empty array means a type that has no values, so
 				// assigning anything to it is an error.
-				return new EnumValueParser(niceTypeName(type), getBareValues(enumValues));
+				return new BootEnumValueParser(niceTypeName(type), getBareValues(enumValues));
 			}
 			if (isMap(type)) {
 				//Trying to parse map types from scalars is not possible. Thus we

headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/BootEnumValueParser.java

@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2025 Broadcom, 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
+ * https://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Broadcom, Inc. - initial API and implementation
+ *******************************************************************************/
+package org.springframework.ide.vscode.boot.properties.reconcile;
+
+import java.util.Arrays;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.springframework.ide.vscode.commons.util.EnumValueParser;
+import org.springframework.ide.vscode.commons.util.StringUtil;
+
+public class BootEnumValueParser extends EnumValueParser {
+	
+	private Set<String> canonicalValues;
+	
+	private static String getCanonicalName(String name) {
+		StringBuilder canonicalName = new StringBuilder(name.length());
+		name.chars()
+			.filter(Character::isLetterOrDigit)
+			.map(Character::toLowerCase)
+			.forEach((c) -> canonicalName.append((char) c));
+		return canonicalName.toString();
+	}
+
+	public BootEnumValueParser(String typeName, String[] values) {
+		super(typeName, values);
+		this.canonicalValues = Arrays.stream(values).map(BootEnumValueParser::getCanonicalName).collect(Collectors.toSet());
+	}
+
+	@Override
+	public Object parse(String str) throws Exception {
+		// IMPORTANT: check the text FIRST before fetching values
+		// from the hints provider, as the hints provider may be expensive when
+		// resolving values
+		if (!StringUtil.hasText(str)) {
+			throw errorOnBlank(createBlankTextErrorMessage());
+		}
+
+		// If values is not fully known then just assume the str is acceptable.
+		if (canonicalValues.contains(getCanonicalName(str))) {
+			return str;
+		} else {
+			throw errorOnParse(createErrorMessage(str, getAllKnownValues()));
+		}
+	}
+
+}