From 18fbb41d409fa4b58e298de2d30581d8e1f4a3a8 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>
Date: Thu, 10 Apr 2014 17:11:32 +0200
Subject: Fix quality flaws

---
 .../component/DefaultRubyComponentService.java     |  2 +-
 .../server/qualityprofile/ProfileRuleQuery.java    | 22 +++++++++++++++-------
 .../java/org/sonar/server/user/DoPrivileged.java   |  2 +-
 3 files changed, 17 insertions(+), 9 deletions(-)

(limited to 'sonar-server')

diff --git a/sonar-server/src/main/java/org/sonar/server/component/DefaultRubyComponentService.java b/sonar-server/src/main/java/org/sonar/server/component/DefaultRubyComponentService.java
index 29293d7e326..ace86157de1 100644
--- a/sonar-server/src/main/java/org/sonar/server/component/DefaultRubyComponentService.java
+++ b/sonar-server/src/main/java/org/sonar/server/component/DefaultRubyComponentService.java
@@ -53,7 +53,7 @@ public class DefaultRubyComponentService implements RubyComponentService {
   }
 
   @Override
-  public Component<?> findByKey(String key) {
+  public Component findByKey(String key) {
     return resourceDao.findByKey(key);
   }
 
diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/ProfileRuleQuery.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ProfileRuleQuery.java
index 4d3c0fc5b98..4080b760b33 100644
--- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/ProfileRuleQuery.java
+++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ProfileRuleQuery.java
@@ -105,6 +105,19 @@ public class ProfileRuleQuery {
       result.addTags(optionalVarargs(params.get(PARAM_TAGS)));
     }
 
+    parseInheritance(params, errors, result);
+
+    parseParams(params, errors, result);
+
+    if (!errors.isEmpty()) {
+      throw BadRequestException.of("Incorrect rule search parameters", errors);
+    } else {
+      result.profileId = RubyUtils.toInteger(params.get(PARAM_PROFILE_ID));
+    }
+    return result;
+  }
+
+  private static void parseInheritance(Map<String, Object> params, List<BadRequestException.Message> errors, ProfileRuleQuery result) {
     if (params.containsKey(PARAM_INHERITANCE)) {
       String inheritance = (String) params.get(PARAM_INHERITANCE);
       validateInheritance(inheritance, errors);
@@ -118,7 +131,9 @@ public class ProfileRuleQuery {
     } else {
       result.setAnyInheritance(true);
     }
+  }
 
+  private static void parseParams(Map<String, Object> params, List<BadRequestException.Message> errors, ProfileRuleQuery result) {
     if (params.get(PARAM_SORT) != null) {
       String sort = (String) params.get(PARAM_SORT);
       Boolean asc = RubyUtils.toBoolean(params.get(PARAM_ASC));
@@ -128,13 +143,6 @@ public class ProfileRuleQuery {
         result.setAsc(asc);
       }
     }
-
-    if (!errors.isEmpty()) {
-      throw BadRequestException.of("Incorrect rule search parameters", errors);
-    } else {
-      result.profileId = RubyUtils.toInteger(params.get(PARAM_PROFILE_ID));
-    }
-    return result;
   }
 
   private static void validatePresenceOf(Map<String, Object> params, List<BadRequestException.Message> errors, String... paramNames) {
diff --git a/sonar-server/src/main/java/org/sonar/server/user/DoPrivileged.java b/sonar-server/src/main/java/org/sonar/server/user/DoPrivileged.java
index 9e323a63919..edae46ab7ae 100644
--- a/sonar-server/src/main/java/org/sonar/server/user/DoPrivileged.java
+++ b/sonar-server/src/main/java/org/sonar/server/user/DoPrivileged.java
@@ -53,7 +53,7 @@ public final class DoPrivileged {
    * Define a task that will be executed using the highest privileges available. The privileged section is restricted
    * to the execution of the {@link #doPrivileged()} method.
    */
-  public static abstract class Task {
+  public abstract static class Task {
 
     /**
      * Code placed in this method will be executed in a privileged environment.
-- 
cgit v1.2.3