Fix Quality flaws

diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContext.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContext.java
index 74c9a8d4a50830e8ec31277b74cfa94759e1ab51..9138d494b7fe7c1c93e897fac330e048cbe91864 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContext.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContext.java
@@ -256,6 +256,7 @@ class RuleActivatorContext {
   void verifyForActivation() {
     checkRequest(RuleStatus.REMOVED != rule.getStatus(), "Rule was removed: %s", rule.getKey());
     checkRequest(!rule.isTemplate(), "Rule template can't be activated on a Quality profile: %s", rule.getKey());
-    checkRequest(rulesProfile.getLanguage().equals(rule.getLanguage()), "Rule %s and profile %s have different languages", rule.getKey(), profile != null ? profile.getKee() : rulesProfile.getKee());
+    checkRequest(rulesProfile.getLanguage().equals(rule.getLanguage()),
+      "Rule %s and profile %s have different languages", rule.getKey(), profile != null ? profile.getKee() : rulesProfile.getKee());
   }
 }

diff --git a/sonar-core/src/main/java/org/sonar/core/util/UtcDateUtils.java b/sonar-core/src/main/java/org/sonar/core/util/UtcDateUtils.java
index d0e8b03fcf51d6a4a3105357af2ea2f09eaa0443..47998556bbdc3e292032fd0965029f735e3edaad 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/util/UtcDateUtils.java
+++ b/sonar-core/src/main/java/org/sonar/core/util/UtcDateUtils.java
@@ -30,15 +30,11 @@ import org.sonar.api.utils.DateUtils;
 public class UtcDateUtils {
 
   private static final ThreadLocal<DateFormat> format =
-    new ThreadLocal<DateFormat>() {
-      @Override
-      protected DateFormat initialValue() {
-        DateFormat f = new SimpleDateFormat(DateUtils.DATETIME_FORMAT);
-        f.setTimeZone(TimeZone.getTimeZone("UTC"));
-        return f;
-
-      }
-    };
+    ThreadLocal.withInitial(() -> {
+      DateFormat f = new SimpleDateFormat(DateUtils.DATETIME_FORMAT);
+      f.setTimeZone(TimeZone.getTimeZone("UTC"));
+      return f;
+    });
 
   private UtcDateUtils() {
     // only static stuff

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/config/AesCipher.java b/sonar-plugin-api/src/main/java/org/sonar/api/config/AesCipher.java
index 049c138dd00e8c692b8923a908f2cfbf8cec3f31..879375b8abcd97bf17207c6169f090fed7e6c93e 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/config/AesCipher.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/config/AesCipher.java
@@ -59,7 +59,7 @@ final class AesCipher implements Cipher {
     } catch (RuntimeException e) {
       throw e;
     } catch (Exception e) {
-      throw new RuntimeException(e);
+      throw new IllegalStateException(e);
     }
   }
 
@@ -73,7 +73,7 @@ final class AesCipher implements Cipher {
     } catch (RuntimeException e) {
       throw e;
     } catch (Exception e) {
-      throw new RuntimeException(e);
+      throw new IllegalStateException(e);
     }
   }
 

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/Version.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/Version.java
index 33a445da0690e2ccc18d09f351047e60ec32014a..10029f7483d00e577f174f79f4974f91f34dd4a4 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/Version.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/Version.java
@@ -218,7 +218,7 @@ public class Version implements Comparable<Version> {
         c = patch - other.patch;
         if (c == 0) {
           long diff = buildNumber - other.buildNumber;
-          c = diff > 0 ? 1 : (diff < 0 ? -1 : 0);
+          c = (diff > 0) ? 1 : ((diff < 0) ? -1 : 0);
         }
       }
     }

diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/pattern/LineRange.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/pattern/LineRange.java
index 0f49d4465042c635128e1e83e73dae657e43bb20..19dc312dd8d7660c997f0d426c7935c64bde2616 100644 (file)
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/pattern/LineRange.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/pattern/LineRange.java
@@ -65,10 +65,10 @@ public class LineRange {
 
   @Override
   public int hashCode() {
-    final int prime = 31;
+    final int PRIME = 31;
     int result = 1;
-    result = prime * result + from;
-    result = prime * result + to;
+    result = PRIME * result + from;
+    result = PRIME * result + to;
     return result;
   }
 

diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/tracking/TrackedIssue.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/tracking/TrackedIssue.java
index b9446d52807b30213128ed9b4460cba9efdabbfb..d1b689640930315dbc111c98c3c7028d81797880 100644 (file)
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/tracking/TrackedIssue.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/tracking/TrackedIssue.java
@@ -227,9 +227,9 @@ public class TrackedIssue implements Trackable, Serializable {
 
   @Override
   public int hashCode() {
-    final int prime = 31;
+    final int PRIME = 31;
     int result = 1;
-    result = prime * result + ((key == null) ? 0 : key.hashCode());
+    result = PRIME * result + ((key == null) ? 0 : key.hashCode());
     return result;
   }