Some code improvements

4 files changed, 9 insertions, 5 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/AbstractDirectoriesDecorator.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/AbstractDirectoriesDecorator.java
index df91617c705..9389c08819c 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/AbstractDirectoriesDecorator.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/AbstractDirectoriesDecorator.java
@@ -36,7 +36,7 @@ public abstract class AbstractDirectoriesDecorator implements Decorator {
   /**
    * @param language this will be use to defined whether the decorator should be executed on a project
    */
-  public AbstractDirectoriesDecorator(Language language) {
+  public AbstractDirectoriesDecorator(Language language) {//NOSONAR this unused parameter is kept for backward-compatibility of API
   }
 
   /**
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/database/model/MeasureModel.java b/sonar-plugin-api/src/main/java/org/sonar/api/database/model/MeasureModel.java
index 2afffb5e307..c0a56de9dd3 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/database/model/MeasureModel.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/database/model/MeasureModel.java
@@ -78,7 +78,7 @@ public class MeasureModel implements Cloneable {
    */
   @Deprecated
   @Column(name = "rules_category_id", nullable = true)
-  private Integer rulesCategoryId;
+  private Integer rulesCategoryId;//NOSONAR this field is kept for backward-compatiblity of API
 
   @Column(name = "rule_priority", updatable = false, nullable = true)
   @Enumerated(EnumType.ORDINAL)
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/HttpDownloader.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/HttpDownloader.java
index a3893cd227c..097fa7a2ba9 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/HttpDownloader.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/HttpDownloader.java
@@ -76,9 +76,8 @@ public class HttpDownloader implements BatchComponent, ServerComponent {
   }
 
   private void initUserAgent(String sonarVersion) {
-    String userAgent = (sonarVersion == null ? "Sonar" : String.format("Sonar %s", sonarVersion));
+    userAgent = (sonarVersion == null ? "Sonar" : String.format("Sonar %s", sonarVersion));
     System.setProperty("http.agent", userAgent);
-    this.userAgent = userAgent;
   }
 
   public String getProxySynthesis(URI uri) {
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/utils/HttpDownloaderTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/utils/HttpDownloaderTest.java
index 9b1d470afef..8e386c8603f 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/utils/HttpDownloaderTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/utils/HttpDownloaderTest.java
@@ -22,6 +22,7 @@ package org.sonar.api.utils;
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.SystemUtils;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
@@ -36,14 +37,15 @@ import java.util.Arrays;
 import java.util.Properties;
 
 import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.not;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assume.assumeThat;
 import static org.junit.internal.matchers.StringContains.containsString;
 import static org.mockito.Matchers.anyObject;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@Ignore("Temporarily deactivated because it sometimes freezes on MS Windows")
 public class HttpDownloaderTest {
 
   private static ServletTester tester;
@@ -51,6 +53,9 @@ public class HttpDownloaderTest {
 
   @BeforeClass
   public static void startServer() throws Exception {
+    // Temporarily deactivated on Windows because it sometimes freezes
+    assumeThat(SystemUtils.IS_OS_WINDOWS, is(false));
+
     tester = new ServletTester();
     tester.setContextPath("/");
     tester.addServlet(RedirectServlet.class, "/redirect/");