Merge branch 'master' into SpringAIUpdate

Author: Angular2Guy

backend/src/main/java/ch/xxx/aidoclibchat/adapter/client/OpenLibraryRestClient.java

@@ -16,6 +16,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 import org.slf4j.Logger;
@@ -41,7 +42,7 @@ public Response apply(Request request) {
 		var titleOpt = this.createParamOpt(request.title(), "title");
 		var subjectOpt = this.createParamOpt(request.subject(), "subject");
 		var paramsStr = List.of(authorOpt, titleOpt, subjectOpt).stream()
-				.filter(Optional::isPresent).map(myOpt -> myOpt.get()).collect(Collectors.joining("&"));
+				.filter(Optional::isPresent).map(Optional::get).collect(Collectors.joining("&"));
 		var urlStr = 
 				String.format("%s?%s", this.baseUrl, paramsStr);
 		LOGGER.info(urlStr);
@@ -50,7 +51,7 @@ public Response apply(Request request) {
 	}
 
 	private Optional<String> createParamOpt(String valueStr, String keyStr) {
-		return Optional.ofNullable(valueStr).stream().filter(myAuthor -> !myAuthor.isBlank())
+		return Optional.ofNullable(valueStr).stream().filter(Predicate.not(String::isBlank))
 				.map(myAuthor -> String.format("%s=%s", keyStr, URLEncoder.encode(myAuthor, StandardCharsets.UTF_8))).findFirst();
 	}
 }

backend/src/main/java/ch/xxx/aidoclibchat/adapter/config/ForwardServletFilter.java

@@ -61,7 +61,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
 		} else {
 			Iterable<Locale> iterable = () -> myRequest.getLocales().asIterator();
 			Locale userLocale = StreamSupport.stream(iterable.spliterator(), false)
-					.filter(myLocale -> SUPPORTED_LOCALES.contains(myLocale)).findFirst().orElse(Locale.ENGLISH);
+					.filter(SUPPORTED_LOCALES::contains).findFirst().orElse(Locale.ENGLISH);
 			String forwardPath = String.format("/%s/index.html", userLocale.getLanguage());
 //			LOG.info(String.format("Forward to: %s", forwardPath));
 			RequestDispatcher dispatcher = myRequest.getServletContext().getRequestDispatcher(forwardPath);

backend/src/main/java/ch/xxx/aidoclibchat/usecase/service/DocumentService.java

@@ -18,10 +18,12 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.StringTokenizer;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -142,16 +144,16 @@ public Optional<Book> findBookByUuid(String uuidStr) {
 
 	public List<Book> findBooksByTitleAuthor(String titleAuthor) {
 		return Optional.ofNullable(titleAuthor).stream().filter(myStr -> myStr.trim().length() > 2)
-				.map(myStr -> myStr.toLowerCase())
+				.map(String::toLowerCase)
 				.flatMap(myStr -> Stream.of(this.bookRepository.findByTitleAuthorWithChapters(myStr)))
-				.flatMap(myList -> myList.stream()).toList();
+				.flatMap(List::stream).toList();
 	}
 
 	@Async
 	public void addBookSummaries(Book book) {
 		var myChapters = book.getChapters().stream().map(myChapter -> this.addChapterSummary(myChapter)).toList();
 		// LOGGER.info(myChapters.getLast().getSummary());
-		var summaries = myChapters.stream().map(myChapter -> myChapter.getChapterText())
+		var summaries = myChapters.stream().map(Chapter::getChapterText)
 				.reduce((acc, myChapter) -> acc + "\n" + myChapter);
 		book.setSummary(this.chatClient.prompt().user(u -> u.text(this.bookPrompt).params(Map.of("text", summaries)))
 				.call().content());
@@ -171,7 +173,7 @@ private Chapter addChapterSummary(final Chapter myChapter) {
 
 	private Chapter createChapter(Book book, String heading, AtomicReference<List<String>> atomicRef) {
 		var result = new Chapter();
-		result.setTitle(atomicRef.get().stream().filter(myLine -> !myLine.isBlank()).findFirst().orElse(""));
+		result.setTitle(atomicRef.get().stream().filter(Predicate.not(String::isBlank)).findFirst().orElse(""));
 		result.setBook(book);
 		var chapterText = atomicRef.get().stream().takeWhile(myLine -> !myLine.contains(heading))
 				.collect(Collectors.joining(System.lineSeparator()));
@@ -249,8 +251,9 @@ public AiDocumentResult queryDocuments(SearchDto searchDto) {
 	private Message getSystemMessage(List<org.springframework.ai.document.Document> similarDocuments, int tokenLimit,
 			String prompt) {
 		String documentStr = this.cutStringToTokenLimit(
-				similarDocuments.stream().map(entry -> entry.getContent())
-						.filter(myStr -> myStr != null && !myStr.isBlank()).collect(Collectors.joining("\n")),
+				similarDocuments.stream().map(entry -> entry.getContent())				
+				.filter(Predicate.not(Objects::isNull))
+						.filter(Predicate.not(String::isBlank)).collect(Collectors.joining("\n")),
 				tokenLimit);
 		SystemPromptTemplate systemPromptTemplate = this.activeProfile.contains("ollama")
 				? new SystemPromptTemplate(this.ollamaPrompt)

backend/src/main/java/ch/xxx/aidoclibchat/usecase/service/TableService.java

@@ -20,6 +20,7 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -226,7 +227,7 @@ private EmbeddingContainer retrieveEmbeddings(SearchDto searchDto) {
 								.collect(Collectors.joining(" ")));
 			}
 		}
-		var rowDocuments = rowSearchStrs.stream().filter(myStr -> !myStr.isBlank())
+		var rowDocuments = rowSearchStrs.stream().filter(Predicate.not(String::isBlank))
 				.flatMap(myStr -> this.documentVsRepository
 						.retrieve(myStr, MetaData.DataType.ROW, searchDto.getResultAmount()).stream())
 				.toList();
@@ -286,10 +287,10 @@ private void updateEmbeddings() {
 		List<Document> rowDocs = Stream.concat(
 				this.importService.findAllSubjects().stream()
 						.filter(mySubject -> Optional.ofNullable(mySubject.getSubject()).stream()
-								.allMatch(mySubjectStr -> !mySubjectStr.isBlank()))
+								.allMatch(Predicate.not(String::isBlank)))
 						.map(this::map),
 				this.importService.findAllWorks().stream().filter(myWork -> Optional.ofNullable(myWork.getStyle())
-						.stream().allMatch(myStyle -> !myStyle.isBlank())).map(this::map))
+						.stream().allMatch(Predicate.not(String::isBlank))).map(this::map))
 				.toList();
 		this.importService.addDocuments(rowDocs);
 		LOGGER.info("Row Embeddings updated {}ms", new Date().getTime() - rowStart.getTime());
@@ -320,9 +321,9 @@ private Document map(ColumnMetadata columnMetadata) {
 		result.getMetadata().put(MetaData.DATANAME, columnMetadata.getColumnName());
 		result.getMetadata().put(MetaData.TABLE_NAME, columnMetadata.getTableMetadata().getTableName());
 		result.getMetadata().put(MetaData.PRIMARY_KEY, columnMetadata.isColumnPrimaryKey());
-		Optional.ofNullable(columnMetadata.getReferenceTableName()).stream().filter(myStr -> !myStr.isBlank())
+		Optional.ofNullable(columnMetadata.getReferenceTableName()).stream().filter(Predicate.not(String::isBlank))
 				.findFirst().ifPresent(myStr -> result.getMetadata().put(MetaData.REFERENCE_TABLE, myStr));
-		Optional.ofNullable(columnMetadata.getReferenceTableColumn()).stream().filter(myStr -> !myStr.isBlank())
+		Optional.ofNullable(columnMetadata.getReferenceTableColumn()).stream().filter(Predicate.not(String::isBlank))
 				.findFirst().ifPresent(myStr -> result.getMetadata().put(MetaData.REFERENCE_COLUMN, myStr));
 		return result;
 	}