Skip to content
Snippets Groups Projects
Commit c1914cee authored by jez04's avatar jez04
Browse files

fix: use same filter for root list files

parent 99da76ef
No related merge requests found
......@@ -94,11 +94,9 @@ public class FixDirStructure {
log.info("");
return;
}
List<File> files = Arrays.asList(dir.toFile().listFiles()).stream()
.filter(f -> !skipNames.contains(f.getName())).toList();
List<File> files = getFileListInProjectRoot(dir);
boolean pomExist = files.stream().anyMatch(f -> f.getName().equals("pom.xml"));
long multiPomCount = findFiles(dir, "pom.xml").size();
findFiles(dir, "pom.xml").stream().forEach(f -> System.out.println(f));
long multiPomCountInRootDir = files.stream()
.filter(f -> !f.isDirectory() && f.getName().matches("pom(\\s*\\((.*)\\))?\\.xml")).count();
boolean onlyJava = files.stream().filter(f -> !f.getName().equals("pom.xml"))
......@@ -136,9 +134,14 @@ public class FixDirStructure {
findMain(dir);
}
private static void fixMultiplepPoms(Path dir) {
private static List<File> getFileListInProjectRoot(Path dir) {
List<File> files = Arrays.asList(dir.toFile().listFiles()).stream()
.filter(f -> !"result.html".equals(f.getName())).toList();
.filter(f -> !skipNames.contains(f.getName())).toList();
return files;
}
private static void fixMultiplepPoms(Path dir) {
List<File> files = getFileListInProjectRoot(dir);
long multiPomCount = files.stream()
.filter(f -> !f.isDirectory() && f.getName().matches("pom(\\s*\\((.*)\\))?\\.xml")).count();
List<File> poms = files.stream()
......@@ -204,6 +207,7 @@ public class FixDirStructure {
}
private static void removeOneDirPapth(Path dir) {
log.info("item in dirs count:" + dir.toFile().listFiles().length);
log.info(Arrays.toString(dir.toFile().listFiles()));
Path insideProject = Arrays.stream(dir.toFile().listFiles()).filter(File::isDirectory).map(File::toPath)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment