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

[Miroslav Šulc]

commit:     766ecd34d054a963c7b7149d8e53676b289b8ea8
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 18:20:44 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 18:20:44 2020 +0000
URL:        https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=766ecd34

minor style fixes and sorted methods in MavenProject

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../gentoo/java/ebuilder/maven/MavenProject.java   | 98 +++++++++++-----------
 1 file changed, 50 insertions(+), 48 deletions(-)

diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java
index b7553b0..e91bb80 100644
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java
@@ -3,6 +3,7 @@ package org.gentoo.java.ebuilder.maven;
 import java.io.PrintWriter;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.SortedSet;
@@ -43,14 +44,14 @@ public class MavenProject {
      * Whether the package has test classes.
      */
     private Boolean hasTests;
-    /**
-     * Lisences.
-     */
-    private SortedSet<String> licenses = new TreeSet<>();
     /**
      * Homepage URL.
      */
     private String homepage;
+    /**
+     * Lisences.
+     */
+    private final SortedSet<String> licenses = new TreeSet<>();
     /**
      * Application main class.
      */
@@ -113,14 +114,12 @@ public class MavenProject {
     /**
      * Adds license to {@link #licenses}.
      *
-     * @param license {@link #licenses}
+     * @param portageLicenses {@link #licenses}
      */
     public void addLicense(final String portageLicenses) {
         final String[] parts = portageLicenses.split(":");
 
-        for (String eachLicense: parts) {
-            licenses.add(eachLicense);
-        }
+        licenses.addAll(Arrays.asList(parts));
     }
 
     /**
@@ -279,6 +278,40 @@ public class MavenProject {
         this.description = description.replaceAll("[\n ]+", " ");
     }
 
+    /**
+     * deal with scope == "system" dependencies
+     *
+     * @param writer writer
+     *
+     * @return lines of ebuild variables
+     */
+    @SuppressWarnings("unchecked")
+    public String getExtraJars(final PrintWriter writer) {
+        String ret = "";
+        List<MavenDependency> systemDependencies = getDependencies(new String[]{
+            "system"});
+
+        for (final MavenDependency dependency : systemDependencies) {
+            switch (dependency.getGroupId()) {
+                case "com.sun":
+                    switch (dependency.getArtifactId()) {
+                        case "tools":
+                            ret += "JAVA_NEEDS_TOOLS=1\n";
+                            break;
+                        default:
+                            writer.println("Equivalent variable for "
+                                    + dependency.getArtifactId() + " not found.");
+                    }
+                    break;
+                default:
+                    writer.println("Equivalent variable for " + dependency.
+                            getGroupId() + " not found.");
+            }
+        }
+
+        return ret;
+    }
+
     /**
      * Getter for {@link #groupId}.
      *
@@ -297,6 +330,15 @@ public class MavenProject {
         this.groupId = groupId;
     }
 
+    /**
+     * Setter for {@link #hasTests}
+     *
+     * @param hasTests {@link #hasTests}
+     */
+    public void setHasTests(boolean hasTests) {
+        this.hasTests = hasTests;
+    }
+
     /**
      * Getter for {@link #homepage}.
      *
@@ -423,37 +465,6 @@ public class MavenProject {
         this.sourceVersion = sourceVersion;
     }
 
-    /**
-     * deal with scope == "system" dependencies
-     *
-     * @return lines of ebuild variables
-     */
-    @SuppressWarnings("unchecked")
-    public String getExtraJars(final PrintWriter writer) {
-        String ret = "";
-        List<MavenDependency> systemDependencies = getDependencies(new String[]{"system"});
-
-        for (final MavenDependency dependency : systemDependencies) {
-            switch (dependency.getGroupId()) {
-                case "com.sun":
-                    switch (dependency.getArtifactId()) {
-                        case "tools":
-                            ret += "JAVA_NEEDS_TOOLS=1\n";
-                            break;
-                        default:
-                            writer.println("Equivalent variable for " +
-                                dependency.getArtifactId() + " not found.");
-                    }
-                    break;
-                default:
-                    writer.println("Equivalent variable for " +
-                            dependency.getGroupId() + " not found.");
-            }
-        }
-
-        return ret;
-    }
-
     /**
      * Getter for {@link #targetVersion}.
      *
@@ -591,15 +602,6 @@ public class MavenProject {
         return hasTests;
     }
 
-    /**
-     * Setter for {@link #hasTests}
-     *
-     * @param hasTests {@link #hasTests}
-     */
-    public void setHasTests(boolean hasTests) {
-        this.hasTests = hasTests;
-    }
-
     /**
      * Returns dependencies based on the specified scopes.
      *