Minor documentation updates

Author: tzolov

models/spring-ai-azure-openai/src/main/java/org/springframework/ai/azure/openai/AzureOpenAiChatClient.java

@@ -18,6 +18,7 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 import com.azure.ai.openai.OpenAIClient;
 import com.azure.ai.openai.models.ChatChoice;
@@ -225,20 +226,13 @@ private ChatCompletionsOptions merge(ChatCompletionsOptions azureOptions, AzureO
 		ChatCompletionsOptions mergedAzureOptions = new ChatCompletionsOptions(azureOptions.getMessages());
 		mergedAzureOptions.setStream(azureOptions.isStream());
 
-		mergedAzureOptions.setMaxTokens(azureOptions.getMaxTokens());
-		if (mergedAzureOptions.getMaxTokens() == null) {
-			mergedAzureOptions.setMaxTokens(springAiOptions.getMaxTokens());
-		}
+		mergedAzureOptions.setMaxTokens(
+				(azureOptions.getMaxTokens() != null) ? azureOptions.getMaxTokens() : springAiOptions.getMaxTokens());
 
-		mergedAzureOptions.setLogitBias(azureOptions.getLogitBias());
-		if (mergedAzureOptions.getLogitBias() == null) {
-			mergedAzureOptions.setLogitBias(springAiOptions.getLogitBias());
-		}
+		mergedAzureOptions.setLogitBias(
+				azureOptions.getLogitBias() != null ? azureOptions.getLogitBias() : springAiOptions.getLogitBias());
 
-		mergedAzureOptions.setStop(azureOptions.getStop());
-		if (mergedAzureOptions.getStop() == null) {
-			mergedAzureOptions.setStop(springAiOptions.getStop());
-		}
+		mergedAzureOptions.setStop(azureOptions.getStop() != null ? azureOptions.getStop() : springAiOptions.getStop());
 
 		mergedAzureOptions.setTemperature(azureOptions.getTemperature());
 		if (mergedAzureOptions.getTemperature() == null && springAiOptions.getTemperature() != null) {
@@ -260,20 +254,12 @@ private ChatCompletionsOptions merge(ChatCompletionsOptions azureOptions, AzureO
 			mergedAzureOptions.setPresencePenalty(springAiOptions.getPresencePenalty().doubleValue());
 		}
 
-		mergedAzureOptions.setN(azureOptions.getN());
-		if (mergedAzureOptions.getN() == null) {
-			mergedAzureOptions.setN(springAiOptions.getN());
-		}
+		mergedAzureOptions.setN(azureOptions.getN() != null ? azureOptions.getN() : springAiOptions.getN());
 
-		mergedAzureOptions.setUser(azureOptions.getUser());
-		if (mergedAzureOptions.getUser() == null) {
-			mergedAzureOptions.setUser(springAiOptions.getUser());
-		}
+		mergedAzureOptions.setUser(azureOptions.getUser() != null ? azureOptions.getUser() : springAiOptions.getUser());
 
-		mergedAzureOptions.setModel(azureOptions.getModel());
-		if (mergedAzureOptions.getModel() == null) {
-			mergedAzureOptions.setModel(springAiOptions.getModel());
-		}
+		mergedAzureOptions
+			.setModel(azureOptions.getModel() != null ? azureOptions.getModel() : springAiOptions.getModel());
 
 		return mergedAzureOptions;
 	}

spring-ai-docs/src/main/antora/modules/ROOT/pages/api/clients/azure-openai-chat.adoc

@@ -4,7 +4,7 @@ Azure's OpenAI offering, powered by ChatGPT, extends beyond traditional OpenAI c
 
 Azure offers Java developers the opportunity to leverage AI's full potential by integrating it with an array of Azure services, which includes AI-related resources such as Vector Stores on Azure.
 
-== Pre-requisites
+== Prerequisites
 
 Obtain your Azure OpenAI `endpoint` and `api-key` from the Azure OpenAI Service section on the link:https://portal.azure.com[Azure Portal].
 

spring-ai-docs/src/main/antora/modules/ROOT/pages/api/clients/azure-openai.adoc

@@ -1,4 +1,4 @@
-= Bedrock Anthropic Chat
+= Anthropic Chat
 
 https://www.anthropic.com/product[Anthropic's Claude] is an AI assistant based on Anthropic’s research into training helpful, honest, and harmless AI systems.
 

spring-ai-docs/src/main/antora/modules/ROOT/pages/api/clients/bedrock/bedrock-anthropic.adoc

@@ -1,4 +1,4 @@
-= Bedrock Llama2 Chat
+= Llama2 Chat
 
 https://ai.meta.com/llama/[Meta's Llama 2 Chat] is part of the Llama 2 collection of large language models.
 It excels in dialogue-based applications with a parameter scale ranging from 7 billion to 70 billion.

spring-ai-docs/src/main/antora/modules/ROOT/pages/api/clients/bedrock/bedrock-llama2.adoc

@@ -8,7 +8,7 @@ Azure's OpenAI extends the OpenAI capabilities, offering safe text generation an
 
 The Azure OpenAI embeddings rely on `cosine similarity` to compute similarity between documents and a query.
 
-== Pre-requisites
+== Prerequisites
 
 Obtain your Azure OpenAI `endpoint` and `api-key` from the Azure OpenAI Service section on the link:https://portal.azure.com[Azure Portal].
 
@@ -146,6 +146,8 @@ EmbeddingResponse embeddingResponse = embeddingClient
 
 NOTE: the `text-embedding-ada-002` is actually the `Deployment Name` as presented in the Azure AI Portal.
 
+=== Embedding Options
+
 The `AzureOpenAiEmbeddingOptions` provides the configuration information for the embedding requests.
 The `AzureOpenAiEmbeddingOptions` offers a builder to create the options.
 

spring-ai-docs/src/main/antora/modules/ROOT/pages/api/embeddings/azure-openai-embeddings.adoc

@@ -16,7 +16,7 @@ Refer to the official Ollama project link:https://github.com/jmorganca/ollama[RE
 Note, installing `ollama run llama2` will download a 4GB docker image.
 
 
-=== OllamaEmbeddingClient Auto-configuration
+== Auto-configuration
 
 Spring AI provides Spring Boot auto-configuration for the Azure Ollama Embedding Client.
 To enable it add the following dependency to your Maven `pom.xml` file:
@@ -44,7 +44,7 @@ NOTE: Refer to the xref:getting-started.adoc#_dependency_management[Dependency M
 The `spring.ai.ollama.embedding.options.*` properties are used to configure the default options used for all embedding requests.
 (It is used as `OllamaEmbeddingClient#withDefaultOptions()` instance).
 
-== Embedding Properties
+=== Embedding Properties
 
 The prefix `spring.ai.ollama` is the property prefix to configure the connection to Ollama
 
@@ -57,7 +57,7 @@ The prefix `spring.ai.ollama` is the property prefix to configure the connection
 
 The prefix `spring.ai.ollama.embedding.options` is the property prefix that configures the `EmbeddingClient` implementation for Ollama.
 
-[cols="3,6,1"]
+[cols="3,5,1"]
 |====
 | Property | Description | Default
 
@@ -168,7 +168,7 @@ EmbeddingResponse embeddingResponse = embeddingClient
 
 The `OllamaOptions` provides the configuration information for all embedding requests.
 
-=== Chat Options
+=== Embedding Options
 
 The https://github.com/spring-projects/spring-ai/blob/main/models/spring-ai-ollama/src/main/java/org/springframework/ai/ollama/api/OllamaOptions.java[OllamaOptions.java] provides the Ollama configurations, such as the model to use, the low level GPU and CPU tunning, etc.