Merge pull request #320 from hazendaz/java

Sonarlint source cleanups
mathieucarbou · Mar 25, 2022 · ef5db46 · ef5db46
2 parents b9a4194 + b12fb93
commit ef5db46
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 18 deletions.
diff --git a/license-maven-plugin-git/src/main/java/com/mycila/maven/plugin/license/git/GitLookup.java b/license-maven-plugin-git/src/main/java/com/mycila/maven/plugin/license/git/GitLookup.java
@@ -18,7 +18,6 @@
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.Status;
 import org.eclipse.jgit.api.errors.GitAPIException;
-import org.eclipse.jgit.api.errors.NoHeadException;
 import org.eclipse.jgit.diff.DiffConfig;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.PersonIdent;
@@ -108,11 +107,10 @@ public GitLookup(File anyFile, DateSource dateSource, TimeZone timeZone, int che
    *
    * @param file for which the year should be retrieved
    * @return year of last modification of the file
-   * @throws NoHeadException if unable to retrieve the head of the git history
    * @throws IOException     if unable to read the file
    * @throws GitAPIException if unable to process the git history
    */
-  int getYearOfLastChange(File file) throws NoHeadException, GitAPIException, IOException {
+  int getYearOfLastChange(File file) throws GitAPIException, IOException {
     String repoRelativePath = pathResolver.relativize(file);
 
     if (isFileModifiedOrUnstaged(repoRelativePath)) {
@@ -161,7 +159,7 @@ int getYearOfCreation(File file) throws IOException, GitAPIException {
     return commitYear;
   }
 
-  String getAuthorNameOfCreation(File file) throws IOException, GitAPIException {
+  String getAuthorNameOfCreation(File file) throws IOException {
     String repoRelativePath = pathResolver.relativize(file);
     String authorName = "";
     RevWalk walk = getGitRevWalk(repoRelativePath, true);
@@ -174,7 +172,7 @@ String getAuthorNameOfCreation(File file) throws IOException, GitAPIException {
     return authorName;
   }
 
-  String getAuthorEmailOfCreation(File file) throws IOException, GitAPIException {
+  String getAuthorEmailOfCreation(File file) throws IOException {
     String repoRelativePath = pathResolver.relativize(file);
     String authorEmail = "";
     RevWalk walk = getGitRevWalk(repoRelativePath, true);

diff --git a/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/AbstractLicenseMojo.java b/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/AbstractLicenseMojo.java
@@ -756,7 +756,7 @@ private String[] buildExcludes(final LicenseSet licenseSet) {
     List<String> ex = new ArrayList<>();
     ex.addAll(asList(licenseSet.excludes));
     if (project != null && project.getModules() != null && !aggregate) {
-      for (String module : (List<String>) project.getModules()) {
+      for (String module : project.getModules()) {
         ex.add(module + "/**");
       }
     }

diff --git a/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/Default.java b/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/Default.java
@@ -21,6 +21,10 @@
  */
 public final class Default {
 
+  private Default() {
+    // Prevent Instantiation
+  }
+
   public static final String[] INCLUDE = new String[]{"**"};
 
   public static final String[] EXCLUDES = {

diff --git a/...main/java/com/mycila/maven/plugin/license/dependencies/AbstractLicensePolicyEnforcer.java b/...main/java/com/mycila/maven/plugin/license/dependencies/AbstractLicensePolicyEnforcer.java
@@ -24,7 +24,7 @@
 public abstract class AbstractLicensePolicyEnforcer<T> implements LicensePolicyEnforcer<T> {
   private final LicensePolicy policy;
 
-  public AbstractLicensePolicyEnforcer(final LicensePolicy policy) {
+  protected AbstractLicensePolicyEnforcer(final LicensePolicy policy) {
     this.policy = policy;
   }
 

diff --git a/...ugin/src/main/java/com/mycila/maven/plugin/license/dependencies/MavenProjectLicenses.java b/...ugin/src/main/java/com/mycila/maven/plugin/license/dependencies/MavenProjectLicenses.java
@@ -50,7 +50,6 @@
 public class MavenProjectLicenses implements LicenseMap, LicenseMessage {
 
   private Set<MavenProject> projects;
-  private MavenSession session;
   private DependencyGraphBuilder graph;
   private ProjectBuilder projectBuilder;
   private ProjectBuildingRequest buildingRequest;
@@ -177,14 +176,6 @@ private Set<Artifact> getDependencies() {
     // return project.getArtifacts();
   }
 
-  private MavenSession getSession() {
-    return session;
-  }
-
-  private void setSession(MavenSession session) {
-    this.session = session;
-  }
-
   protected Set<MavenProject> getProjects() {
     return projects;
   }

diff --git a/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/header/HeaderParser.java b/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/header/HeaderParser.java
@@ -238,7 +238,8 @@ private int findEndPosition() {
         end = fileContent.getPosition();
         line = fileContent.nextLine();
       }
-    } if (headerDefinition.getEndLine().endsWith("EOL") && line != null && "".equals(line.trim())) {
+    }
+    if (headerDefinition.getEndLine().endsWith("EOL") && line != null && "".equals(line.trim())) {
       end = fileContent.getPosition();
     }
     return end;

diff --git a/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/header/HeaderSource.java b/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/header/HeaderSource.java
@@ -243,7 +243,7 @@ public static HeaderSource of(Multi multi, String inlineHeader, String headerPat
   protected final String content;
   private final boolean inline;
 
-  public HeaderSource(String content, boolean inline) {
+  protected HeaderSource(String content, boolean inline) {
     super();
     this.content = content;
     this.inline = inline;