Fix quality flaws

diff --git a/sonar-application/src/main/java/org/sonar/application/FilteredLogger.java b/sonar-application/src/main/java/org/sonar/application/FilteredLogger.java
index 41dbae338f9f5b43e9eade7f44c1fea78fb06a95..f530ee07020de9f4c63bb66f77a060580bdb80c9 100644 (file)
--- a/sonar-application/src/main/java/org/sonar/application/FilteredLogger.java
+++ b/sonar-application/src/main/java/org/sonar/application/FilteredLogger.java
@@ -26,10 +26,6 @@ public class FilteredLogger implements Logger {
   private final String name;
   private final Logger delegate;
 
-  public FilteredLogger() {
-    this(null);
-  }
-
   private FilteredLogger(String name) {
     this.name = name;
     this.delegate = new StdErrLog(name);
@@ -45,7 +41,8 @@ public class FilteredLogger implements Logger {
 
   public void info(String msg, Object arg0, Object arg1) {
     if (msg.contains("JVM BUG(s)")) {
-      return; // Ignore, see SONAR-3866
+      // Ignore, see SONAR-3866
+      return;
     }
     delegate.info(msg, arg0, arg1);
   }

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/SonarIndex.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/SonarIndex.java
index b337c00489a94bb4ad05be6626720a325e8e1c5c..f8f4e33759ea4e77c635fa9a38b8b3c0a3c2a513 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/SonarIndex.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/SonarIndex.java
@@ -23,7 +23,6 @@ import org.sonar.api.design.Dependency;
 import org.sonar.api.measures.Measure;
 import org.sonar.api.measures.MeasuresFilter;
 import org.sonar.api.measures.Metric;
-import org.sonar.api.resources.DuplicatedSourceException;
 import org.sonar.api.resources.Project;
 import org.sonar.api.resources.ProjectLink;
 import org.sonar.api.resources.Resource;

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/rules/RulePriority.java b/sonar-plugin-api/src/main/java/org/sonar/api/rules/RulePriority.java
index 8947a23d5fa754ca07942da307ea9c8ded5b8d06..5d60060ab9027539e8491b19945f8530d9bf2122 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/rules/RulePriority.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/rules/RulePriority.java
@@ -70,25 +70,6 @@ public enum RulePriority {
     if (checkPriority == Priority.INFO) {
       return RulePriority.INFO;
     }
-    return null;
-  }
-
-  public Priority toCheckPriority() {
-    if (this == BLOCKER) {
-      return Priority.BLOCKER;
-    }
-    if (this == CRITICAL) {
-      return Priority.CRITICAL;
-    }
-    if (this == MAJOR) {
-      return Priority.MAJOR;
-    }
-    if (this == MINOR) {
-      return Priority.MINOR;
-    }
-    if (this == INFO) {
-      return Priority.INFO;
-    }
-    return null;
+    throw new IllegalArgumentException("Unknown priority " + checkPriority);
   }
 }
\ No newline at end of file

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/ZipUtils.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/ZipUtils.java
index e462f1ca6cb6ed21f5a8cc8195b5b683f40d4132..4db153f57f6a5373f0c2e802989f2f8e80e378a8 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/ZipUtils.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/ZipUtils.java
@@ -22,7 +22,13 @@ package org.sonar.api.utils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.Enumeration;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
@@ -39,20 +45,22 @@ public final class ZipUtils {
 
   /**
    * Unzip a file into a new temporary directory. The directory is not deleted on JVM exit, so it
-   * must be explicitely deleted. 
+   * must be explicitely deleted.
+   *
    * @return the temporary directory
    * @since 2.2
-   * @deprecated since 3.4 use by {@link org.sonar.api.resources.ProjectFileSystem#getSonarWorkingDirectory} or {@link org.sonar.api.platform.ServerFileSystem#getTempDir}
+   * @deprecated since 3.4 use by {@link org.sonar.api.scan.filesystem.ModuleFileSystem#workingDir()} or {@link org.sonar.api.platform.ServerFileSystem#getTempDir}
    */
   @Deprecated
   public static File unzipToTempDir(File zip) throws IOException {
     File toDir = TempFileUtils.createTempDirectory();
-    unzip (zip, toDir);
+    unzip(zip, toDir);
     return toDir;
   }
 
   /**
    * Unzip a file into a directory. The directory is created if it does not exist.
+   *
    * @return the target directory
    */
   public static File unzip(File zip, File toDir) throws IOException {
@@ -99,7 +107,7 @@ public final class ZipUtils {
         }
       }
       return toDir;
-      
+
     } finally {
       zipFile.close();
     }
@@ -111,7 +119,7 @@ public final class ZipUtils {
     try {
       out = FileUtils.openOutputStream(zip);
       zout = new ZipOutputStream(out);
-      zip(dir, zout, null);
+      zip(dir, zout);
 
     } finally {
       IOUtils.closeQuietly(zout);
@@ -149,17 +157,9 @@ public final class ZipUtils {
     }
   }
 
-  private static void zip(File file, ZipOutputStream out, String prefix) throws IOException {
-    if (prefix != null) {
-      int len = prefix.length();
-      if (len == 0) {
-        prefix = null;
-      } else if (prefix.charAt(len - 1) != '/') {
-        prefix += '/';
-      }
-    }
+  private static void zip(File file, ZipOutputStream out) throws IOException {
     for (File child : file.listFiles()) {
-      String name = prefix != null ? prefix + child.getName() : child.getName();
+      String name = child.getName();
       _zip(name, child, out);
     }
   }

diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/rules/RulePriorityTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/rules/RulePriorityTest.java
index c55a96e107a0c38d583f78b54fbf7ca581768b75..5df2fdfce39019ef5f75268986fc1d1193422454 100644 (file)
--- a/sonar-plugin-api/src/test/java/org/sonar/api/rules/RulePriorityTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/rules/RulePriorityTest.java
@@ -19,19 +19,21 @@
  */
 package org.sonar.api.rules;
 
-import junit.framework.Assert;
 import org.junit.Test;
+import org.sonar.check.Priority;
+
+import static org.fest.assertions.Assertions.assertThat;
 
 public class RulePriorityTest {
 
   @Test
   public void testValueOfString() {
-    Assert.assertEquals(RulePriority.INFO, RulePriority.valueOfString("info"));
-    Assert.assertEquals(RulePriority.MAJOR, RulePriority.valueOfString("MAJOR"));
-    Assert.assertEquals(RulePriority.MAJOR, RulePriority.valueOfString("ERROR"));
-    Assert.assertEquals(RulePriority.INFO, RulePriority.valueOfString("WARNING"));
-    Assert.assertEquals(RulePriority.MAJOR, RulePriority.valueOfString("ErRor"));
-    Assert.assertEquals(RulePriority.INFO, RulePriority.valueOfString("WaRnInG"));
+    assertThat(RulePriority.INFO).isEqualTo(RulePriority.valueOfString("info"));
+    assertThat(RulePriority.MAJOR).isEqualTo(RulePriority.valueOfString("MAJOR"));
+    assertThat(RulePriority.MAJOR).isEqualTo(RulePriority.valueOfString("ERROR"));
+    assertThat(RulePriority.INFO).isEqualTo(RulePriority.valueOfString("WARNING"));
+    assertThat(RulePriority.MAJOR).isEqualTo(RulePriority.valueOfString("ErRor"));
+    assertThat(RulePriority.INFO).isEqualTo(RulePriority.valueOfString("WaRnInG"));
   }
 
   @Test(expected = IllegalArgumentException.class)
@@ -39,4 +41,12 @@ public class RulePriorityTest {
     RulePriority.valueOfString("make me crash");
   }
 
+  @Test
+  public void test_toCheckPriority() {
+    assertThat(RulePriority.fromCheckPriority(Priority.BLOCKER)).isEqualTo(RulePriority.BLOCKER);
+    assertThat(RulePriority.fromCheckPriority(Priority.CRITICAL)).isEqualTo(RulePriority.CRITICAL);
+    assertThat(RulePriority.fromCheckPriority(Priority.MAJOR)).isEqualTo(RulePriority.MAJOR);
+    assertThat(RulePriority.fromCheckPriority(Priority.MINOR)).isEqualTo(RulePriority.MINOR);
+    assertThat(RulePriority.fromCheckPriority(Priority.INFO)).isEqualTo(RulePriority.INFO);
+  }
 }

diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/web/CodeColorizerFormatTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/web/CodeColorizerFormatTest.java
index e9b6517f79cb8ef09f1ff9eebdd3ab52e22480ed..5df75aa7648ea98710ae41473c5099f0c02bdd8c 100644 (file)
--- a/sonar-plugin-api/src/test/java/org/sonar/api/web/CodeColorizerFormatTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/web/CodeColorizerFormatTest.java
@@ -25,18 +25,19 @@ import java.util.List;
 import org.junit.Test;
 import org.sonar.colorizer.Tokenizer;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.fest.assertions.Assertions.assertThat;
 
 public class CodeColorizerFormatTest {
 
   @Test
   public void keyIsLanguage() {
     CodeColorizerFormat format = new FakeFormat("foo");
-    assertThat(format.getLanguageKey(), is("foo"));
+    assertThat(format.getLanguageKey()).isEqualTo("foo");
 
-    assertThat(format.equals(new FakeFormat("foo")), is(true));
-    assertThat(format.equals(new FakeFormat("bar")), is(false));
+    assertThat(format.equals(new FakeFormat("foo"))).isTrue();
+    assertThat(format.equals(new FakeFormat("bar"))).isFalse();
+    assertThat(format.hashCode()).isEqualTo(format.hashCode());
+    assertThat(format.hashCode()).isEqualTo(new FakeFormat("foo").hashCode());
   }
 
   private static class FakeFormat extends CodeColorizerFormat {

diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css
index 4230e0a63ae665735109d5d58a791dd3eb809eed..dac16482f594f6253f4b2253f58c7b0dcf4bf26d 100644 (file)
--- a/sonar-server/src/main/webapp/stylesheets/style.css
+++ b/sonar-server/src/main/webapp/stylesheets/style.css
@@ -828,7 +828,6 @@ span.rulename a:hover {
 
 .global_violations {
   width: 100%;
-  margin-bottom: 10px;
 }
 
 .global_violations > tbody > tr > td {