style: fix code style error

yuluo-yx · yuluo-yx · commit 69f4f4740b9a · 2025-04-12T23:01:01.000+08:00
Signed-off-by: yuluo-yx &lt;yuluo08290126@gmail.com&gt;
diff --git a/document-readers/markdown-reader/src/main/java/org/springframework/ai/reader/markdown/MarkdownDocumentReader.java b/document-readers/markdown-reader/src/main/java/org/springframework/ai/reader/markdown/MarkdownDocumentReader.java
@@ -52,11 +52,11 @@
  * Reads the given Markdown resource and groups headers, paragraphs, or text divided by
  * horizontal lines (depending on the
  * {@link MarkdownDocumentReaderConfig#horizontalRuleCreateDocument} configuration) into
- * {@link Document}s.
- * Currently, only Markdown resource files in the ClassPath path are supported,
- * and Markdown files can be read in the way of directory path configuration.
- * Use {@See org.springframework.ai.reader.markdown.MarkdownDocumentReaderTest#testDirPathSingle()}
- *     {@See org.springframework.ai.reader.markdown.MarkdownDocumentReaderTest#testMultipleMarkdownFiles()}
+ * {@link Document}s. Currently, only Markdown resource files in the ClassPath path are
+ * supported, and Markdown files can be read in the way of directory path configuration.
+ * Use
+ * {@See org.springframework.ai.reader.markdown.MarkdownDocumentReaderTest#testDirPathSingle()}
+ * {@See org.springframework.ai.reader.markdown.MarkdownDocumentReaderTest#testMultipleMarkdownFiles()}
  *
  * @author Piotr Olaszewski
  * @auther shown.Ji
@@ -144,8 +144,8 @@ public MarkdownDocumentReader(List<Resource> markdownResource, MarkdownDocumentR
 	public List<Document> get() {
 
 		return this.markdownResources.stream()
-				.flatMap(markdownResource -> getDocuments(markdownResource).stream())
-				.collect(Collectors.toList());
+			.flatMap(markdownResource -> getDocuments(markdownResource).stream())
+			.collect(Collectors.toList());
 	}
 
 	private List<Document> getDocuments(Resource markdownResource) {
@@ -165,7 +165,8 @@ private List<Document> getDocuments(Resource markdownResource) {
 
 				documents = documentVisitor.getDocuments();
 			}
-		} catch (IOException e) {
+		}
+		catch (IOException e) {
 			logger.error("Error reading markdown resource: " + e.getMessage(), e);
 			throw new RuntimeException("Error reading markdown resource", e);
 		}
@@ -268,7 +269,7 @@ public void visit(FencedCodeBlock fencedCodeBlock) {
 		public void visit(Text text) {
 			if (text.getParent() instanceof Heading heading) {
 				this.currentDocumentBuilder.metadata("category", "header_%d".formatted(heading.getLevel()))
-						.metadata("title", text.getLiteral());
+					.metadata("title", text.getLiteral());
 			}
 			else {
 				this.currentParagraphs.add(text.getLiteral());
@@ -317,9 +318,7 @@ private static List<Resource> loadResources(List<String> markdownResourcePaths)
 
 		DefaultResourceLoader resourceLoader = new DefaultResourceLoader();
 
-		return markdownResourcePaths.stream()
-				.map(resourceLoader::getResource)
-				.collect(Collectors.toList());
+		return markdownResourcePaths.stream().map(resourceLoader::getResource).collect(Collectors.toList());
 	}
 
 	/**
@@ -343,11 +342,13 @@ private static List<String> loadResourcePaths(String resourcePath) {
 							resources.add("classpath:" + mdFile.getName());
 						}
 					}
-				} else if (file.exists() && file.getName().endsWith(".md")) {
+				}
+				else if (file.exists() && file.getName().endsWith(".md")) {
 					resources.add(resourcePath);
 				}
 			}
-		} else {
+		}
+		else {
 			File file = new File(resourcePath);
 			if (file.exists() && file.isDirectory()) {
 				File[] files = file.listFiles((dir, name) -> name.endsWith(".md"));
@@ -356,7 +357,8 @@ private static List<String> loadResourcePaths(String resourcePath) {
 						resources.add(mdFile.getAbsolutePath());
 					}
 				}
-			} else if (file.exists() && file.getName().endsWith(".md")) {
+			}
+			else if (file.exists() && file.getName().endsWith(".md")) {
 				resources.add(file.getAbsolutePath());
 			}
 		}
diff --git a/document-readers/markdown-reader/src/test/java/org/springframework/ai/reader/markdown/MarkdownDocumentReaderTest.java b/document-readers/markdown-reader/src/test/java/org/springframework/ai/reader/markdown/MarkdownDocumentReaderTest.java
@@ -40,11 +40,11 @@ void testDirPathSingle() {
 		List<Document> documents = reader.get();
 
 		assertThat(documents).hasSize(2)
-				.extracting(Document::getMetadata, Document::getText)
-				.containsOnly(tuple(Map.of(),
-								"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur diam eros, laoreet sit amet cursus vitae, varius sed nisi. Cras sit amet quam quis velit commodo porta consectetur id nisi. Phasellus tincidunt pulvinar augue."),
-						tuple(Map.of("category", "blockquote"),
-								"Proin vel laoreet leo, sed luctus augue. Sed et ligula commodo, commodo lacus at, consequat turpis. Maecenas eget sapien odio. Maecenas urna lectus, pellentesque in accumsan aliquam, congue eu libero. Ut rhoncus nec justo a porttitor. Pellentesque auctor pharetra eros, viverra sodales lorem aliquet id. Curabitur semper nisi vel sem interdum suscipit."));
+			.extracting(Document::getMetadata, Document::getText)
+			.containsOnly(tuple(Map.of(),
+					"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur diam eros, laoreet sit amet cursus vitae, varius sed nisi. Cras sit amet quam quis velit commodo porta consectetur id nisi. Phasellus tincidunt pulvinar augue."),
+					tuple(Map.of("category", "blockquote"),
+							"Proin vel laoreet leo, sed luctus augue. Sed et ligula commodo, commodo lacus at, consequat turpis. Maecenas eget sapien odio. Maecenas urna lectus, pellentesque in accumsan aliquam, congue eu libero. Ut rhoncus nec justo a porttitor. Pellentesque auctor pharetra eros, viverra sodales lorem aliquet id. Curabitur semper nisi vel sem interdum suscipit."));
 	}
 
 	@Test
@@ -53,42 +53,41 @@ void testDirPathMultiple() {
 		List<Document> documents = reader.get();
 
 		assertThat(documents).hasSize(6)
-				.extracting(Document::getMetadata, Document::getText)
-				.containsOnly(
-						tuple(Map.of("category", "header_1", "title", "This is a fancy header name"),
-								"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec tincidunt velit non bibendum gravida. Cras accumsan tincidunt ornare. Donec hendrerit consequat tellus blandit accumsan. Aenean aliquam metus at arcu elementum dignissim."),
-						tuple(Map.of("category", "header_3", "title", "Header 3"),
-								"Aenean eu leo eu nibh tristique posuere quis quis massa."),
-						tuple(Map.of("category", "header_1", "title", "Header 1a"),
-								"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur diam eros, laoreet sit amet cursus vitae, varius sed nisi. Cras sit amet quam quis velit commodo porta consectetur id nisi. Phasellus tincidunt pulvinar augue."),
-						tuple(Map.of("category", "header_1", "title", "Header 1b"),
-								"Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Etiam lobortis risus libero, sed sollicitudin risus cursus in. Morbi enim metus, ornare vel lacinia eget, venenatis vel nibh."),
-						tuple(Map.of("category", "header_2", "title", "Header 2b"),
-								"Proin vel laoreet leo, sed luctus augue. Sed et ligula commodo, commodo lacus at, consequat turpis. Maecenas eget sapien odio. Maecenas urna lectus, pellentesque in accumsan aliquam, congue eu libero."),
-						tuple(Map.of("category", "header_2", "title", "Header 2c"),
-								"Ut rhoncus nec justo a porttitor. Pellentesque auctor pharetra eros, viverra sodales lorem aliquet id. Curabitur semper nisi vel sem interdum suscipit."));
+			.extracting(Document::getMetadata, Document::getText)
+			.containsOnly(tuple(Map.of("category", "header_1", "title", "This is a fancy header name"),
+					"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec tincidunt velit non bibendum gravida. Cras accumsan tincidunt ornare. Donec hendrerit consequat tellus blandit accumsan. Aenean aliquam metus at arcu elementum dignissim."),
+					tuple(Map.of("category", "header_3", "title", "Header 3"),
+							"Aenean eu leo eu nibh tristique posuere quis quis massa."),
+					tuple(Map.of("category", "header_1", "title", "Header 1a"),
+							"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur diam eros, laoreet sit amet cursus vitae, varius sed nisi. Cras sit amet quam quis velit commodo porta consectetur id nisi. Phasellus tincidunt pulvinar augue."),
+					tuple(Map.of("category", "header_1", "title", "Header 1b"),
+							"Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Etiam lobortis risus libero, sed sollicitudin risus cursus in. Morbi enim metus, ornare vel lacinia eget, venenatis vel nibh."),
+					tuple(Map.of("category", "header_2", "title", "Header 2b"),
+							"Proin vel laoreet leo, sed luctus augue. Sed et ligula commodo, commodo lacus at, consequat turpis. Maecenas eget sapien odio. Maecenas urna lectus, pellentesque in accumsan aliquam, congue eu libero."),
+					tuple(Map.of("category", "header_2", "title", "Header 2c"),
+							"Ut rhoncus nec justo a porttitor. Pellentesque auctor pharetra eros, viverra sodales lorem aliquet id. Curabitur semper nisi vel sem interdum suscipit."));
 	}
 
 	@Test
 	void testMultipleMarkdownFiles() {
-		MarkdownDocumentReader reader = new MarkdownDocumentReader(List.of("classpath:/only-headers.md", "classpath:/with-formatting.md"));
+		MarkdownDocumentReader reader = new MarkdownDocumentReader(
+				List.of("classpath:/only-headers.md", "classpath:/with-formatting.md"));
 		List<Document> documents = reader.get();
 
 		assertThat(documents).hasSize(6)
-				.extracting(Document::getMetadata, Document::getText)
-				.containsOnly(
-						tuple(Map.of("category", "header_1", "title", "This is a fancy header name"),
-								"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec tincidunt velit non bibendum gravida. Cras accumsan tincidunt ornare. Donec hendrerit consequat tellus blandit accumsan. Aenean aliquam metus at arcu elementum dignissim."),
-						tuple(Map.of("category", "header_3", "title", "Header 3"),
-								"Aenean eu leo eu nibh tristique posuere quis quis massa."),
-						tuple(Map.of("category", "header_1", "title", "Header 1a"),
-								"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur diam eros, laoreet sit amet cursus vitae, varius sed nisi. Cras sit amet quam quis velit commodo porta consectetur id nisi. Phasellus tincidunt pulvinar augue."),
-						tuple(Map.of("category", "header_1", "title", "Header 1b"),
-								"Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Etiam lobortis risus libero, sed sollicitudin risus cursus in. Morbi enim metus, ornare vel lacinia eget, venenatis vel nibh."),
-						tuple(Map.of("category", "header_2", "title", "Header 2b"),
-								"Proin vel laoreet leo, sed luctus augue. Sed et ligula commodo, commodo lacus at, consequat turpis. Maecenas eget sapien odio. Maecenas urna lectus, pellentesque in accumsan aliquam, congue eu libero."),
-						tuple(Map.of("category", "header_2", "title", "Header 2c"),
-								"Ut rhoncus nec justo a porttitor. Pellentesque auctor pharetra eros, viverra sodales lorem aliquet id. Curabitur semper nisi vel sem interdum suscipit."));
+			.extracting(Document::getMetadata, Document::getText)
+			.containsOnly(tuple(Map.of("category", "header_1", "title", "This is a fancy header name"),
+					"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec tincidunt velit non bibendum gravida. Cras accumsan tincidunt ornare. Donec hendrerit consequat tellus blandit accumsan. Aenean aliquam metus at arcu elementum dignissim."),
+					tuple(Map.of("category", "header_3", "title", "Header 3"),
+							"Aenean eu leo eu nibh tristique posuere quis quis massa."),
+					tuple(Map.of("category", "header_1", "title", "Header 1a"),
+							"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur diam eros, laoreet sit amet cursus vitae, varius sed nisi. Cras sit amet quam quis velit commodo porta consectetur id nisi. Phasellus tincidunt pulvinar augue."),
+					tuple(Map.of("category", "header_1", "title", "Header 1b"),
+							"Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Etiam lobortis risus libero, sed sollicitudin risus cursus in. Morbi enim metus, ornare vel lacinia eget, venenatis vel nibh."),
+					tuple(Map.of("category", "header_2", "title", "Header 2b"),
+							"Proin vel laoreet leo, sed luctus augue. Sed et ligula commodo, commodo lacus at, consequat turpis. Maecenas eget sapien odio. Maecenas urna lectus, pellentesque in accumsan aliquam, congue eu libero."),
+					tuple(Map.of("category", "header_2", "title", "Header 2c"),
+							"Ut rhoncus nec justo a porttitor. Pellentesque auctor pharetra eros, viverra sodales lorem aliquet id. Curabitur semper nisi vel sem interdum suscipit."));
 	}
 
 	@Test

Original file line number	Diff line number	Diff line change
`@@ -52,11 +52,11 @@`
`52`	`52`	`* Reads the given Markdown resource and groups headers, paragraphs, or text divided by`
`53`	`53`	`* horizontal lines (depending on the`
`54`	`54`	`* {@link MarkdownDocumentReaderConfig#horizontalRuleCreateDocument} configuration) into`
`55`		`- * {@link Document}s.`
`56`		`- * Currently, only Markdown resource files in the ClassPath path are supported,`
`57`		`- * and Markdown files can be read in the way of directory path configuration.`
`58`		`- * Use {@See org.springframework.ai.reader.markdown.MarkdownDocumentReaderTest#testDirPathSingle()}`
`59`		`- * {@See org.springframework.ai.reader.markdown.MarkdownDocumentReaderTest#testMultipleMarkdownFiles()}`
	`55`	`+ * {@link Document}s. Currently, only Markdown resource files in the ClassPath path are`
	`56`	`+ * supported, and Markdown files can be read in the way of directory path configuration.`
	`57`	`+ * Use`
	`58`	`+ * {@See org.springframework.ai.reader.markdown.MarkdownDocumentReaderTest#testDirPathSingle()}`
	`59`	`+ * {@See org.springframework.ai.reader.markdown.MarkdownDocumentReaderTest#testMultipleMarkdownFiles()}`
`60`	`60`	`*`
`61`	`61`	`* @author Piotr Olaszewski`
`62`	`62`	`* @auther shown.Ji`
`@@ -144,8 +144,8 @@ public MarkdownDocumentReader(List<Resource> markdownResource, MarkdownDocumentR`
`144`	`144`	`public List<Document> get() {`
`145`	`145`
`146`	`146`	`return this.markdownResources.stream()`
`147`		`- .flatMap(markdownResource -> getDocuments(markdownResource).stream())`
`148`		`- .collect(Collectors.toList());`
	`147`	`+ .flatMap(markdownResource -> getDocuments(markdownResource).stream())`
	`148`	`+ .collect(Collectors.toList());`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`private List<Document> getDocuments(Resource markdownResource) {`
`@@ -165,7 +165,8 @@ private List<Document> getDocuments(Resource markdownResource) {`
`165`	`165`
`166`	`166`	`documents = documentVisitor.getDocuments();`
`167`	`167`	`}`
`168`		`- } catch (IOException e) {`
	`168`	`+ }`
	`169`	`+ catch (IOException e) {`
`169`	`170`	`logger.error("Error reading markdown resource: " + e.getMessage(), e);`
`170`	`171`	`throw new RuntimeException("Error reading markdown resource", e);`
`171`	`172`	`}`
`@@ -268,7 +269,7 @@ public void visit(FencedCodeBlock fencedCodeBlock) {`
`268`	`269`	`public void visit(Text text) {`
`269`	`270`	`if (text.getParent() instanceof Heading heading) {`
`270`	`271`	`this.currentDocumentBuilder.metadata("category", "header_%d".formatted(heading.getLevel()))`
`271`		`- .metadata("title", text.getLiteral());`
	`272`	`+ .metadata("title", text.getLiteral());`
`272`	`273`	`}`
`273`	`274`	`else {`
`274`	`275`	`this.currentParagraphs.add(text.getLiteral());`
`@@ -317,9 +318,7 @@ private static List<Resource> loadResources(List<String> markdownResourcePaths)`
`317`	`318`
`318`	`319`	`DefaultResourceLoader resourceLoader = new DefaultResourceLoader();`
`319`	`320`
`320`		`- return markdownResourcePaths.stream()`
`321`		`- .map(resourceLoader::getResource)`
`322`		`- .collect(Collectors.toList());`
	`321`	`+ return markdownResourcePaths.stream().map(resourceLoader::getResource).collect(Collectors.toList());`
`323`	`322`	`}`
`324`	`323`
`325`	`324`	`/**`
`@@ -343,11 +342,13 @@ private static List<String> loadResourcePaths(String resourcePath) {`
`343`	`342`	`resources.add("classpath:" + mdFile.getName());`
`344`	`343`	`}`
`345`	`344`	`}`
`346`		`- } else if (file.exists() && file.getName().endsWith(".md")) {`
	`345`	`+ }`
	`346`	`+ else if (file.exists() && file.getName().endsWith(".md")) {`
`347`	`347`	`resources.add(resourcePath);`
`348`	`348`	`}`
`349`	`349`	`}`
`350`		`- } else {`
	`350`	`+ }`
	`351`	`+ else {`
`351`	`352`	`File file = new File(resourcePath);`
`352`	`353`	`if (file.exists() && file.isDirectory()) {`
`353`	`354`	`File[] files = file.listFiles((dir, name) -> name.endsWith(".md"));`
`@@ -356,7 +357,8 @@ private static List<String> loadResourcePaths(String resourcePath) {`
`356`	`357`	`resources.add(mdFile.getAbsolutePath());`
`357`	`358`	`}`
`358`	`359`	`}`
`359`		`- } else if (file.exists() && file.getName().endsWith(".md")) {`
	`360`	`+ }`
	`361`	`+ else if (file.exists() && file.getName().endsWith(".md")) {`
`360`	`362`	`resources.add(file.getAbsolutePath());`
`361`	`363`	`}`
`362`	`364`	`}`