From: Julien HENRY <julien.henry@sonarsource.com>
Date: Wed, 19 Sep 2018 08:08:57 +0000 (+0200)
Subject: Fix quality flaws
X-Git-Tag: 7.5~443
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e5f73ecf404ab7342a772fd5630835c7893e0c84;p=sonarqube.git

Fix quality flaws
---

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/Metadata.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/Metadata.java
index b917af0c81b..60894166439 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/Metadata.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/Metadata.java
@@ -25,47 +25,47 @@ import javax.annotation.concurrent.Immutable;
 
 @Immutable
 public class Metadata {
-    private final int lines;
-    private final int nonBlankLines;
-    private final String hash;
-    private final int[] originalLineStartOffsets;
-    private final int[] originalLineEndOffsets;
-    private final int lastValidOffset;
+  private final int lines;
+  private final int nonBlankLines;
+  private final String hash;
+  private final int[] originalLineStartOffsets;
+  private final int[] originalLineEndOffsets;
+  private final int lastValidOffset;
 
-    public Metadata(int lines, int nonBlankLines, String hash, int[] originalLineStartOffsets, int[] originalLineEndOffsets, int lastValidOffset) {
-        this.lines = lines;
-        this.nonBlankLines = nonBlankLines;
-        this.hash = hash;
-        this.originalLineStartOffsets = Arrays.copyOf(originalLineStartOffsets, originalLineStartOffsets.length);
-        this.originalLineEndOffsets = Arrays.copyOf(originalLineEndOffsets, originalLineEndOffsets.length);
-        this.lastValidOffset = lastValidOffset;
-    }
+  public Metadata(int lines, int nonBlankLines, String hash, int[] originalLineStartOffsets, int[] originalLineEndOffsets, int lastValidOffset) {
+    this.lines = lines;
+    this.nonBlankLines = nonBlankLines;
+    this.hash = hash;
+    this.originalLineStartOffsets = Arrays.copyOf(originalLineStartOffsets, originalLineStartOffsets.length);
+    this.originalLineEndOffsets = Arrays.copyOf(originalLineEndOffsets, originalLineEndOffsets.length);
+    this.lastValidOffset = lastValidOffset;
+  }
 
-    public int lines() {
-        return lines;
-    }
+  public int lines() {
+    return lines;
+  }
 
-    public int nonBlankLines() {
-        return nonBlankLines;
-    }
+  public int nonBlankLines() {
+    return nonBlankLines;
+  }
 
-    public String hash() {
-        return hash;
-    }
+  public String hash() {
+    return hash;
+  }
 
-    public int[] originalLineStartOffsets() {
-        return originalLineStartOffsets;
-    }
+  public int[] originalLineStartOffsets() {
+    return originalLineStartOffsets;
+  }
 
-    public int[] originalLineEndOffsets() {
-        return originalLineEndOffsets;
-    }
+  public int[] originalLineEndOffsets() {
+    return originalLineEndOffsets;
+  }
 
-    public int lastValidOffset() {
-        return lastValidOffset;
-    }
+  public int lastValidOffset() {
+    return lastValidOffset;
+  }
 
-    public boolean isEmpty() {
-        return lastValidOffset == 0;
-    }
+  public boolean isEmpty() {
+    return lastValidOffset == 0;
+  }
 }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/charhandler/FileHashComputer.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/charhandler/FileHashComputer.java
index 456215dba4b..ca3dd26958e 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/charhandler/FileHashComputer.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/charhandler/FileHashComputer.java
@@ -27,8 +27,6 @@ import java.nio.charset.CodingErrorAction;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 
-import javax.annotation.CheckForNull;
-
 import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.codec.digest.DigestUtils;
 
@@ -78,7 +76,6 @@ public class FileHashComputer extends CharHandler {
     }
   }
 
-  @CheckForNull
   public String getHash() {
     return Hex.encodeHexString(globalMd5Digest.digest());
   }
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/InputFileBuilder.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/InputFileBuilder.java
index d17e9dc4e52..9f4cd14df83 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/InputFileBuilder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/InputFileBuilder.java
@@ -21,13 +21,13 @@ package org.sonar.scanner.scan.filesystem;
 
 import java.nio.file.Path;
 import javax.annotation.Nullable;
+
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.internal.DefaultIndexedFile;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
 import org.sonar.api.batch.fs.internal.DefaultInputModule;
 import org.sonar.api.batch.fs.internal.InputModuleHierarchy;
 import org.sonar.api.batch.fs.internal.SensorStrategy;
-import org.sonar.api.utils.PathUtils;
 import org.sonar.scanner.scan.ScanProperties;
 
 public class InputFileBuilder {