Skip to content

Commit a19c675

Browse files
committed
fix: clean up
1 parent e61494a commit a19c675

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
package ch.xxx.aidoclibchat.adapter.client;
1414

1515
import java.util.Arrays;
16-
import java.util.LinkedList;
1716
import java.util.List;
1817

1918
import org.springframework.stereotype.Component;
@@ -36,6 +35,6 @@ public GithubSource readSourceFile(String url) {
3635
var resultLines = result.lines().toList();
3736
var sourcePackage = resultLines.stream().filter(myLine -> myLine.contains("package")).findFirst().orElseThrow()
3837
.trim().split(" ")[1].split(";")[0].trim();
39-
return new GithubSource(sourceName, sourcePackage, resultLines, new LinkedList<GithubSource>());
38+
return new GithubSource(sourceName, sourcePackage, resultLines, List.of());
4039
}
4140
}

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,22 @@ public CodeGenerationService(GithubClient githubClient) {
3535
public GithubSource generateTests(String url, final boolean referencedSources) {
3636
final var myUrl = url.replace("https://github.com", GithubClient.GITHUB_BASE_URL).replace("/blob", "");
3737
var result = this.githubClient.readSourceFile(myUrl);
38-
var isComment = new AtomicBoolean(false);
39-
var sourceLines = result.lines().stream().map(myLine -> myLine.replaceAll("[\t]", "").trim())
38+
final var isComment = new AtomicBoolean(false);
39+
final var sourceLines = result.lines().stream().map(myLine -> myLine.replaceAll("[\t]", "").trim())
4040
.filter(myLine -> !myLine.isBlank()).filter(myLine -> filterComments(isComment, myLine)).toList();
4141
final var basePackage = List.of(result.sourcePackage().split("\\.")).stream().limit(2)
4242
.collect(Collectors.joining("."));
43-
var importLines = sourceLines.stream().filter(x -> referencedSources).filter(myLine -> myLine.contains("import"))
43+
final var dependencies = this.createDependencies(referencedSources, myUrl, sourceLines, basePackage);
44+
return new GithubSource(result.sourceName(), result.sourcePackage(), sourceLines, dependencies);
45+
}
46+
47+
private List<GithubSource> createDependencies(final boolean referencedSources, final String myUrl,
48+
final List<String> sourceLines, final String basePackage) {
49+
return sourceLines.stream().filter(x -> referencedSources).filter(myLine -> myLine.contains("import"))
4450
.filter(myLine -> myLine.contains(basePackage))
4551
.map(myLine -> String.format("%s%s%s", myUrl.split(basePackage.replace(".", "/"))[0].trim(),
4652
myLine.split("import")[1].split(";")[0].replaceAll("\\.", "/").trim(), ".java"))
4753
.map(myLine -> this.generateTests(myLine, false)).toList();
48-
// importLines.forEach(myLine -> LOGGER.info(myLine));
49-
return new GithubSource(result.sourceName(), result.sourcePackage(), sourceLines, importLines);
5054
}
5155

5256
private boolean filterComments(AtomicBoolean isComment, String myLine) {

0 commit comments

Comments
 (0)