Merge pull request #11 from arey/feature/spring-ai-1.0.0-M5

Upgrade Spring AI to 1.0.0-M5

Author: arey

build.gradle

@@ -15,7 +15,7 @@ apply plugin: 'io.spring.javaformat'
 gradle.startParameter.excludedTaskNames += [ "checkFormatAot", "checkFormatAotTest" ]
 
 group = 'org.springframework.samples'
-version = '3.4.0'
+version = '3.4.2'
 
 java {
   sourceCompatibility = JavaVersion.VERSION_17
@@ -32,7 +32,7 @@ ext.webjarsLocatorLiteVersion = "1.0.1"
 ext.webjarsFontawesomeVersion = "4.7.0"
 ext.webjarsBootstrapVersion = "5.3.3"
 ext.webjarsMarkedVersion = "14.1.2"
-ext.springAiVersion = "1.0.0-M2"
+ext.springAiVersion = "1.0.0-M5"
 
 dependencies {
   // Workaround for AOT issue (https://github.com/spring-projects/spring-framework/pull/33949) -->

pom.xml

@@ -38,7 +38,7 @@
     <maven-checkstyle.version>3.6.0</maven-checkstyle.version>
     <nohttp-checkstyle.version>0.0.11</nohttp-checkstyle.version>
     <spring-format.version>0.0.43</spring-format.version>
-    <spring-ai.version>1.0.0-M3</spring-ai.version>
+    <spring-ai.version>1.0.0-M5</spring-ai.version>
   </properties>
 
   <dependencies>

src/main/java/org/springframework/samples/petclinic/genai/AIDataProvider.java

@@ -59,11 +59,9 @@ public VetResponse getVets(VetRequest request) throws JsonProcessingException {
 		ObjectMapper objectMapper = new ObjectMapper();
 		String vetAsJson = objectMapper.writeValueAsString(request.vet());
 
-		SearchRequest sr = SearchRequest.from(SearchRequest.defaults()).withQuery(vetAsJson).withTopK(20);
-		if (request.vet() == null) {
-			// Provide a limit of 50 results when zero parameters are sent
-			sr = sr.withTopK(50);
-		}
+		// Provide a limit of 50 results when zero parameters are sent
+		int topK = (request.vet() == null) ? 50 : 20;
+		SearchRequest sr = SearchRequest.builder().query(vetAsJson).topK(topK).build();
 
 		List<Document> topMatches = this.vectorStore.similaritySearch(sr);
 		List<String> results = topMatches.stream().map(Document::getContent).toList();