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

Merge branch 'main' into release

parents d8b4db97 99da76ef
Branches
No related merge requests found
...@@ -62,7 +62,7 @@ public class FixDirStructure { ...@@ -62,7 +62,7 @@ public class FixDirStructure {
} }
private static Logger log = java.util.logging.Logger.getLogger(FixDirStructure.class.getName()); private static Logger log = java.util.logging.Logger.getLogger(FixDirStructure.class.getName());
public static final List<String> skipNames = List.of("target", ".settings", ".project", ".classpath", public static final List<String> skipNames = List.of("target", ".settings", ".project", ".classpath",
".kelvin-utils"); ".kelvin-utils", "result.html");
public static final String TAR_GZ_PATTERN = ".*\\.tar\\.gz"; public static final String TAR_GZ_PATTERN = ".*\\.tar\\.gz";
public static void main(String[] args) { public static void main(String[] args) {
...@@ -95,7 +95,7 @@ public class FixDirStructure { ...@@ -95,7 +95,7 @@ public class FixDirStructure {
return; return;
} }
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();
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)); findFiles(dir, "pom.xml").stream().forEach(f -> System.out.println(f));
...@@ -103,7 +103,7 @@ public class FixDirStructure { ...@@ -103,7 +103,7 @@ public class FixDirStructure {
.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"))
.allMatch(f -> f.getName().endsWith(".java")); .allMatch(f -> f.getName().endsWith(".java"));
boolean onlyOneDir = files.stream().allMatch(f -> f.isDirectory()) && files.size() == 1; boolean onlyOneDir = files.stream().allMatch(File::isDirectory) && files.size() == 1;
boolean pomAndSrcZip = pomExist && files.size() == 2 boolean pomAndSrcZip = pomExist && files.size() == 2
&& files.stream().filter(f -> !f.getName().equals("pom.xml")).allMatch(f -> !f.isDirectory()) && files.stream().filter(f -> !f.getName().equals("pom.xml")).allMatch(f -> !f.isDirectory())
&& files.stream().filter(f -> !f.getName().equals("pom.xml")) && files.stream().filter(f -> !f.getName().equals("pom.xml"))
......
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