fix: clean up

Angular2Guy · Jul 9, 2024 · a19c675 · a19c675
1 parent e61494a
commit a19c675
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/backend/src/main/java/ch/xxx/aidoclibchat/adapter/client/GithubRestClient.java b/backend/src/main/java/ch/xxx/aidoclibchat/adapter/client/GithubRestClient.java
@@ -13,7 +13,6 @@
 package ch.xxx.aidoclibchat.adapter.client;
 
 import java.util.Arrays;
-import java.util.LinkedList;
 import java.util.List;
 
 import org.springframework.stereotype.Component;
@@ -36,6 +35,6 @@ public GithubSource readSourceFile(String url) {
 		var resultLines = result.lines().toList();
 		var sourcePackage = resultLines.stream().filter(myLine -> myLine.contains("package")).findFirst().orElseThrow()
 				.trim().split(" ")[1].split(";")[0].trim();
-		return new GithubSource(sourceName, sourcePackage, resultLines, new LinkedList<GithubSource>());
+		return new GithubSource(sourceName, sourcePackage, resultLines, List.of());
 	}
 }
diff --git a/backend/src/main/java/ch/xxx/aidoclibchat/usecase/service/CodeGenerationService.java b/backend/src/main/java/ch/xxx/aidoclibchat/usecase/service/CodeGenerationService.java
@@ -35,18 +35,22 @@ public CodeGenerationService(GithubClient githubClient) {
 	public GithubSource generateTests(String url, final boolean referencedSources) {
 		final var myUrl = url.replace("https://github.com", GithubClient.GITHUB_BASE_URL).replace("/blob", "");
 		var result = this.githubClient.readSourceFile(myUrl);
-		var isComment = new AtomicBoolean(false);
-		var sourceLines = result.lines().stream().map(myLine -> myLine.replaceAll("[\t]", "").trim())
+		final var isComment = new AtomicBoolean(false);
+		final var sourceLines = result.lines().stream().map(myLine -> myLine.replaceAll("[\t]", "").trim())
 				.filter(myLine -> !myLine.isBlank()).filter(myLine -> filterComments(isComment, myLine)).toList();
 		final var basePackage = List.of(result.sourcePackage().split("\\.")).stream().limit(2)
 				.collect(Collectors.joining("."));
-		var importLines = sourceLines.stream().filter(x -> referencedSources).filter(myLine -> myLine.contains("import"))
+		final var dependencies = this.createDependencies(referencedSources, myUrl, sourceLines, basePackage);
+		return new GithubSource(result.sourceName(), result.sourcePackage(), sourceLines, dependencies);
+	}
+
+	private List<GithubSource> createDependencies(final boolean referencedSources, final String myUrl,
+			final List<String> sourceLines, final String basePackage) {
+		return sourceLines.stream().filter(x -> referencedSources).filter(myLine -> myLine.contains("import"))
 				.filter(myLine -> myLine.contains(basePackage))
 				.map(myLine -> String.format("%s%s%s", myUrl.split(basePackage.replace(".", "/"))[0].trim(),
 						myLine.split("import")[1].split(";")[0].replaceAll("\\.", "/").trim(), ".java"))
 				.map(myLine -> this.generateTests(myLine, false)).toList();
-//		importLines.forEach(myLine -> LOGGER.info(myLine));
-		return new GithubSource(result.sourceName(), result.sourcePackage(), sourceLines, importLines);
 	}
 
 	private boolean filterComments(AtomicBoolean isComment, String myLine) {