Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rework FileSystemProjectJavaBuildToolRepository #9662

Merged
merged 1 commit into from
Apr 28, 2024
Merged

Rework FileSystemProjectJavaBuildToolRepository #9662

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 25 additions & 11 deletions ...e/module/infrastructure/secondary/javabuild/FileSystemProjectJavaBuildToolRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
package tech.jhipster.lite.module.infrastructure.secondary.javabuild;

import java.util.Collection;
import java.util.Optional;
import org.springframework.stereotype.Component;
import tech.jhipster.lite.module.domain.file.JHipsterDestination;
import tech.jhipster.lite.module.domain.file.JHipsterFileToMove;
import tech.jhipster.lite.module.domain.file.JHipsterFilesToMove;
import tech.jhipster.lite.module.domain.file.JHipsterModuleFile;
import tech.jhipster.lite.module.domain.file.JHipsterModuleFiles;
import tech.jhipster.lite.module.domain.javabuild.JavaBuildTool;
Expand All @@ -22,29 +20,45 @@ public class FileSystemProjectJavaBuildToolRepository implements ProjectJavaBuil
public Optional<JavaBuildTool> detect(JHipsterProjectFolder projectFolder) {
if (projectFolder.fileExists(POM_XML)) {
return Optional.of(JavaBuildTool.MAVEN);
} else if (projectFolder.fileExists(BUILD_GRADLE_KTS)) {
}

if (projectFolder.fileExists(BUILD_GRADLE_KTS)) {
return Optional.of(JavaBuildTool.GRADLE);
}

return Optional.empty();
}

@Override
public Optional<JavaBuildTool> detect(JHipsterModuleFiles moduleFiles) {
if (hasDestinationFile(moduleFiles.filesToAdd(), POM_XML) || hasDestinationFile(moduleFiles.filesToMove(), POM_XML)) {
if (hasMavenFile(moduleFiles)) {
return Optional.of(JavaBuildTool.MAVEN);
} else if (
hasDestinationFile(moduleFiles.filesToAdd(), BUILD_GRADLE_KTS) || hasDestinationFile(moduleFiles.filesToMove(), BUILD_GRADLE_KTS)
) {
}

if (hasGradleFile(moduleFiles)) {
return Optional.of(JavaBuildTool.GRADLE);
}

return Optional.empty();
}

private static boolean hasDestinationFile(JHipsterFilesToMove filesToMove, String fileName) {
return filesToMove.stream().map(JHipsterFileToMove::destination).map(JHipsterDestination::get).anyMatch(fileName::equals);
private static boolean hasMavenFile(JHipsterModuleFiles moduleFiles) {
return hasBuildFiles(moduleFiles, POM_XML);
}

private static boolean hasGradleFile(JHipsterModuleFiles moduleFiles) {
return hasBuildFiles(moduleFiles, BUILD_GRADLE_KTS);
}

private static boolean hasBuildFiles(JHipsterModuleFiles moduleFiles, String file) {
return hasFileToAdd(moduleFiles, file) || hasFileToMove(moduleFiles, file);
}

private static boolean hasFileToMove(JHipsterModuleFiles files, String fileName) {
return files.filesToMove().stream().map(JHipsterFileToMove::destination).map(JHipsterDestination::get).anyMatch(fileName::equals);
}

private static boolean hasDestinationFile(Collection<JHipsterModuleFile> filesToAdd, String fileName) {
return filesToAdd.stream().map(JHipsterModuleFile::destination).map(JHipsterDestination::get).anyMatch(fileName::equals);
private static boolean hasFileToAdd(JHipsterModuleFiles files, String fileName) {
return files.filesToAdd().stream().map(JHipsterModuleFile::destination).map(JHipsterDestination::get).anyMatch(fileName::equals);
}
}