Make known embedding dimensions maps immutable

Signed-off-by: Nicolas Krier <7557886+nicolaskrier@users.noreply.github.com>

Author: nicolaskrier

models/spring-ai-google-genai-embedding/src/main/java/org/springframework/ai/google/genai/text/GoogleGenAiTextEmbeddingModel.java

@@ -66,8 +66,8 @@ public class GoogleGenAiTextEmbeddingModel extends AbstractEmbeddingModel {
 
 	private static final Map<String, Integer> KNOWN_EMBEDDING_DIMENSIONS = Stream
 		.of(GoogleGenAiTextEmbeddingModelName.values())
-		.collect(Collectors.toMap(GoogleGenAiTextEmbeddingModelName::getName,
-				GoogleGenAiTextEmbeddingModelName::getDimensions));
+		.collect(Collectors.collectingAndThen(Collectors.toMap(GoogleGenAiTextEmbeddingModelName::getName,
+				GoogleGenAiTextEmbeddingModelName::getDimensions), Map::copyOf));
 
 	public final GoogleGenAiTextEmbeddingOptions defaultOptions;
 
@@ -259,7 +259,13 @@ private DefaultUsage getDefaultUsage(Integer totalTokens) {
 
 	@Override
 	public int dimensions() {
-		return KNOWN_EMBEDDING_DIMENSIONS.computeIfAbsent(this.defaultOptions.getModel(), model -> super.dimensions());
+		var dimensions = KNOWN_EMBEDDING_DIMENSIONS.get(this.defaultOptions.getModel());
+
+		if (dimensions == null) {
+			dimensions = super.dimensions();
+		}
+
+		return dimensions;
 	}
 
 	/**

models/spring-ai-vertex-ai-embedding/src/main/java/org/springframework/ai/vertexai/embedding/multimodal/VertexAiMultimodalEmbeddingModel.java

@@ -77,8 +77,8 @@ public class VertexAiMultimodalEmbeddingModel implements DocumentEmbeddingModel
 
 	private static final Map<String, Integer> KNOWN_EMBEDDING_DIMENSIONS = Stream
 		.of(VertexAiMultimodalEmbeddingModelName.values())
-		.collect(Collectors.toMap(VertexAiMultimodalEmbeddingModelName::getName,
-				VertexAiMultimodalEmbeddingModelName::getDimensions));
+		.collect(Collectors.collectingAndThen(Collectors.toMap(VertexAiMultimodalEmbeddingModelName::getName,
+				VertexAiMultimodalEmbeddingModelName::getDimensions), Map::copyOf));
 
 	public final VertexAiMultimodalEmbeddingOptions defaultOptions;
 

models/spring-ai-vertex-ai-embedding/src/main/java/org/springframework/ai/vertexai/embedding/text/VertexAiTextEmbeddingModel.java

@@ -69,8 +69,8 @@ public class VertexAiTextEmbeddingModel extends AbstractEmbeddingModel {
 
 	private static final Map<String, Integer> KNOWN_EMBEDDING_DIMENSIONS = Stream
 		.of(VertexAiTextEmbeddingModelName.values())
-		.collect(Collectors.toMap(VertexAiTextEmbeddingModelName::getName,
-				VertexAiTextEmbeddingModelName::getDimensions));
+		.collect(Collectors.collectingAndThen(Collectors.toMap(VertexAiTextEmbeddingModelName::getName,
+				VertexAiTextEmbeddingModelName::getDimensions), Map::copyOf));
 
 	public final VertexAiTextEmbeddingOptions defaultOptions;
 
@@ -244,7 +244,13 @@ private DefaultUsage getDefaultUsage(Integer totalTokens) {
 
 	@Override
 	public int dimensions() {
-		return KNOWN_EMBEDDING_DIMENSIONS.getOrDefault(this.defaultOptions.getModel(), super.dimensions());
+		var dimensions = KNOWN_EMBEDDING_DIMENSIONS.get(this.defaultOptions.getModel());
+
+		if (dimensions == null) {
+			dimensions = super.dimensions();
+		}
+
+		return dimensions;
 	}
 
 	/**

spring-ai-model/src/main/java/org/springframework/ai/embedding/AbstractEmbeddingModel.java

@@ -82,7 +82,9 @@ private static Map<String, Integer> loadKnownModelDimensions() {
 			}
 			return properties.entrySet()
 				.stream()
-				.collect(Collectors.toMap(e -> e.getKey().toString(), e -> Integer.parseInt(e.getValue().toString())));
+				.collect(Collectors.collectingAndThen(
+						Collectors.toMap(e -> e.getKey().toString(), e -> Integer.parseInt(e.getValue().toString())),
+						Map::copyOf));
 		}
 		catch (IOException e) {
 			throw new RuntimeException(e);