[gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/maven/

[Miroslav Šulc]

commit:     ddca794355fa2f062a5c6c711e91ec80f18ef936
Author:     zongyu <zzy2529420793 <AT> gmail <DOT> com>
AuthorDate: Mon Jun 15 01:39:41 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Jul  6 09:48:27 2020 +0000
URL:        https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=ddca7943

run simple_formatter after mvn -f, which enables us to re-format the irregular 
xml file produced by mvn

Signed-off-by: zongyu <zzy2529420793 <AT> gmail.com>

 .../java/org/gentoo/java/ebuilder/maven/MavenCache.java |  4 ++--
 .../org/gentoo/java/ebuilder/maven/MavenParser.java     | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java 
b/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java
index 4e8767e..19e40f9 100644
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java
@@ -24,7 +24,7 @@ public class MavenCache {
      * items.
      */
     private final Map<String, Map<String, List<CacheItem>>> cache
-            = new HashMap<>(200);
+            = new HashMap<>();
 
     /**
      * Searches for system dependency using maven group id, artifact id and
@@ -151,7 +151,7 @@ public class MavenCache {
                 = cache.get(cacheItem.getGroupId());
 
         if (artifactIds == null) {
-            artifactIds = new HashMap<>(100);
+            artifactIds = new HashMap<>();
             cache.put(cacheItem.getGroupId(), artifactIds);
         }
 

diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java 
b/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java
index 7c9d162..63ba043 100644
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java
@@ -102,6 +102,9 @@ public class MavenParser {
                 pomFile.toString(), "help:effective-pom",
                 "-Doutput=" + outputPath);
         processBuilder.directory(config.getWorkdir().toFile());
+        final ProcessBuilder xmlBuilder = new 
ProcessBuilder("/usr/lib/java-ebuilder/simple_formatter",
+                "" + outputPath);
+        xmlBuilder.directory(config.getWorkdir().toFile());
 
         final Process process;
 
@@ -119,6 +122,20 @@ public class MavenParser {
             Runtime.getRuntime().exit(1);
         }
 
+        final Process xmlProcess;
+        try {
+            xmlProcess = xmlBuilder.start();
+        } catch (final IOException ex) {
+            throw new RuntimeException("Failed to format xml", ex);
+        }
+        try {
+            xmlProcess.waitFor(10, TimeUnit.MINUTES);
+        } catch (final InterruptedException ex) {
+            config.getErrorWriter().println("ERROR: xml formatter run 10 
minutes??");
+            Runtime.getRuntime().exit(1);
+        }
+
+
         if (process.exitValue() != 0) {
             config.getErrorWriter().println(
                     "ERROR: Failed to run mvn command:");