Re-add slf4j logging

- This PR reverts the changes to update Apache Commons Logging and re-add the previously used slf4j logging
spring-projects · Feb 1, 2025 · a2f46be · a2f46be
1 parent ca27895
commit a2f46be
Show file tree

Hide file tree

Showing 199 changed files with 1,059 additions and 814 deletions.
diff --git a/...ers/pdf-reader/src/main/java/org/springframework/ai/reader/pdf/PagePdfDocumentReader.java b/...ers/pdf-reader/src/main/java/org/springframework/ai/reader/pdf/PagePdfDocumentReader.java
@@ -22,18 +22,18 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.apache.commons.logging.LogFactory;
 import org.apache.pdfbox.pdfparser.PDFParser;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.springframework.ai.document.Document;
 import org.springframework.ai.document.DocumentReader;
 import org.springframework.ai.reader.pdf.config.PdfDocumentReaderConfig;
 import org.springframework.ai.reader.pdf.layout.PDFLayoutTextStripperByArea;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.Resource;
-import org.springframework.core.log.LogAccessor;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
@@ -55,10 +55,10 @@ public class PagePdfDocumentReader implements DocumentReader {
 
 	private static final String PDF_PAGE_REGION = "pdfPageRegion";
 
-	private static final LogAccessor logger = new LogAccessor(LogFactory.getLog(PagePdfDocumentReader.class));
-
 	protected final PDDocument document;
 
+	private final Logger logger = LoggerFactory.getLogger(getClass());
+
 	protected String resourceFileName;
 
 	private PdfDocumentReaderConfig config;
@@ -112,7 +112,7 @@ public List<Document> get() {
 			for (PDPage page : this.document.getDocumentCatalog().getPages()) {
 				lastPage = page;
 				if (counter % logFrequency == 0 && counter / logFrequency < 10) {
-					logger.info("Processing PDF page: " + (counter + 1));
+					logger.info("Processing PDF page: {}", (counter + 1));
 				}
 				counter++;
 
@@ -154,7 +154,7 @@ public List<Document> get() {
 				readDocuments.add(toDocument(lastPage, pageTextGroupList.stream().collect(Collectors.joining()),
 						startPageNumber, pageNumber));
 			}
-			logger.info("Processing " + totalPages + " pages");
+			logger.info("Processing {} pages", totalPages);
 			return readDocuments;
 
 		}

diff --git a/...df-reader/src/main/java/org/springframework/ai/reader/pdf/ParagraphPdfDocumentReader.java b/...df-reader/src/main/java/org/springframework/ai/reader/pdf/ParagraphPdfDocumentReader.java
@@ -23,6 +23,8 @@
 
 import org.apache.pdfbox.pdfparser.PDFParser;
 import org.apache.pdfbox.pdmodel.PDDocument;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.springframework.ai.document.Document;
 import org.springframework.ai.document.DocumentReader;
@@ -32,7 +34,6 @@
 import org.springframework.ai.reader.pdf.layout.PDFLayoutTextStripperByArea;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.Resource;
-import org.springframework.core.log.LogAccessor;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
@@ -61,7 +62,7 @@ public class ParagraphPdfDocumentReader implements DocumentReader {
 
 	protected final PDDocument document;
 
-	private static final LogAccessor logger = new LogAccessor(ParagraphPdfDocumentReader.class);
+	private final Logger logger = LoggerFactory.getLogger(getClass());
 
 	private final ParagraphManager paragraphTextExtractor;
 

diff --git a/models/spring-ai-anthropic/pom.xml b/models/spring-ai-anthropic/pom.xml
@@ -76,6 +76,10 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context-support</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-logging</artifactId>
+		</dependency>
 
 		<!-- test dependencies -->
 		<dependency>

diff --git a/...pring-ai-anthropic/src/main/java/org/springframework/ai/anthropic/AnthropicChatModel.java b/...pring-ai-anthropic/src/main/java/org/springframework/ai/anthropic/AnthropicChatModel.java
@@ -27,6 +27,8 @@
 import io.micrometer.observation.Observation;
 import io.micrometer.observation.ObservationRegistry;
 import io.micrometer.observation.contextpropagation.ObservationThreadLocalAccessor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -65,7 +67,6 @@
 import org.springframework.ai.model.function.FunctionCallbackResolver;
 import org.springframework.ai.model.function.FunctionCallingOptions;
 import org.springframework.ai.retry.RetryUtils;
-import org.springframework.core.log.LogAccessor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.retry.support.RetryTemplate;
 import org.springframework.util.Assert;
@@ -91,7 +92,7 @@ public class AnthropicChatModel extends AbstractToolCallSupport implements ChatM
 
 	public static final Double DEFAULT_TEMPERATURE = 0.8;
 
-	private static final LogAccessor logger = new LogAccessor(AnthropicChatModel.class);
+	private static final Logger logger = LoggerFactory.getLogger(AnthropicChatModel.class);
 
 	private static final ChatModelObservationConvention DEFAULT_OBSERVATION_CONVENTION = new DefaultChatModelObservationConvention();
 

diff --git a/...ing-ai-anthropic/src/test/java/org/springframework/ai/anthropic/AnthropicChatModelIT.java b/...ing-ai-anthropic/src/test/java/org/springframework/ai/anthropic/AnthropicChatModelIT.java
@@ -27,6 +27,8 @@
 import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import reactor.core.publisher.Flux;
 
 import org.springframework.ai.anthropic.api.AnthropicApi;
@@ -57,7 +59,6 @@
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
-import org.springframework.core.log.LogAccessor;
 import org.springframework.util.MimeType;
 import org.springframework.util.MimeTypeUtils;
 import org.springframework.util.StringUtils;
@@ -68,7 +69,7 @@
 @EnabledIfEnvironmentVariable(named = "ANTHROPIC_API_KEY", matches = ".+")
 class AnthropicChatModelIT {
 
-	private static final LogAccessor logger = new LogAccessor(AnthropicChatModelIT.class);
+	private static final Logger logger = LoggerFactory.getLogger(AnthropicChatModelIT.class);
 
 	@Autowired
 	protected ChatModel chatModel;
@@ -282,7 +283,7 @@ void functionCallTest() {
 
 		ChatResponse response = this.chatModel.call(new Prompt(messages, promptOptions));
 
-		logger.info("Response: " + response);
+		logger.info("Response: {}", response);
 
 		Generation generation = response.getResult();
 		assertThat(generation).isNotNull();
@@ -321,7 +322,7 @@ void streamFunctionCallTest() {
 			.map(cr -> cr.getResult().getOutput().getText())
 			.collect(Collectors.joining());
 
-		logger.info("Response: " + content);
+		logger.info("Response: {}", content);
 		assertThat(content).contains("30", "10", "15");
 	}
 
@@ -346,7 +347,7 @@ void streamFunctionCallUsageTest() {
 
 		ChatResponse chatResponse = responseFlux.last().block();
 
-		logger.info("Response: " + chatResponse);
+		logger.info("Response: {}", chatResponse);
 		Usage usage = chatResponse.getMetadata().getUsage();
 
 		assertThat(usage).isNotNull();

diff --git a/...spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/EventParsingTests.java b/...spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/EventParsingTests.java
@@ -23,10 +23,11 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.springframework.ai.anthropic.api.AnthropicApi.StreamEvent;
 import org.springframework.core.io.DefaultResourceLoader;
-import org.springframework.core.log.LogAccessor;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -36,7 +37,7 @@
  */
 public class EventParsingTests {
 
-	private static final LogAccessor logger = new LogAccessor(EventParsingTests.class);
+	private static final Logger logger = LoggerFactory.getLogger(EventParsingTests.class);
 
 	@Test
 	public void readEvents() throws IOException {

diff --git a/...pic/src/test/java/org/springframework/ai/anthropic/api/tool/AnthropicApiLegacyToolIT.java b/...pic/src/test/java/org/springframework/ai/anthropic/api/tool/AnthropicApiLegacyToolIT.java
@@ -22,6 +22,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.springframework.ai.anthropic.api.AnthropicApi;
 import org.springframework.ai.anthropic.api.AnthropicApi.AnthropicMessage;
@@ -34,7 +36,6 @@
 import org.springframework.ai.anthropic.api.tool.XmlHelper.Tools.ToolDescription;
 import org.springframework.ai.anthropic.api.tool.XmlHelper.Tools.ToolDescription.Parameter;
 import org.springframework.ai.model.ModelOptionsUtils;
-import org.springframework.core.log.LogAccessor;
 import org.springframework.http.ResponseEntity;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -80,7 +81,7 @@ public class AnthropicApiLegacyToolIT {
 
 	public static final ConcurrentHashMap<String, Function> FUNCTIONS = new ConcurrentHashMap<>();
 
-	private static final LogAccessor logger = new LogAccessor(AnthropicApiLegacyToolIT.class);
+	private static final Logger logger = LoggerFactory.getLogger(AnthropicApiLegacyToolIT.class);
 
 	AnthropicApi anthropicApi = new AnthropicApi(System.getenv("ANTHROPIC_API_KEY"));
 

diff --git a/...anthropic/src/test/java/org/springframework/ai/anthropic/api/tool/AnthropicApiToolIT.java b/...anthropic/src/test/java/org/springframework/ai/anthropic/api/tool/AnthropicApiToolIT.java
@@ -23,6 +23,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.springframework.ai.anthropic.api.AnthropicApi;
 import org.springframework.ai.anthropic.api.AnthropicApi.AnthropicMessage;
@@ -33,7 +35,6 @@
 import org.springframework.ai.anthropic.api.AnthropicApi.Role;
 import org.springframework.ai.anthropic.api.AnthropicApi.Tool;
 import org.springframework.ai.model.ModelOptionsUtils;
-import org.springframework.core.log.LogAccessor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.util.CollectionUtils;
 
@@ -55,7 +56,7 @@ public class AnthropicApiToolIT {
 
 	public static final ConcurrentHashMap<String, Function> FUNCTIONS = new ConcurrentHashMap<>();
 
-	private static final LogAccessor logger = new LogAccessor(AnthropicApiToolIT.class);
+	private static final Logger logger = LoggerFactory.getLogger(AnthropicApiToolIT.class);
 
 	AnthropicApi anthropicApi = new AnthropicApi(System.getenv("ANTHROPIC_API_KEY"));
 

diff --git a/...nthropic/src/test/java/org/springframework/ai/anthropic/client/AnthropicChatClientIT.java b/...nthropic/src/test/java/org/springframework/ai/anthropic/client/AnthropicChatClientIT.java
@@ -28,6 +28,8 @@
 import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import reactor.core.publisher.Flux;
 
 import org.springframework.ai.anthropic.AnthropicChatOptions;
@@ -48,7 +50,6 @@
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
-import org.springframework.core.log.LogAccessor;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.util.MimeTypeUtils;
 
@@ -59,7 +60,7 @@
 @ActiveProfiles("logging-test")
 class AnthropicChatClientIT {
 
-	private static final LogAccessor logger = new LogAccessor(AnthropicChatClientIT.class);
+	private static final Logger logger = LoggerFactory.getLogger(AnthropicChatClientIT.class);
 
 	@Autowired
 	ChatModel chatModel;
@@ -218,7 +219,7 @@ void functionCallTest() {
 				.content();
 		// @formatter:on
 
-		logger.info("Response: " + response);
+		logger.info("Response: {}", response);
 
 		assertThat(response).contains("30", "10", "15");
 	}
@@ -236,7 +237,7 @@ void functionCallWithGeneratedDescription() {
 				.content();
 		// @formatter:on
 
-		logger.info("Response: " + response);
+		logger.info("Response: {}", response);
 
 		assertThat(response).contains("30", "10", "15");
 	}
@@ -257,7 +258,7 @@ void defaultFunctionCallTest() {
 			.content();
 		// @formatter:on
 
-		logger.info("Response: " + response);
+		logger.info("Response: {}", response);
 
 		assertThat(response).contains("30", "10", "15");
 	}
@@ -277,7 +278,7 @@ void streamFunctionCallTest() {
 		// @formatter:on
 
 		String content = response.collectList().block().stream().collect(Collectors.joining());
-		logger.info("Response: " + content);
+		logger.info("Response: {}", content);
 
 		assertThat(content).contains("30", "10", "15");
 	}
@@ -339,7 +340,7 @@ void streamingMultiModality() throws IOException {
 
 		String content = response.collectList().block().stream().collect(Collectors.joining());
 
-		logger.info("Response: " + content);
+		logger.info("Response: {}", content);
 		assertThat(content).contains("bananas", "apple");
 		assertThat(content).containsAnyOf("bowl", "basket");
 	}