romanov73/git-extractor
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

#12 -- Fix code

Browse Source
This commit is contained in:
Anton Romanov 2021-04-10 12:19:44 +04:00
parent 03e2b7ac07
commit bf611faa38
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/ru/ulstu/extractor/heuristic/service/StructuralUnitService.java
View File

@ -13,6 +13,7 @@ import ru.ulstu.extractor.service.GitRepositoryService;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.function.Predicate;
@Service @Service
public class StructuralUnitService { public class StructuralUnitService {
@ -32,18 +33,24 @@ public class StructuralUnitService {
File rootPath = gitRepositoryService.getProjectDirectoryFile(repositoryUrl); File rootPath = gitRepositoryService.getProjectDirectoryFile(repositoryUrl);
List<File> projectFiles = directoryService.getFilesRecursively(rootPath); List<File> projectFiles = directoryService.getFilesRecursively(rootPath);
List<File> rootProjectFiles = directoryService.getDirectoryFiles(rootPath.toPath()); List<File> rootProjectFiles = directoryService.getDirectoryFiles(rootPath.toPath());
StructuralUnitIdentifier selectedIdentifier = structuralUnitIdentifiers.stream() return getStructuralUnitIdentifier(
.filter(structuralUnitIdentifier -> structuralUnitIdentifier.canAppliedToProject(rootPath.getPath(), projectFiles, rootProjectFiles)) structuralUnitIdentifier -> structuralUnitIdentifier.canAppliedToProject(
.findAny() rootPath.getPath(),
.orElseThrow(() -> new RuntimeException("Identifier not found")); projectFiles,
return selectedIdentifier.getEntityClasses(rootPath.getPath(), projectFiles, rootProjectFiles); rootProjectFiles)
).getEntityClasses(rootPath.getPath(), projectFiles, rootProjectFiles);
} }
public boolean containsEntity(File projectFile) { public boolean containsEntity(File projectFile) {
StructuralUnitIdentifier selectedIdentifier = structuralUnitIdentifiers.stream() return getStructuralUnitIdentifier(
.filter(structuralUnitIdentifier -> structuralUnitIdentifier.canAppliedToFile(projectFile)) structuralUnitIdentifier -> structuralUnitIdentifier.canAppliedToFile(projectFile)
).isEntityClass(projectFile);
}
private StructuralUnitIdentifier getStructuralUnitIdentifier(Predicate<StructuralUnitIdentifier> predicate) {
return structuralUnitIdentifiers.stream()
.filter(predicate)
.findAny() .findAny()
.orElseThrow(() -> new RuntimeException("Identifier not found")); .orElseThrow(() -> new RuntimeException("Identifier not found"));
return selectedIdentifier.isEntityClass(projectFile);
} }
} }