Miscellaneous code cleanup (#104)

Author: basil

src/main/java/com/github/terma/jenkins/githubprcoveragestatus/Configuration.java

@@ -92,7 +92,7 @@ public static final class ConfigurationDescriptor extends Descriptor<Configurati
         private static final int DEFAULT_YELLOW_THRESHOLD = 80;
         private static final int DEFAULT_GREEN_THRESHOLD = 90;
 
-        private final Map<String, Float> coverageByRepo = new ConcurrentHashMap<String, Float>();
+        private final Map<String, Float> coverageByRepo = new ConcurrentHashMap<>();
 
         private boolean disableSimpleCov;
         private String gitHubApiUrl;

src/main/java/com/github/terma/jenkins/githubprcoveragestatus/GetCoverageCallable.java

@@ -44,7 +44,7 @@ private List<Float> getFloats(File ws, String path, CoverageReportParser parser)
         FileSet fs = Util.createFileSet(ws, path);
         DirectoryScanner ds = fs.getDirectoryScanner();
         String[] files = ds.getIncludedFiles();
-        List<Float> cov = new ArrayList<Float>();
+        List<Float> cov = new ArrayList<>();
         for (String file : files) {
             cov.add(parser.get(new File(ds.getBasedir(), file).getAbsolutePath()));
         }
@@ -60,8 +60,8 @@ public float get(final FilePath workspace) throws IOException, InterruptedExcept
     }
 
     @Override
-    public Float invoke(final File ws, final VirtualChannel channel) throws IOException {
-        final List<Float> cov = new ArrayList<Float>();
+    public Float invoke(final File ws, final VirtualChannel channel) {
+        final List<Float> cov = new ArrayList<>();
         cov.addAll(getFloats(ws, "**/cobertura.xml", new CoberturaParser()));
         cov.addAll(getFloats(ws, "**/cobertura-coverage.xml", new CoberturaParser()));
         cov.addAll(getFloats(ws, "**/jacoco.xml", new JacocoParser(jacocoCounterType)));

src/main/java/com/github/terma/jenkins/githubprcoveragestatus/XmlUtils.java

@@ -30,6 +30,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.StringReader;
+import java.nio.charset.StandardCharsets;
 
 public class XmlUtils {
 
@@ -48,7 +49,7 @@ public InputSource resolveEntity(String publicId, String systemId)
 //                    }
                 }
             });
-            Document doc = builder.parse(new InputSource(new ByteArrayInputStream(xml.getBytes("utf-8"))));
+            Document doc = builder.parse(new InputSource(new ByteArrayInputStream(xml.getBytes(StandardCharsets.UTF_8))));
             XPathFactory xPathfactory = XPathFactory.newInstance();
             XPathExpression expr = xPathfactory.newXPath().compile(xpath);
             return (String) expr.evaluate(doc, XPathConstants.STRING);

src/test/java/com/github/terma/jenkins/githubprcoveragestatus/CloverParserTest.java

@@ -20,36 +20,34 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.io.IOException;
-
 public class CloverParserTest {
 
     @Test
-    public void extractCoverageFromCloverReport() throws IOException {
+    public void extractCoverageFromCloverReport() {
         String filePath = CloverParserTest.class.getResource(
                 "/com/github/terma/jenkins/githubprcoveragestatus/CloverParserTest/clover.xml").getFile();
 
         Assert.assertEquals(0.5, new CloverParser().get(filePath), 0.1);
     }
 
     @Test
-    public void extractZeroCoverageIfNoCoveredStatements() throws IOException {
+    public void extractZeroCoverageIfNoCoveredStatements() {
         String filePath = CloverParserTest.class.getResource(
                 "/com/github/terma/jenkins/githubprcoveragestatus/CloverParserTest/clover-zero-statements-coverage.xml").getFile();
 
         Assert.assertEquals(0, new CloverParser().get(filePath), 0.1);
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void throwExceptionIfReportDoesntHaveStatementsAttribute() throws IOException {
+    public void throwExceptionIfReportDoesntHaveStatementsAttribute() {
         String filePath = CloverParserTest.class.getResource(
                 "/com/github/terma/jenkins/githubprcoveragestatus/CloverParserTest/clover-invalid-no-statements.xml").getFile();
 
         Assert.assertEquals(0, new CloverParser().get(filePath), 0.1);
     }
 
     @Test
-    public void extractZeroCoverageIfZeroStatements() throws IOException {
+    public void extractZeroCoverageIfZeroStatements() {
         String filePath = CloverParserTest.class.getResource(
                 "/com/github/terma/jenkins/githubprcoveragestatus/CloverParserTest/clover-zero-statements.xml").getFile();
 

src/test/java/com/github/terma/jenkins/githubprcoveragestatus/CoberturaParserTest.java

@@ -20,59 +20,57 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.io.IOException;
-
 public class CoberturaParserTest {
 
     @Test
-    public void extractCoverageFromCoberturaReportAsLineRatePlusBranchRateDivByTwo() throws IOException {
+    public void extractCoverageFromCoberturaReportAsLineRatePlusBranchRateDivByTwo() {
         String filePath = CoberturaParserTest.class.getResource(
                 "/com/github/terma/jenkins/githubprcoveragestatus/CoberturaParserTest/cobertura.xml").getFile();
 
         Assert.assertEquals(0.94, new CoberturaParser().get(filePath), 0.1);
     }
 
     @Test
-    public void extractCoverageFromCoberturaReportWithSingleQuotes() throws IOException {
+    public void extractCoverageFromCoberturaReportWithSingleQuotes() {
         String filePath = CoberturaParserTest.class.getResource(
                 "/com/github/terma/jenkins/githubprcoveragestatus/CoberturaParserTest/cobertura-with-single-quotes.xml").getFile();
 
         Assert.assertEquals(0.94, new CoberturaParser().get(filePath), 0.1);
     }
 
     @Test
-    public void extractZeroCoverageIfNoZeroLineRateAndBranchRate() throws IOException {
+    public void extractZeroCoverageIfNoZeroLineRateAndBranchRate() {
         String filePath = CoberturaParserTest.class.getResource(
                 "/com/github/terma/jenkins/githubprcoveragestatus/CoberturaParserTest/cobertura-zero-coverage.xml").getFile();
 
         Assert.assertEquals(0, new CoberturaParser().get(filePath), 0.1);
     }
 
     @Test
-    public void extractCoverageIfBranchRateIsZeroAndHasOnlyLineRate() throws IOException {
+    public void extractCoverageIfBranchRateIsZeroAndHasOnlyLineRate() {
         String filePath = CoberturaParserTest.class.getResource(
                 "/com/github/terma/jenkins/githubprcoveragestatus/CoberturaParserTest/cobertura-zero-branch-rate.xml").getFile();
 
         Assert.assertEquals(0.5, new CoberturaParser().get(filePath), 0.1);
     }
 
     @Test
-    public void extractCoverageIfLineRateIsZeroAndHasBranchRate() throws IOException {
+    public void extractCoverageIfLineRateIsZeroAndHasBranchRate() {
         String filePath = CoberturaParserTest.class.getResource(
                 "/com/github/terma/jenkins/githubprcoveragestatus/CoberturaParserTest/cobertura-zero-line-rate.xml").getFile();
 
         Assert.assertEquals(1, new CoberturaParser().get(filePath), 0.1);
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void throwExceptionIfNoLineRate() throws IOException {
+    public void throwExceptionIfNoLineRate() {
         String filePath = CoberturaParserTest.class.getResource(
                 "/com/github/terma/jenkins/githubprcoveragestatus/CoberturaParserTest/cobertura-no-line-rate.xml").getFile();
         new CoberturaParser().get(filePath);
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void throwExceptionIfNoBranchRate() throws IOException {
+    public void throwExceptionIfNoBranchRate() {
         String filePath = CoberturaParserTest.class.getResource(
                 "/com/github/terma/jenkins/githubprcoveragestatus/CoberturaParserTest/cobertura-no-branch-rate.xml").getFile();
         new CoberturaParser().get(filePath);

src/test/java/com/github/terma/jenkins/githubprcoveragestatus/CompareCoverageActionTest.java

@@ -56,7 +56,7 @@ public class CompareCoverageActionTest {
     private CompareCoverageAction coverageAction = new CompareCoverageAction();
 
     @Before
-    public void initMocks() throws IOException, InterruptedException {
+    public void initMocks() throws IOException {
         ServiceRegistry.setMasterCoverageRepository(masterCoverageRepository);
         ServiceRegistry.setCoverageRepository(coverageRepository);
         ServiceRegistry.setSettingsRepository(settingsRepository);

src/test/java/com/github/terma/jenkins/githubprcoveragestatus/JacocoParserTest.java

@@ -20,44 +20,42 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.io.IOException;
-
 public class JacocoParserTest {
 
     @Test
-    public void extractCoverageFromJacocoReport() throws IOException {
+    public void extractCoverageFromJacocoReport() {
         String filePath = JacocoParserTest.class.getResource(
                 "/com/github/terma/jenkins/githubprcoveragestatus/JacocoParserTest/jacoco.xml").getFile();
 
         Assert.assertEquals(0.22, new JacocoParser("LINE").get(filePath), 0.1);
     }
 
     @Test
-    public void extractCoverageFromJacocoReportWhenNoLinesOfCode() throws IOException {
+    public void extractCoverageFromJacocoReportWhenNoLinesOfCode() {
         String filePath = JacocoParserTest.class.getResource(
                 "/com/github/terma/jenkins/githubprcoveragestatus/JacocoParserTest/jacoco-no-code.xml").getFile();
 
         Assert.assertEquals(0, new JacocoParser("LINE").get(filePath), 0.1);
     }
 
     @Test
-    public void extractInstructionCoverageFromJacocoReportWhenCoverageTypeNull() throws IOException {
+    public void extractInstructionCoverageFromJacocoReportWhenCoverageTypeNull() {
         String filePath = JacocoParserTest.class.getResource(
                 "/com/github/terma/jenkins/githubprcoveragestatus/JacocoParserTest/jacoco.xml").getFile();
 
         Assert.assertEquals(0.22, new JacocoParser(null).get(filePath), 0.1);
     }
 
     @Test
-    public void extractInstructionCoverageFromJacocoReportWhenCoverageTypeUnknown() throws IOException {
+    public void extractInstructionCoverageFromJacocoReportWhenCoverageTypeUnknown() {
         String filePath = JacocoParserTest.class.getResource(
                 "/com/github/terma/jenkins/githubprcoveragestatus/JacocoParserTest/jacoco.xml").getFile();
 
         Assert.assertEquals(0.22, new JacocoParser("random").get(filePath), 0.1);
     }
 
     @Test
-    public void throwExceptionWhenExtractCoverageFromJacocoAndNoLineTag() throws IOException {
+    public void throwExceptionWhenExtractCoverageFromJacocoAndNoLineTag() {
         String filePath = JacocoParserTest.class.getResource(
                 "/com/github/terma/jenkins/githubprcoveragestatus/JacocoParserTest/jacoco-no-line-tag.xml").getFile();
 
@@ -80,7 +78,7 @@ public void throwExceptionWhenExtractCoverageFromJacocoAndNoLineTag() throws IOE
     }
 
     @Test
-    public void throwExceptionWhenExtractCoverageFromJacocoAndMissedNotNumber() throws IOException {
+    public void throwExceptionWhenExtractCoverageFromJacocoAndMissedNotNumber() {
         String filePath = JacocoParserTest.class.getResource(
                 "/com/github/terma/jenkins/githubprcoveragestatus/JacocoParserTest/jacoco-missed-not-number.xml").getFile();
 
@@ -104,7 +102,7 @@ public void throwExceptionWhenExtractCoverageFromJacocoAndMissedNotNumber() thro
     }
 
     @Test
-    public void throwExceptionWhenExtractCoverageFromJacocoAndCoveredNotNumber() throws IOException {
+    public void throwExceptionWhenExtractCoverageFromJacocoAndCoveredNotNumber() {
         String filePath = JacocoParserTest.class.getResource(
                 "/com/github/terma/jenkins/githubprcoveragestatus/JacocoParserTest/jacoco-covered-not-number.xml").getFile();
 
@@ -128,7 +126,7 @@ public void throwExceptionWhenExtractCoverageFromJacocoAndCoveredNotNumber() thr
     }
 
     @Test
-    public void throwExceptionWhenExtractCoverageFromJacocoAndNoFile() throws IOException {
+    public void throwExceptionWhenExtractCoverageFromJacocoAndNoFile() {
         try {
             new JacocoParser("LINE").get("/jacoco-no-file.xml");
             Assert.fail("Where is my exception?");

src/test/java/com/github/terma/jenkins/githubprcoveragestatus/SimpleCovParserTest.java

@@ -1,7 +1,6 @@
 package com.github.terma.jenkins.githubprcoveragestatus;
 
 import junit.framework.TestCase;
-import org.junit.Assert;
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.equalTo;

src/test/java/com/github/terma/jenkins/githubprcoveragestatus/SonarMasterCoverageRepositoryTest.java

@@ -28,7 +28,7 @@ public class SonarMasterCoverageRepositoryTest {
     private ByteArrayOutputStream buildLogOutputStream;
 
     @After
-    public void afterTest() throws Exception {
+    public void afterTest() {
         System.out.println(buildLogOutputStream.toString());
         wireMockRule.resetMappings();
     }