From: Julien HENRY Date: Thu, 21 May 2015 14:31:22 +0000 (+0200) Subject: Fix some quality flaws X-Git-Tag: 5.2-RC1~1870 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=851e8b5d5f5bce878d0d362a7f21bd786e3b9221;p=sonarqube.git Fix some quality flaws --- diff --git a/sonar-batch/src/main/java/org/sonar/batch/deprecated/perspectives/BatchPerspectives.java b/sonar-batch/src/main/java/org/sonar/batch/deprecated/perspectives/BatchPerspectives.java index 47124c44c29..a39e2383f25 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/deprecated/perspectives/BatchPerspectives.java +++ b/sonar-batch/src/main/java/org/sonar/batch/deprecated/perspectives/BatchPerspectives.java @@ -23,13 +23,9 @@ import com.google.common.collect.Maps; import java.util.Map; import javax.annotation.CheckForNull; import org.sonar.api.batch.SonarIndex; -import org.sonar.api.batch.fs.InputDir; -import org.sonar.api.batch.fs.InputFile; import org.sonar.api.batch.fs.InputPath; import org.sonar.api.component.Perspective; import org.sonar.api.component.ResourcePerspectives; -import org.sonar.api.resources.Directory; -import org.sonar.api.resources.File; import org.sonar.api.resources.Resource; import org.sonar.batch.index.BatchComponentCache; @@ -63,14 +59,6 @@ public class BatchPerspectives implements ResourcePerspectives { @Override public

P as(Class

perspectiveClass, InputPath inputPath) { - Resource r; - if (inputPath instanceof InputDir) { - r = Directory.create(((InputDir) inputPath).relativePath()); - } else if (inputPath instanceof InputFile) { - r = File.create(((InputFile) inputPath).relativePath()); - } else { - throw new IllegalArgumentException("Unknow input path type: " + inputPath); - } PerspectiveBuilder

builder = builderFor(perspectiveClass); return builder.loadPerspective(perspectiveClass, componentCache.get(inputPath)); } diff --git a/sonar-batch/src/main/java/org/sonar/batch/test/DefaultTestCase.java b/sonar-batch/src/main/java/org/sonar/batch/test/DefaultTestCase.java index 6cf1af728da..0c692e17a90 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/test/DefaultTestCase.java +++ b/sonar-batch/src/main/java/org/sonar/batch/test/DefaultTestCase.java @@ -82,7 +82,6 @@ public class DefaultTestCase implements MutableTestCase { @Override public MutableTestCase setStatus(@Nullable Status s) { this.status = s; - ; return this; }