Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
No results found
Show changes
Commits on Source (2)
...@@ -94,11 +94,9 @@ public class FixDirStructure { ...@@ -94,11 +94,9 @@ public class FixDirStructure {
log.info(""); log.info("");
return; return;
} }
List<File> files = Arrays.asList(dir.toFile().listFiles()).stream() List<File> files = getFileListInProjectRoot(dir);
.filter(f -> !skipNames.contains(f.getName())).toList();
boolean pomExist = files.stream().anyMatch(f -> f.getName().equals("pom.xml")); boolean pomExist = files.stream().anyMatch(f -> f.getName().equals("pom.xml"));
long multiPomCount = findFiles(dir, "pom.xml").size(); long multiPomCount = findFiles(dir, "pom.xml").size();
findFiles(dir, "pom.xml").stream().forEach(f -> System.out.println(f));
long multiPomCountInRootDir = files.stream() long multiPomCountInRootDir = files.stream()
.filter(f -> !f.isDirectory() && f.getName().matches("pom(\\s*\\((.*)\\))?\\.xml")).count(); .filter(f -> !f.isDirectory() && f.getName().matches("pom(\\s*\\((.*)\\))?\\.xml")).count();
boolean onlyJava = files.stream().filter(f -> !f.getName().equals("pom.xml")) boolean onlyJava = files.stream().filter(f -> !f.getName().equals("pom.xml"))
...@@ -136,9 +134,14 @@ public class FixDirStructure { ...@@ -136,9 +134,14 @@ public class FixDirStructure {
findMain(dir); findMain(dir);
} }
private static void fixMultiplepPoms(Path dir) { private static List<File> getFileListInProjectRoot(Path dir) {
List<File> files = Arrays.asList(dir.toFile().listFiles()).stream() 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() long multiPomCount = files.stream()
.filter(f -> !f.isDirectory() && f.getName().matches("pom(\\s*\\((.*)\\))?\\.xml")).count(); .filter(f -> !f.isDirectory() && f.getName().matches("pom(\\s*\\((.*)\\))?\\.xml")).count();
List<File> poms = files.stream() List<File> poms = files.stream()
...@@ -204,6 +207,7 @@ public class FixDirStructure { ...@@ -204,6 +207,7 @@ public class FixDirStructure {
} }
private static void removeOneDirPapth(Path dir) { private static void removeOneDirPapth(Path dir) {
log.info("item in dirs count:" + dir.toFile().listFiles().length); log.info("item in dirs count:" + dir.toFile().listFiles().length);
log.info(Arrays.toString(dir.toFile().listFiles())); log.info(Arrays.toString(dir.toFile().listFiles()));
Path insideProject = Arrays.stream(dir.toFile().listFiles()).filter(File::isDirectory).map(File::toPath) Path insideProject = Arrays.stream(dir.toFile().listFiles()).filter(File::isDirectory).map(File::toPath)
......